geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From d...@apache.org
Subject svn commit: rev 55685 - in geronimo/trunk/modules/axis: . src/java/org/apache/geronimo/axis
Date Wed, 27 Oct 2004 11:55:26 GMT
Author: dims
Date: Wed Oct 27 04:55:25 2004
New Revision: 55685

Modified:
   geronimo/trunk/modules/axis/project.xml
   geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/GeronimoWsDeployContext.java
   geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployer.java
Log:
Srinath has reworked the JSR 109 support in EWS. This is the cascading change.



Modified: geronimo/trunk/modules/axis/project.xml
==============================================================================
--- geronimo/trunk/modules/axis/project.xml	(original)
+++ geronimo/trunk/modules/axis/project.xml	Wed Oct 27 04:55:25 2004
@@ -295,56 +295,6 @@
                 <module>true</module>
             </properties>
         </dependency>
-        <!--
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>jaxb-api</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>jaxb-impl</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>jaxb-libs</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>namespace</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>relaxngDatatype</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        <dependency>
-            <groupId>jaxb-ri</groupId>
-            <artifactId>xsdlib</artifactId>
-            <version>&jaxb-ri-version;</version>
-            <properties>
-                <module>true</module>
-            </properties>
-        </dependency>
-        -->
         
 		<dependency>
             <groupId>xmlbeans</groupId>
@@ -439,12 +389,10 @@
             </includes>
 
             <excludes>
-                <exclude>**/Abstract*.java</exclude>
+               <exclude>**/Abstract*.java</exclude>
                 <exclude>**/EWSTest.java</exclude>
-                <exclude>**/ComplexTypeWebServiceTest.java</exclude>
-                <!-- Temporary ignore for all tests 
-                <exclude>**/*.java</exclude> -->
-            </excludes>
+                <exclude>**/ComplexTypeWebServiceTest.java</exclude> 
+			</excludes>
 
             <resources>
                 <resource>

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/GeronimoWsDeployContext.java
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/GeronimoWsDeployContext.java
(original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/GeronimoWsDeployContext.java
Wed Oct 27 04:55:25 2004
@@ -16,10 +16,11 @@
 package org.apache.geronimo.axis;
 
 import org.apache.axis.wsdl.fromJava.Emitter;
+import org.apache.geronimo.ews.ws4j2ee.module.Module;
+import org.apache.geronimo.ews.ws4j2ee.module.ModuleFactory;
 import org.apache.geronimo.ews.ws4j2ee.toWs.GenerationConstants;
 import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2eeDeployContext;
-import org.apache.geronimo.ews.ws4j2ee.utils.packager.load.PackageModule;
-import org.apache.geronimo.ews.ws4j2ee.utils.packager.load.PackageModuleFactory;
+
 
 /**
  * Class GeronimoWsDeployContext
@@ -29,7 +30,7 @@
     /**
      * Field module
      */
-    private PackageModule module;
+    private Module module;
 
     /**
      * Field moduleLocation
@@ -50,7 +51,7 @@
     public GeronimoWsDeployContext(String moduleLocation,
                                    String outputLocation) {
         module =
-                PackageModuleFactory.createPackageModule(moduleLocation, true);
+                ModuleFactory.createPackageModule(moduleLocation);
         this.moduleLocation = moduleLocation;
         this.outputLocation = outputLocation;
     }
@@ -78,7 +79,7 @@
      *
      * @return
      */
-    public PackageModule getModule() {
+    public Module getModule() {
         return module;
     }
 

Modified: geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployer.java
==============================================================================
--- geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployer.java
(original)
+++ geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployer.java
Wed Oct 27 04:55:25 2004
@@ -15,20 +15,6 @@
  */
 package org.apache.geronimo.axis;
 
-import org.apache.axis.client.AdminClient;
-import org.apache.axis.client.Call;
-import org.apache.axis.utils.ClassUtils;
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.apache.geronimo.deployment.DeploymentException;
-import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2ee;
-import org.apache.geronimo.ews.ws4j2ee.utils.packager.load.PackageModule;
-import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
-import org.apache.geronimo.kernel.Kernel;
-import org.apache.geronimo.kernel.jmx.JMXUtil;
-import org.openejb.deployment.OpenEJBModuleBuilder;
-
-import javax.management.ObjectName;
 import java.io.File;
 import java.io.FileInputStream;
 import java.io.FileNotFoundException;
@@ -44,6 +30,21 @@
 import java.util.zip.ZipEntry;
 import java.util.zip.ZipFile;
 
+import javax.management.ObjectName;
+
+import org.apache.axis.client.AdminClient;
+import org.apache.axis.client.Call;
+import org.apache.axis.utils.ClassUtils;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.apache.geronimo.deployment.DeploymentException;
+import org.apache.geronimo.ews.ws4j2ee.module.Module;
+import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2ee;
+import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
+import org.apache.geronimo.kernel.Kernel;
+import org.apache.geronimo.kernel.jmx.JMXUtil;
+import org.openejb.deployment.OpenEJBModuleBuilder;
+
 /**
  * Class WebServiceDeployer
  */
@@ -168,7 +169,7 @@
         ws4j2ee.generate();
         log.info("ews code generation done.");
 
-        PackageModule packageModule = deployContext.getModule();
+        Module packageModule = deployContext.getModule();
 
         if (packageModule.getEjbJarfile() != null) {
             this.hasEJB = true;
@@ -297,11 +298,10 @@
                 axisProperties.setProperty("style", "web");
             }
             
-            //right now class name is not avalible here So we set the default
-            //classloader
             ArrayList classList = AxisGeronimoUtils.getClassFileList(new ZipFile(module));
             for (int i = 0; i < classList.size(); i++) {
                 String className = (String) classList.get(i);
+                System.out.println(className);
                 ClassUtils.setClassLoader(className, classloader);
             }
 

Mime
View raw message