geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: rev 55936 - in geronimo/trunk/modules/axis/src: java/org/apache/geronimo/axis test/org/apache/geronimo/axis
Date Fri, 29 Oct 2004 03:40:13 GMT
Author: djencks
Date: Thu Oct 28 20:40:11 2004
New Revision: 55936

Modified:
   geronimo/trunk/modules/axis/src/java/org/apache/geronimo/axis/WebServiceDeployer.java
   geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/DynamicEJBDeploymentTest.java
Log:
fix the stuff I broke in axis.  The generated samples don't compile, I don't know why

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
Thu Oct 28 20:40:11 2004
@@ -56,30 +56,6 @@
     protected final Log log = LogFactory.getLog(getClass());
 
     /**
-     * Field j2eeDomainName
-     */
-    private static final String j2eeDomainName =
-            AxisGeronimoConstants.J2EE_DOMAIN_NAME;
-
-    /**
-     * Field j2eeServerName
-     */
-    private static final String j2eeServerName =
-            AxisGeronimoConstants.J2EE_SERVER_PREFIX;
-
-    /**
-     * Field transactionManagerObjectName
-     */
-    private static final ObjectName transactionManagerObjectName =
-            JMXUtil.getObjectName(j2eeDomainName + ":type=TransactionManager");
-
-    /**
-     * Field connectionTrackerObjectName
-     */
-    private static final ObjectName connectionTrackerObjectName =
-            JMXUtil.getObjectName(j2eeDomainName + ":type=ConnectionTracker");
-
-    /**
      * Field j2eeModuleName
      */
     private String j2eeModuleName;
@@ -337,7 +313,7 @@
              * But this can quickly fix looking at it.      
              */
 
-            OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(kernel);
+            OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
 //            ClassLoader oldCl =
 //                    Thread.currentThread().getContextClassLoader();
 //            ClassLoader cl =
@@ -355,7 +331,7 @@
                                 AxisGeronimoConstants.TRACKED_CONNECTION_ASSOCIATOR_NAME,
                                 AxisGeronimoConstants.TRANSACTIONAL_TIMER_NAME,
                                 AxisGeronimoConstants.NONTRANSACTIONAL_TIMER_NAME,
-                                null, moduleBuilder, moduleBuilder, null, null, null, null);
+                                null, moduleBuilder, moduleBuilder, null, null, null, null,
null);
 
                 JarFile jarFile = null;
                 try {

Modified: geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/DynamicEJBDeploymentTest.java
==============================================================================
--- geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/DynamicEJBDeploymentTest.java
(original)
+++ geronimo/trunk/modules/axis/src/test/org/apache/geronimo/axis/DynamicEJBDeploymentTest.java
Thu Oct 28 20:40:11 2004
@@ -16,27 +16,19 @@
 
 package org.apache.geronimo.axis;
 
-import org.apache.geronimo.connector.outbound.connectiontracking.ConnectionTrackingCoordinator;
+import java.io.File;
+import java.net.URL;
+import java.net.URLClassLoader;
+import java.util.jar.JarFile;
+import javax.management.ObjectName;
+
 import org.apache.geronimo.ews.ws4j2ee.toWs.Ws4J2ee;
-import org.apache.geronimo.gbean.jmx.GBeanMBean;
 import org.apache.geronimo.j2ee.deployment.EARConfigBuilder;
-import org.apache.geronimo.j2ee.management.impl.J2EEServerImpl;
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.kernel.jmx.JMXUtil;
 import org.apache.geronimo.kernel.management.State;
-import org.apache.geronimo.system.serverinfo.ServerInfo;
-import org.apache.geronimo.transaction.GeronimoTransactionManager;
 import org.openejb.deployment.OpenEJBModuleBuilder;
 
-import javax.management.ObjectName;
-import java.io.File;
-import java.net.URL;
-import java.net.URLClassLoader;
-import java.util.Collections;
-import java.util.HashSet;
-import java.util.Set;
-import java.util.jar.JarFile;
-
 /**
  * <p>This test case show the infomation about openEJB that we assumed. And the
  * simmlier code code is used in the real code. As the OpenEJB is developing and
@@ -104,7 +96,7 @@
     }
 
     public void testEJBJarDeploy() throws Exception {
-        OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder(kernel);
+        OpenEJBModuleBuilder moduleBuilder = new OpenEJBModuleBuilder();
 
         File earFile = new File(outDir + "/echo-ewsimpl.jar");
         if (!earFile.exists()) {
@@ -121,8 +113,6 @@
         Thread.currentThread().setContextClassLoader(cl);
 
         File carFile = File.createTempFile("OpenEJBTest", ".car");
-        ObjectName j2eeServerObjectName = new ObjectName(j2eeDomainName
-                + ":j2eeType=J2EEServer,name=" + j2eeServerName);
         try {
             EARConfigBuilder earConfigBuilder =
                     new EARConfigBuilder(new ObjectName(j2eeDomainName + ":j2eeType=J2EEServer,name="
+ j2eeServerName),
@@ -133,6 +123,7 @@
                             null,
                             moduleBuilder,
                             moduleBuilder,
+                            null,
                             null,
                             null,
                             null,

Mime
View raw message