geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ga...@apache.org
Subject svn commit: r526031 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/ assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/ configs/axis-deployer/src/plan/ configs/axis/ modules/geronimo-axis-builder/...
Date Fri, 06 Apr 2007 02:28:03 GMT
Author: gawor
Date: Thu Apr  5 19:28:02 2007
New Revision: 526031

URL: http://svn.apache.org/viewvc?view=rev&rev=526031
Log:
enabling jaxrpc ejb support

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
    geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
    geronimo/server/trunk/configs/axis/pom.xml
    geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=526031&r1=526030&r2=526031
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/resources/var/config/config.xml
Thu Apr  5 19:28:02 2007
@@ -201,6 +201,20 @@
         <gbean name="AxisServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>
+        <gbean name="AxisModuleBuilderExtension">
+            <attribute name="listener">?name=JettyWebContainer</attribute>
+            <attribute name="defaultEnvironment">
+              <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>jetty6</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+              </environment>
+             </attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/javamail/${version}/car">

Modified: geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml?view=diff&rev=526031&r1=526030&r2=526031
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
(original)
+++ geronimo/server/trunk/assemblies/geronimo-tomcat6-jee5/src/main/resources/var/config/config.xml
Thu Apr  5 19:28:02 2007
@@ -208,6 +208,20 @@
         <gbean name="AxisServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>
+        <gbean name="AxisModuleBuilderExtension">
+            <attribute name="listener">?name=TomcatWebContainer</attribute>
+            <attribute name="defaultEnvironment">
+              <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
+                <dependencies>
+                    <dependency>
+                        <groupId>org.apache.geronimo.configs</groupId>
+                        <artifactId>tomcat6</artifactId>
+                        <type>car</type>
+                    </dependency>
+                </dependencies>
+              </environment>
+            </attribute>
+        </gbean>
     </module>
 
     <module name="org.apache.geronimo.configs/javamail/${version}/car">

Modified: geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml?view=diff&rev=526031&r1=526030&r2=526031
==============================================================================
--- geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml (original)
+++ geronimo/server/trunk/configs/axis-deployer/src/plan/plan.xml Thu Apr  5 19:28:02 2007
@@ -33,27 +33,12 @@
     </gbean>
 
     <gbean name="AxisModuleBuilderExtension" class="org.apache.geronimo.axis.builder.AxisModuleBuilderExtension">
-        <xml-attribute name="defaultEnvironment">
-            <environment xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-                <dependencies>
-                    <dependency>
-                        <groupId>org.apache.geronimo.configs</groupId>
-                        <artifactId>axis</artifactId>
-                        <type>car</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>openejb-axis</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                    <dependency>
-                        <groupId>org.apache.geronimo.modules</groupId>
-                        <artifactId>geronimo-openejb-builder</artifactId>
-                        <type>jar</type>
-                    </dependency>
-                </dependencies>
-            </environment>
-        </xml-attribute>
+        <!-- This attribute and the environment must be updated appropriately in the config.xml
file -->
+        <attribute name="listener">?name=WebContainer</attribute>
+
+        <reference name="WebServiceBuilder">
+            <name>WebServiceBuilder</name>
+        </reference>
     </gbean>
 
     <gbean name="AxisServiceRefBuilder" class="org.apache.geronimo.axis.builder.AxisServiceRefBuilder">

Modified: geronimo/server/trunk/configs/axis/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/configs/axis/pom.xml?view=diff&rev=526031&r1=526030&r2=526031
==============================================================================
--- geronimo/server/trunk/configs/axis/pom.xml (original)
+++ geronimo/server/trunk/configs/axis/pom.xml Thu Apr  5 19:28:02 2007
@@ -41,9 +41,17 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>j2ee-security</artifactId>
+            <version>${version}</version>
+            <type>car</type>
+        </dependency>
+
+        <dependency>
+            <groupId>org.apache.geronimo.configs</groupId>
+            <artifactId>openejb</artifactId>
             <version>${version}</version>
             <type>car</type>
         </dependency>

