geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r887060 - in /geronimo/server/trunk: ./ plugins/activemq/activemq-broker/ plugins/activemq/activemq-broker/src/main/history/ plugins/axis2/ plugins/axis2/axis2-ejb-deployer/src/main/history/ plugins/axis2/axis2-ejb-deployer/src/main/plan/ p...
Date Fri, 04 Dec 2009 05:05:13 GMT
Author: xuhaihong
Date: Fri Dec  4 05:05:07 2009
New Revision: 887060

URL: http://svn.apache.org/viewvc?rev=887060&view=rev
Log:
GERONIMO-4967 Enable Axis2 plugin in Geronimo 3.0
1. Rename some packages to avoid the exporting conflict
2. Use those bundlized dependency

Added:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/
      - copied from r886668, geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/
      - copied from r886721, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/
      - copied from r886668, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/
      - copied from r886668, geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/
Removed:
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/wsdl/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/builder/
Modified:
    geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
    geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.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/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
    geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/Axis2EJBBuilder.java
    geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml
    geronimo/server/trunk/plugins/axis2/pom.xml
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGenerator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorOptions.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/EJBWebServiceFinder.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java
    geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java
    geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
    geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
    geronimo/server/trunk/pom.xml

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/pom.xml Fri Dec  4 05:05:07 2009
@@ -75,7 +75,7 @@
         </dependency>
 
         <dependency>
-            <groupId>backport-util-concurrent</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
     </dependencies>

Modified: geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/activemq/activemq-broker/src/main/history/dependencies.xml Fri Dec  4 05:05:07 2009
@@ -7,7 +7,7 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>backport-util-concurrent</groupId>
+        <groupId>org.apache.geronimo.bundles</groupId>
         <artifactId>backport-util-concurrent</artifactId>
         <type>jar</type>
     </dependency>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/history/dependencies.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/history/dependencies.xml Fri Dec  4 05:05:07 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2-ejb-deployer</artifactId>
@@ -11,7 +11,7 @@
         <artifactId>axis2-deployer</artifactId>
         <type>car</type>
     </dependency>
-    <dependency start="true">
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2-ejb</artifactId>
         <type>car</type>

Modified: geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2-ejb-deployer/src/main/plan/plan.xml Fri Dec  4 05:05:07 2009
@@ -20,7 +20,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="Axis2EJBBuilder" class="org.apache.geronimo.axis2.builder.Axis2EJBBuilder">
+    <gbean name="Axis2EJBBuilder" class="org.apache.geronimo.axis2.ejb.builder.Axis2EJBBuilder">
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
@@ -42,7 +42,7 @@
         </references>
     </gbean>
 
-   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.ejb.builder.JAXWSEJBModuleBuilderExtension">
         <reference name="WebServiceBuilder">
             <name>Axis2EJBBuilder</name>
         </reference>

Modified: geronimo/server/trunk/plugins/axis2/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/axis2/pom.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/axis2/pom.xml Fri Dec  4 05:05:07 2009
@@ -118,7 +118,7 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
 
@@ -143,8 +143,8 @@
         </dependency>
 
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
         </dependency>
 
         <dependency>
@@ -158,9 +158,34 @@
         </dependency>
 
         <dependency>
-            <groupId>backport-util-concurrent</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>backport-util-concurrent</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.bundles</groupId>
+            <artifactId>woden-impl-dom</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.ops4j.pax.logging</groupId>
+            <artifactId>pax-logging-api</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>commons-fileupload</groupId>
+            <artifactId>commons-fileupload</artifactId>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.javamail</groupId>
+            <artifactId>geronimo-javamail_1.4_mail</artifactId>
+        </dependency>
+
+         <dependency>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+         </dependency>            
     </dependencies>
 
     <build>

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=887060&r1=887059&r2=887060&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 Fri Dec  4 05:05:07 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>axis2</artifactId>
@@ -7,41 +7,6 @@
         <type>car</type>
     </module-id>
     <dependency>
-        <groupId>backport-util-concurrent</groupId>
-        <artifactId>backport-util-concurrent</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>com.sun.xml.bind</groupId>
-        <artifactId>jaxb-impl</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-codec</groupId>
-        <artifactId>commons-codec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-fileupload</groupId>
-        <artifactId>commons-fileupload</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-httpclient</groupId>
-        <artifactId>commons-httpclient</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>commons-io</groupId>
-        <artifactId>commons-io</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>log4j</groupId>
-        <artifactId>log4j</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.axis2</groupId>
         <artifactId>addressing</artifactId>
         <type>mar</type>
@@ -87,6 +52,26 @@
         <type>jar</type>
     </dependency>
     <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>backport-util-concurrent</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>commons-fileupload</groupId>
