Skip to content

Commit

Permalink
FISH-5802 Formatting
Browse files Browse the repository at this point in the history 
Signed-off-by: Andrew Pielage <pandrex247@hotmail.com>
  • Loading branch information
@Pandrex247
Pandrex247 committed Nov 5, 2021
1 parent 91f883e commit a00748a
Showing 1 changed file with 84 additions and 75 deletions.
159 changes: 84 additions & 75 deletions appserver/extras/payara-micro/payara-micro-distribution/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -52,8 +52,8 @@
<property name="deploydir" value="${microdir}/deploy"/>
<property name="libdir" value="${microdir}/lib"/>
<property name="domaindir" value="${microdir}/domain"/>
<property name="tempdir" value="${rootdir}/temp" />
<property name="tempdir" value="${rootdir}/temp"/>

<target name="new.create">
<antcall target="makeDirs"/>
<antcall target="dumpRuntime"/>
Expand All @@ -66,19 +66,19 @@
<antcall target="buildFinalJar"/>
<attachArtifact file="${finaljar}"/>
</target>
<target name="makeDirs">
<mkdir dir="${rootdir}/stage/META-INF"/>
<mkdir dir="${microdir}"/>
<mkdir dir="${domaindir}"/>
<mkdir dir="${libdir}"/>
<mkdir dir="${runtimedir}"/>
<mkdir dir="${classesdir}"/>
<mkdir dir="${deploydir}"/>
</target>
<target name="dumpRuntime">
<echo message="Dumping Dependencies into the runtime directory" />

<target name="makeDirs">
<mkdir dir="${rootdir}/stage/META-INF"/>
<mkdir dir="${microdir}"/>
<mkdir dir="${domaindir}"/>
<mkdir dir="${libdir}"/>
<mkdir dir="${runtimedir}"/>
<mkdir dir="${classesdir}"/>
<mkdir dir="${deploydir}"/>
</target>

<target name="dumpRuntime">
<echo message="Dumping Dependencies into the runtime directory"/>
<copy todir="${runtimedir}">
<fileset dir="${zipdir}">
<include name="*.jar"/>
Expand All @@ -90,52 +90,54 @@
<exclude name="mq**.zip"/>
</fileset>
</unzip>
</target>

<target name="tidyRuntimeJars">
<move todir="${runtimedir}" flatten="true">
<fileset dir="${runtimedir}/">
<include name="**/*.jar"/>
</fileset>
</move>
<delete file="${runtimedir}/javahelp.jar"/>
<delete file="${runtimedir}/upgrade-tool.jar"/>
<delete file="${runtimedir}/web-gui-plugin-common.jar"/>
<delete file="${runtimedir}/ha-file-store.jar"/>
<delete file="${runtimedir}/payara-console-extras.jar"/>
<delete file="${runtimedir}/load-balancer-admin.jar"/>
<delete file="${runtimedir}/gf-load-balancer-connector.jar"/>
<delete file="${runtimedir}/backup.jar"/>
<delete file="${runtimedir}/ant.jar" failonerror="false"/>
<delete verbose="true" failonerror="false">
<fileset dir="${runtimedir}" includes="**console-plugin.jar"/>
<fileset dir="${runtimedir}" includes="console-**-help.jar"/>
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
<fileset dir="${runtimedir}" includes="**/appserver-domain*.jar"/>
<fileset dir="${runtimedir}" includes="**/nucleus-domain.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-se-shaded.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-environment-common.jar"/>
</delete>
<delete file="${runtimedir}/autostart/osgi-cdi.jar" failonerror="false"/>
</target>
<target name="sortOutBootClasses">
</target>

<target name="tidyRuntimeJars">
<move todir="${runtimedir}" flatten="true">
<fileset dir="${runtimedir}/">
<include name="**/*.jar"/>
</fileset>
</move>
<delete file="${runtimedir}/javahelp.jar"/>
<delete file="${runtimedir}/upgrade-tool.jar"/>
<delete file="${runtimedir}/web-gui-plugin-common.jar"/>
<delete file="${runtimedir}/ha-file-store.jar"/>
<delete file="${runtimedir}/payara-console-extras.jar"/>
<delete file="${runtimedir}/load-balancer-admin.jar"/>
<delete file="${runtimedir}/gf-load-balancer-connector.jar"/>
<delete file="${runtimedir}/backup.jar"/>
<delete file="${runtimedir}/ant.jar" failonerror="false"/>
<delete verbose="true" failonerror="false">
<fileset dir="${runtimedir}" includes="**console-plugin.jar"/>
<fileset dir="${runtimedir}" includes="console-**-help.jar"/>
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
<fileset dir="${runtimedir}" includes="**/appserver-domain*.jar"/>
<fileset dir="${runtimedir}" includes="**/nucleus-domain.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-se-shaded.jar"/>
<fileset dir="${runtimedir}" includes="**/weld-environment-common.jar"/>
</delete>
<delete file="${runtimedir}/autostart/osgi-cdi.jar" failonerror="false"/>
</target>

