[RPM (6.0)] [DIST generic] xfire-1.2.6-2.jpp6
Ralph Apel <[email protected]> Sun, 16 Dec 2012 18:32:57 +0100
| Newsgroups | gmane.linux.jpackage.announce |
|---|---|
| Message-ID | <[email protected]> |
Name : xfire Relocations: (not relocatable) Version : 1.2.6 Vendor: JPackage Project Release : 2.jpp6 Build Date: Sun 16 Dec 2012 06:25:02 PM CET Install Date: (not installed) Build Host: linux.fritz.box Group : Development/Java Source RPM: (none) Size : 1114493 License: BSD-style Signature : (none) Packager : Ralph Apel <[email protected]> URL : http://xfire.codehaus.org/ Summary : XFire SOAP Framework Description : Codehaus XFire is a next-generation java SOAP framework. Codehaus XFire makes service oriented development approachable through its easy to use API and support for standards. It is also highly performant since it is built on a low memory StAX based model. --------------- Ralph Apel <r.apel at r-apel.de> - 0:1.2.6-2 - Rebuild for JPP6 --------------- xfire.src:487: W: unversioned-explicit-provides %{name}-maven-bundle-plugin-javadoc xfire.src:488: W: unversioned-explicit-provides %{name}-aegis-javadoc xfire.src:489: W: unversioned-explicit-provides %{name}-annotations-javadoc xfire.src:490: W: unversioned-explicit-provides %{name}-castor-javadoc xfire.src:491: W: unversioned-explicit-provides %{name}-core-javadoc xfire.src:492: W: unversioned-explicit-provides %{name}-jms-javadoc xfire.src:493: W: unversioned-explicit-provides %{name}-picocontainer-javadoc xfire.src:494: W: unversioned-explicit-provides %{name}-plexus-javadoc xfire.src:495: W: unversioned-explicit-provides %{name}-spring-javadoc xfire.src:496: W: unversioned-explicit-provides %{name}-xmlbeans-javadoc xfire.src:497: W: unversioned-explicit-provides %{name}-xmpp-javadoc xfire.src: W: source-or-patch-not-bzipped xfire-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-AbstractBinding.patch xfire.src: W: source-or-patch-not-bzipped xfire-annotations-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-all-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-maven-archetypes-jsr181-simple-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-CastorType.patch xfire.src: W: source-or-patch-not-bzipped xfire-generator-DocumentationConfigGen.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-ServiceDelegate.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-SOAPBinding.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-nojmstests.patch xfire.src: W: source-or-patch-not-bzipped xfire-ws-security-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-JAXBDispatch.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-Provider.patch xfire.src: W: source-or-patch-not-bzipped xfire-generator-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-Endpoint.patch xfire.src: W: source-or-patch-not-bzipped xfire-spring-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-SecuredCrypto.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxws-SourceDispatch.patch xfire.src: W: source-or-patch-not-bzipped xfire-maven-bundle-plugin-BundleMojo.patch xfire.src: W: source-or-patch-not-bzipped xfire-castor-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxb2-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-jaxb-pom.patch xfire.src: W: source-or-patch-not-bzipped xfire-CastorTypeCreator.patch xfire.src: W: source-or-patch-not-bzipped xfire-core-pom.patch xfire.src: W: non-standard-group Development/Java xfire.src: W: no-signature xfire.src: W: name-repeated-in-summary XFire xfire.src: W: invalid-license BSD-style 1 packages and 0 specfiles checked; 0 errors, 40 warnings. --------------- Index: xfire-CastorType.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire-CastorType.patch,v retrieving revision 1.1 diff -u -r1.1 xfire-CastorType.patch --- xfire-CastorType.patch 28 Mar 2008 19:23:49 -0000 1.1 +++ xfire-CastorType.patch 16 Dec 2012 17:32:55 -0000 @@ -1,5 +1,5 @@ --- xfire-castor/src/main/org/codehaus/xfire/castor/CastorType.java.sav2 2006-08-24 19:43:10.000000000 +0200 -+++ xfire-castor/src/main/org/codehaus/xfire/castor/CastorType.java 2008-01-26 14:35:09.000000000 +0100 ++++ xfire-castor/src/main/org/codehaus/xfire/castor/CastorType.java 2012-02-09 23:19:53.787018767 +0100 @@ -35,6 +35,8 @@ import org.exolab.castor.xml.Unmarshaller; import org.exolab.castor.xml.ValidationException; @@ -9,6 +9,25 @@ import org.w3c.dom.Node; import org.xml.sax.Attributes; import org.xml.sax.ContentHandler; +@@ -173,14 +175,14 @@ + marshaller.setMapping(mapping); + } + } +- catch (IOException e) ++ catch (MappingException e) + { +- log.error("Could not marshall type.", e); ++ log.error("Could not use specified Castor mapping for marshalling.", e); + throw new XFireFault(e); + } +- catch (MappingException e) ++ catch (Exception e) + { +- log.error("Could not use specified Castor mapping for marshalling.", e); ++ log.error("Could not marshall type.", e); + throw new XFireFault(e); + } + @@ -224,7 +226,9 @@ { try Index: xfire-all-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire-all-pom.patch,v retrieving revision 1.1 diff -u -r1.1 xfire-all-pom.patch --- xfire-all-pom.patch 28 Mar 2008 19:23:49 -0000 1.1 +++ xfire-all-pom.patch 16 Dec 2012 17:32:55 -0000 @@ -1,12 +1,14 @@ ---- xfire-all/pom.xml.sav 2008-03-18 15:18:10.000000000 +0100 -+++ xfire-all/pom.xml 2008-03-18 15:19:17.000000000 +0100 -@@ -105,11 +105,13 @@ - <groupId>org.codehaus.xfire</groupId> - <artifactId>xfire-jaxws</artifactId> +--- xfire-all/pom.xml.sav12 2007-05-02 14:57:07.000000000 +0200 ++++ xfire-all/pom.xml 2012-02-11 00:21:32.887884522 +0100 +@@ -101,6 +101,7 @@ + <artifactId>xfire-jaxb</artifactId> + <scope>provided</scope> </dependency> +<!-- <dependency> <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-jaxws</artifactId> +@@ -110,6 +111,7 @@ <artifactId>xfire-loom</artifactId> <scope>provided</scope> </dependency> Index: xfire-jaxb2-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire-jaxb2-pom.patch,v retrieving revision 1.1 diff -u -r1.1 xfire-jaxb2-pom.patch --- xfire-jaxb2-pom.patch 28 Mar 2008 19:23:49 -0000 1.1 +++ xfire-jaxb2-pom.patch 16 Dec 2012 17:32:55 -0000 @@ -1,5 +1,5 @@ ---- xfire-jaxb2/pom.xml.sav 2008-02-29 15:25:48.000000000 +0100 -+++ xfire-jaxb2/pom.xml 2008-02-29 15:26:00.000000000 +0100 +--- xfire-jaxb2/pom.xml.sav8 2007-05-02 14:57:07.000000000 +0200 ++++ xfire-jaxb2/pom.xml 2012-02-11 00:10:40.976947355 +0100 @@ -22,7 +22,7 @@ <tasks> <taskdef classname="com.sun.tools.xjc.XJCTask" classpathref="maven.test.classpath" name="xjc" /> @@ -9,7 +9,19 @@ <schema includes="enum.xsd" dir="${basedir}/src/test-schemas" /> <schema includes="inheritance2.xsd" dir="${basedir}/src/test-schemas" /> <schema includes="picture.xsd" dir="${basedir}/src/test-schemas" /> -@@ -96,4 +96,4 @@ +@@ -64,6 +64,11 @@ + </build> + <dependencies> + <dependency> ++ <groupId>org.codehaus.plexus</groupId> ++ <artifactId>plexus-utils</artifactId> ++ <version>1.5.15</version> ++ </dependency> ++ <dependency> + <groupId>org.codehaus.xfire</groupId> + <artifactId>xfire-aegis</artifactId> + </dependency> +@@ -96,4 +101,4 @@ <artifactId>xfire-core</artifactId> </dependency> </dependencies> Index: xfire-jpp-depmap.xml =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire-jpp-depmap.xml,v retrieving revision 1.2 diff -u -r1.2 xfire-jpp-depmap.xml --- xfire-jpp-depmap.xml 28 Mar 2008 19:23:49 -0000 1.2 +++ xfire-jpp-depmap.xml 16 Dec 2012 17:32:55 -0000 @@ -1,6 +1,43 @@ <dependencies> -<!-- ---> +<dependency> + <maven> + <groupId>qdox</groupId> + <artifactId>qdox</artifactId> + <version>1.6.1</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>qdox</artifactId> + <version>1.12</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.bea.xml</groupId> + <artifactId>jsr173-ri</artifactId> + <version>1.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>bea-stax-ri</artifactId> + <version>1.2.0</version> + </jpp> + </dependency> <dependency> <maven> <groupId>stax-utils</groupId> @@ -13,6 +50,7 @@ <version>snapshot-20060502</version> </jpp> </dependency> + <dependency> <maven> <groupId>stax</groupId> @@ -27,29 +65,31 @@ </dependency> <dependency> <maven> - <groupId>stax</groupId> - <artifactId>stax</artifactId> - <version>1.1.2-dev</version> + <groupId>javax.xml.stream</groupId> + <artifactId>stax-api</artifactId> + <version>1.0-2</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>bea-stax-ri</artifactId> - <version>1.2.0</version> + <artifactId>stax_1_0_api</artifactId> + <version>1.0</version> </jpp> </dependency> + <dependency> <maven> - <groupId>org.apache.ws.commons</groupId> - <artifactId>XmlSchema</artifactId> - <version>1.1</version> + <groupId>stax</groupId> + <artifactId>stax</artifactId> + <version>1.1.2-dev</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>ws-commons-XmlSchema</artifactId> - <version>1.3.1</version> + <artifactId>bea-stax-ri</artifactId> + <version>1.2.0</version> </jpp> </dependency> +<!-- <dependency> <maven> <groupId>easymock</groupId> @@ -74,6 +114,9 @@ <version>1.1</version> </jpp> </dependency> +--> + + <!-- 1.3.0.1 --> <dependency> <maven> <groupId>castor</groupId> @@ -81,9 +124,9 @@ <version>1.0M4</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>castor</artifactId> - <version>1.1.2.1</version> + <groupId>JPP/castor</groupId> + <artifactId>core</artifactId> + <version>1.3.0.1</version> </jpp> </dependency> <dependency> @@ -93,9 +136,9 @@ <version>1.0M4</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>castor-xml</artifactId> - <version>1.1.2.1</version> + <groupId>JPP/castor</groupId> + <artifactId>xml</artifactId> + <version>1.3.0.1</version> </jpp> </dependency> <dependency> @@ -105,9 +148,9 @@ <version>1.0M4</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>castor-anttasks</artifactId> - <version>1.1.2.1</version> + <groupId>JPP/castor</groupId> + <artifactId>anttasks</artifactId> + <version>1.3.0.1</version> </jpp> </dependency> <dependency> @@ -117,52 +160,29 @@ <version>1.0M4</version> </maven> <jpp> - <groupId>JPP</groupId> - <artifactId>castor-codegen</artifactId> - <version>1.1.2.1</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>xpp3</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.3.4.O</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>xpp3</artifactId> - <version>1.1.3.8</version> + <groupId>JPP/castor</groupId> + <artifactId>codegen</artifactId> + <version>1.3.0.1</version> </jpp> </dependency> + <!-- --> <dependency> <maven> <groupId>msv</groupId> - <artifactId>xsdlib</artifactId> + <artifactId>relaxngDatatype</artifactId> <version>20050913</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>xsdlib</artifactId> - <version>1.2</version> + <artifactId>relaxngDatatype</artifactId> + <version>1.0</version> </jpp> </dependency> <dependency> <maven> <groupId>com.sun.xml</groupId> - <artifactId>xsdlib</artifactId> - <version>20050614</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>xsdlib</artifactId> - <version>1.2</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>msv</groupId> <artifactId>relaxngDatatype</artifactId> - <version>20050913</version> + <version>1.0</version> </maven> <jpp> <groupId>JPP</groupId> @@ -172,182 +192,147 @@ </dependency> <dependency> <maven> - <groupId>msv</groupId> - <artifactId>isorelax</artifactId> - <version>20050913</version> + <groupId>javax.xml</groupId> + <artifactId>jaxb-2.2-api</artifactId> + <version>2.2</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>isorelax</artifactId> - <version>0.1</version> + <artifactId>jaxb_2_2_api</artifactId> + <version>2.2</version> </jpp> </dependency> <dependency> <maven> - <groupId>msv</groupId> - <artifactId>msv</artifactId> - <version>20050913</version> + <groupId>javax.xml</groupId> + <artifactId>jaxb-api</artifactId> + <version>1.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>msv-msv</artifactId> - <version>1.2</version> + <artifactId>jaxb_1_0_api</artifactId> + <version>1.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>xmlbeans</groupId> - <artifactId>xbean</artifactId> - <version>2.2.0</version> + <groupId>com.sun.xml</groupId> + <artifactId>jaxb-impl</artifactId> + <version>1.0.5</version> </maven> <jpp> - <groupId>JPP/xmlbeans</groupId> - <artifactId>xbean</artifactId> - <version>2.1.0</version> + <groupId>JPP/sun-jaxb-1.0</groupId> + <artifactId>impl</artifactId> + <version>1.0.6</version> </jpp> </dependency> <dependency> <maven> - <groupId>org.apache.xbean</groupId> - <artifactId>xbean-spring</artifactId> - <version>2.8</version> + <groupId>com.sun.xml</groupId> + <artifactId>jaxb-xjc</artifactId> + <version>1.0.5</version> </maven> <jpp> - <groupId>JPP/xbean</groupId> - <artifactId>xbean-spring</artifactId> - <version>2.8</version> + <groupId>JPP/sun-jaxb-1.0</groupId> + <artifactId>xjc</artifactId> + <version>1.0.6</version> </jpp> </dependency> <dependency> <maven> - <groupId>aopalliance</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> + <groupId>msv</groupId> + <artifactId>isorelax</artifactId> + <version>20050913</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>aopalliance</artifactId> - <version>1.0</version> + <artifactId>isorelax</artifactId> + <version>0.1</version> </jpp> </dependency> <dependency> <maven> - <groupId>wsdl4j</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.1</version> + <groupId>javax.xml</groupId> + <artifactId>namespace</artifactId> + <version>1.0.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>wsdl4j</artifactId> - <version>1.6.2</version> + <artifactId>qname_1_1_api</artifactId> + <version>1.1</version> </jpp> </dependency> + <!-- <dependency> <maven> - <groupId>springframework</groupId> - <artifactId>spring</artifactId> - <version>1.2.2</version> + <groupId>xpp3</groupId> + <artifactId>xpp3</artifactId> + <version>1.1.3.4.O</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>spring</artifactId> - <version>1.2.9</version> + <artifactId>xpp3</artifactId> + <version>1.1.3.8</version> </jpp> </dependency> <dependency> <maven> - <groupId>org.springframework</groupId> - <artifactId>spring</artifactId> - <version>1.2.6</version> + <groupId>msv</groupId> + <artifactId>xsdlib</artifactId> + <version>20050913</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>spring</artifactId> - <version>1.2.9</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>org.springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>1.2.6</version> - </maven> - <jpp> - <groupId>JPP/spring</groupId> - <artifactId>mock</artifactId> - <version>1.2.9</version> + <artifactId>xsdlib</artifactId> + <version>1.2</version> </jpp> </dependency> <dependency> <maven> - <groupId>springframework</groupId> - <artifactId>spring-mock</artifactId> - <version>1.2.6</version> + <groupId>msv</groupId> + <artifactId>msv</artifactId> + <version>20050913</version> </maven> <jpp> - <groupId>JPP/spring</groupId> - <artifactId>mock</artifactId> - <version>1.2.9</version> + <groupId>JPP</groupId> + <artifactId>msv-msv</artifactId> + <version>1.2</version> </jpp> </dependency> <dependency> <maven> - <groupId>incubator-activemq</groupId> - <artifactId>activemq-core</artifactId> - <version>4.0</version> + <groupId>org.apache.xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>2.8</version> </maven> <jpp> - <groupId>JPP/activemq3</groupId> - <artifactId>core</artifactId> - <version>3.2.5</version> + <groupId>JPP/xbean</groupId> + <artifactId>xbean-spring</artifactId> + <version>2.8</version> </jpp> </dependency> <dependency> <maven> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-j2ee-jacc</artifactId> - <version>1.0-rc4</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>jacc_1_0_api</artifactId> + <groupId>aopalliance</groupId> + <artifactId>aopalliance</artifactId> <version>1.0</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-j2ee-management</artifactId> - <version>1.0-rc4</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>j2ee_management_1_0_api</artifactId> + <artifactId>aopalliance</artifactId> <version>1.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-jms</artifactId> - <version>1.1-rc4</version> - </maven> - <jpp> - <groupId>JPP</groupId> - <artifactId>jms_1_1_api</artifactId> - <version>1.1</version> - </jpp> - </dependency> - <dependency> - <maven> - <groupId>geronimo-spec</groupId> - <artifactId>geronimo-spec-jta</artifactId> - <version>1.0.1B-rc4</version> + <groupId>wsdl4j</groupId> + <artifactId>wsdl4j</artifactId> + <version>1.6.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>jta_1_0_1B_api</artifactId> - <version>1.0.1B</version> + <artifactId>wsdl4j</artifactId> + <version>1.6.2</version> </jpp> </dependency> <dependency> @@ -532,230 +517,395 @@ </dependency> <dependency> <maven> - <groupId>jivesoftware</groupId> - <artifactId>smack</artifactId> - <version>1.5.0</version> + <groupId>commons-discovery</groupId> + <artifactId>commons-discovery</artifactId> + <version>0.2</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>smack</artifactId> - <version>1.5.0</version> + <artifactId>commons-discovery</artifactId> + <version>0.4</version> </jpp> </dependency> <dependency> <maven> - <groupId>jivesoftware</groupId> - <artifactId>smackx</artifactId> - <version>1.5.0</version> + <groupId>relaxngDatatype</groupId> + <artifactId>relaxngDatatype</artifactId> + <version>20020414</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>smackx</artifactId> - <version>1.5.0</version> + <artifactId>relaxngDatatype</artifactId> + <version>1.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>picocontainer</groupId> - <artifactId>picocontainer</artifactId> - <version>1.2</version> + <groupId>slide</groupId> + <artifactId>slide-webdavlib</artifactId> + <version>2.1</version> + </maven> + <jpp> + <groupId>JPP/slide</groupId> + <artifactId>slide-webdavclient-webdavlib</artifactId> + <version>2.1</version> + </jpp> + </dependency> + --> + <dependency> + <maven> + <groupId>com.sun.xml</groupId> + <artifactId>xsdlib</artifactId> + <version>20050614</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>picocontainer</artifactId> - <version>1.3</version> + <artifactId>xsdlib</artifactId> + <version>1.2</version> </jpp> </dependency> + <dependency> <maven> - <groupId>xfire</groupId> - <artifactId>opensaml</artifactId> - <version>1.0.1</version> + <groupId>javax.xml</groupId> + <artifactId>jax-qname</artifactId> + <version>1.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>opensaml</artifactId> - <version>1.1b</version> + <artifactId>qname_1_1_api</artifactId> + <version>1.1</version> </jpp> </dependency> + <dependency> <maven> - <groupId>wss4j</groupId> - <artifactId>wss4j</artifactId> - <version>1.5.1</version> + <groupId>org.apache.ws.commons</groupId> + <artifactId>XmlSchema</artifactId> + <version>1.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>wss4j</artifactId> - <version>1.5.0</version> + <artifactId>ws-commons-XmlSchema</artifactId> + <version>1.3.1</version> </jpp> </dependency> + <dependency> <maven> - <groupId>xml-security</groupId> - <artifactId>xmlsec</artifactId> - <version>1.3.0</version> + <groupId>xalan</groupId> + <artifactId>xalan-serializer</artifactId> + <version>2.7.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>xml-security</artifactId> - <version>1.3.0</version> + <artifactId>xalan-j2-serializer</artifactId> + <version>2.7.0</version> </jpp> </dependency> + <dependency> <maven> - <groupId>commons-discovery</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.2</version> + <groupId>xmlbeans</groupId> + <artifactId>xbean</artifactId> + <version>2.2.0</version> + </maven> + <jpp> + <groupId>JPP/xmlbeans</groupId> + <artifactId>xbean</artifactId> + <version>2.1.0</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>springframework</groupId> + <artifactId>spring</artifactId> + <version>1.2.2</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>commons-discovery</artifactId> - <version>0.4</version> + <artifactId>spring</artifactId> + <version>1.2.9</version> </jpp> </dependency> <dependency> <maven> - <groupId>xfire</groupId> - <artifactId>xfire-jsr181-api</artifactId> - <version>1.0-M1</version> + <groupId>org.springframework</groupId> + <artifactId>spring</artifactId> + <version>1.2.6</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>ws_metadata_2_0_api</artifactId> - <version>2.0</version> + <artifactId>spring</artifactId> + <version>1.2.9</version> </jpp> </dependency> <dependency> <maven> - <groupId>relaxngDatatype</groupId> - <artifactId>relaxngDatatype</artifactId> - <version>20020414</version> + <groupId>org.springframework</groupId> + <artifactId>spring-mock</artifactId> + <version>1.2.6</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>mock</artifactId> + <version>1.2.9</version> + </jpp> + </dependency> + <dependency> + <maven> + <groupId>springframework</groupId> + <artifactId>spring-mock</artifactId> + <version>1.2.6</version> + </maven> + <jpp> + <groupId>JPP/spring</groupId> + <artifactId>mock</artifactId> + <version>1.2.9</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-j2ee-management</artifactId> + <version>1.0-rc4</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>relaxngDatatype</artifactId> + <artifactId>j2ee_management_1_0_api</artifactId> <version>1.0</version> </jpp> </dependency> <dependency> <maven> - <groupId>xalan</groupId> - <artifactId>xalan-serializer</artifactId> - <version>2.7.0</version> + <groupId>org.apache.geronimo.specs</groupId> + <artifactId>geronimo-j2ee-management_1.0_spec</artifactId> + <version>1.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>xalan-j2-serializer</artifactId> - <version>2.7.0</version> + <artifactId>j2ee_management_1_0_api</artifactId> + <version>1.0</version> </jpp> </dependency> + <dependency> <maven> - <groupId>xfire</groupId> - <artifactId>saaj-impl</artifactId> - <version>1.3</version> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-j2ee-jacc</artifactId> + <version>1.0-rc4</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>sun-saaj-1.3-impl</artifactId> - <version>1.3.1</version> + <artifactId>jacc_1_0_api</artifactId> + <version>1.0</version> </jpp> </dependency> + <dependency> <maven> - <groupId>javax.xml.ws</groupId> - <artifactId>jaxws-api</artifactId> - <version>2.0</version> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-jms</artifactId> + <version>1.1-rc4</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>jaxws_2_0_api</artifactId> - <version>2.0</version> + <artifactId>jms_1_1_api</artifactId> + <version>1.1</version> </jpp> </dependency> <dependency> <maven> - <groupId>com.sun.xml</groupId> - <artifactId>jaxb-impl</artifactId> - <version>1.0.5</version> + <groupId>geronimo-spec</groupId> + <artifactId>geronimo-spec-jta</artifactId> + <version>1.0.1B-rc4</version> </maven> <jpp> - <groupId>JPP/sun-jaxb-1.0</groupId> - <artifactId>impl</artifactId> - <version>1.0.6</version> + <groupId>JPP</groupId> + <artifactId>jta_1_0_1B_api</artifactId> + <version>1.0.1B</version> </jpp> </dependency> + <dependency> <maven> - <groupId>com.sun.xml</groupId> - <artifactId>jaxb-xjc</artifactId> - <version>1.0.5</version> + <groupId>incubator-activemq</groupId> + <artifactId>activemq-core</artifactId> + <version>4.0</version> </maven> <jpp> - <groupId>JPP/sun-jaxb-1.0</groupId> - <artifactId>xjc</artifactId> - <version>1.0.6</version> + <groupId>JPP/activemq4</groupId> + <artifactId>core</artifactId> + <version>4.1.2</version> </jpp> </dependency> + <dependency> <maven> - <groupId>javax.xml</groupId> - <artifactId>jaxb-api</artifactId> - <version>1.0</version> + <groupId>jivesoftware</groupId> + <artifactId>smack</artifactId> + <version>1.5.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>jaxb_1_0_api</artifactId> - <version>1.0</version> + <artifactId>smack2</artifactId> + <version>2.2.1</version> </jpp> </dependency> <dependency> <maven> - <groupId>com.sun.xml</groupId> - <artifactId>relaxngDatatype</artifactId> - <version>1.0</version> + <groupId>jivesoftware</groupId> + <artifactId>smackx</artifactId> + <version>1.5.0</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>relaxngDatatype</artifactId> - <version>1.0</version> + <artifactId>smack2x</artifactId> + <version>2.2.1</version> </jpp> </dependency> + <dependency> <maven> - <groupId>javax.xml</groupId> - <artifactId>namespace</artifactId> + <groupId>picocontainer</groupId> + <artifactId>picocontainer</artifactId> + <version>1.2</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>picocontainer</artifactId> + <version>1.3</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>xfire</groupId> + <artifactId>opensaml</artifactId> <version>1.0.1</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>qname_1_1_api</artifactId> - <version>1.1</version> + <artifactId>opensaml</artifactId> + <version>1.1b</version> </jpp> </dependency> + <dependency> <maven> - <groupId>javax.xml</groupId> - <artifactId>jax-qname</artifactId> - <version>1.1</version> + <groupId>org.codehaus.xfire</groupId> + <artifactId>bcprov-jdk15</artifactId> + <version>133</version> </maven> <jpp> <groupId>JPP</groupId> - <artifactId>qname_1_1_api</artifactId> - <version>1.1</version> + <artifactId>bcprov</artifactId> + <version>1.46</version> </jpp> </dependency> + <dependency> <maven> - <groupId>slide</groupId> - <artifactId>slide-webdavlib</artifactId> - <version>2.1</version> + <groupId>wss4j</groupId> + <artifactId>wss4j</artifactId> + <version>1.5.1</version> </maven> <jpp> - <groupId>JPP/slide</groupId> - <artifactId>slide-webdavclient-webdavlib</artifactId> - <version>2.1</version> + <groupId>JPP</groupId> + <artifactId>wss4j</artifactId> + <version>1.5.0</version> + </jpp> + </dependency> + + <dependency> + <maven> + <groupId>xml-security</groupId> + <artifactId>xmlsec</artifactId> + <version>1.3.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>xml-security</artifactId> + <version>1.4.2</version> + </jpp> + </dependency> + <dependency> + <maven> + <groupId>org.apache.santuario</groupId> + <artifactId>xmlsec</artifactId> + <version>1.4.4</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>xml-security</artifactId> + <version>1.4.2</version> + </jpp> + </dependency> + <dependency> + <maven> + <groupId>javax.xml.ws</groupId> + <artifactId>jaxws-api</artifactId> + <version>2.0</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>jaxws_2_2_api</artifactId> + <version>2.2</version> </jpp> </dependency> + <dependency> + <maven> + <groupId>xfire</groupId> + <artifactId>xfire-jsr181-api</artifactId> + <version>1.0-M1</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>ws_metadata_2_0_api</artifactId> + <version>2.0</version> + </jpp> + </dependency> + <dependency> + <maven> + <groupId>xfire</groupId> + <artifactId>saaj-impl</artifactId> + <version>1.3</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>sun-saaj-1.3-impl</artifactId> + <version>1.3.1</version> + </jpp> + </dependency> + <dependency> + <maven> + <groupId>javax.xml.soap</groupId> + <artifactId>saaj-api</artifactId> + <version>1.3</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>saaj_1_3_api</artifactId> + <version>1.3</version> + </jpp> + </dependency> +<!-- + javax.xml.soap:saaj-api:jar:1.3 +--> + +<dependency> + <maven> + <groupId>org.mortbay.jetty</groupId> + <artifactId>servlet-api</artifactId> + <version>2.5-20081211</version> + </maven> + <jpp> + <groupId>JPP</groupId> + <artifactId>servlet_2_5_api</artifactId> + <version>2.5</version> + </jpp> +</dependency> + </dependencies> Index: xfire-pom.patch =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire-pom.patch,v retrieving revision 1.1 diff -u -r1.1 xfire-pom.patch --- xfire-pom.patch 28 Mar 2008 19:23:49 -0000 1.1 +++ xfire-pom.patch 16 Dec 2012 17:32:55 -0000 @@ -1,5 +1,33 @@ --- pom.xml.sav4 2007-05-02 14:57:07.000000000 +0200 -+++ pom.xml 2008-03-18 13:07:27.000000000 +0100 ++++ pom.xml 2012-02-11 00:19:47.039885078 +0100 +@@ -59,8 +59,8 @@ + <plugin> + <artifactId>maven-compiler-plugin</artifactId> + <configuration> +- <source>1.4</source> +- <target>1.4</target> ++ <source>1.5</source> ++ <target>1.5</target> + </configuration> + </plugin> + <plugin> +@@ -95,14 +95,14 @@ + <profile> + <id>jdk1.5</id> + <activation> +- <jdk>1.5</jdk> ++ <jdk>1.6</jdk> + </activation> + <modules> + <module>xfire-all</module> + <module>xfire-generator</module> + <module>xfire-java5</module> + <module>xfire-jaxb2</module> +- <module>xfire-jaxws</module> ++ <module>xfire-jaxws</module> + </modules> + </profile> + <profile> @@ -122,7 +122,9 @@ <module>xfire-annotations</module> <module>xfire-castor</module> Index: xfire.spec =================================================================== RCS file: /home/projects/jpackage/cvs/rpms/free/xfire/xfire.spec,v retrieving revision 1.2 diff -u -r1.2 xfire.spec --- xfire.spec 28 Mar 2008 19:23:49 -0000 1.2 +++ xfire.spec 16 Dec 2012 17:32:55 -0000 @@ -28,24 +28,20 @@ # OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. # -%define gcj_support %{?_with_gcj_support:1}%{!?_with_gcj_support:%{?_without_gcj_support:0}%{!?_without_gcj_support:%{?_gcj_support:%{_gcj_support}}%{!?_gcj_support:0}}} # use this option to skip xfire-jms unit tests while activemq isn't available %define nojmstests %{?_with_nojmstests:1}%{!?_with_nojmstests:%{?_without_nojmstests:0}%{!?_without_nojmstests:%{?_nojmstests:%{_nojmstests}}%{!?_nojmstests:0}}} %define section free -%define repo_dir m2_repo/repository %define mbpversion 1.0 Name: xfire Version: 1.2.6 -Release: 1jpp +Release: 2%{?dist} Epoch: 0 Summary: XFire SOAP Framework License: BSD-style Group: Development/Java -Vendor: JPackage Project -Distribution: JPackage URL: http://xfire.codehaus.org/ Source0: %{name}-%{version}.tar.gz # svn export http://svn.codehaus.org/xfire/tags/xfire-1.2.6/ @@ -57,9 +53,9 @@ Patch2: xfire-CastorType.patch Patch3: xfire-castor-pom.patch Patch4: xfire-pom.patch -Patch5: xfire-1.2.6-AbstractXFireJMSTest.patch +#Patch5: xfire-1.2.6-AbstractXFireJMSTest.patch Patch6: xfire-SecuredCrypto.patch -Patch7: xfire-wss4j150-SecuredCrypto.patch +#Patch7: xfire-wss4j150-SecuredCrypto.patch Patch8: xfire-jaxb2-pom.patch Patch9: xfire-maven-bundle-plugin-BundleMojo.patch Patch10: xfire-jaxb-pom.patch @@ -69,11 +65,24 @@ Patch14: xfire-nojmstests.patch -BuildRequires: jpackage-utils >= 0:1.7.4 -BuildRequires: java-devel = 0:1.5.0 -BuildRequires: ant >= 0:1.6.5 +Patch15: xfire-annotations-pom.patch +Patch16: xfire-generator-pom.patch +Patch17: xfire-generator-DocumentationConfigGen.patch +Patch18: xfire-jaxws-SOAPBinding.patch +Patch19: xfire-jaxws-AbstractBinding.patch +Patch20: xfire-jaxws-JAXBDispatch.patch +Patch21: xfire-jaxws-SourceDispatch.patch +Patch22: xfire-jaxws-ServiceDelegate.patch +Patch23: xfire-jaxws-Provider.patch +Patch24: xfire-jaxws-Endpoint.patch +Patch25: xfire-jaxws-pom.patch +Patch26: xfire-spring-pom.patch + +BuildRequires: jpackage-utils >= 0:1.7.5 +BuildRequires: java-devel >= 0:1.6.0 +BuildRequires: ant >= 0:1.7.1 -BuildRequires: maven2 >= 0:2.0.7 +BuildRequires: maven2 >= 0:2.0.8 BuildRequires: maven2-plugin-ant BuildRequires: maven2-plugin-antrun BuildRequires: maven2-plugin-assembly @@ -85,19 +94,22 @@ BuildRequires: maven2-plugin-plugin BuildRequires: maven2-plugin-resources BuildRequires: maven2-plugin-site -BuildRequires: maven2-plugin-surefire +BuildRequires: maven-surefire-plugin +BuildRequires: maven-surefire-provider-junit3 BuildRequires: maven-release BuildRequires: mojo-maven2-plugin-build-helper +BuildRequires: geronimo-genesis +BuildRequires: oss-parent + %if ! %{nojmstests} -BuildRequires: activemq3 +BuildRequires: activemq4 %endif BuildRequires: aopalliance BuildRequires: backport-util-concurrent BuildRequires: bea-stax BuildRequires: stax_1_0_api BuildRequires: castor -BuildRequires: castor-xml BuildRequires: javamail_1_4_api #BuildRequires: concurrent BuildRequires: dom4j @@ -106,20 +118,21 @@ BuildRequires: isorelax BuildRequires: j2ee_management_1_0_api #BuildRequires: jacc_1_0_api -BuildRequires: jaf_1_1_api -BuildRequires: jms_1_1_api -BuildRequires: jta_1_0_1B_api +BuildRequires: geronimo-jaf-1.1-api +BuildRequires: geronimo-jms-1.1-api +BuildRequires: geronimo-jta-1.0.1B-api BuildRequires: httpunit -BuildRequires: jakarta-commons-attributes -BuildRequires: jakarta-commons-beanutils -BuildRequires: jakarta-commons-codec -BuildRequires: jakarta-commons-discovery -BuildRequires: jakarta-commons-httpclient -BuildRequires: jakarta-commons-logging +BuildRequires: apache-commons-attributes +BuildRequires: apache-commons-beanutils +BuildRequires: apache-commons-codec +BuildRequires: apache-commons-discovery +BuildRequires: apache-commons-httpclient +BuildRequires: apache-commons-logging +BuildRequires: bouncycastle #BuildRequires: jakarta-slide-webdavclient BuildRequires: javacc3 -BuildRequires: jaxb_1_0_api -BuildRequires: jaxws_2_0_api +BuildRequires: sun-jaxb-1.0-api +BuildRequires: geronimo-jaxws-2.2-api BuildRequires: jaxen BuildRequires: jdom BuildRequires: jetty6 @@ -138,13 +151,13 @@ BuildRequires: plexus-container-default BuildRequires: plexus-servlet BuildRequires: plexus-utils -BuildRequires: qdox +BuildRequires: qdox >= 0:1.12 BuildRequires: qname_1_1_api BuildRequires: relaxngDatatype BuildRequires: saaj_1_3_api BuildRequires: servlet_2_3_api -BuildRequires: smack -BuildRequires: spring +BuildRequires: smack2 +BuildRequires: spring-all BuildRequires: spring-mock BuildRequires: stax-utils BuildRequires: sun-jaxb-1.0-impl @@ -166,14 +179,7 @@ BuildRequires: xmlunit BuildRequires: xpp3 -%if %{gcj_support} -BuildRequires: java-gcj-compat-devel -Requires(post): java-gcj-compat -Requires(postun): java-gcj-compat -%endif -%if ! %{gcj_support} BuildArch: noarch -%endif BuildRoot: %{_tmppath}/%{name}-%{version}-%{release}-buildroot Requires(post): jpackage-utils >= 0:1.7.4 @@ -207,7 +213,7 @@ Requires: qname_1_1_api Requires: xml-commons-jaxp-1.3-apis Requires: stax_1_0_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: jdom %description aegis @@ -227,8 +233,8 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: %{name}-aegis = %{epoch}:%{version}-%{release} Requires: qname_1_1_api -Requires: jakarta-commons-attributes -Requires: jakarta-commons-logging +Requires: apache-commons-attributes +Requires: apache-commons-logging %description annotations %{summary}. @@ -241,10 +247,9 @@ Requires: stax-utils Requires: qname_1_1_api Requires: stax_1_0_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: dom4j Requires: castor -Requires: castor-xml Requires: xml-commons-jaxp-1.3-apis %description castor @@ -256,9 +261,9 @@ Requires: java >= 0:1.5.0 Requires: bea-stax Requires: jaf_1_1_api -Requires: jakarta-commons-codec -Requires: jakarta-commons-httpclient -Requires: jakarta-commons-logging +Requires: apache-commons-codec +Requires: apache-commons-httpclient +Requires: apache-commons-logging Requires: jaxen Requires: jdom Requires: jetty6 @@ -286,7 +291,7 @@ Requires: %{name}-xmlbeans = %{epoch}:%{version}-%{release} Requires: ant Requires: jdom -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: qdox Requires: xmlbeans @@ -372,7 +377,7 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: jms_1_1_api Requires: stax_1_0_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging %description jms %{summary}. @@ -382,7 +387,7 @@ Group: Development/Java Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: qname_1_1_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: picocontainer %description picocontainer @@ -396,7 +401,7 @@ Requires: servlet_2_3_api Requires: qname_1_1_api Requires: stax_1_0_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: jdom Requires: plexus-container-default Requires: plexus-servlet @@ -415,7 +420,7 @@ Requires: qname_1_1_api Requires: stax_1_0_api Requires: aopalliance -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: xbean >= 0:2.8 Requires: spring-aop Requires: spring-beans @@ -430,9 +435,9 @@ Summary: WS-Security module from %{name} Group: Development/Java Requires: %{name}-core = %{epoch}:%{version}-%{release} -Requires: bouncycastle-jdk1.5 -Requires: jakarta-commons-discovery -Requires: jakarta-commons-logging +Requires: bouncycastle +Requires: apache-commons-discovery +Requires: apache-commons-logging Requires: opensaml Requires: wss4j >= 0:1.5.3 #Requires: wss4j @@ -465,9 +470,9 @@ Requires: %{name}-core = %{epoch}:%{version}-%{release} Requires: qname_1_1_api Requires: stax_1_0_api -Requires: jakarta-commons-logging +Requires: apache-commons-logging Requires: jdom -Requires: smack +Requires: smack2 Requires: xpp3 %description xmpp @@ -513,9 +518,9 @@ %patch2 -b .sav2 %patch3 -b .sav3 %patch4 -b .sav4 -%patch5 -b .sav5 +#%%patch5 -b .sav5 %patch6 -b .sav6 -#%patch7 -b .sav7 +#%%patch7 -b .sav7 %patch8 -b .sav8 %patch9 -b .sav9 %patch10 -b .sav10 @@ -528,9 +533,23 @@ rm -rf xfire-jms/src/test/ %endif -%build -export JAVA_HOME=%{_jvmdir}/java-1.5.0 +%patch15 -b .sav15 +%patch16 -b .sav16 +%patch17 -b .sav17 +%patch18 -b .sav18 +%patch19 -b .sav19 +%patch20 -b .sav20 +%patch21 -b .sav21 +%patch22 -b .sav22 +%patch23 -b .sav23 +%patch24 -b .sav24 +%patch25 -b .sav25 +%patch26 -b .sav26 +rm -rf xfire-generator/src/test +rm -rf xfire-jaxws/src/test + +%build cp %{SOURCE3} maven2-settings.xml sed -i -e "s|<url>__JPP_URL_PLACEHOLDER__</url>|<url>file://`pwd`/m2_repo/repository</url>|g" maven2-settings.xml @@ -544,7 +563,7 @@ mkdir -p m2_repo/repository export MAVEN_REPO_LOCAL=$(pwd)/m2_repo/repository mkdir -p m2_repo/repository/org.codehaus.xfire -ln -sf $(build-classpath bouncycastle/bcprov) m2_repo/repository/org.codehaus.xfire/bcprov-jdk15.jar +ln -sf $(build-classpath bcprov) m2_repo/repository/org.codehaus.xfire/bcprov-jdk15.jar export SETTINGS=$(pwd)/maven2-settings.xml export DEPMAP=%{SOURCE2} @@ -555,7 +574,8 @@ -Dmaven.test.failure.ignore=true \ -Dmaven2.jpp.depmap.file=$DEPMAP \ -Djava.awt.headless=true \ - ant:ant install javadoc:javadoc + install javadoc:javadoc +# ant:ant install javadoc:javadoc popd pushd maven-bundle-plugin @@ -565,7 +585,8 @@ -Dmaven.test.failure.ignore=true \ -Dmaven2.jpp.depmap.file=$DEPMAP \ -Djava.awt.headless=true \ - ant:ant install javadoc:javadoc + install javadoc:javadoc +# ant:ant install javadoc:javadoc popd mvn-jpp -e \ @@ -574,7 +595,8 @@ -Dmaven.test.failure.ignore=true \ -Dmaven2.jpp.depmap.file=$DEPMAP \ -Djava.awt.headless=true \ - ant:ant install javadoc:javadoc + install javadoc:javadoc +# ant:ant install javadoc:javadoc %install rm -rf $RPM_BUILD_ROOT @@ -744,223 +766,19 @@ ln -s %{name}-%{version} $RPM_BUILD_ROOT%{_javadocdir}/%{name} # ghost symlink -%if %{gcj_support} -%{_bindir}/aot-compile-rpm -%endif - %clean rm -rf $RPM_BUILD_ROOT -%post javadoc -rm -f %{_javadocdir}/%{name} -ln -s %{name}-%{version} %{_javadocdir}/%{name} - -%postun javadoc -if [ "$1" = "0" ]; then - rm -f %{_javadocdir}/%{name} -fi - -%if %{gcj_support} -%post maven-bundle-plugin -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun maven-bundle-plugin -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post aegis -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun aegis -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post all -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun all -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post annotations -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun annotations -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post castor -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun castor -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %post core %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %postun core %update_maven_depmap -%if %{gcj_support} -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post jms -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun jms -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post picocontainer -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun picocontainer -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post plexus -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun plexus -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post spring -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun spring -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post xmlbeans -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun xmlbeans -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%post xmpp -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif - -%if %{gcj_support} -%postun xmpp -if [ -x %{_bindir}/rebuild-gcj-db ] -then - %{_bindir}/rebuild-gcj-db -fi -%endif %files maven-bundle-plugin %defattr(-,root,root,-) %{_javadir}/%{name}/maven-bundle-plugin*.jar -%if %{gcj_support} -%attr(-,root,root) %dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/maven-bundle-plugin*-%{version}.jar.* -%endif %files aegis %defattr(-,root,root,-) @@ -969,11 +787,6 @@ %files all %defattr(-,root,root,-) %{_javadir}/%{name}/all*.jar -%if %{gcj_support} -%attr(-,root,root) %dir %{_libdir}/gcj/%{name} -%attr(-,root,root) %{_libdir}/gcj/%{name}/all*-%{version}.jar.* -%endif - %files annotations %defattr(-,root,root,-) %{_javadir}/%{name}/annotations*.jar @@ -986,8 +799,8 @@ %defattr(-,root,root,-) %dir %{_javadir}/%{name} %{_javadir}/%{name}/core*.jar -%{_datadir}/maven2 -%{_mavendepmapfragdir} +%{_datadir}/maven2/poms/* +%{_mavendepmapfragdir}/* %files generator %defattr(-,root,root,-) @@ -1045,9 +858,12 @@ %files javadoc %defattr(-,root,root,-) %doc %{_javadocdir}/%{name}-%{version} -%ghost %doc %{_javadocdir}/%{name} +%doc %{_javadocdir}/%{name} %changelog +* Wed Oct 31 2012 Ralph Apel <r.apel at r-apel.de> - 0:1.2.6-2 +- Rebuild for JPP6 + * Fri Mar 28 2008 Ralph Apel <r.apel at r-apel.de> - 0:1.2.6-1jpp - 1.2.6 - Build extended with java5 for java5