Skip to content

Commit f83bb49

Browse files
japodjapod
committed
added GFv4.0 IPS bundle module
removed redundant license files from the jax-rs-ri module Change-Id: Idd44203736a19f9a952ef3a8bc9230b473626383
1 parent 138d1f3 commit f83bb49

File tree

13 files changed

+364
-280
lines changed

13 files changed

+364
-280
lines changed

‎license.html ‎LICENSE.html

File renamed without changes.

‎bundles/jax-rs-ri/src/main/resources/Jersey-LICENSE.txt ‎LICENSE.txt

File renamed without changes.

‎bundles/glassfish/pom.xml

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
5+
6+
Copyright (c) 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+
http://glassfish.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+
<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
44+
<modelVersion>4.0.0</modelVersion>
45+
46+
<parent>
47+
<groupId>org.glassfish.jersey.bundles</groupId>
48+
<artifactId>project</artifactId>
49+
<version>2.0-SNAPSHOT</version>
50+
</parent>
51+
52+
<groupId>org.glassfish.jersey.bundles.glassfish</groupId>
53+
<artifactId>project</artifactId>
54+
<packaging>pom</packaging>
55+
<name>jersey-bundles-glassfish</name>
56+
57+
<description>Jersey GlassFish bundles</description>
58+
59+
<modules>
60+
<module>v4.0</module>
61+
</modules>
62+
</project>

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

+135
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,135 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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+
http://glassfish.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+
<project xmlns="http://maven.apache.org/POM/4.0.0"
44+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
45+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
46+
<modelVersion>4.0.0</modelVersion>
47+
<parent>
48+
<groupId>org.glassfish.jersey.bundles.glassfish.v4_0</groupId>
49+
<artifactId>project</artifactId>
50+
<version>2.0-SNAPSHOT</version>
51+
</parent>
52+
<artifactId>jersey-gfv4_0-core</artifactId>
53+
<name>jersey-bundles-glassfish-v4.0-core</name>
54+
<packaging>pom</packaging>
55+
<dependencies>
56+
<dependency>
57+
<groupId>org.glassfish.jersey.core</groupId>
58+
<artifactId>jersey-server</artifactId>
59+
<version>${project.version}</version>
60+
</dependency>
61+
<dependency>
62+
<groupId>org.glassfish.jersey.core</groupId>
63+
<artifactId>jersey-client</artifactId>
64+
<version>${project.version}</version>
65+
</dependency>
66+
<dependency>
67+
<groupId>org.glassfish.jersey.containers</groupId>
68+
<artifactId>jersey-container-grizzly2-http</artifactId>
69+
<version>${project.version}</version>
70+
</dependency>
71+
<dependency>
72+
<groupId>org.glassfish.jersey.containers</groupId>
73+
<artifactId>jersey-container-servlet</artifactId>
74+
<version>${project.version}</version>
75+
</dependency>
76+
<dependency>
77+
<groupId>org.glassfish.jersey.media</groupId>
78+
<artifactId>jersey-media-json</artifactId>
79+
<version>${project.version}</version>
80+
</dependency>
81+
</dependencies>
82+
<build>
83+
<plugins>
84+
<plugin>
85+
<groupId>org.apache.maven.plugins</groupId>
86+
<artifactId>maven-dependency-plugin</artifactId>
87+
<executions>
88+
<execution>
89+
<id>copy-dependencies</id>
90+
<phase>generate-sources</phase>
91+
<goals>
92+
<goal>copy-dependencies</goal>
93+
</goals>
94+
<configuration>
95+
<stripVersion>true</stripVersion>
96+
<includeGroupIds>
97+
org.glassfish.jersey.core,
98+
,org.glassfish.jersey.containers,
99+
,org.glassfish.jersey.media,
100+
,javax.ws.rs,
101+
,com.googlecode.guava-osgi,
102+
,org.codehaus.jackson,
103+
,org.codehaus.jettison</includeGroupIds>
104+
</configuration>
105+
</execution>
106+
</executions>
107+
</plugin>
108+
<plugin>
109+
<artifactId>maven-assembly-plugin</artifactId>
110+
<configuration>
111+
<descriptors>
112+
<descriptor>src/main/assembly/ips.xml</descriptor>
113+
</descriptors>
114+
</configuration>
115+
<executions>
116+
<execution>
117+
<id>make-assembly</id>
118+
<!-- this is used for inheritance merges -->
119+
<phase>package</phase>
120+
<!-- append to the packaging phase. -->
121+
<goals>
122+
<goal>attached</goal>
123+
<!-- goals == mojos -->
124+
</goals>
125+
</execution>
126+
</executions>
127+
</plugin>
128+
</plugins>
129+
</build>
130+
131+
<properties>
132+
<assembly.directory>${project.build.directory}/assembly</assembly.directory>
133+
</properties>
134+
135+
</project>

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

