geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r581318 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-javaee5/ assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/ assemblies/geronimo-tomcat6-javaee5/ assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/confi...
Date Tue, 02 Oct 2007 17:46:24 GMT
Author: gawor
Date: Tue Oct  2 10:46:21 2007
New Revision: 581318

URL: http://svn.apache.org/viewvc?rev=581318&view=rev
Log:
making axis2 intergration more modular: separated ejb bits from servlet bits.

Added:
    geronimo/server/trunk/configs/axis2-ejb/
    geronimo/server/trunk/configs/axis2-ejb-deployer/
    geronimo/server/trunk/configs/axis2-ejb-deployer/LICENSE.txt
      - copied unchanged from r581257, geronimo/server/trunk/configs/axis2-deployer/LICENSE.txt
    geronimo/server/trunk/configs/axis2-ejb-deployer/NOTICE.txt
      - copied unchanged from r581257, geronimo/server/trunk/configs/axis2-deployer/NOTICE.txt
    geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml   (with props)
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/
    geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml   (with props)
    geronimo/server/trunk/configs/axis2-ejb/LICENSE.txt
      - copied unchanged from r581257, geronimo/server/trunk/configs/axis2/LICENSE.txt
    geronimo/server/trunk/configs/axis2-ejb/NOTICE.txt
      - copied unchanged from r581257, geronimo/server/trunk/configs/axis2/NOTICE.txt
    geronimo/server/trunk/configs/axis2-ejb/pom.xml   (with props)
    geronimo/server/trunk/configs/axis2-ejb/src/
    geronimo/server/trunk/configs/axis2-ejb/src/main/
    geronimo/server/trunk/configs/axis2-ejb/src/main/plan/
    geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml   (with props)
    geronimo/server/trunk/configs/axis2-ejb/src/plan/
    geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml   (with props)
    geronimo/server/trunk/modules/geronimo-axis2-ejb/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/LICENSE.txt
      - copied unchanged from r581257, geronimo/server/trunk/modules/geronimo-axis2-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/NOTICE.txt
      - copied unchanged from r581257, geronimo/server/trunk/modules/geronimo-axis2-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/
    geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
      - copied unchanged from r581290, geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
    geronimo/server/trunk/modules/geronimo-axis2-ejb/LICENSE.txt
      - copied unchanged from r581257, geronimo/server/trunk/modules/geronimo-axis2/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-axis2-ejb/NOTICE.txt
      - copied unchanged from r581257, geronimo/server/trunk/modules/geronimo-axis2/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/
    geronimo/server/trunk/modules/geronimo-axis2-ejb/src/main/java/org/apache/geronimo/axis2/ejb/
      - copied from r581257, geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/
Removed:
    geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
    geronimo/server/trunk/modules/geronimo-axis2/src/main/java/org/apache/geronimo/axis2/ejb/
Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/configs/axis2-deployer/pom.xml
    geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/axis2/pom.xml
    geronimo/server/trunk/configs/pom.xml
    geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
    geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-axis2/pom.xml
    geronimo/server/trunk/modules/pom.xml

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Tue Oct  2 10:46:21 2007
@@ -110,6 +110,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -307,6 +314,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-ejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/config.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/src/main/resources/var/config/config.xml Tue Oct  2 10:46:21 2007
@@ -55,6 +55,7 @@
 
     <module name="org.apache.geronimo.configs/axis/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/axis2/${version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/axis2-ejb/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf-ejb/${version}/car" load="false"/>
 
@@ -218,6 +219,9 @@
     </module>
 
     <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car" 
+            condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'"/>
+
+    <module name="org.apache.geronimo.configs/axis2-ejb-deployer/${version}/car" 
             condition="props['org.apache.geronimo.jaxws.provider'] == 'axis2'">
 
         <gbean name="Axis2ModuleBuilderExtension">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Tue Oct  2 10:46:21 2007
