Skip to content

Commit

Permalink
LPS-130748 SF didn't auto sort this, Hugo SF
Browse files Browse the repository at this point in the history
  • Loading branch information
brianchandotcom committed Aug 24, 2021
1 parent 8f22e83 commit 4321f4c
Showing 1 changed file with 23 additions and 23 deletions.
46 changes: 23 additions & 23 deletions build.xml
Original file line number Diff line number Diff line change
Expand Up @@ -568,29 +568,6 @@ message.
</DTDDoc>
</target>

<target name="update-portal-properties-with-osgi-configuration-overrides">
<pathconvert pathsep="," property="configuration.java.files">
<fileset
dir="modules"
excludes=""
includes="**/apps/**/configuration/*Configuration.java"
>
</fileset>
</pathconvert>

<java
classname="com.liferay.portal.tools.ConfigurationEnvBuilder"
classpathref="project.classpath"
dir="${project.dir}/modules"
fork="${fork.mode}"
newenvironment="true"
>
<arg value="configuration.java.files=${configuration.java.files}" />
<arg value="output.file=${project.dir}/portal-impl/src/portal.properties" />
<jvmarg if:true="${jvm.debug}" line="${jpda.settings}" />
</java>
</target>

<target name="install-portal-snapshots">
<ant dir="portal-impl" inheritAll="false" target="install-portal-snapshot" />
<ant dir="portal-kernel" inheritAll="false" target="install-portal-snapshot" />
Expand Down Expand Up @@ -1261,6 +1238,29 @@ print AdminControl.invoke(appManager, 'startApplication', 'liferay-portal')
</execute>
</target>

<target name="update-portal-properties-with-osgi-configuration-overrides">
<pathconvert pathsep="," property="configuration.java.files">
<fileset
dir="modules"
excludes=""
includes="**/apps/**/configuration/*Configuration.java"
>
</fileset>
</pathconvert>

<java
classname="com.liferay.portal.tools.ConfigurationEnvBuilder"
classpathref="project.classpath"
dir="${project.dir}/modules"
fork="${fork.mode}"
newenvironment="true"
>
<arg value="configuration.java.files=${configuration.java.files}" />
<arg value="output.file=${project.dir}/portal-impl/src/portal.properties" />
<jvmarg if:true="${jvm.debug}" line="${jpda.settings}" />
</java>
</target>

<target name="validate-xml">
<xmlvalidate failonerror="no">
<fileset
Expand Down

0 comments on commit 4321f4c

Please sign in to comment.