geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r487942 - in /geronimo/server/trunk: assemblies/geronimo-jetty6-jee5/src/main/var/config/ modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/ modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/w...
Date Sun, 17 Dec 2006 05:23:47 GMT
Author: djencks
Date: Sat Dec 16 21:23:44 2006
New Revision: 487942

URL: http://svn.apache.org/viewvc?view=rev&rev=487942
Log:
GERONIMO-2668 help the axis deployer adjust to presence of other webservice deployers

Modified:
    geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
    geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
    geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java

Modified: geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml?view=diff&rev=487942&r1=487941&r2=487942
==============================================================================
--- geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml (original)
+++ geronimo/server/trunk/assemblies/geronimo-jetty6-jee5/src/main/var/config/config.xml Sat
Dec 16 21:23:44 2006
@@ -39,7 +39,7 @@
           <attribute name="userRepositories">[]</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/j2ee-server/${version}/car"/>
 
     <module name="org.apache.geronimo.configs/transaction-jta11/${version}/car"/>
@@ -56,8 +56,8 @@
             <attribute name="urlPath">/jndi/rmi://${PlanServerHostname}:${PlanNamingPort}/JMXConnector</attribute>
         </gbean>
     </module>
-    
-    <module name="org.apache.geronimo.configs/axis/${version}/car"/>
+
+    <module name="org.apache.geronimo.configs/axis/${version}/car" load="false"/>
     <module name="org.apache.geronimo.configs/cxf/${version}/car" load="false"/>
 
     <module name="org.apache.geronimo.configs/openejb/${version}/car">
@@ -80,23 +80,23 @@
             <attribute name="host">${PlanCOSNamingHost}</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/system-database/${version}/car">
         <gbean name="DerbyNetwork">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanDerbyPort}</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/activemq-broker/${version}/car">
         <gbean name="ActiveMQ.tcp.default">
             <attribute name="host">${PlanServerHostname}</attribute>
             <attribute name="port">${PlanActiveMQPort}</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/activemq/${version}/car"/>
-    
+
     <module name="org.apache.geronimo.configs/jetty6/${version}/car">
         <gbean name="JettyWebConnector">
             <attribute name="host">${PlanServerHostname}</attribute>
@@ -113,13 +113,13 @@
         </gbean>
 -->
     </module>
-    
+
     <!--
-    NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer 
+    NOTE: n.b. be sure the gbean deployer is explicitly loaded before j2ee-deployer
           so that defaultEnvironment overrides work properly
     -->
     <module name="org.apache.geronimo.configs/geronimo-gbean-deployer/${version}/car"/>
-    
+
     <module name="org.apache.geronimo.configs/j2ee-deployer/${version}/car">
         <gbean name="WebBuilder">
             <attribute name="defaultNamespace">http://geronimo.apache.org/xml/ns/j2ee/web/jetty-1.2</attribute>
@@ -128,7 +128,7 @@
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>
     </module>
-    
+
     <module name="org.apache.geronimo.configs/connector-deployer/${version}/car">
         <gbean name="ResourceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
@@ -175,11 +175,12 @@
         </gbean>
 
     </module>
-    
+
     <module name="org.apache.geronimo.configs/client-deployer/${version}/car">
     </module>
 
     <module name="org.apache.geronimo.configs/cxf-deployer/${version}/car">
+        <!-- this gbean is not yet written -->
         <!--<gbean name="CXFServiceRefBuilder">
             <attribute name="eeNamespaces">http://java.sun.com/xml/ns/j2ee,http://java.sun.com/xml/ns/javaee</attribute>
         </gbean>-->

Modified: geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java?view=diff&rev=487942&r1=487941&r2=487942
==============================================================================
--- geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
(original)
+++ geronimo/server/trunk/modules/geronimo-axis-builder/src/main/java/org/apache/geronimo/axis/builder/AxisBuilder.java
Sat Dec 16 21:23:44 2006
@@ -113,6 +113,8 @@
                     EnvironmentBuilder.mergeEnvironments(environment, defaultEnvironment);
                 }
                 sharedContext.put(KEY, portMap);
+            } else {
+                sharedContext.put(KEY, Collections.EMPTY_MAP);
             }
         } catch (MalformedURLException e) {
             // The webservices.xml file doesn't exist.

Modified: geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java?view=diff&rev=487942&r1=487941&r2=487942
==============================================================================
--- geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
(original)
+++ geronimo/server/trunk/modules/geronimo-webservices-builder/src/main/java/org/apache/geronimo/webservices/builder/WSDescriptorParser.java
Sat Dec 16 21:23:44 2006
@@ -79,6 +79,8 @@
 import org.apache.geronimo.webservices.builder.PortInfo;
 import org.apache.geronimo.webservices.builder.SchemaInfoBuilder;
 import org.apache.xmlbeans.XmlException;
+import org.apache.xmlbeans.XmlCursor;
+import org.apache.xmlbeans.XmlObject;
 
 /**
  * @version $Rev$ $Date$
@@ -380,7 +382,16 @@
 
     public static Map parseWebServiceDescriptor(URL wsDDUrl, JarFile moduleFile, boolean
isEJB, Map servletLocations) throws DeploymentException {
         try {
-            WebservicesDocument webservicesDocument = WebservicesDocument.Factory.parse(wsDDUrl);
+            XmlObject webservicesDocumentUntyped = XmlObject.Factory.parse(wsDDUrl);
+            XmlCursor cursor = webservicesDocumentUntyped.newCursor();
+            cursor.toFirstContentToken();
+            QName qname = cursor.getName();
+            if (!WebservicesDocument.type.getDocumentElementName().equals(qname)) {
+                //not a jaxrpc/j2ee 1.4 webservices document.
+                //TODO handle jaxrpc inside a jee5 webservices document.
+                return null;
+            }
+            WebservicesDocument webservicesDocument = (WebservicesDocument) webservicesDocumentUntyped;
             XmlBeansUtil.validateDD(webservicesDocument);
             WebservicesType webservicesType = webservicesDocument.getWebservices();
             return parseWebServiceDescriptor(webservicesType, moduleFile, isEJB, servletLocations);



Mime
View raw message