+68
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,68 @@
1+
<!--
2+
3+
DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS HEADER.
4+
5+
Copyright (c) 2012 Oracle and/or its affiliates. All rights reserved.
6+
7+
The contents of this file are subject to the terms of either the GNU
8+
General Public License Version 2 only ("GPL") or the Common Development
9+
and Distribution License("CDDL") (collectively, the "License"). You
10+
may not use this file except in compliance with the License. You can
11+
obtain a copy of the License at
12+
http://glassfish.java.net/public/CDDL+GPL_1_1.html
13+
or packager/legal/LICENSE.txt. See the License for the specific
14+
language governing permissions and limitations under the License.
15+
16+
When distributing the software, include this License Header Notice in each
17+
file and include the License file at packager/legal/LICENSE.txt.
18+
19+
GPL Classpath Exception:
20+
Oracle designates this particular file as subject to the "Classpath"
21+
exception as provided by Oracle in the GPL Version 2 section of the License
22+
file that accompanied this code.
23+
24+
Modifications:
25+
If applicable, add the following below the License Header, with the fields
26+
enclosed by brackets [] replaced by your own identifying information:
27+
"Portions Copyright [year] [name of copyright owner]"
28+
29+
Contributor(s):
30+
If you wish your version of this file to be governed by only the CDDL or
31+
only the GPL Version 2, indicate your decision by adding "[Contributor]
32+
elects to include this software in this distribution under the [CDDL or GPL
33+
Version 2] license." If you don't indicate a single choice of license, a
34+
recipient has the option to distribute your version of this file under
35+
either the CDDL, the GPL Version 2 or to extend the choice of license to
36+
its licensees as provided above. However, if you add GPL Version 2 code
37+
and therefore, elected the GPL Version 2 license, then the option applies
38+
only if the new code is made subject to such option by the copyright
39+
holder.
40+
41+
-->
42+
<assembly>
43+
<id>project</id>
44+
<includeBaseDirectory>false</includeBaseDirectory>
45+
<formats>
46+
<format>zip</format>
47+
</formats>
48+
<fileSets>
49+
<fileSet>
50+
<directory>src/main/resources</directory>
51+
<outputDirectory></outputDirectory>
52+
</fileSet>
53+
<fileSet>
54+
<directory>target/dependency</directory>
55+
<outputDirectory>glassfish/modules</outputDirectory>
56+
</fileSet>
57+
</fileSets>
58+
<files>
59+
<file>
60+
<source>../../../../LICENSE.txt</source>
61+
<outputDirectory></outputDirectory>
62+
</file>
63+
<file>
64+
<source>../../../../third-party-license-readme.txt</source>
65+
<outputDirectory></outputDirectory>
66+
</file>
67+
</files>
68+
</assembly>

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

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
pkg = {
2+
"name" : "jersey",
3+
"version" : "2.0,0-0.1",
4+
"attributes" : { "pkg.summary" : "Jersey 2 Core, RESTful Web services for GlassFish",
5+
"pkg.description" :
6+
"Jersey core runtime libraries including some 3rd party dependencies. \
7+
Jersey is the open source (under dual CDDL+GPL license)\
8+
JAX-RS (JSR 311) Reference Implementation for building RESTful Web services. \
9+
But, it is also more than the Reference Implementation. \
10+
Jersey provides additional APIs and extension points (SPIs) \
11+
so that developers may extend Jersey to suite their needs.",
12+
"info.classification" : "Web Services" },
13+
"dirtrees" : [ "glassfish"],
14+
"depends" : {
15+
"pkg:/[email protected]" : {"type" : "require" }
16+
,"pkg:/glassfish-common" : {"type" : "require" }
17+
,"pkg:/[email protected]" : {"type" : "require" }
18+
},
19+
"licenses" : { "LICENSE.txt" : { "license" : "CDDL+GPL" }, "third-party-license-readme.txt" : { "license" : "Apache2" }}
20+
}

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

+62
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,62 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
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+
http://glassfish.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+
<project xmlns="http://maven.apache.org/POM/4.0.0"
44+
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
45+
xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
46+
<modelVersion>4.0.0</modelVersion>
47+
<parent>
48+
<groupId>org.glassfish.jersey.bundles.glassfish</groupId>
49+
<artifactId>project</artifactId>
50+
<version>2.0-SNAPSHOT</version>
51+
</parent>
52+
<groupId>org.glassfish.jersey.bundles.glassfish.v4_0</groupId>
53+
<artifactId>project</artifactId>
54+
<name>jersey-bundles-glassfish-v4.0</name>
55+
<description>
56+
Jersey GlassFish V4.0 Update Center Packages
57+
</description>
58+
<packaging>pom</packaging>
59+
<modules>
60+
<module>core</module>
61+
</modules>
62+
</project>

‎bundles/jax-rs-ri/pom.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
</parent>
5050

5151
<artifactId>jax-rs-ri</artifactId>
52-
<name>jax-rs-ri</name>
52+
<name>jersey-bundles-jax-rs-ri</name>
5353
<packaging>pom</packaging>
5454

5555
<dependencies>

‎bundles/jax-rs-ri/src/main/assembly/archive.xml

+11
Original file line numberDiff line numberDiff line change
@@ -73,4 +73,15 @@
7373
<outputDirectory>ext</outputDirectory>
7474
</fileSet>
7575
</fileSets>
76+
<files>
77+
<file>
78+
<source>../../LICENSE.txt</source>
79+
<destName>Jersey-LICENSE.txt</destName>
80+
<outputDirectory></outputDirectory>
81+
</file>
82+
<file>
83+
<source>../../third-party-license-readme.txt</source>
84+
<outputDirectory></outputDirectory>
85+
</file>
86+
</files>
7687
</assembly>

‎bundles/pom.xml

+1
Original file line numberDiff line numberDiff line change
@@ -58,5 +58,6 @@
5858

5959
<modules>
6060
<module>jax-rs-ri</module>
61+
<module>glassfish</module>
6162
</modules>
6263
</project>

0 commit comments

Comments
 (0)