@@ -124,6 +124,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -307,6 +314,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-ejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/config.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/src/main/resources/var/config/config.xml Tue Oct  2 10:46:21 2007
@@ -55,6 +55,7 @@
 
     <module name="org.apache.geronimo.configs/axis/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/axis2/${version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/axis2-ejb/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf-ejb/${version}/car" load="false"/>
 
@@ -225,6 +226,9 @@
     </module>
 
     <module name="org.apache.geronimo.configs/axis2-deployer/${version}/car"  
+            condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'axis2') == 'axis2'"/>
+
+    <module name="org.apache.geronimo.configs/axis2-ejb-deployer/${version}/car"  
             condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'axis2') == 'axis2'">
 
       <gbean name="Axis2ModuleBuilderExtension">

Modified: geronimo/server/trunk/configs/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/pom.xml Tue Oct  2 10:46:21 2007
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-             <artifactId>jaxws-ejb-deployer</artifactId>
+             <artifactId>jaxws-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -71,7 +71,7 @@
                     <dependencies>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-ejb-deployer</artifactId>
+                        <artifactId>jaxws-deployer</artifactId>
                         <type>car</type>
                       </dependency>
                       <dependency>
@@ -88,26 +88,6 @@
                         <import>classes</import>
                       </dependency>
                     </dependencies>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content>
-                                <gbean name="Axis2ModuleBuilderExtension">
-                                    <attribute name="listener">?name=#{webcontainer}</attribute>
-                                    <attribute name="defaultEnvironment">
-                                      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                                        <dependencies>
-                                            <dependency>
-                                                <groupId>org.apache.geronimo.configs</groupId>
-                                                <artifactId>#{webcontainerName}</artifactId>
-                                                <type>car</type>
-                                            </dependency>
-                                        </dependencies>
-                                      </environment>
-                                     </attribute>
-                                </gbean>
-                            </config-xml-content>
-                        </plugin-artifact>
-                    </instance>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/main/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -47,9 +47,6 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="Axis2Builder">
-            <name>Axis2Builder</name>
-        </reference>
     </gbean>
 
     <gbean name="Axis2ClientServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
@@ -58,119 +55,6 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <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>
-                        <artifactId>geronimo-j2ee-schema</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-java2wsdl</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-kernel</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-adb</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-jaxws</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-metadata</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-saaj</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-api</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-dom</artifactId>
-                    </dependency>
-                    <dependency>
-                         <groupId>org.apache.httpcomponents</groupId>
-                         <artifactId>httpcore</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-impl</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>commons-codec</groupId>
-                        <artifactId>commons-codec</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.xmlbeans</groupId>
-                        <artifactId>xmlbeans</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>jaxen</groupId>
-                        <artifactId>jaxen</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>annogen</groupId>
-                        <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>
-                        <artifactId>client-security</artifactId>
-                        <type>car</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>backport-util-concurrent</groupId>
-                        <artifactId>backport-util-concurrent</artifactId>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="Axis2Builder">
-            <name>Axis2Builder</name>
-        </reference>
-    </gbean>
-    
-    <gbean name="Axis2EJBBuilder" class="org.apache.geronimo.axis2.builder.Axis2EJBBuilder">
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
                         <artifactId>axis2</artifactId>
                         <type>car</type>
@@ -179,19 +63,5 @@
             </environment>
         </xml-attribute>
     </gbean>
-
-   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
-        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
-        <attribute name="listener">?name=WebContainer</attribute>
-
-        <reference name="WebServiceBuilder">
-            <name>Axis2EJBBuilder</name>
-        </reference>
-        <reference name="WebServiceLinkTemplate">
-            <name>Axis2WebServiceEJBLinkTemplate</name>
-        </reference>
-    </gbean>
-
-    <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
 
 </module>

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?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/src/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -47,9 +47,6 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="Axis2Builder">
-            <name>Axis2Builder</name>
-        </reference>
     </gbean>
 
     <gbean name="Axis2ClientServiceRefBuilder" class="org.apache.geronimo.axis2.builder.Axis2ServiceRefBuilder">