+        <artifactId>commons-fileupload</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>httpcore</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.bundles</groupId>
+        <artifactId>woden-impl-dom</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>j2ee-server</artifactId>
         <type>car</type>
@@ -117,13 +102,13 @@
         <type>car</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-axis2</artifactId>
+        <groupId>org.apache.geronimo.javamail</groupId>
+        <artifactId>geronimo-javamail_1.4_mail</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws</artifactId>
+        <artifactId>geronimo-axis2</artifactId>
         <type>jar</type>
     </dependency>
     <dependency>
@@ -168,6 +153,11 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.specs</groupId>
+        <artifactId>geronimo-servlet_3.0_spec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.geronimo.specs</groupId>
         <artifactId>geronimo-stax-api_1.0_spec</artifactId>
         <type>jar</type>
     </dependency>
@@ -188,6 +178,26 @@
     </dependency>
     <dependency>
         <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.commons-io</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
+        <artifactId>org.apache.servicemix.bundles.xmlresolver</artifactId>
+        <type>jar</type>
+    </dependency>
+    <dependency>
+        <groupId>org.apache.servicemix.bundles</groupId>
         <artifactId>org.apache.servicemix.bundles.xpp3</artifactId>
         <type>jar</type>
     </dependency>
@@ -202,11 +212,6 @@
         <type>jar</type>
     </dependency>
     <dependency>
-        <groupId>org.apache.woden</groupId>
-        <artifactId>woden-impl-dom</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
         <groupId>org.apache.ws.commons.axiom</groupId>
         <artifactId>axiom-api</artifactId>
         <type>jar</type>
@@ -241,9 +246,4 @@
         <artifactId>wsdl4j</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>xml-resolver</groupId>
-        <artifactId>xml-resolver</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Fri Dec  4 05:05:07 2009
@@ -27,8 +27,6 @@
 import java.util.Map;
 import java.util.jar.JarFile;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.axis2.pojo.POJOWebServiceContainerFactoryGBean;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.GBeanData;
@@ -41,8 +39,8 @@
 import org.apache.geronimo.jaxws.PortInfo;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceBuilder;
 import org.apache.geronimo.jaxws.builder.WARWebServiceFinder;
-import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
-import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.xbeans.javaee.PortComponentType;
 import org.apache.geronimo.xbeans.javaee.ServiceImplBeanType;
