[Jpackage-commits] dist/jersey/devel .cvsignore, 1.1, 1.2 jersey-archive-pom.patch, NONE, 1.1 jersey-bundle-pom.patch, NONE, 1.1 jersey-contribs-pom.patch, NONE, 1.1 jersey-documentation-pom.patch, NONE, 1.1 jersey-jpp-depmap.xml, NONE, 1.1 jersey-json-JacksonArrayWrapperGenerator.patch, NONE, 1.1 jersey-json-JacksonRootAddingParser.patch, NONE, 1.1 jersey-json-JacksonRootStrippingGenerator.patch, NONE, 1.1 jersey-json-JacksonStringMergingGenerator.patch, NONE, 1.1 jersey-json-pom.patch, NONE, 1.1 jersey-no-wagon-svn.patch, NONE, 1.1 jersey-pom.patch, NONE, 1.1 jersey-ri-pom.patch, NONE, 1.1 jersey-samples-atompub-contacts-server-pom.patch, NONE, 1.1 jersey-samples-pom.patch, NONE, 1.1 jersey-server-pom.patch, NONE, 1.1 jersey-settings.xml, NONE, 1.1 jersey.spec, NONE, 1.1 sources, 1.1, 1.2

jpackage jpackage at ryu.zarb.org
Thu Oct 6 08:04:36 CEST 2011


Update of /home/projects/jpackage/cvs/dist/jersey/devel
In directory ryu.zarb.org:/tmp/cvs-serv14331/devel

Modified Files:
	.cvsignore sources 
Added Files:
	jersey-archive-pom.patch jersey-bundle-pom.patch 
	jersey-contribs-pom.patch jersey-documentation-pom.patch 
	jersey-jpp-depmap.xml 
	jersey-json-JacksonArrayWrapperGenerator.patch 
	jersey-json-JacksonRootAddingParser.patch 
	jersey-json-JacksonRootStrippingGenerator.patch 
	jersey-json-JacksonStringMergingGenerator.patch 
	jersey-json-pom.patch jersey-no-wagon-svn.patch 
	jersey-pom.patch jersey-ri-pom.patch 
	jersey-samples-atompub-contacts-server-pom.patch 
	jersey-samples-pom.patch jersey-server-pom.patch 
	jersey-settings.xml jersey.spec 
Log Message:
Import jersey into devel

--- NEW FILE: jersey-contribs-pom.patch ---
--- jersey/contribs/pom.xml.sav3	2010-03-10 14:17:23.000000000 +0100
+++ jersey/contribs/pom.xml	2011-07-22 16:32:30.000000000 +0200
@@ -63,7 +63,7 @@
         <module>jersey-simple-server</module>
         <module>jersey-guice</module>
         <module>jersey-oauth</module>
-        <module>scala</module>
+        <!--<module>scala</module>-->
         <module>bill-burke-book</module>
     </modules>
 </project>

Index: .cvsignore
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jersey/devel/.cvsignore,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** .cvsignore	6 Oct 2011 05:58:20 -0000	1.1
--- .cvsignore	6 Oct 2011 06:04:34 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ jersey-1.1.5.1.tgz

--- NEW FILE: jersey-archive-pom.patch ---
--- jersey/archive/pom.xml.sav12	2010-03-10 14:17:23.000000000 +0100
+++ jersey/archive/pom.xml	2011-06-15 18:32:43.000000000 +0200
@@ -64,11 +64,13 @@
             <version>${project.version}</version>
         </dependency>
         <!-- contribs -->
+<!--
         <dependency>
             <groupId>com.sun.jersey.contribs</groupId>
             <artifactId>jersey-contribs</artifactId>
             <version>${project.version}</version>
         </dependency>
+-->
     </dependencies>
     <build>
         <plugins>
@@ -103,6 +105,7 @@
                                     <outputDirectory>${assembly.directory}/apidocs/jersey</outputDirectory>
                                 </artifactItem>
                                 <!-- contribs-->
+<!--
                                 <artifactItem>
                                     <groupId>com.sun.jersey.contribs</groupId>
                                     <artifactId>jersey-spring</artifactId>
@@ -112,6 +115,7 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${assembly.directory}/apidocs/contribs/jersey-spring</outputDirectory>
                                 </artifactItem>
+-->
                                 <artifactItem>
                                     <groupId>com.sun.jersey.contribs</groupId>
                                     <artifactId>jersey-guice</artifactId>
@@ -277,6 +281,7 @@
                                     <outputDirectory>${assembly.directory}</outputDirectory>
                                 </artifactItem>
                                  <!-- contribs -->
+<!--
                                 <artifactItem>
                                     <groupId>com.sun.jersey.contribs</groupId>
                                     <artifactId>jersey-spring</artifactId>
@@ -285,6 +290,7 @@
                                     <overWrite>false</overWrite>
                                     <outputDirectory>${assembly.directory}/contribs</outputDirectory>
                                 </artifactItem>
+-->
                                 <artifactItem>
                                     <groupId>com.sun.jersey.contribs</groupId>
                                     <artifactId>jersey-guice</artifactId>

--- NEW FILE: jersey-documentation-pom.patch ---
--- jersey/jersey-documentation/pom.xml.sav13	2010-03-10 14:17:23.000000000 +0100
+++ jersey/jersey-documentation/pom.xml	2011-06-16 16:03:44.000000000 +0200
@@ -72,6 +72,62 @@
                 <!--
 								<copy file="../jersey-module/src/docbook/module.xml" todir="${gen-src-dir}"/>
 								-->
