You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by di...@apache.org on 2007/04/19 19:59:32 UTC
svn commit: r530502 - in /geronimo/server/trunk:
configs/axis2-deployer/pom.xml configs/axis2-deployer/src/plan/plan.xml
configs/axis2/pom.xml modules/geronimo-axis2/pom.xml
Author: dims
Date: Thu Apr 19 10:59:31 2007
New Revision: 530502
URL: http://svn.apache.org/viewvc?view=rev&rev=530502
Log:
cleanup axis2 pom's/plan's
Modified:
geronimo/server/trunk/configs/axis2-deployer/pom.xml
geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
geronimo/server/trunk/configs/axis2/pom.xml
geronimo/server/trunk/modules/geronimo-axis2/pom.xml
Modified: geronimo/server/trunk/configs/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/pom.xml?view=diff&rev=530502&r1=530501&r2=530502
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/pom.xml Thu Apr 19 10:59:31 2007
@@ -54,7 +54,6 @@
<version>${version}</version>
<scope>runtime</scope>
</dependency>
-
</dependencies>
</project>
Modified: geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml?view=diff&rev=530502&r1=530501&r2=530502
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml Thu Apr 19 10:59:31 2007
@@ -60,6 +60,12 @@
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-axis2</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.geronimo.modules</groupId>
+ <artifactId>geronimo-jaxws</artifactId>
+ <version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
@@ -102,14 +108,6 @@
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </dependency>
- <dependency>
- <groupId>commons-logging</groupId>
- <artifactId>commons-logging</artifactId>
- </dependency>
- <dependency>
<groupId>commons-httpclient</groupId>
<artifactId>commons-httpclient</artifactId>
</dependency>
@@ -118,14 +116,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
@@ -142,8 +132,18 @@
<artifactId>annogen</artifactId>
</dependency>
<dependency>
+ <groupId>wsdl4j</groupId>
+ <artifactId>wsdl4j</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
+ <type>jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
</dependency>
<dependency>
<groupId>org.apache.geronimo.configs</groupId>
Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?view=diff&rev=530502&r1=530501&r2=530502
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Thu Apr 19 10:59:31 2007
@@ -54,12 +54,6 @@
<artifactId>webservices-common</artifactId>
<type>car</type>
<version>${version}</version>
- <exclusions>
- <exclusion>
- <groupId>com.sun.xml.messaging.saaj</groupId>
- <artifactId>saaj-impl</artifactId>
- </exclusion>
- </exclusions>
</dependency>
<dependency>
@@ -129,10 +123,6 @@
<artifactId>XmlSchema</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.neethi</groupId>
- <artifactId>neethi</artifactId>
- </dependency>
- <dependency>
<groupId>commons-logging</groupId>
<artifactId>commons-logging</artifactId>
</dependency>
@@ -145,14 +135,6 @@
<artifactId>commons-codec</artifactId>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.javamail</groupId>
- <artifactId>geronimo-javamail_1.4_mail</artifactId>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-activation_1.1_spec</artifactId>
- </dependency>
- <dependency>
<groupId>xalan</groupId>
<artifactId>xalan</artifactId>
</dependency>
@@ -171,6 +153,10 @@
<dependency>
<groupId>xml-resolver</groupId>
<artifactId>xml-resolver</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.neethi</groupId>
+ <artifactId>neethi</artifactId>
</dependency>
<dependency>
<groupId>com.sun.xml.ws</groupId>
Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/pom.xml?view=diff&rev=530502&r1=530501&r2=530502
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Thu Apr 19 10:59:31 2007
@@ -35,38 +35,32 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-j2ee-schema</artifactId>
- <version>${version}</version>
- </dependency>
- <dependency>
- <groupId>org.apache.geronimo.modules</groupId>
<artifactId>geronimo-webservices</artifactId>
<version>${version}</version>
</dependency>
- <dependency>
- <groupId>org.apache.axis2</groupId>
- <artifactId>axis2-jaxws</artifactId>
- </dependency>
+
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-naming</artifactId>
+ <artifactId>geronimo-jaxws</artifactId>
<version>${version}</version>
</dependency>
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-openejb</artifactId>
+ <artifactId>geronimo-j2ee-schema</artifactId>
<version>${version}</version>
</dependency>
<dependency>
- <groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-transaction</artifactId>
- <version>${version}</version>
+ <groupId>org.apache.axis2</groupId>
+ <artifactId>axis2-jaxws</artifactId>
</dependency>
+
+ <!-- g-naming, g-transaction come from this -->
<dependency>
<groupId>org.apache.geronimo.modules</groupId>
- <artifactId>geronimo-jaxws</artifactId>
+ <artifactId>geronimo-openejb</artifactId>
<version>${version}</version>
</dependency>
+
<!-- Had to add due to the Axis2WebServiceContainerTest -->
<dependency>
<groupId>com.sun.xml.bind</groupId>
@@ -240,3 +234,4 @@
</plugins>
</build>
</project>
+