geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r580112 [1/2] - 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...
Date Thu, 27 Sep 2007 17:35:20 GMT
Author: gawor
Date: Thu Sep 27 10:35:15 2007
New Revision: 580112

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

Added:
    geronimo/server/trunk/configs/cxf-ejb/
    geronimo/server/trunk/configs/cxf-ejb-deployer/
    geronimo/server/trunk/configs/cxf-ejb-deployer/LICENSE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/cxf-deployer/LICENSE.txt
    geronimo/server/trunk/configs/cxf-ejb-deployer/NOTICE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/cxf-deployer/NOTICE.txt
    geronimo/server/trunk/configs/cxf-ejb-deployer/pom.xml   (with props)
    geronimo/server/trunk/configs/cxf-ejb-deployer/src/
      - copied from r579250, geronimo/server/trunk/configs/cxf-deployer/src/
    geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/
      - copied from r580085, geronimo/server/trunk/configs/cxf-deployer/src/main/
    geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/
      - copied from r580085, geronimo/server/trunk/configs/cxf-deployer/src/plan/
    geronimo/server/trunk/configs/cxf-ejb/LICENSE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/cxf/LICENSE.txt
    geronimo/server/trunk/configs/cxf-ejb/NOTICE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/cxf/NOTICE.txt
    geronimo/server/trunk/configs/cxf-ejb/pom.xml   (with props)
    geronimo/server/trunk/configs/cxf-ejb/src/
      - copied from r579250, geronimo/server/trunk/configs/cxf/src/
    geronimo/server/trunk/configs/cxf-ejb/src/main/
      - copied from r580085, geronimo/server/trunk/configs/cxf/src/main/
    geronimo/server/trunk/configs/cxf-ejb/src/plan/
      - copied from r580085, geronimo/server/trunk/configs/cxf/src/plan/
    geronimo/server/trunk/configs/jaxws-ejb-deployer/
    geronimo/server/trunk/configs/jaxws-ejb-deployer/LICENSE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/jaxws-deployer/LICENSE.txt
    geronimo/server/trunk/configs/jaxws-ejb-deployer/NOTICE.txt
      - copied unchanged from r579250, geronimo/server/trunk/configs/jaxws-deployer/NOTICE.txt
    geronimo/server/trunk/configs/jaxws-ejb-deployer/pom.xml   (with props)
    geronimo/server/trunk/configs/jaxws-ejb-deployer/src/
      - copied from r579250, geronimo/server/trunk/configs/jaxws-deployer/src/
    geronimo/server/trunk/configs/jaxws-ejb-deployer/src/main/
      - copied from r580085, geronimo/server/trunk/configs/jaxws-deployer/src/main/
    geronimo/server/trunk/configs/jaxws-ejb-deployer/src/plan/
      - copied from r580085, geronimo/server/trunk/configs/jaxws-deployer/src/plan/
    geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java   (with props)
    geronimo/server/trunk/modules/geronimo-cxf-ejb/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/LICENSE.txt
      - copied unchanged from r579250, geronimo/server/trunk/modules/geronimo-cxf-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/NOTICE.txt
      - copied unchanged from r579250, geronimo/server/trunk/modules/geronimo-cxf-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/
    geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFEJBBuilder.java   (with props)
    geronimo/server/trunk/modules/geronimo-cxf-ejb/LICENSE.txt
      - copied unchanged from r579250, geronimo/server/trunk/modules/geronimo-cxf/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-cxf-ejb/NOTICE.txt
      - copied unchanged from r579250, geronimo/server/trunk/modules/geronimo-cxf/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-cxf-ejb/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/
      - copied from r579250, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
      - copied unchanged from r580085, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBEndpoint.java
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBInterceptor.java
      - copied unchanged from r580085, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBInterceptor.java
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
      - copied unchanged from r580085, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBMethodInvoker.java
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java
      - copied unchanged from r580085, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceContainer.java
    geronimo/server/trunk/modules/geronimo-cxf-ejb/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java
      - copied unchanged from r580085, geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/EJBWebServiceGBean.java
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/LICENSE.txt
      - copied unchanged from r579342, geronimo/server/trunk/modules/geronimo-jaxws-builder/LICENSE.txt
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/NOTICE.txt
      - copied unchanged from r579342, geronimo/server/trunk/modules/geronimo-jaxws-builder/NOTICE.txt
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/pom.xml   (with props)
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/EJBWebServiceFinder.java   (with props)
    geronimo/server/trunk/modules/geronimo-jaxws-ejb-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
      - copied unchanged from r579342, geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