+  <exec executable="unzip">
+    <arg value="-oq"/>
+    <arg value="/usr/share/java/docbook-xsl-resources.zip"/>
+  </exec>
+
+  <java classname="com.icl.saxon.StyleSheet">
+    <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+    <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
+    <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration" value="org.apache.xerces.parsers.XIncludeParserConfiguration"/>
+    <arg value="-x"/>
+    <arg value="org.apache.xml.resolver.tools.ResolvingXMLReader"/>
+    <arg value="-y"/>
+    <arg value="org.apache.xml.resolver.tools.ResolvingXMLReader"/>
+    <arg value="-r"/>
+    <arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
+    <arg value="-o"/>
+    <arg value="${project.build.directory}/docbook/user-guide.html"/>
+    <arg value="${gen-src-dir}/user-guide.xml"/>
+    <arg value="${basedir}/docbook/html/docbook.xsl"/>
+    <classpath>
+      <pathelement location="/usr/share/java/saxon.jar"/>
+      <pathelement location="/usr/share/java/xerces-j2.jar"/>
+      <pathelement location="/usr/share/java/xml-commons-resolver12.jar"/>
+      <pathelement location="/etc/java/resolver/"/>
+    </classpath>
+  </java>
+
+  <java classname="com.icl.saxon.StyleSheet">
+    <sysproperty key="javax.xml.parsers.DocumentBuilderFactory" value="org.apache.xerces.jaxp.DocumentBuilderFactoryImpl"/>
+    <sysproperty key="javax.xml.parsers.SAXParserFactory" value="org.apache.xerces.jaxp.SAXParserFactoryImpl"/>
+    <sysproperty key="org.apache.xerces.xni.parser.XMLParserConfiguration" value="org.apache.xerces.parsers.XIncludeParserConfiguration"/>
+    <arg value="-x"/>
+    <arg value="org.apache.xml.resolver.tools.ResolvingXMLReader"/>
+    <arg value="-y"/>
+    <arg value="org.apache.xml.resolver.tools.ResolvingXMLReader"/>
+    <arg value="-r"/>
+    <arg value="org.apache.xml.resolver.tools.CatalogResolver"/>
+    <arg value="-o"/>
+    <arg value="${project.build.directory}/docbook/user-guide.fo"/>
+    <arg value="${gen-src-dir}/user-guide.xml"/>
+    <arg value="${basedir}/docbook/fo/docbook.xsl"/>
+    <classpath>
+      <pathelement location="/usr/share/java/saxon.jar"/>
+      <pathelement location="/usr/share/java/xerces-j2.jar"/>
+      <pathelement location="/usr/share/java/xml-commons-resolver12.jar"/>
+      <pathelement location="/etc/java/resolver/"/>
+    </classpath>
+  </java>
+
+  <exec executable="xmlgraphics-fop">
+    <arg value="-r"/>
+    <arg value="-fo"/>
+    <arg value="${project.build.directory}/docbook/user-guide.fo"/>
+    <arg value="${project.build.directory}/docbook/user-guide.pdf"/>
+  </exec>
+
 							</tasks>
 						</configuration>
 						<id>process-entities</id>
@@ -82,7 +138,7 @@
 					</execution>
 				</executions>
 			</plugin>
-			
+<!--			
 			<plugin>
 				<groupId>com.agilejava.docbkx</groupId>
 				<artifactId>docbkx-maven-plugin</artifactId>
@@ -107,7 +163,7 @@
           <linenumberingEveryNth>1</linenumberingEveryNth>
           <calloutsExtension>1</calloutsExtension>
           <calloutGraphics>0</calloutGraphics>
-          <!--calloutGraphicsExtension>1</calloutGraphicsExtension-->
+          <calloutGraphicsExtension>1</calloutGraphicsExtension>
 				</configuration>
 				<executions>
 					<execution>
@@ -119,6 +175,7 @@
 					</execution>
 				</executions>
 			</plugin>
+-->
 			<plugin>
 				<artifactId>maven-assembly-plugin</artifactId>
 				<configuration>

--- NEW FILE: jersey-json-pom.patch ---
--- jersey/jersey-json/pom.xml.sav	2011-06-08 18:50:43.000000000 +0200
+++ jersey/jersey-json/pom.xml	2011-06-08 18:51:10.000000000 +0200
@@ -148,7 +148,7 @@
                 </executions>
             </plugin>
             <plugin>
-                <groupId>de.jflex.maven.plugin</groupId>
+                <groupId>de.jflex</groupId>
                 <artifactId>maven-jflex-plugin</artifactId>
                 <version>0.2</version>
                 <executions>

--- NEW FILE: jersey-json-JacksonStringMergingGenerator.patch ---
--- jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonStringMergingGenerator.java.sav7	2009-09-14 16:43:20.000000000 +0200
+++ jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonStringMergingGenerator.java	2011-06-09 16:58:37.000000000 +0200
@@ -75,11 +75,23 @@
     }
 
     @Override
+    public JsonGenerator enable(Feature feature) {
+        generator.enableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void disableFeature(Feature feature) {
         generator.disableFeature(feature);
     }
 
     @Override
+    public JsonGenerator disable(Feature feature) {
+        generator.disableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void setFeature(Feature feature, boolean enabled) {
         generator.setFeature(feature, enabled);
     }
@@ -90,8 +102,14 @@
     }
 
     @Override
-    public void useDefaultPrettyPrinter() {
+    public boolean isEnabled(Feature feature) {
+        return generator.isFeatureEnabled(feature);
+    }
+
+    @Override
+    public JsonGenerator useDefaultPrettyPrinter() {
         generator.useDefaultPrettyPrinter();
+        return generator;
     }
 
     @Override
@@ -229,8 +247,9 @@
     }
 
     @Override
-    public void setCodec(ObjectCodec codec) {
+    public JsonGenerator setCodec(ObjectCodec codec) {
         generator.setCodec(codec);
+        return generator;
     }
 
     @Override

--- NEW FILE: jersey-json-JacksonRootAddingParser.patch ---
--- jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/reader/JacksonRootAddingParser.java.sav5	2009-07-20 17:09:52.000000000 +0200
+++ jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/reader/JacksonRootAddingParser.java	2011-06-09 14:28:51.000000000 +0200
@@ -177,8 +177,9 @@
     }
 
     @Override
-    public void skipChildren() throws IOException, JsonParseException {
+    public JsonParser skipChildren() throws IOException, JsonParseException {
         parser.skipChildren();
+        return parser;
     }
 
     @Override
@@ -261,4 +262,10 @@
     public BigDecimal getDecimalValue() throws IOException, JsonParseException {
         return parser.getDecimalValue();
     }
+
+    @Override
+    public void setCodec(org.codehaus.jackson.ObjectCodec c) {}
+
+    @Override
+    public org.codehaus.jackson.ObjectCodec getCodec() { return (org.codehaus.jackson.ObjectCodec)null; }
 }

--- NEW FILE: jersey-pom.patch ---
--- jersey/pom.xml.sav0	2010-03-10 14:17:23.000000000 +0100
+++ jersey/pom.xml	2011-07-22 18:23:56.000000000 +0200
@@ -95,7 +95,7 @@
     </licenses>
     <modules>
         <module>contribs</module>
-        <module>samples</module>
+        <!--<module>samples</module>-->
         <module>jersey-core</module>
         <module>jersey-server</module>
         <module>jersey-client</module>
@@ -105,10 +105,10 @@
         <module>jersey-tests</module>
         <module>jersey-bundle</module>
         <module>archetypes</module>
-        <module>jersey-test-framework</module>
+        <!--<module>jersey-test-framework</module>-->
         <module>archive</module>
         <module>jersey-documentation</module>
-        <module>ri</module>
+        <!--<module>ri</module>-->
     </modules>
     <build>
         <plugins>

--- NEW FILE: jersey-samples-pom.patch ---
--- jersey/samples/pom.xml.sav10	2010-03-10 14:17:23.000000000 +0100
+++ jersey/samples/pom.xml	2011-06-09 20:06:25.000000000 +0200
@@ -48,10 +48,10 @@
         <module>atompub-contacts-client</module>
         <module>atompub-contacts-models</module>
         <module>atompub-contacts-server</module>
-        <module>bookmark</module>
-        <module>bookmark-em</module>
-        <module>bookstore</module>
-        <module>entity-provider</module>
+        <!--<module>bookmark</module>-->
+        <!--<module>bookmark-em</module>-->
+        <!--<module>bookstore</module>-->
+        <!--<module>entity-provider</module>-->
         <module>extended-wadl-webapp</module>
         <module>generate-wadl</module>
         <module>groovy</module>

--- NEW FILE: jersey-json-JacksonRootStrippingGenerator.patch ---
--- jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonRootStrippingGenerator.java.sav4	2009-07-20 17:09:52.000000000 +0200
+++ jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonRootStrippingGenerator.java	2011-06-09 17:15:19.000000000 +0200
@@ -76,11 +76,23 @@
     }
 
     @Override