@@ -58,126 +55,13 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <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>
-                        <artifactId>geronimo-j2ee-schema</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-java2wsdl</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-kernel</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-adb</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-jaxws</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-metadata</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.axis2</groupId>
-                        <artifactId>axis2-saaj</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-api</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-dom</artifactId>
-                    </dependency>
-                    <dependency>
-                         <groupId>org.apache.httpcomponents</groupId>
-                         <artifactId>httpcore</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.axiom</groupId>
-                        <artifactId>axiom-impl</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>commons-httpclient</groupId>
-                        <artifactId>commons-httpclient</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>commons-codec</groupId>
-                        <artifactId>commons-codec</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.xmlbeans</groupId>
-                        <artifactId>xmlbeans</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>jaxen</groupId>
-                        <artifactId>jaxen</artifactId>
-                    </dependency>
-                    <dependency>
-                        <groupId>annogen</groupId>
-                        <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>
-                        <artifactId>client-security</artifactId>
+                        <artifactId>axis2</artifactId>
                         <type>car</type>
                     </dependency>
-                    <dependency>
-                        <groupId>backport-util-concurrent</groupId>
-                        <artifactId>backport-util-concurrent</artifactId>
-                    </dependency>
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="Axis2Builder">
-            <name>Axis2Builder</name>
-        </reference>
-    </gbean>
-
-   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
-        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
-        <attribute name="listener">?name=WebContainer</attribute>
-
-        <reference name="WebServiceBuilder">
-            <name>Axis2Builder</name>
-        </reference>
-        <reference name="WebServiceLinkTemplate">
-            <name>Axis2WebServiceEJBLinkTemplate</name>
-        </reference>
     </gbean>
-
-    <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
 
 </module>