Modified: geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java?view=diff&rev=526031&r1=526030&r2=526031
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisModuleBuilderExtension.java
Thu Apr  5 19:28:02 2007
@@ -26,13 +26,16 @@
 import org.apache.geronimo.axis.server.EjbWebServiceGBean;
 import org.apache.geronimo.common.DeploymentException;
 import org.apache.geronimo.deployment.ModuleIDBuilder;
+import org.apache.geronimo.deployment.service.EnvironmentBuilder;
 import org.apache.geronimo.gbean.AbstractName;
+import org.apache.geronimo.gbean.AbstractNameQuery;
 import org.apache.geronimo.gbean.GBeanData;
 import org.apache.geronimo.gbean.GBeanInfo;
 import org.apache.geronimo.gbean.GBeanInfoBuilder;
 import org.apache.geronimo.j2ee.deployment.EARContext;
 import org.apache.geronimo.j2ee.deployment.Module;
 import org.apache.geronimo.j2ee.deployment.ModuleBuilderExtension;
+import org.apache.geronimo.j2ee.deployment.WebServiceBuilder;
 import org.apache.geronimo.j2ee.j2eeobjectnames.NameFactory;
 import org.apache.geronimo.kernel.GBeanAlreadyExistsException;
 import org.apache.geronimo.kernel.Naming;
@@ -50,14 +53,20 @@
  */
 public class AxisModuleBuilderExtension implements ModuleBuilderExtension {
 
-    private final AxisBuilder axisBuilder;
+    private WebServiceBuilder axisBuilder;
+    private Environment defaultEnvironment;
+    private AbstractNameQuery listener;   
 
     public AxisModuleBuilderExtension() {
-        this(null);
+        this(null, null, null);
     }
 
-    public AxisModuleBuilderExtension(Environment defaultEnvironment) {
-        axisBuilder = new AxisBuilder(defaultEnvironment);
+    public AxisModuleBuilderExtension(WebServiceBuilder wsBuilder,
+                                      Environment defaultEnvironment,
+                                      AbstractNameQuery listener) {
+        this.axisBuilder = wsBuilder;
+        this.defaultEnvironment = defaultEnvironment;
+        this.listener = listener;
     }
 
     public void createModule(Module module, Object plan, JarFile moduleFile, String targetPath,
URL specDDUrl, Environment environment, Object moduleContextInfo, AbstractName earName, Naming
naming, ModuleIDBuilder idBuilder) throws DeploymentException {
@@ -80,7 +89,11 @@
            }
         }
 
-        axisBuilder.findWebServices(moduleFile, true, correctedPortLocations, environment,
ejbModule.getSharedContext());
+        axisBuilder.findWebServices(module, true, correctedPortLocations, environment, ejbModule.getSharedContext());
+        
+        if (this.defaultEnvironment != null) {
+            EnvironmentBuilder.mergeEnvironments(environment, this.defaultEnvironment);
+        } 
     }
 
     public void installModule(JarFile earFile, EARContext earContext, Module module, Collection
configurationStores, ConfigurationStore targetConfigurationStore, Collection repository) throws
DeploymentException {
@@ -145,6 +158,10 @@
                             "Could not add axis ejb web service gbean to context", e);
                 }
                 
+                if (this.listener != null) {
+                    ejbWebServiceGBean.setReferencePattern("WebServiceContainer", this.listener);
+                }
+                
                 ejbWebServiceGBean.setReferencePattern("EjbDeployment", sessionName);
             }
 
@@ -169,9 +186,11 @@
     static {
         GBeanInfoBuilder infoBuilder = GBeanInfoBuilder.createStatic(AxisModuleBuilderExtension.class,
NameFactory.MODULE_BUILDER);
         infoBuilder.addInterface(ModuleBuilderExtension.class);
+        infoBuilder.addReference("WebServiceBuilder", WebServiceBuilder.class, NameFactory.MODULE_BUILDER);
         infoBuilder.addAttribute("defaultEnvironment", Environment.class, true, true);
+        infoBuilder.addAttribute("listener", AbstractNameQuery.class, true);
 
-        infoBuilder.setConstructor(new String[]{"defaultEnvironment"});
+        infoBuilder.setConstructor(new String[]{"WebServiceBuilder","defaultEnvironment","listener"});
 
         GBEAN_INFO = infoBuilder.getBeanInfo();
     }



Mime
View raw message