Skip to content

Commit 5f196fa

Browse files
Pandrex247Pandrex247
committed
Remove microprofile-config xml tag from JDK7 release
1 parent be5713f commit 5f196fa

File tree

2 files changed

+283
-23
lines changed

2 files changed

+283
-23
lines changed

‎appserver/extras/payara-micro/payara-micro-distribution/build-jdk7.xml

Lines changed: 221 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,221 @@
1+
<?xml version="1.0" encoding="iso-8859-1"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
7+
8+
The contents of this file are subject to the terms of either the GNU
9+
General Public License Version 2 only ("GPL") or the Common Development
10+
and Distribution License("CDDL") (collectively, the "License"). You
11+
may not use this file except in compliance with the License. You can
12+
obtain a copy of the License at
13+
https://glassfish.dev.java.net/public/CDDL+GPL_1_1.html
14+
or packager/legal/LICENSE.txt. See the License for the specific
15+
language governing permissions and limitations under the License.
16+
17+
When distributing the software, include this License Header Notice in each
18+
file and include the License file at packager/legal/LICENSE.txt.
19+
20+
GPL Classpath Exception:
21+
Oracle designates this particular file as subject to the "Classpath"
22+
exception as provided by Oracle in the GPL Version 2 section of the License
23+
file that accompanied this code.
24+
25+
Modifications:
26+
If applicable, add the following below the License Header, with the fields
27+
enclosed by brackets [] replaced by your own identifying information:
28+
"Portions Copyright [year] [name of copyright owner]"
29+
30+
Contributor(s):
31+
If you wish your version of this file to be governed by only the CDDL or
32+
only the GPL Version 2, indicate your decision by adding "[Contributor]
33+
elects to include this software in this distribution under the [CDDL or GPL
34+
Version 2] license." If you don't indicate a single choice of license, a
35+
recipient has the option to distribute your version of this file under
36+
either the CDDL, the GPL Version 2 or to extend the choice of license to
37+
its licensees as provided above. However, if you add GPL Version 2 code
38+
and therefore, elected the GPL Version 2 license, then the option applies
39+
only if the new code is made subject to such option by the copyright
40+
holder.
41+
42+
-->
43+
<!-- Portions Copyright [2016-2017] [Payara Foundation] -->
44+
45+
<project name="payara-micro" default="new.create" basedir=".">
46+
<property name="rootdir" value="target"/>
47+
<property name="zipdir" value="${rootdir}/packager_zips"/>
48+
<property name="stagedir" value="${rootdir}/stage"/>
49+
<property name="microdir" value="${stagedir}/MICRO-INF"/>
50+
<property name="runtimedir" value="${microdir}/runtime"/>
51+
<property name="classesdir" value="${microdir}/classes"/>
52+
<property name="deploydir" value="${microdir}/deploy"/>
53+
<property name="libdir" value="${microdir}/lib"/>
54+
<property name="domaindir" value="${microdir}/domain"/>
55+
<property name="tempdir" value="${rootdir}/temp" />
56+
57+
<target name="new.create">
58+
<antcall target="makeDirs"/>
59+
<antcall target="dumpRuntime"/>
60+
<antcall target="addSchemas"/>
61+
<antcall target="addRARs"/>
62+
<antcall target="addKeystores"/>
63+
<antcall target="tidyRuntimeJars"/>
64+
<antcall target="sortOutBootClasses"/>
65+
<antcall target="finalClean"/>
66+
<antcall target="buildFinalJar"/>
67+
<attachArtifact file="${finaljar}"/>
68+
</target>
69+
70+
<target name="makeDirs">
71+
<mkdir dir="${rootdir}/stage/META-INF"/>
72+
<mkdir dir="${microdir}"/>
73+
<mkdir dir="${domaindir}"/>
74+
<mkdir dir="${libdir}"/>
75+
<mkdir dir="${runtimedir}"/>
76+
<mkdir dir="${classesdir}"/>
77+
<mkdir dir="${deploydir}"/>
78+
</target>
79+
80+
<target name="dumpRuntime">
81+
<echo message="Dumping Dependencies into the runtime directory" />
82+
<copy todir="${runtimedir}">
83+
<fileset dir="${zipdir}">
84+
<include name="*.jar"/>
85+
</fileset>
86+
</copy>
87+
<unzip dest="${runtimedir}">
88+
<fileset dir="${zipdir}">
89+
<include name="*.zip"/>
90+
<exclude name="mq**.zip"/>
91+
</fileset>
92+
</unzip>
93+
</target>
94+
95+
<target name="tidyRuntimeJars">
96+
<move todir="${runtimedir}" flatten="true">
97+
<fileset dir="${runtimedir}/">
98+
<include name="**/*.jar"/>
99+
</fileset>
100+
</move>
101+
<delete file="${runtimedir}/javahelp.jar"/>
102+
<delete file="${runtimedir}/upgrade-tool.jar"/>
103+
<delete file="${runtimedir}/web-gui-plugin-common.jar"/>
104+
<delete file="${runtimedir}/ha-shoal-cache-store.jar"/>
105+
<delete file="${runtimedir}/ha-shoal-cache-bootstrap.jar"/>
106+
<delete file="${runtimedir}/ha-file-store.jar"/>
107+
<delete file="${runtimedir}/payara-console-extras.jar"/>
108+
<delete file="${runtimedir}/shoal-cache.jar"/>
109+
<delete file="${runtimedir}/shoal-gms-api.jar"/>
110+
<delete file="${runtimedir}/load-balancer-admin.jar"/>
111+
<delete file="${runtimedir}/gf-load-balancer-connector.jar"/>
112+
<delete file="${runtimedir}/backup.jar"/>
113+
<delete file="${runtimedir}/ant.jar" failonerror="false"/>
114+
<delete verbose="true" failonerror="false">
115+
<fileset dir="${runtimedir}" includes="**console-plugin.jar"/>
116+
<fileset dir="${runtimedir}" includes="console-**-help.jar"/>
117+
<fileset dir="${runtimedir}" includes="console-**-plugin.jar"/>
118+
<!-- skip the domain creation template jar files viz., nucleus-domain.jar, appserver-domain.jar -->
119+
<fileset dir="${runtimedir}" includes="**/appserver-domain*.jar"/>
120+
<fileset dir="${runtimedir}" includes="**/payara-domain*.jar"/>
121+
<fileset dir="${runtimedir}" includes="**/nucleus-domain.jar"/>
122+
<fileset dir="${runtimedir}" includes="**/weld-se-core.jar"/>
123+
<fileset dir="${runtimedir}" includes="**/weld-environment-common.jar"/>
124+
<fileset dir="${runtimedir}" includes="**/derbyLocale*.jar"/>
125+
</delete>
126+
<delete file="${runtimedir}/autostart/osgi-cdi.jar" failonerror="false"/>
127+
</target>
128+
129+
<target name="sortOutBootClasses">
130+
<unzip dest="${stagedir}">
131+
<fileset dir="${runtimedir}">
132+
<include name="*payara-micro-boot*.jar"/>
133+
</fileset>
134+
</unzip>
135+
<delete>
136+
<fileset dir="${runtimedir}">
137+
<include name="*payara-micro-boot*.jar"/>
138+
</fileset>
139+
</delete>
140+
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@PRODUCT@@@" value="Payara Micro"/>
141+
<replace file="${domaindir}/branding/glassfish-version.properties" token="@@@BUILD_NUMBER@@@" value="${build.number}"/>
142+
<replace file="${domaindir}/domain.xml" token="&lt;microprofile-config/&gt;" value=""/>
143+
</target>
144+
145+
<target name="addSchemas" >
146+
<echo message="adding schemas"/>
147+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/920"/>
148+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/1.0"/>
149+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/10.0"/>
150+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/10.3"/>
151+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/90"/>
152+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/910"/>
153+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/deployment-plan"/>
154+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/domain"/>
155+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/jdbc-data-source"/>
156+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/persistence-configuration"/>
157+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/security"/>
158+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/servers"/>
159+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-application"/>
160+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-application-client"/>
161+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-connector"/>
162+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-diagnostics"/>
163+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-diagnostics-image"/>
164+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-ejb-jar"/>
165+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-interception"/>
166+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-javaee"/>
167+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-jms"/>
168+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-pubsub"/>
169+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-rdbms-jar"/>
170+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-sca"/>
171+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-sca-binding"/>
172+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-web-app"/>
173+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-webservices"/>
174+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-wsee-clienthandlerchain"/>
175+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-wsee-databinding"/>
176+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/weblogic-wsee-standaloneclient"/>
177+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas/webservice-policy-ref"/>
178+
<jar jarfile="${runtimedir}/dtds.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib" includes="dtds/**/*"/>
179+
<jar jarfile="${runtimedir}/schemas.jar" basedir="${runtimedir}/${install.dir.name}/glassfish/lib" includes="schemas/**/*"/>
180+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/dtds" />
181+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/schemas" />
182+
</target>
183+
184+
<target name="addRARs">
185+
<echo message="adding rars"/>
186+
<jar jarfile="${runtimedir}/__cp_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__cp_jdbc_ra/**/*"/>
187+
<jar jarfile="${runtimedir}/__ds_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__ds_jdbc_ra/**/*"/>
188+
<jar jarfile="${runtimedir}/__dm_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__dm_jdbc_ra/**/*"/>
189+
<jar jarfile="${runtimedir}/__xa_jdbc_ra.rar" basedir="${runtimedir}/${install.dir.name}/glassfish" includes="lib/install/applications/__xa_jdbc_ra/**/*"/>
190+
<delete dir="${runtimedir}/${install.dir.name}/glassfish/lib/install/applications" />
191+
</target>
192+
193+
<target name="addKeystores">
194+
<unzip dest="${tempdir}">
195+
<fileset dir="${runtimedir}/${install.dir.name}/glassfish/common/templates/gf">
196+
<include name="payara-domain.jar"/>
197+
</fileset>
198+
</unzip>
199+
<copy todir="${domaindir}">
200+
<fileset dir="${tempdir}/config">
201+
<include name="*.jks"/>
202+
</fileset>
203+
</copy>
204+
</target>
205+
206+
207+
<target name="finalClean">
208+
<delete dir="${runtimedir}/${install.dir.name}"/>
209+
</target>
210+
211+
<target name="buildFinalJar">
212+
<jar basedir="${stagedir}" destfile="${finaljar}" compress="false">
213+
<manifest>
214+
<attribute name="Bundle-SymbolicName" value="${bundlename}"/>
215+
<attribute name="Main-Class" value="fish.payara.micro.PayaraMicro"/>
216+
<attribute name="Start-Class" value="fish.payara.micro.impl.PayaraMicroImpl"/>
217+
</manifest>
218+
</jar>
219+
</target>
220+
221+
</project>

