Author: gawor
Date: Tue Oct 7 13:52:02 2008
New Revision: 702631
URL: http://svn.apache.org/viewvc?rev=702631&view=rev
Log:
use jaxws-tools 2.1 to generate the wsdl (that needs extra CDDL libs such as
stax-ex and streambuffer) and drop unneeded jaxen and annogen dependencies
(GERONIMO-4327)
Removed:
geronimo/server/trunk/repository/com/
Modified:
geronimo/server/trunk/NOTICE.txt
geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/pom.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml
geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
geronimo/server/trunk/plugins/cxf/cxf/pom.xml
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
geronimo/server/trunk/pom.xml
geronimo/server/trunk/repository/pom.xml
Modified: geronimo/server/trunk/NOTICE.txt
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/NOTICE.txt?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/NOTICE.txt (original)
+++ geronimo/server/trunk/NOTICE.txt Tue Oct 7 13:52:02 2008
@@ -97,19 +97,6 @@
apply to these dependencies.
=========================================================================
-== ANNOGEN Notice ==
-=========================================================================
-
-This product includes software developed by the Annogen project
-(http://annogen.codehaus.org/)
-
-This software consists of voluntary contributions made by many
-individuals on behalf of the Apache Software Foundation and was
-originally based on software copyright (c) 2000-2004 BEA Systems
-Inc., <http://www.bea.com/>. For more information on the Apache
-Software Foundation, please see <http://www.apache.org/>.
-
-=========================================================================
== Apache ActiveMQ Notice ==
=========================================================================
@@ -496,15 +483,6 @@
=========================================================================
-== jaxen Notice ==
-=========================================================================
-
-This product includes software developed by the jaxen project
-(http://jaxen.org/).
-
- Copyright 2003-2006 The Werken Company. All Rights Reserved.
-
-=========================================================================
== JDBM Notice ==
=========================================================================
@@ -610,6 +588,12 @@
This product includes software developed for Java API for XML Web Services
project (JAX-WS) (https://jax-ws.dev.java.net/)
+This product includes software developed for StAX-Ex Project
+(https://stax-ex.dev.java.net/)
+
+This product includes software developed for XML Stream Buffer Project
+(https://xmlstreambuffer.dev.java.net/)
+
This product includes software developed for the Java Server Pages Tag
Library project (https://jstl.dev.java.net/)
Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb/pom.xml Tue Oct 7 13:52:02
2008
@@ -74,6 +74,11 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>Web Services</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false"/>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Tue Oct 7 13:52:02 2008
@@ -159,16 +159,6 @@
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- </dependency>
-
- <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
</dependency>
@@ -187,6 +177,16 @@
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
</dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.stream.buffer</groupId>
+ <artifactId>streambuffer</artifactId>
+ </dependency>
+
+ <dependency>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ </dependency>
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -206,6 +206,11 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>Web Services</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false"/>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified:
geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
(original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/history/dependencies.xml
Tue Oct 7 13:52:02 2008
@@ -32,11 +32,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis2</artifactId>
<type>jar</type>
@@ -127,11 +122,6 @@
<type>jar</type>
</dependency>
<dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <type>jar</type>
- </dependency>
- <dependency>
<groupId>org.apache.geronimo.framework</groupId>
<artifactId>server-security-config</artifactId>
<type>car</type>
@@ -186,4 +176,14 @@
<artifactId>woden-impl-dom</artifactId>
<type>jar</type>
</dependency>
+ <dependency>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>com.sun.xml.stream.buffer</groupId>
+ <artifactId>streambuffer</artifactId>
+ <type>jar</type>
+ </dependency>
</plugin-artifact>
Modified: geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/src/main/plan/plan.xml Tue Oct 7
13:52:02 2008
@@ -20,4 +20,11 @@
<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}";>
+ <gbean name="Axis2SystemProperties"
+ class="org.apache.geronimo.system.properties.SystemProperties">
+ <attribute name="systemProperties">
+ javax.xml.ws.spi.Provider=org.apache.axis2.jaxws.spi.Provider
+ </attribute>
+ </gbean>
+
</module>
Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Tue Oct 7
13:52:02 2008
@@ -124,17 +124,7 @@
<groupId>commons-codec</groupId>
<artifactId>commons-codec</artifactId>
</dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- </dependency>
-
- <dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- </dependency>
-
+
</dependencies>
</project>
Modified: geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf-ejb/pom.xml Tue Oct 7 13:52:02 2008
@@ -74,6 +74,11 @@
<artifactId>car-maven-plugin</artifactId>
<configuration>
<category>Web Services</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false"/>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified: geronimo/server/trunk/plugins/cxf/cxf/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/cxf/cxf/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/cxf/cxf/pom.xml (original)
+++ geronimo/server/trunk/plugins/cxf/cxf/pom.xml Tue Oct 7 13:52:02 2008
@@ -176,6 +176,11 @@
<includeVersion>true</includeVersion>
</useMavenDependencies>
<category>Web Services</category>
+ <instance>
+ <plugin-artifact>
+ <config-xml-content load="false"/>
+ </plugin-artifact>
+ </instance>
</configuration>
</plugin>
</plugins>
Modified:
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
---
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
(original)
+++
geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSTools.java
Tue Oct 7 13:52:02 2008
@@ -47,6 +47,8 @@
{ "com.sun.xml.bind", "jaxb-xjc" },
{ "com.sun.xml.ws", "jaxws-tools" },
{ "com.sun.xml.ws", "jaxws-rt" },
+ { "com.sun.xml.stream.buffer", "streambuffer" },
+ { "org.jvnet.staxex", "stax-ex" },
{ "org.apache.geronimo.javamail", "geronimo-javamail_1.4_mail"},
{ "org.apache.geronimo.specs", "geronimo-activation_1.1_spec"},
{ "org.apache.geronimo.specs", "geronimo-annotation_1.0_spec"},
@@ -59,6 +61,7 @@
{ "org.apache.geronimo.specs", "geronimo-jms_1.1_spec"},
{ "org.apache.geronimo.specs", "geronimo-jta_1.1_spec"},
{ "org.apache.geronimo.specs", "geronimo-j2ee-management_1.1_spec"},
+ { "org.codehaus.woodstox", "wstx-asl" },
};
private final static Artifact SUN_SAAJ_IMPL_ARTIFACT = new Artifact("com.sun.xml.messaging.saaj","saaj-impl", (Version)null, "jar");
Modified: geronimo/server/trunk/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Tue Oct 7 13:52:02 2008
@@ -1732,6 +1732,10 @@
<groupId>org.apache.axis2</groupId>
<artifactId>axis2-transport-local</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1824,6 +1828,10 @@
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -1983,6 +1991,10 @@
<groupId>org.apache.geronimo.specs</groupId>
<artifactId>geronimo-javamail_1.4_spec</artifactId>
</exclusion>
+ <exclusion>
+ <groupId>jaxen</groupId>
+ <artifactId>jaxen</artifactId>
+ </exclusion>
</exclusions>
</dependency>
@@ -2061,53 +2073,61 @@
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-tools</artifactId>
- <version>2.0</version>
+ <version>2.1.4</version>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
<artifactId>jaxws-rt</artifactId>
- <version>2.0</version>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.bind</groupId>
- <artifactId>jaxb-xjc</artifactId>
- <version>2.1.7</version>
- </dependency>
-
- <dependency>
- <groupId>jaxen</groupId>
- <artifactId>jaxen</artifactId>
- <version>1.1-beta-11</version>
+ <version>2.1.4</version>
<exclusions>
<exclusion>
- <groupId>xml-apis</groupId>
- <artifactId>xml-apis</artifactId>
+ <groupId>javax.xml.ws</groupId>
+ <artifactId>jaxws-api</artifactId>
</exclusion>
<exclusion>
- <groupId>xerces</groupId>
- <artifactId>xercesImpl</artifactId>
+ <groupId>com.sun.xml.stream</groupId>
+ <artifactId>sjsxp</artifactId>
</exclusion>
<exclusion>
- <groupId>dom4j</groupId>
- <artifactId>dom4j</artifactId>
+ <groupId>com.sun.org.apache.xml.internal</groupId>
+ <artifactId>resolver</artifactId>
</exclusion>
<exclusion>
- <groupId>jdom</groupId>
- <artifactId>jdom</artifactId>
+ <groupId>org.jvnet</groupId>
+ <artifactId>mimepull</artifactId>
</exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.stream.buffer</groupId>
+ <artifactId>streambuffer</artifactId>
+ <version>0.8</version>
+ <exclusions>
<exclusion>
- <groupId>xom</groupId>
- <artifactId>xom</artifactId>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
</exclusion>
</exclusions>
</dependency>
<dependency>
- <groupId>annogen</groupId>
- <artifactId>annogen</artifactId>
- <version>0.1.0</version>
+ <groupId>org.jvnet.staxex</groupId>
+ <artifactId>stax-ex</artifactId>
+ <version>1.0</version>
+ <exclusions>
+ <exclusion>
+ <groupId>javax.activation</groupId>
+ <artifactId>activation</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+
+ <dependency>
+ <groupId>com.sun.xml.bind</groupId>
+ <artifactId>jaxb-xjc</artifactId>
+ <version>2.1.7</version>
</dependency>
<dependency>
Modified: geronimo/server/trunk/repository/pom.xml
URL:
http://svn.apache.org/viewvc/geronimo/server/trunk/repository/pom.xml?rev=702631&r1=702630&r2=702631&view=diff
==============================================================================
--- geronimo/server/trunk/repository/pom.xml (original)
+++ geronimo/server/trunk/repository/pom.xml Tue Oct 7 13:52:02 2008
@@ -117,18 +117,6 @@
<artifactId>jasper-el</artifactId>
</dependency>
- <!-- add the following for wsgen -->
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-tools</artifactId>
- </dependency>
-
- <dependency>
- <groupId>com.sun.xml.ws</groupId>
- <artifactId>jaxws-rt</artifactId>
- </dependency>
- <!--end add for wsgen-->
-
<!-- This is to resolve an intermitent Maven problem with openejb-3.0-beta-1 transitive depend -->
<dependency>
<groupId>org.apache.xbean</groupId>