@@ -51,6 +49,8 @@
 import org.apache.geronimo.xbeans.javaee.WebservicesType;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 /**
  * @version $Rev$ $Date$

Modified: geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/Axis2EJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/Axis2EJBBuilder.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/Axis2EJBBuilder.java (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/ejb/builder/Axis2EJBBuilder.java Fri Dec  4 05:05:07 2009
@@ -15,16 +15,17 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.axis2.builder;
+package org.apache.geronimo.axis2.ejb.builder;
 
 import java.util.Collection;
 
+import org.apache.geronimo.axis2.builder.Axis2Builder;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
-import org.apache.geronimo.jaxws.builder.EJBWebServiceFinder;
-import org.apache.geronimo.jaxws.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator;
+import org.apache.geronimo.jaxws.ejb.builder.EJBWebServiceFinder;
 import org.apache.geronimo.kernel.repository.Environment;
 
 /**

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=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/geronimo-axis2/pom.xml Fri Dec  4 05:05:07 2009
@@ -100,13 +100,13 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.httpcomponents</groupId>
+            <groupId>org.apache.geronimo.bundles</groupId>
             <artifactId>httpcore</artifactId>
         </dependency>
 
         <dependency>
-            <groupId>commons-httpclient</groupId>
-            <artifactId>commons-httpclient</artifactId>
+            <groupId>org.apache.servicemix.bundles</groupId>
+            <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/plugins/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/axis2/pom.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/axis2/pom.xml (original)
+++ geronimo/server/trunk/plugins/axis2/pom.xml Fri Dec  4 05:05:07 2009
@@ -87,6 +87,22 @@
                         <groupId>org.apache.httpcomponents</groupId>
                         <artifactId>httpcore-niossl</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.woden</groupId>
+                        <artifactId>woden-impl-dom</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-fileupload</groupId>
+                        <artifactId>commons-fileupload</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>commons-httpclient</groupId>
+                        <artifactId>commons-httpclient</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>wsdl</groupId>
+                        <artifactId>wsdl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -123,6 +139,14 @@
                         <groupId>javax.xml.bind</groupId>
                         <artifactId>jaxb-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-resolver</groupId>
+                        <artifactId>xml-resolver</artifactId>
+                    </exclusion>                    
                 </exclusions>
             </dependency>
 
@@ -155,6 +179,18 @@
                         <groupId>javax.xml.bind</groupId>
                         <artifactId>jaxb-api</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>com.sun.xml.bind</groupId>
+                        <artifactId>jaxb-impl</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>log4j</groupId>
+                        <artifactId>log4j</artifactId>
+                    </exclusion>
+                    <exclusion>
+                        <groupId>xml-resolver</groupId>
+                        <artifactId>xml-resolver</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -200,6 +236,10 @@
                         <groupId>xalan</groupId>
                         <artifactId>xalan</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                         <artifactId>commons-io</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -216,6 +256,10 @@
                         <groupId>xalan</groupId>
                          <artifactId>xalan</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                         <artifactId>commons-io</artifactId>
+                    </exclusion>                    
                 </exclusions>
             </dependency>
 
@@ -232,6 +276,10 @@
                         <groupId>xalan</groupId>
                         <artifactId>xalan</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>commons-io</groupId>
+                         <artifactId>commons-io</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
         </dependencies>

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGenerator.java?rev=887060&r1=886721&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGenerator.java Fri Dec  4 05:05:07 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jaxws.wsdl;
+package org.apache.geronimo.jaxws.builder.wsdl;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorOptions.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorOptions.java?rev=887060&r1=886721&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorOptions.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorOptions.java Fri Dec  4 05:05:07 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jaxws.wsdl;
+package org.apache.geronimo.jaxws.builder.wsdl;
 
 import javax.xml.namespace.QName;
 

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java?rev=887060&r1=886721&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/wsdl/WsdlGeneratorUtils.java Fri Dec  4 05:05:07 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jaxws.wsdl;
+package org.apache.geronimo.jaxws.builder.wsdl;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/EJBWebServiceFinder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/EJBWebServiceFinder.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/EJBWebServiceFinder.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/EJBWebServiceFinder.java Fri Dec  4 05:05:07 2009
@@ -15,20 +15,21 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.ejb.builder;
 
 import java.util.HashMap;
 import java.util.Map;
 
-import org.slf4j.Logger;
-import org.slf4j.LoggerFactory;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.jaxws.JAXWSUtils;
 import org.apache.geronimo.jaxws.PortInfo;
+import org.apache.geronimo.jaxws.builder.WebServiceFinder;
 import org.apache.geronimo.openejb.deployment.EjbModule;
 import org.apache.openejb.assembler.classic.EnterpriseBeanInfo;
 import org.osgi.framework.Bundle;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
 
 public class EJBWebServiceFinder implements WebServiceFinder {
 

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/ejb/builder/JAXWSEJBModuleBuilderExtension.java Fri Dec  4 05:05:07 2009
@@ -14,7 +14,7 @@
  *  See the License for the specific language governing permissions and
  *  limitations under the License.
  */
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.ejb.builder;
 
 import java.net.URL;
 import java.security.PermissionCollection;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSTools.java Fri Dec  4 05:05:07 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import java.io.File;
 import java.io.OutputStream;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/JAXWSToolsCLI.java Fri Dec  4 05:05:07 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import java.io.File;
 import java.io.OutputStream;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/SunWsdlGenerator.java Fri Dec  4 05:05:07 2009
@@ -15,16 +15,16 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
-import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
 