Removed:
    geronimo/server/trunk/modules/geronimo-cxf/src/main/java/org/apache/geronimo/cxf/ejb/
    geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSEJBModuleBuilderExtension.java
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/cxf-deployer/pom.xml
    geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/plan/plan.xml
    geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/cxf/pom.xml
    geronimo/server/trunk/configs/jaxws-deployer/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-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
    geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
    geronimo/server/trunk/modules/geronimo-cxf/pom.xml
    geronimo/server/trunk/modules/geronimo-jaxws-builder/pom.xml
    geronimo/server/trunk/modules/geronimo-jaxws-builder/src/main/java/org/apache/geronimo/jaxws/builder/JAXWSServiceBuilder.java
    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=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-javaee5/pom.xml Thu Sep 27 10:35:15 2007
@@ -100,12 +100,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
@@ -115,6 +117,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -305,6 +314,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-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=580112&r1=580111&r2=580112&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 Thu Sep 27 10:35:15 2007
@@ -56,6 +56,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/cxf/${version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/cxf-ejb/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
@@ -236,6 +237,9 @@
     </module>
 
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
+            condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'"/>
+
+    <module name="org.apache.geronimo.configs/cxf-ejb-deployer/${version}/car" 
             condition="props.getProperty('org.apache.geronimo.jaxws.provider', 'cxf') == 'cxf'">
 
         <gbean name="CXFModuleBuilderExtension">

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=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-javaee5/pom.xml Thu Sep 27 10:35:15 2007
@@ -114,12 +114,14 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>axis2</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf</artifactId>
@@ -129,6 +131,13 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-ejb</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-corba-yoko</artifactId>
             <version>${version}</version>
             <type>car</type>
@@ -305,6 +314,13 @@
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>cxf-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-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=580112&r1=580111&r2=580112&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 Thu Sep 27 10:35:15 2007
@@ -56,6 +56,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/cxf/${version}/car" load="false"/>
+    <module name="org.apache.geronimo.configs/cxf-ejb/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
         <gbean name="EJBNetworkService">
@@ -243,6 +244,9 @@
     </module>
 
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car" 
+            condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf'"/>
+
+    <module name="org.apache.geronimo.configs/cxf-ejb-deployer/${version}/car" 
             condition="props['org.apache.geronimo.jaxws.provider'] == 'cxf'">
 
         <gbean name="CXFModuleBuilderExtension">

Modified: geronimo/server/trunk/configs/axis2-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis2-deployer/pom.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/axis2-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/axis2-deployer/pom.xml Thu Sep 27 10:35:15 2007
@@ -38,7 +38,7 @@
     <dependencies>
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-             <artifactId>jaxws-deployer</artifactId>
+             <artifactId>jaxws-ejb-deployer</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>
@@ -71,7 +71,7 @@
                     <dependencies>
                       <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>jaxws-deployer</artifactId>
+                        <artifactId>jaxws-ejb-deployer</artifactId>
                         <type>car</type>
                       </dependency>
                       <dependency>

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=580112&r1=580111&r2=580112&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 Thu Sep 27 10:35:15 2007
@@ -165,13 +165,27 @@
             <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>
+                    </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>Axis2Builder</name>
+            <name>Axis2EJBBuilder</name>
         </reference>
         <reference name="WebServiceLinkTemplate">
             <name>Axis2WebServiceEJBLinkTemplate</name>

Modified: geronimo/server/trunk/configs/cxf-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/pom.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/pom.xml Thu Sep 27 10:35:15 2007
@@ -33,7 +33,7 @@
     <name>Geronimo Configs :: CXF Deployer</name>
     <packaging>car</packaging>
 
-    <description>Geronimo web services deployer for Apache CXF</description>
+    <description>Geronimo JAX-WS deployer for Apache CXF</description>
 
     <dependencies>
         
@@ -57,6 +57,7 @@
             <version>${version}</version>
             <scope>runtime</scope>
        </dependency>
+
     </dependencies>
     
     <build>
@@ -89,26 +90,6 @@
                         <import>classes</import>
                       </dependency>
                     </dependencies>
-                    <instance>
-                        <plugin-artifact>
-                            <config-xml-content>
-                                <gbean name="CXFModuleBuilderExtension">
-                                    <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/cxf-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/src/main/plan/plan.xml Thu Sep 27 10:35:15 2007
@@ -47,9 +47,6 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
     </gbean>
 
     <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
@@ -58,125 +55,13 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-jaxws</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-api</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-soap</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-xml</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-simple</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-transports-http</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-common</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                        <version>1.2</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                        <type>jar</type>
-                    </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>cxf</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
     </gbean>
-
-    <gbean name="CXFModuleBuilderExtension" 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>CXFBuilder</name>
-        </reference>
-        <reference name="WebServiceLinkTemplate">
-            <name>CXFWebServiceEJBLinkTemplate</name>
-        </reference>
-    </gbean>
-
-    <gbean name="CXFWebServiceEJBLinkTemplate" class="org.apache.geronimo.cxf.ejb.EJBWebServiceGBean"/>
 
 </module>

Modified: geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-deployer/src/plan/plan.xml Thu Sep 27 10:35:15 2007
@@ -47,9 +47,6 @@
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
     </gbean>
 
     <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
@@ -58,125 +55,13 @@
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-jaxws</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-api</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-soap</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-xml</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-simple</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-transports-http</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-common</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                        <version>1.2</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                        <type>jar</type>
-                    </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>cxf</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>
             </environment>
         </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
     </gbean>
-
-    <gbean name="CXFModuleBuilderExtension" 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>CXFBuilder</name>
-        </reference>
-        <reference name="WebServiceLinkTemplate">
-            <name>CXFWebServiceEJBLinkTemplate</name>
-        </reference>
-    </gbean>
-
-    <gbean name="CXFWebServiceEJBLinkTemplate" class="org.apache.geronimo.cxf.ejb.EJBWebServiceGBean"/>
 
 </module>

Added: geronimo/server/trunk/configs/cxf-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-ejb-deployer/pom.xml?rev=580112&view=auto
==============================================================================
--- geronimo/server/trunk/configs/cxf-ejb-deployer/pom.xml (added)
+++ geronimo/server/trunk/configs/cxf-ejb-deployer/pom.xml Thu Sep 27 10:35:15 2007
@@ -0,0 +1,130 @@
+<?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>cxf-ejb-deployer</artifactId>
+    <name>Geronimo Configs :: CXF EJB Deployer</name>
+    <packaging>car</packaging>
+
+    <description>Geronimo JAX-WS EJB deployer for Apache CXF</description>
+
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-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-cxf-ejb-builder</artifactId>
+            <version>${version}</version>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf-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>cxf-deployer</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>cxf-ejb</artifactId>
+                        <type>car</type>
+                        <import>classes</import>
+                      </dependency>
+                      <dependency>
+                        <groupId>org.apache.geronimo.modules</groupId>
+                        <artifactId>geronimo-cxf-ejb-builder</artifactId>
+                        <version>2.1-SNAPSHOT</version>
+                        <type>jar</type>
+                        <import>classes</import>
+                      </dependency>
+                    </dependencies>
+                    <instance>
+                        <plugin-artifact>
+                            <config-xml-content>
+                                <gbean name="CXFModuleBuilderExtension">
+                                    <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/cxf-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/plan/plan.xml?rev=580112&r1=580085&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-ejb-deployer/src/main/plan/plan.xml Thu Sep 27 10:35:15 2007
@@ -20,13 +20,13 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="CXFBuilder" class="org.apache.geronimo.cxf.builder.CXFBuilder">
+    <gbean name="CXFEJBBuilder" class="org.apache.geronimo.cxf.builder.CXFEJBBuilder">
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf</artifactId>
+                        <artifactId>cxf-ejb</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>
@@ -34,143 +34,12 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
-        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf</artifactId>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
-    </gbean>
-
-    <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
-        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-jaxws</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-api</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-soap</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-xml</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-simple</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-transports-http</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-common</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                        <version>1.2</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                        <type>jar</type>
-                    </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>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
-    </gbean>
-
     <gbean name="CXFModuleBuilderExtension" 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>CXFBuilder</name>
+            <name>CXFEJBBuilder</name>
         </reference>
         <reference name="WebServiceLinkTemplate">
             <name>CXFWebServiceEJBLinkTemplate</name>

Modified: geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/plan.xml?rev=580112&r1=580085&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/cxf-ejb-deployer/src/plan/plan.xml Thu Sep 27 10:35:15 2007
@@ -20,13 +20,13 @@
 
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
 
-    <gbean name="CXFBuilder" class="org.apache.geronimo.cxf.builder.CXFBuilder">
+    <gbean name="CXFEJBBuilder" class="org.apache.geronimo.cxf.builder.CXFEJBBuilder">
         <xml-attribute name="defaultEnvironment">
             <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
                 <dependencies>
                     <dependency>
                         <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf</artifactId>
+                        <artifactId>cxf-ejb</artifactId>
                         <type>car</type>
                     </dependency>
                 </dependencies>
@@ -34,143 +34,12 @@
         </xml-attribute>
     </gbean>
 
-    <gbean name="CXFServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
-        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>cxf</artifactId>
-                        <type>car</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
-    </gbean>
-
-    <gbean name="CXFClientServiceRefBuilder" class="org.apache.geronimo.cxf.builder.CXFServiceRefBuilder">
-        <attribute name="eeNamespaces">http://java.sun.com/xml/ns/javaee</attribute>
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-${geronimoSchemaVersion}">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-cxf</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-jaxws</artifactId>
-                        <version>${version}</version>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-api</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-common-utilities</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-soap</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-bindings-xml</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-databinding-jaxb</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-jaxws</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-frontend-simple</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-rt-transports-http</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.cxf</groupId>
-                        <artifactId>cxf-tools-common</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.ws.commons.schema</groupId>
-                        <artifactId>XmlSchema</artifactId>
-                        <version>1.2</version>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-core</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-beans</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.springframework</groupId>
-                        <artifactId>spring-context</artifactId>
-                        <type>jar</type>
-                    </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>
-                </dependencies>
-            </environment>
-        </xml-attribute>
-        <reference name="CXFBuilder">
-            <name>CXFBuilder</name>
-        </reference>
-    </gbean>
-
     <gbean name="CXFModuleBuilderExtension" 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>CXFBuilder</name>
+            <name>CXFEJBBuilder</name>
         </reference>
         <reference name="WebServiceLinkTemplate">
             <name>CXFWebServiceEJBLinkTemplate</name>

Added: geronimo/server/trunk/configs/cxf-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf-ejb/pom.xml?rev=580112&view=auto
==============================================================================
--- geronimo/server/trunk/configs/cxf-ejb/pom.xml (added)
+++ geronimo/server/trunk/configs/cxf-ejb/pom.xml Thu Sep 27 10:35:15 2007
@@ -0,0 +1,80 @@
+<?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>cxf-ejb</artifactId>
+    <name>Geronimo Configs :: CXF EJB</name>
+    <packaging>car</packaging>
+
+    <description>
+        Geronimo Web Services Apache CXF EJB integration
+    </description>
+
+    <dependencies>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>cxf</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-cxf-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/cxf-ejb/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/configs/cxf/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/cxf/pom.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/cxf/pom.xml (original)
+++ geronimo/server/trunk/configs/cxf/pom.xml Thu Sep 27 10:35:15 2007
@@ -62,13 +62,6 @@
 
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>transaction</artifactId>
             <version>${version}</version>
             <type>car</type>

Modified: geronimo/server/trunk/configs/jaxws-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jaxws-deployer/pom.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/jaxws-deployer/pom.xml (original)
+++ geronimo/server/trunk/configs/jaxws-deployer/pom.xml Thu Sep 27 10:35:15 2007
@@ -33,7 +33,7 @@
     <name>Geronimo Configs :: JAXWS Deployer</name>
     <packaging>car</packaging>
 
-    <description>Command line access to jaxws deployment tools.</description>
+    <description>Base configuration for JAX-WS Web services.</description>
     
     <dependencies>
         
@@ -52,23 +52,10 @@
         </dependency>
 
         <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>openejb-deployer</artifactId>
-            <version>${version}</version>
-            <type>car</type>
-        </dependency>
-
-        <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
             <artifactId>geronimo-jaxws-builder</artifactId>
             <version>${version}</version>
         </dependency>
-
-        <!--<dependency>-->
-            <!--<groupId>org.apache.xbean</groupId>-->
-            <!--<artifactId>xbean-finder</artifactId>-->
-            <!--<scope>runtime</scope>-->
-        <!--</dependency>-->
         
     </dependencies>
     
@@ -117,7 +104,6 @@
                     </classpath>
                     <classpathPrefix>../lib</classpathPrefix>
 
-
                     <useMavenDependencies>
                         <value>false</value>
                     </useMavenDependencies>
@@ -135,14 +121,10 @@
                             <import>classes</import>
                         </dependency>
                         <dependency>
-                            <groupId>org.apache.geronimo.configs</groupId>
-                            <artifactId>openejb-deployer</artifactId>
-                            <type>car</type>
-                        </dependency>
-                        <dependency>
                             <groupId>org.apache.geronimo.modules</groupId>
                             <artifactId>geronimo-jaxws-builder</artifactId>
                             <version>${version}</version>
+                            <type>jar</type>
                             <import>classes</import>
                         </dependency>
                     </dependencies>

Added: geronimo/server/trunk/configs/jaxws-ejb-deployer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/jaxws-ejb-deployer/pom.xml?rev=580112&view=auto
==============================================================================
--- geronimo/server/trunk/configs/jaxws-ejb-deployer/pom.xml (added)
+++ geronimo/server/trunk/configs/jaxws-ejb-deployer/pom.xml Thu Sep 27 10:35:15 2007
@@ -0,0 +1,78 @@
+<?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: 574101 $ $Date: 2007-09-09 19:14:43 -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>jaxws-ejb-deployer</artifactId>
+    <name>Geronimo Configs :: JAXWS EJB Deployer</name>
+    <packaging>car</packaging>
+
+    <description>Base configuration for JAX-WS EJB Web services.</description>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>jaxws-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb-deployer</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-jaxws-ejb-builder</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/jaxws-ejb-deployer/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/configs/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/pom.xml?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/configs/pom.xml (original)
+++ geronimo/server/trunk/configs/pom.xml Thu Sep 27 10:35:15 2007
@@ -197,8 +197,11 @@
         <module>axis2</module>
         <module>axis2-deployer</module>
         <module>cxf</module>
+        <module>cxf-ejb</module>
         <module>cxf-deployer</module>
+        <module>cxf-ejb-deployer</module>
         <module>jaxws-deployer</module>
+        <module>jaxws-ejb-deployer</module>
         <module>dojo-jetty6</module>
         <module>jetty6</module>
         <module>jetty6-clustering-builder-wadi</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=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml (original)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/pom.xml Thu Sep 27 10:35:15 2007
@@ -40,7 +40,7 @@
         </dependency>
         <dependency>
             <groupId>org.apache.geronimo.modules</groupId>
-            <artifactId>geronimo-jaxws-builder</artifactId>
+            <artifactId>geronimo-jaxws-ejb-builder</artifactId>
             <version>${version}</version>
         </dependency>
         

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=580112&r1=580111&r2=580112&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 Thu Sep 27 10:35:15 2007
@@ -48,6 +48,7 @@
 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;
@@ -72,6 +73,7 @@
         
     public Axis2Builder(Environment defaultEnviroment) {
         super(defaultEnviroment);
+        this.webServiceFinder = new WARWebServiceFinder();
     }
     
     public Axis2Builder(){

Added: geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java?rev=580112&view=auto
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java (added)
+++ geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java Thu Sep 27 10:35:15 2007
@@ -0,0 +1,54 @@
+/**
+ * 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.
+ */
+
+package org.apache.geronimo.axis2.builder;
+
+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.kernel.repository.Environment;
+
+/**
+ * @version $Rev$ $Date$
+ */
+public class Axis2EJBBuilder extends Axis2Builder {
+        
+    public Axis2EJBBuilder(Environment defaultEnviroment) {
+        super(defaultEnviroment);
+        this.webServiceFinder = new EJBWebServiceFinder();
+    }
+    
+    public Axis2EJBBuilder(){
+        super(null);
+    }
+              
+    public static final GBeanInfo GBEAN_INFO;
+
+    static {
+        GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(Axis2EJBBuilder.class, NameFactory.MODULE_BUILDER);
+        infoBuilder.addInterface(WebServiceBuilder.class);
+        infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        GBEAN_INFO = infoBuilder.getBeanInfo();
+    }
+
+    public static GBeanInfo getGBeanInfo() {
+        return GBEAN_INFO;
+    }
+}

Propchange: geronimo/server/trunk/modules/geronimo-axis2-builder/src/main/java/org/apache/geronimo/axis2/builder/Axis2EJBBuilder.java
------------------------------------------------------------------------------
    svn:eol-style = native

Modified: geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFBuilder.java Thu Sep 27 10:35:15 2007
@@ -19,8 +19,6 @@
 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;
@@ -31,7 +29,6 @@
 import javax.xml.bind.JAXBElement;
 import javax.xml.bind.JAXBException;
 import javax.xml.bind.Unmarshaller;
-import javax.xml.namespace.QName;
 import javax.xml.transform.stream.StreamSource;
 
 import org.apache.commons.logging.Log;
@@ -43,7 +40,6 @@
 import org.apache.cxf.jaxws.javaee.WebservicesType;
 import org.apache.cxf.jaxws.support.JaxWsImplementorInfo;
 import org.apache.geronimo.common.DeploymentException;
-import org.apache.geronimo.cxf.client.CXFServiceReference;
 import org.apache.geronimo.cxf.pojo.POJOWebServiceContainerFactoryGBean;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
@@ -53,15 +49,10 @@
 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.ServiceRefHandlerChainsType;
-import org.apache.xmlbeans.XmlOptions;
 
 public class CXFBuilder extends JAXWSServiceBuilder {
     private static final Log LOG = LogFactory.getLog(CXFBuilder.class);
@@ -75,11 +66,12 @@
         "org.apache.geronimo.cxf.use.wsgen";
 
     public CXFBuilder() {
-        this(null);
+        super(null);
     }
 
     public CXFBuilder(Environment defaultEnvironment) {
         super(defaultEnvironment);
+        this.webServiceFinder = new WARWebServiceFinder();
     }
 
     protected GBeanInfo getContainerFactoryGBeanInfo() {
@@ -185,52 +177,7 @@
             }
         }
     }
-
-    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 CXFServiceReference(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-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java?rev=580112&r1=580111&r2=580112&view=diff
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java (original)
+++ geronimo/server/trunk/modules/geronimo-cxf-builder/src/main/java/org/apache/geronimo/cxf/builder/CXFServiceRefBuilder.java Thu Sep 27 10:35:15 2007
@@ -17,41 +17,80 @@
 
 package org.apache.geronimo.cxf.builder;
 
+import java.io.IOException;
+import java.io.StringWriter;
 import java.net.URI;
 import java.util.Map;
 
 import javax.xml.namespace.QName;
 
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
 import org.apache.geronimo.common.DeploymentException;
+import org.apache.geronimo.cxf.client.CXFServiceReference;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
+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.repository.Environment;
 import org.apache.geronimo.naming.deployment.ServiceRefBuilder;
 import org.apache.geronimo.xbeans.geronimo.naming.GerServiceRefType;
 import org.apache.geronimo.xbeans.javaee.PortComponentRefType;
+import org.apache.geronimo.xbeans.javaee.ServiceRefHandlerChainsType;
 import org.apache.geronimo.xbeans.javaee.ServiceRefType;
+import org.apache.xmlbeans.XmlOptions;
 
 public class CXFServiceRefBuilder extends JAXWSServiceRefBuilder {
 
-    private final CXFBuilder cxfBuilder;
-    
+    private static final Log LOG = LogFactory.getLog(CXFServiceRefBuilder.class);
+        
     public CXFServiceRefBuilder(Environment defaultEnvironment,
-                                String[] eeNamespaces,
-                                CXFBuilder cxfBuilder) {
+                                String[] eeNamespaces) {
         super(defaultEnvironment, eeNamespaces);
-        this.cxfBuilder = cxfBuilder;
     }
        
     public Object createService(ServiceRefType serviceRef, GerServiceRefType gerServiceRef, 
-                                Module module, ClassLoader cl, Class serviceInterfaceClass, 
-                                QName serviceQName, URI wsdlURI, Class serviceReferenceType, 
-                                Map<Class, PortComponentRefType> portComponentRefMap) throws DeploymentException {   
-        return this.cxfBuilder.createService(serviceInterfaceClass, serviceReferenceType, wsdlURI, 
-                                             serviceQName, portComponentRefMap, serviceRef.getHandlerChains(),
-                                             gerServiceRef, module, cl);
+                                Module module, ClassLoader cl, Class serviceInterface, 
+                                QName serviceQName, URI wsdlURI, Class serviceReference, 
+                                Map<Class, PortComponentRefType> portComponentRefMap) throws DeploymentException {
+        EndpointInfoBuilder builder = new EndpointInfoBuilder(serviceInterface,
+                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 = (serviceReference == null) ? null : serviceReference.getName();
+        
+        return new CXFServiceReference(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;
     }
     
     public static final GBeanInfo GBEAN_INFO;
@@ -63,11 +102,9 @@
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true,
                 true);
         infoBuilder.addAttribute("eeNamespaces", String[].class, true, true);
-        infoBuilder.addReference("CXFBuilder", CXFBuilder.class,
-                NameFactory.MODULE_BUILDER);
 
         infoBuilder.setConstructor(new String[] { "defaultEnvironment",
-                "eeNamespaces", "CXFBuilder" });
+                                                  "eeNamespaces"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }

Added: geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/pom.xml?rev=580112&view=auto
==============================================================================
--- geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/pom.xml (added)
+++ geronimo/server/trunk/modules/geronimo-cxf-ejb-builder/pom.xml Thu Sep 27 10:35:15 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: 558782 $ $Date: 2007-07-23 11:56:02 -0400 (Mon, 23 Jul 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.modules</groupId>
+        <artifactId>modules</artifactId>
+        <version>2.1-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <artifactId>geronimo-cxf-ejb-builder</artifactId>
+    <name>Geronimo :: CXF :: EJB Builder</name>
+    
+    <dependencies>
+        
+        <dependency>
+            <groupId>org.apache.geronimo.modules</groupId>
+            <artifactId>geronimo-cxf-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-cxf-ejb-builder/pom.xml
------------------------------------------------------------------------------
    svn:eol-style = native



Mime
View raw message