<target name="sortOutBootClasses">
<unzip dest="${stagedir}">
<fileset dir="${runtimedir}">
<include name="*payara-micro-boot*.jar"/>
<include name="*payara-micro-boot*.jar"/>
</fileset>
</unzip>
<delete>
<fileset dir="${runtimedir}">
<include name="*payara-micro-boot*.jar"/>
<include name="*payara-micro-boot*.jar"/>
</fileset>
</delete>
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@PRODUCT@@@" value="${product.name}"/>
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@BUILD_NUMBER@@@" value="${build.number}"/>
</target>

<target name="addSchemas" >
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@PRODUCT@@@"
value="${product.name}"/>
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@BUILD_NUMBER@@@"
value="${build.number}"/>
</target>

<target name="addSchemas">
<echo message="adding schemas"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/920"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/1.0"/>
Expand Down Expand Up @@ -168,21 +170,27 @@
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-wsee-databinding"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-wsee-standaloneclient"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/webservice-policy-ref"/>
<jar jarfile="${runtimedir}/dtds.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib" includes="dtds/**/*"/>
<jar jarfile="${runtimedir}/schemas.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib" includes="schemas/**/*"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/dtds" />
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas" />
<jar jarfile="${runtimedir}/dtds.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib"
includes="dtds/**/*"/>
<jar jarfile="${runtimedir}/schemas.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib"
includes="schemas/**/*"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/dtds"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas"/>
</target>

<target name="addRARs">
<echo message="adding rars"/>
<jar jarfile="${runtimedir}/__cp_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__cp_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__ds_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__ds_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__dm_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__dm_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__xa_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__xa_jdbc_ra/**/*"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/install/applications" />
</target>

<jar jarfile="${runtimedir}/__cp_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish"
includes="lib/install/applications/__cp_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__ds_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish"
includes="lib/install/applications/__ds_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__dm_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish"
includes="lib/install/applications/__dm_jdbc_ra/**/*"/>
<jar jarfile="${runtimedir}/__xa_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish"
includes="lib/install/applications/__xa_jdbc_ra/**/*"/>
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/install/applications"/>
</target>

<target name="addKeystores">
<unzip dest="${tempdir}">
<fileset dir="${runtimedir}/${install.dir.name}/glassfish/common/templates/gf">
Expand All @@ -194,27 +202,28 @@
<include name="*.jks"/>
<include name="keyfile"/>
</fileset>
</copy>
</copy>
</target>


<target name="finalClean">
<delete dir="${runtimedir}/${install.dir.name}"/>
<delete file="${libdir}/.gitkeep"/>
<delete file="${deploydir}/.gitkeep"/>
<delete file="${classesdir}/.gitkeep"/>
</target>
</target>

<target name="buildFinalJar">
<jar basedir="${stagedir}" destfile="${finaljar}" compress="false">
<manifest>
<manifest>
<attribute name="Bundle-SymbolicName" value="${bundlename}"/>
<attribute name="Main-Class" value="fish.payara.micro.PayaraMicro"/>
<attribute name="Start-Class" value="fish.payara.micro.impl.PayaraMicroImpl"/>
<attribute name="Add-Exports" value="java.base/jdk.internal.ref"/>
<attribute name="Add-Opens" value="java.base/jdk.internal.loader java.base/java.lang java.base/java.net java.base/java.nio java.base/java.util java.base/sun.nio.ch java.management/sun.management jdk.management/com.sun.management.internal java.base/sun.net.www.protocol.jrt java.base/sun.net.www.protocol.jar java.naming/javax.naming.spi java.rmi/sun.rmi.transport java.logging/java.util.logging"/>
</manifest>
</jar>
</target>

<attribute name="Add-Opens"
value="java.base/jdk.internal.loader java.base/java.lang java.base/java.net java.base/java.nio java.base/java.util java.base/sun.nio.ch java.management/sun.management jdk.management/com.sun.management.internal java.base/sun.net.www.protocol.jrt java.base/sun.net.www.protocol.jar java.naming/javax.naming.spi java.rmi/sun.rmi.transport java.logging/java.util.logging"/>
</manifest>
</jar>
</target>

</project>

0 comments on commit a00748a

Please sign in to comment.