‎appserver/extras/payara-micro/payara-micro-distribution/pom.xml

Lines changed: 62 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -77,27 +77,6 @@
7777
</execution>
7878
</executions>
7979
</plugin>
80-
<plugin>
81-
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
82-
<artifactId>maven-antrun-extended-plugin</artifactId>
83-
<executions>
84-
<execution>
85-
<phase>package</phase>
86-
<goals>
87-
<goal>run</goal>
88-
</goals>
89-
<configuration>
90-
<tasks>
91-
<ant dir="." antfile="build.xml" target="new.create">
92-
<property name="bundlename" value="fish.payara.micro" />
93-
<property name="finaljar" value="${project.build.directory}/payara-micro.jar" />
94-
<property name="install.dir.name" value="${install.dir.name}" />
95-
</ant>
96-
</tasks>
97-
</configuration>
98-
</execution>
99-
</executions>
100-
</plugin>
10180
<plugin>
10281
<artifactId>maven-jar-plugin</artifactId>
10382
<executions>
@@ -462,12 +441,72 @@
462441
</plugins>
463442
</build>
464443
</profile>
465-
466-
<profile>
444+
445+
<profile>
446+
<id>jdk7</id>
447+
<activation>
448+
<jdk>1.7</jdk>
449+
</activation>
450+
<build>
451+
<defaultGoal>install</defaultGoal>
452+
<plugins>
453+
<plugin>
454+
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
455+
<artifactId>maven-antrun-extended-plugin</artifactId>
456+
<executions>
457+
<execution>
458+
<phase>package</phase>
459+
<goals>
460+
<goal>run</goal>
461+
</goals>
462+
<configuration>
463+
<tasks>
464+
<ant dir="." antfile="build-jdk7.xml" target="new.create">
465+
<property name="bundlename" value="fish.payara.micro" />
466+
<property name="finaljar" value="${project.build.directory}/payara-micro.jar" />
467+
<property name="install.dir.name" value="${install.dir.name}" />
468+
</ant>
469+
</tasks>
470+
</configuration>
471+
</execution>
472+
</executions>
473+
</plugin>
474+
</plugins>
475+
</build>
476+
</profile>
477+
478+
<profile>
467479
<id>jdk8</id>
468480
<activation>
469481
<jdk>1.8</jdk>
470482
</activation>
483+
<build>
484+
<defaultGoal>install</defaultGoal>
485+
<plugins>
486+
<plugin>
487+
<groupId>org.jvnet.maven-antrun-extended-plugin</groupId>
488+
<artifactId>maven-antrun-extended-plugin</artifactId>
489+
<executions>
490+
<execution>
491+
<phase>package</phase>
492+
<goals>
493+
<goal>run</goal>
494+
</goals>
495+
<configuration>
496+
<tasks>
497+
<ant dir="." antfile="build.xml" target="new.create">
498+
<property name="bundlename" value="fish.payara.micro" />
499+
<property name="finaljar" value="${project.build.directory}/payara-micro.jar" />
500+
<property name="install.dir.name" value="${install.dir.name}" />
501+
</ant>
502+
</tasks>
503+
</configuration>
504+
</execution>
505+
</executions>
506+
</plugin>
507+
</plugins>
508+
</build>
509+
471510
<dependencies>
472511
<!-- Add Microprofile 1.1 apis -->
473512
<dependency>

0 commit comments

Comments
 (0)