Added: geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 580112 $ $Date: 2007-09-27 13:35:15 -0400 (Thu, 27 Sep 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>axis2-ejb-deployer</artifactId>
+    <name>Geronimo Configs :: Axis2 EJB Deployer</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo JAX-WS EJB deployer for Apache Axis2</description>
+    
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+             <artifactId>jaxws-ejb-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2-ejb-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2-ejb</artifactId>
+            <type>car</type>
+            <version>${version}</version>
+            <scope>runtime</scope>
+       </dependency>
+
+    </dependencies>
+    
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>false</value>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                    <dependencies>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>jaxws-ejb-deployer</artifactId>
+                        <type>car</type>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2-deployer</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2-ejb</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-axis2-ejb-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="Axis2ModuleBuilderExtension">
+                                    <attribute name="listener">?name=#{webcontainer}</attribute>
+                                    <attribute name="defaultEnvironment">
+                                      <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                                        <dependencies>
+                                            <dependency>
+                                                <groupId>org.apache.geronimo.configs</groupId>
+                                                <artifactId>#{webcontainerName}</artifactId>
+                                                <type>car</type>
+                                            </dependency>
+                                        </dependencies>
+                                      </environment>
+                                     </attribute>
+                                </gbean>
+                            </config-xml-content>
+                        </plugin-artifact>
+                    </instance>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

Propchange: geronimo/server/trunk/configs/axis2-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 558555 $ $Date: 2007-07-22 17:45:52 -0400 (Sun, 22 Jul 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="Axis2EJBBuilder" class="org.apache.geronimo.axis2.builder.Axis2EJBBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2-ejb</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
+        <attribute name="listener">?name=WebContainer</attribute>
+
+        <reference name="WebServiceBuilder">
+            <name>Axis2EJBBuilder</name>
+        </reference>
+        <reference name="WebServiceLinkTemplate">
+            <name>Axis2WebServiceEJBLinkTemplate</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
+
+</module>

Propchange: geronimo/server/trunk/configs/axis2-ejb-deployer/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 558555 $ $Date: 2007-07-22 17:45:52 -0400 (Sun, 22 Jul 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+
+    <gbean name="Axis2EJBBuilder" class="org.apache.geronimo.axis2.builder.Axis2EJBBuilder">
+        <xml-attribute name="defaultEnvironment">
+            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>axis2-ejb</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+            </environment>
+        </xml-attribute>
+    </gbean>
+
+   <gbean name="Axis2ModuleBuilderExtension" class="org.apache.geronimo.jaxws.builder.JAXWSEJBModuleBuilderExtension">
+        <!-- This attribute and the environment must be updated appropriately in the config.xml file -->
+        <attribute name="listener">?name=WebContainer</attribute>
+
+        <reference name="WebServiceBuilder">
+            <name>Axis2EJBBuilder</name>
+        </reference>
+        <reference name="WebServiceLinkTemplate">
+            <name>Axis2WebServiceEJBLinkTemplate</name>
+        </reference>
+    </gbean>
+
+    <gbean name="Axis2WebServiceEJBLinkTemplate" class="org.apache.geronimo.axis2.ejb.EJBWebServiceGBean"/>
+
+</module>

Propchange: geronimo/server/trunk/configs/axis2-ejb-deployer/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/configs/axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb/pom.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb/pom.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb/pom.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,79 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 573957 $ $Date: 2007-09-09 04:14:57 -0400 (Sun, 09 Sep 2007) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.configs</groupId>
+        <artifactId>configs</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>axis2-ejb</artifactId>
+    <name>Geronimo Configs :: Axis2 EJB</name>
+    <packaging>car</packaging>
+
+    <description>
+       Geronimo Web Services Apache Axis2 EJB integration
+   </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>axis2</artifactId>
+            <type>car</type>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2-ejb</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.geronimo.plugins</groupId>
+                <artifactId>car-maven-plugin</artifactId>
+                <configuration>
+                    <useMavenDependencies>
+                        <value>true</value>
+                        <includeVersion>true</includeVersion>
+                    </useMavenDependencies>
+                    <category>Web Services</category>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+</project>

Propchange: geronimo/server/trunk/configs/axis2-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 573957 $ $Date: 2007-09-09 04:14:57 -0400 (Sun, 09 Sep 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+</module>

Propchange: geronimo/server/trunk/configs/axis2-ejb/src/main/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml (added)
+++ geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  Licensed to the Apache Software Foundation (ASF) under one or more
+  contributor license agreements.  See the NOTICE file distributed with
+  this work for additional information regarding copyright ownership.
+  The ASF licenses this file to You under the Apache License, Version 2.0
+  (the "License"); you may not use this file except in compliance with
+  the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+-->
+
+<!-- $Rev: 514090 $ $Date: 2007-03-03 01:21:18 -0500 (Sat, 03 Mar 2007) $ -->
+
+<module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.1">
+
+</module>

Propchange: geronimo/server/trunk/configs/axis2-ejb/src/plan/plan.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/configs/axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2/pom.xml Tue Oct  2 10:46:21 2007
@@ -33,7 +33,9 @@
     <name>Geronimo Configs :: Axis2</name>
     <packaging>car</packaging>
 
-    <description>Geronimo Axis 2 integration</description>
+    <description>
+        Geronimo Web Services Apache Axis2 integration
+    </description>
 
     <dependencies>
 
@@ -56,13 +58,6 @@
             <artifactId>webservices-common</artifactId>
             <type>car</type>
             <version>${version}</version>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
         </dependency>
 
         <dependency>

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Tue Oct  2 10:46:21 2007
@@ -195,7 +195,9 @@
         <module>persistence-jpa10-deployer</module>
         <module>openjpa</module>
         <module>axis2</module>
+        <module>axis2-ejb</module>
         <module>axis2-deployer</module>
+        <module>axis2-ejb-deployer</module>
         <module>cxf</module>
         <module>cxf-ejb</module>
         <module>cxf-deployer</module>

Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml Tue Oct  2 10:46:21 2007
@@ -35,12 +35,7 @@
     <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-jaxws-ejb-builder</artifactId>
+            <artifactId>geronimo-jaxws-builder</artifactId>
             <version>${version}</version>
         </dependency>
         
@@ -57,7 +52,6 @@
             <version>${version}</version>
         </dependency>
 
-        <!-- g-j2ee comes from this via g-openejb -->
        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-axis2</artifactId>

Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2Builder.java Tue Oct  2 10:46:21 2007
@@ -20,20 +20,16 @@
 import java.io.FileNotFoundException;
 import java.io.IOException;
 import java.io.InputStream;
-import java.io.StringWriter;
-import java.net.URI;
 import java.net.URL;
 import java.util.Collections;
 import java.util.HashMap;
 import java.util.Map;
 import java.util.jar.JarFile;
 
-import javax.xml.namespace.QName;
 import javax.xml.ws.http.HTTPBinding;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.axis2.client.Axis2ServiceReference;
 import org.apache.geronimo.axis2.pojo.POJOWebServiceContainerFactoryGBean;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.DeploymentContext;
@@ -46,23 +42,17 @@
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.jaxws.JAXWSUtils;
 import org.apache.geronimo.jaxws.PortInfo;
-import org.apache.geronimo.jaxws.builder.EndpointInfoBuilder;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceBuilder;
 import org.apache.geronimo.jaxws.builder.WARWebServiceFinder;
 import org.apache.geronimo.jaxws.builder.WsdlGenerator;
-import org.apache.geronimo.jaxws.client.EndpointInfo;
 import org.apache.geronimo.kernel.repository.Environment;
-import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
-import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
 import org.apache.geronimo.xbeans.javaee.PortComponentType;
 import org.apache.geronimo.xbeans.javaee.ServiceImplBeanType;
-import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainsType;
 import org.apache.geronimo.xbeans.javaee.WebserviceDescriptionType;
 import org.apache.geronimo.xbeans.javaee.WebservicesDocument;
 import org.apache.geronimo.xbeans.javaee.WebservicesType;
 import org.apache.xmlbeans.XmlCursor;
 import org.apache.xmlbeans.XmlObject;
-import org.apache.xmlbeans.XmlOptions;
 
 /**
  * @version $Rev$ $Date$
@@ -217,50 +207,6 @@
         return status;
     }
 
-    public Object createService(Class serviceInterface,
-                                Class serviceReference,
-                                URI wsdlURI,
-                                QName serviceQName,
-                                Map<Class, PortComponentRefType> portComponentRefMap,
-                                ServiceRefHandlerChainsType handlerChains,
-                                GerServiceRefType serviceRefType,
-                                Module module,
-                                ClassLoader cl) throws DeploymentException {
-        EndpointInfoBuilder builder = new EndpointInfoBuilder(serviceInterface,
-                serviceRefType, portComponentRefMap, module.getModuleFile(),
-                wsdlURI, serviceQName);
-        builder.build();
-
-        wsdlURI = builder.getWsdlURI();
-        serviceQName = builder.getServiceQName();
-        Map<Object, EndpointInfo> seiInfoMap = builder.getEndpointInfo();
-
-        String handlerChainsXML = null;
-        try {
-            handlerChainsXML = getHandlerChainAsString(handlerChains);
-        } catch (IOException e) {
-            // this should not happen
-            log.warn("Failed to serialize handler chains", e);
-        }
-
-        String serviceReferenceName = (serviceReference == null) ? null : serviceReference.getName();
-        return new Axis2ServiceReference(serviceInterface.getName(), serviceReferenceName,  wsdlURI,
-                serviceQName, module.getModuleName(), handlerChainsXML, seiInfoMap);
-    }
-
-    private static String getHandlerChainAsString(ServiceRefHandlerChainsType handlerChains)
-        throws IOException {
-        String xml = null;
-        if (handlerChains != null) {
-            StringWriter w = new StringWriter();
-            XmlOptions options = new XmlOptions();
-            options.setSaveSyntheticDocumentElement(new QName("http://java.sun.com/xml/ns/javaee", "handler-chains")); 
-            handlerChains.save(w, options);
-            xml = w.toString();
-        }
-        return xml;
-    }
-    
     private static String getString(String in) {
         if (in != null) {
             in = in.trim();

Modified: geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2ServiceRefBuilder.java Tue Oct  2 10:46:21 2007
@@ -17,37 +17,45 @@
 
 package org.apache.geronimo.axis2.builder;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.jaxws.builder.EndpointInfoBuilder;
 import org.apache.geronimo.jaxws.builder.JAXWSServiceRefBuilder;
+import org.apache.geronimo.jaxws.client.EndpointInfo;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.GBeanNotFoundException;
 import org.apache.geronimo.kernel.repository.Environment;
 import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainsType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.axis2.client.Axis2ConfigGBean;
+import org.apache.geronimo.axis2.client.Axis2ServiceReference;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.gbean.AbstractName;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
+import org.apache.xmlbeans.XmlOptions;
 
 import javax.xml.namespace.QName;
+
+import java.io.IOException;
+import java.io.StringWriter;
 import java.net.URI;
 import java.util.Map;
 
 public class Axis2ServiceRefBuilder extends JAXWSServiceRefBuilder {
 
-    private final Axis2Builder axis2Builder;
-
+    private static final Log log = LogFactory.getLog(Axis2ServiceRefBuilder.class);
+    
     public Axis2ServiceRefBuilder(Environment defaultEnvironment,
-                                String[] eeNamespaces,
-                                Axis2Builder axis2Builder) {
+                                 String[] eeNamespaces) {
         super(defaultEnvironment, eeNamespaces);
-        this.axis2Builder = axis2Builder;
     }
 
     public Object createService(ServiceRefType serviceRef, GerServiceRefType gerServiceRef,
@@ -55,11 +63,42 @@
                                 QName serviceQName, URI wsdlURI, Class serviceReferenceType,
                                 Map<Class, PortComponentRefType> portComponentRefMap) throws DeploymentException {
         registerConfigGBean(module);
-        return this.axis2Builder.createService(serviceInterfaceClass, serviceReferenceType, wsdlURI,
-                                             serviceQName, portComponentRefMap, serviceRef.getHandlerChains(),
-                                             gerServiceRef, module, cl);
+        EndpointInfoBuilder builder = new EndpointInfoBuilder(serviceInterfaceClass,
+                gerServiceRef, portComponentRefMap, module.getModuleFile(),                
+                wsdlURI, serviceQName);
+        builder.build();
+
+        wsdlURI = builder.getWsdlURI();
+        serviceQName = builder.getServiceQName();
+        Map<Object, EndpointInfo> seiInfoMap = builder.getEndpointInfo();
+
+        String handlerChainsXML = null;
+        try {
+            handlerChainsXML = getHandlerChainAsString(serviceRef.getHandlerChains());
+        } catch (IOException e) {
+            // this should not happen
+            log.warn("Failed to serialize handler chains", e);
+        }
+
+        String serviceReferenceName = (serviceReferenceType == null) ? null : serviceReferenceType.getName();
+        return new Axis2ServiceReference(serviceInterfaceClass.getName(), serviceReferenceName,  wsdlURI,
+                serviceQName, module.getModuleName(), handlerChainsXML, seiInfoMap);
     }
 
+    private static String getHandlerChainAsString(ServiceRefHandlerChainsType handlerChains)
+            throws IOException {
+        String xml = null;
+        if (handlerChains != null) {
+            StringWriter w = new StringWriter();
+            XmlOptions options = new XmlOptions();
+            options.setSaveSyntheticDocumentElement(new QName("http://java.sun.com/xml/ns/javaee",
+                                                              "handler-chains"));
+            handlerChains.save(w, options);
+            xml = w.toString();
+        }
+        return xml;
+    }
+    
     private void registerConfigGBean(Module module) throws DeploymentException {
         EARContext context = module.getEarContext();
         AbstractName containerFactoryName = context.getNaming().createChildName(
@@ -89,11 +128,9 @@
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true,
                 true);
         infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
-        infoBuilder.addReference("Axis2Builder", Axis2Builder.class,
-                NameFactory.MODULE_BUILDER);
 
         infoBuilder.setConstructor(new String[] { "defaultEnvironment",
-                "eeNamespaces", "Axis2Builder" });
+                                                  "eeNamespaces" });
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Added: geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,51 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 482336 $ $Date: 2006-12-04 15:12:19 -0500 (Mon, 04 Dec 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+    <modelVersion>4.0.0</modelVersion>
+
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-axis2-ejb-builder</artifactId>
+    <name>Geronimo :: Axis2 :: EJB Builder</name>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-ejb-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+        
+    </dependencies>
+
+</project>

Propchange: geronimo/server/trunk/modules/geronimo-axis2-ejb-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Added: geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml?rev=581318&view=auto
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml Tue Oct  2 10:46:21 2007
@@ -0,0 +1,52 @@
+<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one or more
+    contributor license agreements.  See the NOTICE file distributed with
+    this work for additional information regarding copyright ownership.
+    The ASF licenses this file to You under the Apache License, Version 2.0
+    (the "License"); you may not use this file except in compliance with
+    the License.  You may obtain a copy of the License at
+
+       http://www.apache.org/licenses/LICENSE-2.0
+
+    Unless required by applicable law or agreed to in writing, software
+    distributed under the License is distributed on an "AS IS" BASIS,
+    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+    See the License for the specific language governing permissions and
+    limitations under the License.
+-->
+
+<!-- $Rev: 482336 $ $Date: 2006-12-04 15:12:19 -0500 (Mon, 04 Dec 2006) $ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+    
+    <modelVersion>4.0.0</modelVersion>
+    
+    <parent>
+        <groupId>org.apache.geronimo.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+    
+    <artifactId>geronimo-axis2-ejb</artifactId>
+    <name>Geronimo :: AXIS2 EJB</name>
+    
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-axis2</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-openejb</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+    </dependencies>
+
+</project>
+

Propchange: geronimo/server/trunk/modules/geronimo-axis2-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-axis2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2/pom.xml Tue Oct  2 10:46:21 2007
@@ -44,20 +44,21 @@
             <artifactId>geronimo-jaxws</artifactId>
             <version>${version}</version>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-j2ee-schema</artifactId>
             <version>${version}</version>
         </dependency>
+
         <dependency>
             <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-openejb</artifactId>
+            <artifactId>geronimo-transaction</artifactId>
             <version>${version}</version>
         </dependency>
 
@@ -131,10 +132,6 @@
         <dependency>
             <groupId>org.apache.geronimo.specs</groupId>
             <artifactId>geronimo-stax-api_1.0_spec</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.apache.geronimo.specs</groupId>
-            <artifactId>geronimo-interceptor_3.0_spec</artifactId>
         </dependency>
         <dependency>
             <groupId>org.apache.xmlbeans</groupId>

Modified: geronimo/server/trunk/modules/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/pom.xml?rev=581318&r1=581317&r2=581318&view=diff
==============================================================================
--- geronimo/server/trunk/modules/pom.xml (original)
+++ geronimo/server/trunk/modules/pom.xml Tue Oct  2 10:46:21 2007
@@ -101,7 +101,9 @@
         <module>geronimo-persistence-jpa10</module>
         <module>geronimo-persistence-jpa10-builder</module>
         <module>geronimo-axis2</module>
+        <module>geronimo-axis2-ejb</module>
         <module>geronimo-axis2-builder</module>
+        <module>geronimo-axis2-ejb-builder</module>
         <module>geronimo-cxf</module>
         <module>geronimo-cxf-ejb</module>
         <module>geronimo-cxf-builder</module>



Mime
View raw message