-public class SunWsdlGenerator implements org.apache.geronimo.jaxws.wsdl.WsdlGenerator {
+public class SunWsdlGenerator implements org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator {
 
     public String generateWsdl(Module module,
                                String serviceClass,
@@ -38,7 +38,7 @@
 
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(SunWsdlGenerator.class, GBeanInfoBuilder.DEFAULT_J2EE_TYPE);
-        infoBuilder.addInterface(org.apache.geronimo.jaxws.wsdl.WsdlGenerator.class);
+        infoBuilder.addInterface(org.apache.geronimo.jaxws.builder.wsdl.WsdlGenerator.class);
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }
 

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsdlGenerator.java Fri Dec  4 05:05:07 2009
@@ -15,7 +15,7 @@
  * limitations under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import java.io.ByteArrayOutputStream;
 import java.io.File;
@@ -33,8 +33,8 @@
 import org.apache.geronimo.deployment.DeploymentContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorOptions;
-import org.apache.geronimo.jaxws.wsdl.WsdlGeneratorUtils;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorOptions;
+import org.apache.geronimo.jaxws.builder.wsdl.WsdlGeneratorUtils;
 import org.apache.geronimo.kernel.repository.Repository;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsgenCommand.java Fri Dec  4 05:05:07 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.CommandSupport;

Modified: geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java?rev=887060&r1=886668&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java (original)
+++ geronimo/server/trunk/plugins/jaxws/geronimo-jaxws-sun-tools/src/main/java/org/apache/geronimo/jaxws/sun/tools/WsimportCommand.java Fri Dec  4 05:05:07 2009
@@ -17,7 +17,7 @@
  * under the License.
  */
 
-package org.apache.geronimo.jaxws.builder;
+package org.apache.geronimo.jaxws.sun.tools;
 
 import org.apache.geronimo.gshell.command.CommandContext;
 import org.apache.geronimo.gshell.command.CommandSupport;

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-deployer/src/main/history/dependencies.xml Fri Dec  4 05:05:07 2009
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<plugin-artifact xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2" xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3">
+<plugin-artifact xmlns="http://geronimo.apache.org/xml/ns/plugins-1.3" xmlns:ns2="http://geronimo.apache.org/xml/ns/attributes-1.2">
     <module-id>
         <groupId>org.apache.geronimo.configs</groupId>
         <artifactId>jaxws-deployer</artifactId>
@@ -18,27 +18,7 @@
     </dependency>
     <dependency>
         <groupId>org.apache.geronimo.modules</groupId>
-        <artifactId>geronimo-jaxws</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.modules</groupId>
         <artifactId>geronimo-jaxws-builder</artifactId>
         <type>jar</type>
     </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jaxb_2.1_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-ws-metadata_2.0_spec</artifactId>
-        <type>jar</type>
-    </dependency>
 </plugin-artifact>

Modified: geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/plugins/jaxws/jaxws-sun-tools/src/main/plan/plan.xml Fri Dec  4 05:05:07 2009
@@ -20,7 +20,7 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="SunWsdlGenerator" class="org.apache.geronimo.jaxws.builder.SunWsdlGenerator">
+    <gbean name="SunWsdlGenerator" class="org.apache.geronimo.jaxws.sun.tools.SunWsdlGenerator">
     </gbean>
 
 </module>

Modified: geronimo/server/trunk/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/pom.xml?rev=887060&r1=887059&r2=887060&view=diff
==============================================================================
--- geronimo/server/trunk/pom.xml (original)
+++ geronimo/server/trunk/pom.xml Fri Dec  4 05:05:07 2009
@@ -553,9 +553,9 @@
                   be compatible with AMQ 4.1, latest 3.0 causes CCE problems.
             -->
             <dependency>
-                <groupId>backport-util-concurrent</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>backport-util-concurrent</artifactId>
-                <version>2.2</version>
+                <version>2.2_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -947,7 +947,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>commons-discovery</artifactId>
-                <version>0.4-SNAPSHOT</version>
+                <version>0.4_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -983,7 +983,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>commons-digester</artifactId>
-                <version>1.8-SNAPSHOT</version>
+                <version>1.8_1-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -1037,9 +1037,9 @@
             </dependency>
 
             <dependency>
-                <groupId>commons-httpclient</groupId>
-                <artifactId>commons-httpclient</artifactId>
-                <version>3.1</version>
+                <groupId>org.apache.servicemix.bundles</groupId>
+                <artifactId>org.apache.servicemix.bundles.commons-httpclient</artifactId>
+                <version>3.1_5-SNAPSHOT</version>
                 <exclusions>
                     <exclusion>
                         <groupId>commons-logging</groupId>
@@ -1049,6 +1049,10 @@
                         <groupId>junit</groupId>
                         <artifactId>junit</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>org.apache.servicemix.bundles</groupId>
+                        <artifactId>org.apache.servicemix.bundles.commons-codec</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
 
@@ -1086,7 +1090,7 @@
             <dependency>
                 <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>jstl</artifactId>
-                <version>1.2-SNAPSHOT</version>
+                <version>1.2_1-SNAPSHOT</version>
             </dependency>
 
             <!--<dependency>-->
@@ -1512,9 +1516,9 @@
             </dependency>
 
             <dependency>
-                <groupId>org.apache.httpcomponents</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>httpcore</artifactId>
-                <version>4.0.1</version>
+                <version>4.0.1_1-SNAPSHOT</version>
             </dependency>
 
             <dependency>
@@ -1706,27 +1710,17 @@
                         <groupId>xerces</groupId>
                         <artifactId>xmlParserAPIs</artifactId>
                     </exclusion>
+                    <exclusion>
+                        <groupId>wsdl</groupId>
+                        <artifactId>wsdl</artifactId>
+                    </exclusion>
                 </exclusions>
             </dependency>
-
+           
             <dependency>
-                <groupId>org.apache.woden</groupId>
+                <groupId>org.apache.geronimo.bundles</groupId>
                 <artifactId>woden-impl-dom</artifactId>
-                <version>1.0M8</version>
-                <exclusions>
-                    <exclusion>
-                        <groupId>org.apache.ant</groupId>
-                        <artifactId>ant</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xercesImpl</artifactId>
-                    </exclusion>
-                    <exclusion>
-                        <groupId>xerces</groupId>
-                        <artifactId>xmlParserAPIs</artifactId>
-                    </exclusion>
-                </exclusions>
+                <version>1.0M8_1-SNAPSHOT</version>
             </dependency>
 
             <!-- GShell Framework Support -->



Mime
View raw message