Skip to content

Commit 47d9fdd

Browse files
author
Marek Potociar
committed
Resolved JERSEY-1785, JERSEY-1816.
- Removed GF bundles from the project. - Introduced web app example parent pom module. - Added generation of individual example project sources ZIP and GF-specific project sources ZIP bits. - Unified external container test profile. - Added build.readme with a brief description of how to run various examples build profiles. - Added umbrella example ZIP bundle Change-Id: I58fb8fe70a1877c00435a1dc34a3b8871e1eef98 Signed-off-by: Marek Potociar <[email protected]>
1 parent f5d8270 commit 47d9fdd

File tree

89 files changed

+2620
-2241
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

89 files changed

+2620
-2241
lines changed

bundles/examples/pom.xml

+516
Large diffs are not rendered by default.

examples/osgi-http-service/assembly.xml bundles/examples/src/main/assembly/examples-assembly.xml

+18-17
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,8 @@
11
<?xml version="1.0" encoding="UTF-8"?>
22
<!--
3-
43
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
54
6-
Copyright (c) 2010-2012 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
76
87
The contents of this file are subject to the terms of either the GNU
98
General Public License Version 2 only ("GPL") or the Common Development
@@ -38,21 +37,23 @@
3837
and therefore, elected the GPL Version 2 license, then the option applies
3938
only if the new code is made subject to such option by the copyright
4039
holder.
41-
4240
-->
4341
<assembly>
44-
<id>project</id>
45-
<formats>
46-
<format>zip</format>
47-
</formats>
48-
<fileSets>
49-
<fileSet>
50-
<directory>.</directory>
51-
<outputDirectory></outputDirectory>
52-
<useDefaultExcludes>true</useDefaultExcludes>
53-
<excludes>
54-
<exclude>**/target/**</exclude>
55-
</excludes>
56-
</fileSet>
57-
</fileSets>
42+
<id>all</id>
43+
<includeBaseDirectory>false</includeBaseDirectory>
44+
<formats>
45+
<format>zip</format>
46+
</formats>
47+
<fileSets>
48+
<fileSet>
49+
<directory>target/dependency/examples</directory>
50+
<outputDirectory>jersey/examples</outputDirectory>
51+
</fileSet>
52+
</fileSets>
53+
<files>
54+
<file>
55+
<source>../../LICENSE.txt</source>
56+
<outputDirectory>jersey</outputDirectory>
57+
</file>
58+
</files>
5859
</assembly>

examples/gf-project-src-assembly.xml bundles/examples/src/main/assembly/gf-examples-assembly.xml

+16-18
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
12
<!--
2-
33
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
44
5-
Copyright (c) 2010-2013 Oracle and/or its affiliates. All rights reserved.
5+
Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
66
77
The contents of this file are subject to the terms of either the GNU
88
General Public License Version 2 only ("GPL") or the Common Development
@@ -37,29 +37,27 @@
3737
and therefore, elected the GPL Version 2 license, then the option applies
3838
only if the new code is made subject to such option by the copyright
3939
holder.
40-
4140
-->
42-
4341
<assembly>
44-
<id>gf-project-src</id>
42+
<id>gf</id>
43+
<includeBaseDirectory>false</includeBaseDirectory>
4544
<formats>
4645
<format>zip</format>
4746
</formats>
4847
<fileSets>
4948
<fileSet>
50-
<directory>${project.basedir}</directory>
51-
<outputDirectory>/</outputDirectory>
52-
<useDefaultExcludes>true</useDefaultExcludes>
53-
<excludes>
54-
<exclude>pom.xml</exclude>
55-
<exclude>**/target/**</exclude>
56-
<exclude>**/sun-web.xml</exclude>
57-
<exclude>**/*.iml</exclude>
58-
</excludes>
59-
</fileSet>
60-
<fileSet>
61-
<directory>${project.basedir}/target/gf-pom-file</directory>
62-
<outputDirectory>/</outputDirectory>
49+
<directory>target/dependency/gf-examples</directory>
50+
<outputDirectory>glassfish/jersey/examples</outputDirectory>
6351
</fileSet>
6452
</fileSets>
53+
<files>
54+
<file>
55+
<source>../../LICENSE.txt</source>
56+
<outputDirectory>.</outputDirectory>
57+
</file>
58+
<file>
59+
<source>../../LICENSE.txt</source>
60+
<outputDirectory>glassfish/jersey</outputDirectory>
61+
</file>
62+
</files>
6563
</assembly>

bundles/glassfish/v4.0/core/pom.xml

-170
This file was deleted.

bundles/glassfish/v4.0/core/src/main/assembly/ips.xml

-68
This file was deleted.

bundles/glassfish/v4.0/core/src/main/resources/jersey-core_proto.py

-20
This file was deleted.

0 commit comments

Comments
 (0)