+    public JsonGenerator enable(Feature feature) {
+        generator.enableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void disableFeature(Feature feature) {
         generator.disableFeature(feature);
     }
 
     @Override
+    public JsonGenerator disable(Feature feature) {
+        generator.disableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void setFeature(Feature feature, boolean enabled) {
         generator.setFeature(feature, enabled);
     }
@@ -91,8 +103,14 @@
     }
 
     @Override
-    public void useDefaultPrettyPrinter() {
+    public boolean isEnabled(Feature feature) {
+        return generator.isFeatureEnabled(feature);
+    }
+
+    @Override
+    public JsonGenerator useDefaultPrettyPrinter() {
         generator.useDefaultPrettyPrinter();
+	return generator;
     }
 
     @Override
@@ -225,8 +243,9 @@
     }
 
     @Override
-    public void setCodec(ObjectCodec codec) {
+    public JsonGenerator setCodec(ObjectCodec codec) {
         generator.setCodec(codec);
+	return generator;
     }
 
     @Override

--- NEW FILE: jersey-server-pom.patch ---
--- jersey/jersey-server/pom.xml.sav1	2010-03-10 14:17:23.000000000 +0100
+++ jersey/jersey-server/pom.xml	2011-06-07 20:24:37.000000000 +0200
@@ -119,6 +119,24 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>javax.enterprise</groupId>
+            <artifactId>cdi-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.interceptor</groupId>
+            <artifactId>interceptor-api</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>javax.annotation</groupId>
+            <artifactId>annotation-api</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>junit</groupId>
             <artifactId>junit</artifactId>
             <version>3.8.1</version>

Index: sources
===================================================================
RCS file: /home/projects/jpackage/cvs/dist/jersey/devel/sources,v
retrieving revision 1.1
retrieving revision 1.2
diff -C 2 -d -r1.1 -r1.2
*** sources	6 Oct 2011 05:58:20 -0000	1.1
--- sources	6 Oct 2011 06:04:34 -0000	1.2
***************
*** 0 ****
--- 1 ----
+ beddf98be456e5fdf3d5098a59c88925  jersey-1.1.5.1.tgz

--- NEW FILE: jersey-settings.xml ---
<settings>
	<profiles>
		<profile>
			<id>JPP</id>
			<repositories>
				<repository>
					<id>internal</id>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>external</id>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</repository>
				<repository>
					<id>local</id>
					<layout>jpp</layout>
					<url>__MAVENREPO_DIR_PLACEHOLDER__</url>
				</repository>
			</repositories>
			<pluginRepositories>
				<pluginRepository>
					<id>plugins-internal</id>
					<name>plugins-internal</name>
					<layout>jpp</layout>
					<url>__JPP_URL_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-external</id>
					<name>plugins-external</name>
					<layout>jpp</layout>
					<url>__JAVADIR_PLACEHOLDER__</url>
				</pluginRepository>
				<pluginRepository>
					<id>plugins-maven</id>
					<name>plugins-maven</name>
					<layout>jpp</layout>
					<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>
				</pluginRepository>
			</pluginRepositories>
		</profile>
	</profiles>
	<activeProfiles>
		<activeProfile>JPP</activeProfile>
	</activeProfiles>
</settings>

--- NEW FILE: jersey-bundle-pom.patch ---
--- jersey/jersey-bundle/pom.xml.sav11	2010-03-10 14:17:23.000000000 +0100
+++ jersey/jersey-bundle/pom.xml	2011-06-14 13:51:39.000000000 +0200
@@ -111,6 +111,24 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jcdi_1.0_spec</artifactId>
+            <version>1.0</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.1_spec</artifactId>
+            <version>1.1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-interceptor_1.1_spec</artifactId>
+            <version>1.1</version>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
             <groupId>ant</groupId>
             <artifactId>ant</artifactId>
             <version>1.6.5</version>

--- NEW FILE: jersey-ri-pom.patch ---
--- jersey/ri/pom.xml.sav14	2010-03-10 14:17:23.000000000 +0100
+++ jersey/ri/pom.xml	2011-07-22 18:05:41.000000000 +0200
@@ -53,7 +53,7 @@
     <packaging>pom</packaging>
     <modules>
         <module>jax-rs-ri</module>
-        <module>jax-rs-ri-source</module>
-        <module>jax-rs-ri-source-licensee</module>
+        <!--<module>jax-rs-ri-source</module>-->
+        <!--<module>jax-rs-ri-source-licensee</module>-->
     </modules>
 </project>

--- NEW FILE: jersey-jpp-depmap.xml ---
<dependencies>
   <dependency>
      <maven>
         <groupId>org.testng</groupId>
         <artifactId>testng</artifactId>
         <version>5.8</version>
      </maven>
      <jpp>
         <groupId>JPP</groupId>
         <artifactId>testng</artifactId>
         <version>5.8</version>
      </jpp>
   </dependency>


<dependency>
    <maven>
        <groupId>com.thoughtworks.qdox</groupId>
        <artifactId>qdox</artifactId>
        <version>1.12</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>qdox</artifactId>
        <version>1.12</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>com.sun.grizzly</groupId>
        <artifactId>grizzly-servlet-webserver</artifactId>
        <version>1.9.8</version>
    </maven>
    <jpp>
        <groupId>JPP/grizzly</groupId>
        <artifactId>servlet-webserver</artifactId>
        <version>1.9.34</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>com.sun.net.httpserver</groupId>
        <artifactId>http</artifactId>
        <version>20070405</version>
    </maven>
    <jpp>
        <groupId>JPP/maven2</groupId>
        <artifactId>empty-dep</artifactId>
        <version>2.0.8</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.jboss.weld</groupId>
        <artifactId>weld-osgi-bundle</artifactId>
        <version>1.0.0-CR1-SP1</version>
    </maven>
    <jpp>
        <groupId>JPP/maven2</groupId>
        <artifactId>empty-dep</artifactId>
        <version>2.0.8</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.glassfish</groupId>
        <artifactId>javax.ejb</artifactId>
        <version>3.0-b59</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>ejb_3_1_api</artifactId>
        <version>3.1</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.glassfish</groupId>
        <artifactId>javax.servlet</artifactId>
        <version>3.0-b66</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>servlet_3_0_api</artifactId>
        <version>3.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>javax.persistence</groupId>
        <artifactId>persistence-api</artifactId>
        <version>1.0.2</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jpa_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>

<!--
  javax.ws.rs:jsr311-api:jar:1.1.1
-->
<dependency>
    <maven>
        <groupId>javax.ws.rs</groupId>
        <artifactId>jsr311-api</artifactId>
        <version>1.1.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jsr311-1.1.1-api</artifactId>
        <version>1.1.1</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.apache.geronimo.specs</groupId>
        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
        <version>1.0.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>stax_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>javax.xml.bind</groupId>
        <artifactId>jsr173_api</artifactId>
        <version>1.0</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>stax_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>javax.xml.stream</groupId>
        <artifactId>stax-api</artifactId>
        <version>1.0-2</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>stax_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>javax.enterprise</groupId>
        <artifactId>cdi-api</artifactId>
        <version>1.0</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jcdi_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>javax.annotation</groupId>
        <artifactId>annotation-api</artifactId>
        <version>1.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>annotation_1_1_api</artifactId>
        <version>1.1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>javax.annotation</groupId>
        <artifactId>jsr250-api</artifactId>
        <version>1.0</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>annotation_1_0_api</artifactId>
        <version>1.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>javax.interceptor</groupId>
        <artifactId>interceptor-api</artifactId>
        <version>1.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>interceptor_1_1_api</artifactId>
        <version>1.1</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.1</version>
    </maven>
    <jpp>
        <groupId>JPP/objectweb-asm</groupId>
        <artifactId>asm</artifactId>
        <version>3.3.1</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.apache.maven</groupId>
        <artifactId>apache-maven</artifactId>
        <version>2.0.9</version>
    </maven>
    <jpp>
        <groupId>JPP/maven2</groupId>
        <artifactId>core</artifactId>
        <version>2.0.8</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.guiceyfruit</groupId>
        <artifactId>guice-all</artifactId>
        <version>2.0</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>google-guice</artifactId>
        <version>2.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>geronimo-spec</groupId>
        <artifactId>geronimo-spec-jta</artifactId>
        <version>1.0.1B-rc4</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jta_1_0_1B_api</artifactId>
        <version>1.0.1B</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>javax.transaction</groupId>
        <artifactId>jta</artifactId>
        <version>1.0.1B</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jta_1_0_1B_api</artifactId>
        <version>1.0.1B</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.mortbay.jetty</groupId>
        <artifactId>start</artifactId>
        <version>6.1.22</version>
    </maven>
    <jpp>
        <groupId>JPP/jetty6</groupId>
        <artifactId>start</artifactId>
        <version>6.1.22</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.mortbay.jetty</groupId>
        <artifactId>jsp-2.1-jetty</artifactId>
        <version>6.1.22</version>
    </maven>
    <jpp>
        <groupId>JPP/jetty6/jsp-2.1</groupId>
        <artifactId>jsp-2.1-jetty</artifactId>
        <version>6.1.22</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>de.jflex.maven.plugin</groupId>
        <artifactId>maven-jflex-plugin</artifactId>
        <version>0.2</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>maven-jflex-plugin</artifactId>
        <version>1.4.3</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>woodstox</groupId>
        <artifactId>wstx-asl</artifactId>
        <version>3.2.1</version>
    </maven>
    <jpp>
        <groupId>JPP/wstx</groupId>
        <artifactId>wstx-asl</artifactId>
        <version>3.2.8</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>org.jboss.webbeans</groupId>
        <artifactId>webbeans-osgi-bundle</artifactId>
        <version>1.0.0.PREVIEW4.SP1</version>
    </maven>
    <jpp>
        <groupId>JPP/maven2</groupId>
        <artifactId>empty-dep</artifactId>
        <version>2.0.8</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>javax.servlet.jsp</groupId>
        <artifactId>jsp-api</artifactId>
        <version>2.0</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>jsp_2_0_api</artifactId>
        <version>2.0</version>
    </jpp>
</dependency>

<dependency>
    <maven>
        <groupId>xml-resolver</groupId>
        <artifactId>xml-resolver</artifactId>
        <version>1.1</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>xml-commons-resolver11</artifactId>
        <version>1.1</version>
    </jpp>
</dependency>
<dependency>
    <maven>
        <groupId>xml-apis</groupId>
        <artifactId>xml-apis-ext</artifactId>
        <version>1.3.04</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>xml-commons-jaxp-1.3-apis</artifactId>
        <version>1.3.04</version>
    </jpp>
</dependency>

  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring-core</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP/spring2</groupId>
        <artifactId>core</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP</groupId>
        <artifactId>spring2</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring-beans</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP/spring2</groupId>
        <artifactId>beans</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring-context</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP/spring2</groupId>
        <artifactId>context</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring-web</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP/spring2</groupId>
        <artifactId>web</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>
  <dependency>
    <maven>
        <groupId>org.springframework</groupId>
        <artifactId>spring-aop</artifactId>
        <version>2.5.6</version>
    </maven>
    <jpp>
        <groupId>JPP/spring2</groupId>
        <artifactId>aop</artifactId>
        <version>2.5.6</version>
    </jpp>
  </dependency>

</dependencies>

--- NEW FILE: jersey-json-JacksonArrayWrapperGenerator.patch ---
--- jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonArrayWrapperGenerator.java.sav6	2009-07-20 17:09:52.000000000 +0200
+++ jersey/jersey-json/src/main/java/com/sun/jersey/json/impl/writer/JacksonArrayWrapperGenerator.java	2011-06-09 16:59:36.000000000 +0200
@@ -91,11 +91,23 @@
     }
 
     @Override
+    public JsonGenerator enable(Feature feature) {
+        generator.enableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void disableFeature(Feature feature) {
         generator.disableFeature(feature);
     }
 
     @Override
+    public JsonGenerator disable(Feature feature) {
+        generator.disableFeature(feature);
+        return generator;
+    }
+
+    @Override
     public void setFeature(Feature feature, boolean enabled) {
         generator.setFeature(feature, enabled);
     }
@@ -106,13 +118,20 @@
     }
 
     @Override
-    public void useDefaultPrettyPrinter() {
+    public boolean isEnabled(Feature feature) {
+        return generator.isFeatureEnabled(feature);
+    }
+
+    @Override
+    public JsonGenerator useDefaultPrettyPrinter() {
         generator.useDefaultPrettyPrinter();
+        return generator;
     }
 
     @Override
-    public void setCodec(ObjectCodec codec) {
+    public JsonGenerator setCodec(ObjectCodec codec) {
         generator.setCodec(codec);
+        return generator;
     }
 
     @Override

--- NEW FILE: jersey-samples-atompub-contacts-server-pom.patch ---
--- jersey/samples/atompub-contacts-server/pom.xml.sav	2011-06-09 18:04:52.000000000 +0200
+++ jersey/samples/atompub-contacts-server/pom.xml	2011-06-09 18:05:43.000000000 +0200
@@ -110,6 +110,12 @@
             <version>3.8.2</version>
             <scope>test</scope>
         </dependency>
+         <dependency>
+            <groupId>org.apache.ws.commons.axiom</groupId>
+            <artifactId>axiom</artifactId>
+            <version>1.2.8</version>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
     <build>

--- NEW FILE: jersey.spec ---
# Copyright (c) 2000-2011, JPackage Project
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
# modification, are permitted provided that the following conditions
# are met:
#
# 1. Redistributions of source code must retain the above copyright
#    notice, this list of conditions and the following disclaimer.
# 2. Redistributions in binary form must reproduce the above copyright
#    notice, this list of conditions and the following disclaimer in the
#    documentation and/or other materials provided with the
#    distribution.
# 3. Neither the name of the JPackage Project nor the names of its
#    contributors may be used to endorse or promote products derived
#    from this software without specific prior written permission.
#
# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
# "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
# LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
# A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
# OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
# SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
# LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
# DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
# THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
# OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
#

%define with()          %{expand:%%{?with_%{1}:1}%%{!?with_%{1}:0}}
%define without()       %{expand:%%{?with_%{1}:0}%%{!?with_%{1}:1}}
%define bcond_with()    %{expand:%%{?_with_%{1}:%%global with_%{1} 1}}
%define bcond_without() %{expand:%%{!?_without_%{1}:%%global with_%{1} 1}}

Name:           jersey
Version:        1.1.5.1
Release:        1%{?dist}
Epoch:          0
Summary:        JAX-RS Reference Implementation
License:        GPL 2.0, CDDL
Group:          Development/Java
URL:            http://jersey.java.net/
BuildRoot:      %{_tmppath}/%{name}-%{version}-%{release}-root
BuildArch:      noarch
Source0:        jersey-1.1.5.1.tgz
# svn export https://svn.java.net/svn/jersey~svn/tags/jersey-1.1.5.1
# tar czf ../SOURCES/jersey-1.1.5.1.tgz jersey-1.1.5.1/

Source1:        %{name}-settings.xml
Source2:        %{name}-jpp-depmap.xml

Patch0:         jersey-pom.patch
Patch1:         jersey-no-wagon-svn.patch
Patch2:         jersey-server-pom.patch
Patch3:         jersey-contribs-pom.patch
Patch4:         jersey-json-pom.patch
Patch5:         jersey-json-JacksonRootStrippingGenerator.patch
Patch6:         jersey-json-JacksonRootAddingParser.patch
Patch7:         jersey-json-JacksonArrayWrapperGenerator.patch
Patch8:         jersey-json-JacksonStringMergingGenerator.patch
Patch9:         jersey-samples-atompub-contacts-server-pom.patch
Patch10:        jersey-samples-pom.patch
Patch11:        jersey-bundle-pom.patch
Patch12:        jersey-archive-pom.patch
Patch13:        jersey-documentation-pom.patch
Patch14:        jersey-ri-pom.patch

BuildRequires:  java-devel >= 0:1.6.0
BuildRequires:  jpackage-utils >= 0:1.7.5
BuildRequires:  maven2 >= 0:2.0.8
BuildRequires:  maven2-plugin-antrun
BuildRequires:  maven2-plugin-assembly
BuildRequires:  maven2-plugin-compiler
BuildRequires:  maven2-plugin-install
BuildRequires:  maven2-plugin-jar
BuildRequires:  maven2-plugin-javadoc
BuildRequires:  maven2-plugin-resources

BuildRequires:  docbook-xsl
BuildRequires:  saxon
BuildRequires:  saxon-scripts
BuildRequires:  xmlgraphics-fop

Requires:  java-devel >= 0:1.6.0

%description
Jersey is the open source, production quality, JAX-RS (JSR
311) Reference Implementation for building RESTful Web 
services. But, it is also more than the Reference 
Implementation. Jersey provides an API so that developers 
may extend Jersey to suit their needs. 

%package devel
Summary:        Source and Javadoc archives for %{name}
Group:          Development/Libraries

%description devel
%{summary}.

%package javadoc
Summary:        Javadoc for %{name}
Group:          Development/Documentation

%description javadoc
%{summary}.

%prep
%setup -q 
%patch0 -b .sav0
%patch1 -b .sav1
%patch2 -b .sav2
%patch3 -b .sav3
%patch4 -b .sav4
%patch5 -b .sav5
%patch6 -b .sav6
%patch7 -b .sav7
%patch8 -b .sav8
%patch9 -b .sav9
%patch10 -b .sav10
%patch11 -b .sav11
%patch12 -b .sav12
%patch13 -b .sav13
%patch14 -b .sav14

cp -p %{SOURCE1} settings.xml
sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__JAVADIR_PLACEHOLDER__</url>|<url>file://`pwd`/external_repo</url>|g" settings.xml
sed -i -e "s|<url>__MAVENREPO_DIR_PLACEHOLDER__</url>|<url>file://`pwd`/.m2/repository</url>|g" settings.xml
sed -i -e "s|<url>__MAVENDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/maven2/plugins</url>|g" settings.xml
sed -i -e "s|<url>__ECLIPSEDIR_PLUGIN_PLACEHOLDER__</url>|<url>file:///usr/share/eclipse/plugins</url>|g" settings.xml

%build
export CLASSPATH=
export MAVEN_REPO_LOCAL=$(pwd)/.m2/repository
mkdir -p ${MAVEN_REPO_LOCAL}/JPP
ln -sf $(build-classpath jsr311-api-javadoc) ${MAVEN_REPO_LOCAL}/JPP/jsr311_api-javadoc.jar
export MAVEN_OPTS="-Xmx768m -XX:MaxPermSize=128m"
export MAVEN_SETTINGS=$(pwd)/settings.xml
cd jersey
%{_bindir}/mvn-jpp \
        -e \
        -s ${MAVEN_SETTINGS} \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
        -Dmaven.test.skip=true \
        -Dspring25-release-version=2.5.6.SEC01 \
        install 
#       -Dmaven.test.failure.ignore=true \

%{_bindir}/mvn-jpp \
        -e \
        -s ${MAVEN_SETTINGS} \
        -Dmaven2.jpp.depmap.file=%{SOURCE2} \
        -Dmaven.repo.local=${MAVEN_REPO_LOCAL} \
        -Dspring25-release-version=2.5.6.SEC01 \
        javadoc:aggregate

%install
rm -rf $RPM_BUILD_ROOT

# jars, poms and depmap frags
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}/sources
install -d -m 755 $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc
install -d -m 755 $RPM_BUILD_ROOT%{_datadir}/maven2/poms

install -m 644 jersey/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-project.pom
%add_to_maven_depmap com.sun.jersey jersey-project %{version} JPP/%{name} project

install -m 644 jersey/archetypes/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-archetypes.pom
%add_to_maven_depmap com.sun.jersey.archetypes jersey-archetypes %{version} JPP/%{name} archetypes


install -m 644 jersey/archetypes/jersey-quickstart-ejb/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-quickstart-ejb.pom
%add_to_maven_depmap com.sun.jersey.archetypes jersey-quickstart-ejb %{version} JPP/%{name} quickstart-ejb
install -m 644 jersey/archetypes/jersey-quickstart-ejb/target/jersey-quickstart-ejb-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/quickstart-ejb-%{version}.jar

install -m 644 jersey/archetypes/jersey-quickstart-grizzly/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-quickstart-grizzly.pom
%add_to_maven_depmap com.sun.jersey.archetypes jersey-quickstart-grizzly %{version} JPP/%{name} quickstart-grizzly
install -m 644 jersey/archetypes/jersey-quickstart-grizzly/target/jersey-quickstart-grizzly-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/quickstart-grizzly-%{version}.jar

install -m 644 jersey/archetypes/jersey-quickstart-webapp/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-quickstart-webapp.pom
%add_to_maven_depmap com.sun.jersey.archetypes jersey-quickstart-webapp %{version} JPP/%{name} quickstart-webapp
install -m 644 jersey/archetypes/jersey-quickstart-webapp/target/jersey-quickstart-webapp-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/quickstart-webapp-%{version}.jar

install -m 644 jersey/contribs/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-contribs.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-contribs %{version} JPP/%{name} contribs

install -m 644 jersey/contribs/spring/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-spring.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-spring %{version} JPP/%{name} spring
install -m 644 jersey/contribs/spring/target/jersey-spring-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/spring-%{version}.jar
install -m 644 jersey/contribs/spring/target/jersey-spring-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/spring-javadoc-%{version}.jar
install -m 644 jersey/contribs/spring/target/jersey-spring-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/spring-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-apache-client/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-apache-client.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-apache-client %{version} JPP/%{name} apache-client
install -m 644 jersey/contribs/jersey-apache-client/target/jersey-apache-client-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/apache-client-%{version}.jar
install -m 644 jersey/contribs/jersey-apache-client/target/jersey-apache-client-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/apache-client-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-apache-client/target/jersey-apache-client-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/apache-client-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-atom-abdera/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-atom-abdera.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-atom-abdera %{version} JPP/%{name} atom-abdera
install -m 644 jersey/contribs/jersey-atom-abdera/target/jersey-atom-abdera-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/atom-abdera-%{version}.jar
install -m 644 jersey/contribs/jersey-atom-abdera/target/jersey-atom-abdera-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/atom-abdera-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-atom-abdera/target/jersey-atom-abdera-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/atom-abdera-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-guice/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-guice.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-guice %{version} JPP/%{name} guice
install -m 644 jersey/contribs/jersey-guice/target/jersey-guice-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/guice-%{version}.jar
install -m 644 jersey/contribs/jersey-guice/target/jersey-guice-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/guice-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-guice/target/jersey-guice-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/guice-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-multipart/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-multipart.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-multipart %{version} JPP/%{name} multipart
install -m 644 jersey/contribs/jersey-multipart/target/jersey-multipart-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/multipart-%{version}.jar
install -m 644 jersey/contribs/jersey-multipart/target/jersey-multipart-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/multipart-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-multipart/target/jersey-multipart-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/multipart-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-oauth/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth.pom
%add_to_maven_depmap com.sun.jersey.contribs.jersey-oauth jersey-oauth %{version} JPP/%{name} oauth

install -m 644 jersey/contribs/jersey-oauth/oauth-client/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth-client.pom
%add_to_maven_depmap com.sun.jersey.contribs.jersey-oauth oauth-client %{version} JPP/%{name} oauth-client
install -m 644 jersey/contribs/jersey-oauth/oauth-client/target/oauth-client-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/oauth-client-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-client/target/oauth-client-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/oauth-client-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-client/target/oauth-client-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/oauth-client-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-oauth/oauth-server/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth-server.pom
%add_to_maven_depmap com.sun.jersey.contribs.jersey-oauth oauth-server %{version} JPP/%{name} oauth-server
install -m 644 jersey/contribs/jersey-oauth/oauth-server/target/oauth-server-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/oauth-server-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-server/target/oauth-server-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/oauth-server-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-server/target/oauth-server-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/oauth-server-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-oauth/oauth-signature/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth-signature.pom
%add_to_maven_depmap com.sun.jersey.contribs.jersey-oauth oauth-signature %{version} JPP/%{name} oauth-signature
install -m 644 jersey/contribs/jersey-oauth/oauth-signature/target/oauth-signature-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/oauth-signature-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-signature/target/oauth-signature-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/oauth-signature-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-oauth/oauth-signature/target/oauth-signature-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/oauth-signature-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-oauth/oauth-tests/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth-tests.pom
%add_to_maven_depmap com.sun.jersey.contribs.jersey-oauth oauth-tests %{version} JPP/%{name} oauth-tests
install -m 644 jersey/contribs/jersey-oauth/oauth-tests/target/oauth-tests-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/oauth-tests-%{version}.jar
#install -m 644 jersey/contribs/jersey-oauth/oauth-tests/target/oauth-tests-%{version}-sources.jar \
#               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/oauth-tests-sources-%{version}.jar

install -m 644 jersey/contribs/jersey-simple-server/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-oauth-tests.pom
%add_to_maven_depmap com.sun.jersey.contribs jersey-simple-server %{version} JPP/%{name} simple-server
install -m 644 jersey/contribs/jersey-simple-server/target/jersey-simple-server-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/simple-server-%{version}.jar
install -m 644 jersey/contribs/jersey-simple-server/target/jersey-simple-server-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc/simple-server-javadoc-%{version}.jar
install -m 644 jersey/contribs/jersey-simple-server/target/jersey-simple-server-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/simple-server-sources-%{version}.jar

install -m 644 jersey/contribs/maven-wadl-plugin/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-maven-wadl-plugin.pom
%add_to_maven_depmap com.sun.jersey.contribs maven-wadl-plugin %{version} JPP/%{name} maven-wadl-plugin
install -m 644 jersey/contribs/maven-wadl-plugin/target/maven-wadl-plugin-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/maven-wadl-plugin-%{version}.jar
install -m 644 jersey/contribs/maven-wadl-plugin/target/maven-wadl-plugin-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/maven-wadl-plugin-sources-%{version}.jar

install -m 644 jersey/contribs/wadl-resourcedoc-doclet/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-wadl-resourcedoc-doclet.pom
%add_to_maven_depmap com.sun.jersey.contribs wadl-resourcedoc-doclet %{version} JPP/%{name} wadl-resourcedoc-doclet
install -m 644 jersey/contribs/wadl-resourcedoc-doclet/target/wadl-resourcedoc-doclet-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/wadl-resourcedoc-doclet-%{version}.jar
install -m 644 jersey/contribs/wadl-resourcedoc-doclet/target/wadl-resourcedoc-doclet-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/wadl-resourcedoc-doclet-sources-%{version}.jar

install -m 644 jersey/jersey-atom/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-atom.pom
%add_to_maven_depmap com.sun.jersey jersey-atom %{version} JPP/%{name} atom
install -m 644 jersey/jersey-atom/target/jersey-atom-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/atom-%{version}.jar
install -m 644 jersey/jersey-atom/target/jersey-atom-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/atom-sources-%{version}.jar

install -m 644 jersey/jersey-bundle/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-bundle.pom
%add_to_maven_depmap com.sun.jersey jersey-bundle %{version} JPP/%{name} bundle
install -m 644 jersey/jersey-bundle/target/jersey-bundle-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/bundle-%{version}.jar
install -m 644 jersey/jersey-bundle/target/jersey-bundle-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/bundle-javadoc-%{version}.jar
install -m 644 jersey/jersey-bundle/target/jersey-bundle-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/bundle-sources-%{version}.jar

install -m 644 jersey/jersey-client/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-client.pom
%add_to_maven_depmap com.sun.jersey jersey-client %{version} JPP/%{name} client
install -m 644 jersey/jersey-client/target/jersey-client-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/client-%{version}.jar
install -m 644 jersey/jersey-client/target/jersey-client-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/client-javadoc-%{version}.jar
install -m 644 jersey/jersey-client/target/jersey-client-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/client-sources-%{version}.jar

install -m 644 jersey/jersey-core/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-core.pom
%add_to_maven_depmap com.sun.jersey jersey-core %{version} JPP/%{name} core
install -m 644 jersey/jersey-core/target/jersey-core-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/core-%{version}.jar
install -m 644 jersey/jersey-core/target/jersey-core-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/core-javadoc-%{version}.jar
install -m 644 jersey/jersey-core/target/jersey-core-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/core-sources-%{version}.jar

install -m 644 jersey/jersey-fastinfoset/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-fastinfoset.pom
%add_to_maven_depmap com.sun.jersey jersey-fastinfoset %{version} JPP/%{name} fastinfoset
install -m 644 jersey/jersey-fastinfoset/target/jersey-fastinfoset-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/fastinfoset-%{version}.jar
install -m 644 jersey/jersey-fastinfoset/target/jersey-fastinfoset-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/fastinfoset-sources-%{version}.jar

install -m 644 jersey/jersey-json/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-json.pom
%add_to_maven_depmap com.sun.jersey jersey-json %{version} JPP/%{name} json
install -m 644 jersey/jersey-json/target/jersey-json-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/json-%{version}.jar
install -m 644 jersey/jersey-json/target/jersey-json-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/json-javadoc-%{version}.jar
install -m 644 jersey/jersey-json/target/jersey-json-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/json-sources-%{version}.jar

install -m 644 jersey/jersey-server/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-server.pom
%add_to_maven_depmap com.sun.jersey jersey-server %{version} JPP/%{name} server
install -m 644 jersey/jersey-server/target/jersey-server-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/server-%{version}.jar
install -m 644 jersey/jersey-server/target/jersey-server-%{version}-javadoc.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/server-javadoc-%{version}.jar
install -m 644 jersey/jersey-server/target/jersey-server-%{version}-sources.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/server-sources-%{version}.jar

install -m 644 jersey/jersey-tests/pom.xml \
    $RPM_BUILD_ROOT%{_datadir}/maven2/poms/JPP.%{name}-tests.pom
%add_to_maven_depmap com.sun.jersey jersey-tests %{version} JPP/%{name} tests
install -m 644 jersey/jersey-tests/target/jersey-tests-%{version}.jar \
               $RPM_BUILD_ROOT%{_javadir}/%{name}/tests-%{version}.jar
#install -m 644 jersey/jersey-tests/target/jersey-tests-%{version}-sources.jar \
#               $RPM_BUILD_ROOT%{_javadir}/%{name}/sources/tests-sources-%{version}.jar
#BUILD/jersey-1.1.5.1/jersey/legal/maintenance/lib/license-tool-1.0-SNAPSHOT.jar
#BUILD/jersey-1.1.5.1/jersey/ri/jax-rs-ri/target/assembly/jersey-core-1.1.5.1.jar
#BUILD/jersey-1.1.5.1/jersey/ri/jax-rs-ri/target/assembly/jersey-server-1.1.5.1.jar


(cd $RPM_BUILD_ROOT%{_javadir}/%{name}
for jar in *-%{version}*.jar; do ln -sf ${jar} `echo ${jar} | sed "s|-%{version}||g"`;done)

(cd $RPM_BUILD_ROOT%{_javadir}/%{name}/javadoc
for jar in *-%{version}*.jar; do ln -sf ${jar} `echo ${jar} | sed "s|-%{version}||g"`;done)

(cd $RPM_BUILD_ROOT%{_javadir}/%{name}/sources
for jar in *-%{version}*.jar; do ln -sf ${jar} `echo ${jar} | sed "s|-%{version}||g"`;done)
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/asm-3.3.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/jersey-apache-client-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/jersey-atom-abdera-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/jersey-guice-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/jersey-multipart-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/jersey-simple-server-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/oauth-client-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/oauth-server-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/contribs/oauth-signature-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jackson-core-asl-1.4.2.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-atom-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-client-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-core-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-fastinfoset-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-json-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jersey-server-1.1.5.1.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jettison-1.2.jar
# BUILD/jersey-1.1.5.1/jersey/archive/target/assembly/jsr311-api-1.0.jar

# javadoc
mkdir -p $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
cp -pr jersey/target/site/apidocs/* $RPM_BUILD_ROOT%{_javadocdir}/%{name}-%{version}
ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name}

# manual
mkdir -p $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 jersey/jersey-documentation/target/docbook/user-guide.html $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}
install -m 644 jersey/jersey-documentation/target/docbook/user-guide.pdf $RPM_BUILD_ROOT%{_docdir}/%{name}-%{version}

%clean
rm -rf $RPM_BUILD_ROOT

%post
%update_maven_depmap

%postun
%update_maven_depmap

%files
%defattr(0644,root,root,0755)
%dir %{_javadir}/%{name}
%{_javadir}/%{name}/*.jar
%{_datadir}/maven2/poms/*
%{_mavendepmapfragdir}/*
%{_docdir}/%{name}-%{version}

%files devel
%defattr(0644,root,root,0755)
%dir %{_javadir}/%{name}/sources
%{_javadir}/%{name}/sources/*.jar
%dir %{_javadir}/%{name}/javadoc
%{_javadir}/%{name}/javadoc/*.jar

%files javadoc
%defattr(0644,root,root,0755)
%{_javadocdir}/%{name}-%{version}
%{_javadocdir}/%{name}

%changelog
* Fri Jul 22 2011 Ralph Apel <r.apel at r-apel.de> 0:1.1.5.1-1
- first release


--- NEW FILE: jersey-no-wagon-svn.patch ---
--- jersey/pom.xml.sav0	2010-03-10 14:17:23.000000000 +0100
+++ jersey/pom.xml	2011-06-09 18:24:07.000000000 +0200
@@ -174,6 +174,7 @@
           <!--version>2.5</version-->
         </plugin>
       </plugins>
+<!--
         <extensions>
             <extension>
                 <groupId>org.jvnet.wagon-svn</groupId>
@@ -181,6 +182,7 @@
                 <version>1.8</version>
             </extension>
         </extensions>
+-->
     </build>
 
 <!--
--- jersey/archetypes/pom.xml.sav	2011-06-09 18:24:16.000000000 +0200
+++ jersey/archetypes/pom.xml	2011-06-09 18:24:36.000000000 +0200
@@ -52,6 +52,7 @@
         <module>jersey-quickstart-ejb</module>
     </modules>
     <build>
+<!--
         <extensions>
             <extension>
                 <groupId>org.jvnet.wagon-svn</groupId>
@@ -59,6 +60,7 @@
                 <version>1.8</version>
             </extension>
         </extensions>
+-->
      </build>
     <distributionManagement>
         <repository>
--- jersey/glassfish/v2-package/pom.xml.sav	2011-06-09 18:25:01.000000000 +0200
+++ jersey/glassfish/v2-package/pom.xml	2011-06-09 18:25:13.000000000 +0200
@@ -56,6 +56,7 @@
         </repository>
     </repositories>
     <build>
+<!--
         <extensions>
             <extension>
                 <groupId>org.jvnet.wagon-svn</groupId>
@@ -63,6 +64,7 @@
                 <version>1.8</version>
             </extension>
         </extensions>
+-->
     </build>
     <distributionManagement>
         <repository>
--- jersey/glassfish/v3-packages/pom.xml.sav	2011-06-09 18:25:24.000000000 +0200
+++ jersey/glassfish/v3-packages/pom.xml	2011-06-09 18:25:37.000000000 +0200
@@ -60,6 +60,7 @@
         </repository>
     </repositories>
     <build>
+<!--
         <extensions>
             <extension>
                 <groupId>org.jvnet.wagon-svn</groupId>
@@ -67,6 +68,7 @@
                 <version>1.8</version>
             </extension>
         </extensions>
+-->
     </build>
     <distributionManagement>
         <repository>




More information about the JPackage-commits mailing list