Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

PAYARA-3876 Added profiles for adding and embedding source in build #3987

Merged
merged 4 commits into from
Jun 13, 2019
Merged

PAYARA-3876 Added profiles for adding and embedding source in build #3987

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
9988ed6
PAYARA-3876 Added profiles for adding and embedding source in build
arjantijms May 29, 2019
23bdfc0
PAYARA-3876 Fix appclient resources
arjantijms Jun 12, 2019
479145c
PAYARA-3876 Addressing feedback - Merged profiles into 1, added comment
arjantijms Jun 13, 2019
3f2396c
Merge branch 'master' into PAYARA-3876-embed-source
arjantijms Jun 13, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 7 additions & 5 deletions appserver/packager/glassfish-appclient/src/main/assembly/glassfish-appclient.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->
<!-- Portions Copyright [2016] [Payara Foundation] -->
<!-- Portions Copyright [2016-2019] [Payara Foundation] -->

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
Expand All @@ -57,29 +57,31 @@
<outputDirectory>${install.dir.name}/glassfish</outputDirectory>
<excludes>
<exclude>modules/gf-client.jar</exclude>
<exclude>modules/weld-se-shaded.jar</exclude>
<exclude>modules/weld-environment-common.jar</exclude>
<exclude>modules/gf-client-sources.jar</exclude>
<exclude>modules/weld-se-shaded*.jar</exclude>
<exclude>modules/weld-environment-common*.jar</exclude>
<exclude>pkg_proto.py</exclude>
</excludes>
</fileSet>
<fileSet>
<directory>${temp.dir}/glassfish/modules</directory>
<includes>
<include>gf-client.jar</include>
<include>gf-client-sources.jar</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/glassfish/modules</directory>
<includes>
<include>weld-se-shaded.jar</include>
<include>weld-se-shaded*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib/appclient</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/glassfish/modules</directory>
<includes>
<include>weld-environment-common.jar</include>
<include>weld-environment-common*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/glassfish/lib/appclient</outputDirectory>
</fileSet>
Expand Down
17 changes: 9 additions & 8 deletions appserver/packager/glassfish-common-web/src/main/assembly/glassfish-common-web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@
holder.

-->

<!-- Portions Copyright [2019] [Payara Foundation and/or its affiliates] -->

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
Expand All @@ -56,10 +57,10 @@
<directory>${temp.dir}/glassfish</directory>
<outputDirectory>${install.dir.name}/glassfish</outputDirectory>
<excludes>
<exclude>modules/cli-optional.jar</exclude>
<exclude>modules/appserver-cli.jar</exclude>
<exclude>modules/jna.jar</exclude>
<exclude>modules/jline-terminal-jna.jar</exclude>
<exclude>modules/cli-optional*.jar</exclude>
<exclude>modules/appserver-cli*.jar</exclude>
<exclude>modules/jna*.jar</exclude>
<exclude>modules/jline-terminal-jna*.jar</exclude>
<exclude>bin/*</exclude>
<exclude>pkg_proto.py</exclude>
</excludes>
Expand All @@ -76,16 +77,16 @@
<directory>${temp.dir}/glassfish/modules</directory>
<outputDirectory>${install.dir.name}/glassfish/lib/asadmin</outputDirectory>
<includes>
<include>cli-optional.jar</include>
<include>cli-optional*.jar</include>
</includes>
</fileSet>
<fileSet>
<directory>${temp.dir}/glassfish/modules</directory>
<outputDirectory>${install.dir.name}/glassfish/lib/client</outputDirectory>
<includes>
<include>appserver-cli.jar</include>
<include>jna.jar</include>
<include>jline-terminal-jna.jar</include>
<include>appserver-cli*.jar</include>
<include>jna*.jar</include>
<include>jline-terminal-jna*.jar</include>
</includes>
</fileSet>
<fileSet>
Expand Down
359 changes: 253 additions & 106 deletions appserver/packager/pom.xml
View file
Open in desktop

Large diffs are not rendered by default.

6 changes: 3 additions & 3 deletions nucleus/packager/nucleus-cluster/src/main/assembly/nucleus-cluster.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->

<!--"Portions Copyright [2019] [Payara Foundation and/or its affiliates]" -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

Expand All @@ -54,14 +54,14 @@
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>cluster-cli.jar</include>
<include>cluster-cli*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/asadmin</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}</directory>
<excludes>
<exclude>modules/cluster-cli.jar</exclude>
<exclude>modules/cluster-cli*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand Down
10 changes: 5 additions & 5 deletions nucleus/packager/nucleus-osgi/src/main/assembly/nucleus-osgi.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->

<!--"Portions Copyright [2019] [Payara Foundation and/or its affiliates]" -->
<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">

Expand All @@ -54,22 +54,22 @@
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>org.apache.felix.*.jar</include>
<include>org.apache.felix*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/modules/autostart</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}</directory>
<excludes>
<exclude>modules/org.apache.felix.*.jar</exclude>
<exclude>modules/osgi-cli-interactive.jar</exclude>
<exclude>modules/org.apache.felix*.jar</exclude>
<exclude>modules/osgi-cli-interactive*.jar</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>osgi-cli-interactive.jar</include>
<include>osgi-cli-interactive*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/asadmin</outputDirectory>
</fileSet>
Expand Down
18 changes: 9 additions & 9 deletions nucleus/packager/nucleus/src/main/assembly/nucleus.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -40,7 +40,7 @@
holder.

-->
<!-- Portions Copyright [2018] [Payara Foundation and/or its affiliates] -->
<!-- Portions Copyright [2018-2019] [Payara Foundation and/or its affiliates] -->

<assembly xmlns="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://maven.apache.org/plugins/maven-assembly-plugin/assembly/1.1.2 http://maven.apache.org/xsd/assembly-1.1.2.xsd">
Expand All @@ -62,34 +62,34 @@
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>server-mgmt.jar</include>
<include>server-mgmt*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/asadmin</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>flashlight-agent.jar</include>
<include>flashlight-agent*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/lib/monitor</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}/modules</directory>
<includes>
<include>nucleus-domain.jar</include>
<include>nucleus-domain*.jar</include>
</includes>
<outputDirectory>${install.dir.name}/common/templates/gf</outputDirectory>
</fileSet>
<fileSet>
<directory>${temp.dir}</directory>
<excludes>
<exclude>modules/server-mgmt.jar</exclude>
<exclude>modules/server-mgmt*.jar</exclude>
<exclude>glassfish/**</exclude>
<exclude>modules/flashlight-agent.jar</exclude>
<exclude>modules/nucleus-domain.jar</exclude>
<exclude>modules/javax.annotation-api.jar</exclude>
<exclude>modules/flashlight-agent*.jar</exclude>
<exclude>modules/nucleus-domain*.jar</exclude>
<exclude>modules/javax.annotation-api*.jar</exclude>
<exclude>META-INF/**</exclude>
<exclude>bin/**</exclude>
<exclude>bin/**</exclude>
</excludes>
<outputDirectory>${install.dir.name}</outputDirectory>
</fileSet>
Expand Down
Loading