geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ammul...@apache.org
Subject svn commit: r225338 - in /geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88: project.xml src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Date Tue, 26 Jul 2005 16:07:21 GMT
Author: ammulder
Date: Tue Jul 26 09:07:17 2005
New Revision: 225338

URL: http://svn.apache.org/viewcvs?rev=225338&view=rev
Log:
Remove OpenEJB dependency in branch

Modified:
    geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/project.xml
    geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
    geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java

Modified: geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/project.xml
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/project.xml?rev=225338&r1=225337&r2=225338&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/project.xml (original)
+++ geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/project.xml Tue Jul 26 09:07:17 2005
@@ -116,12 +116,6 @@
         </dependency>
 
         <dependency>
-            <groupId>openejb</groupId>
-            <artifactId>openejb-builder</artifactId>
-            <version>${openejb_version}</version>
-        </dependency>
-
-        <dependency>
             <groupId>geronimo</groupId>
             <artifactId>geronimo-j2ee</artifactId>
             <version>${pom.currentVersion}</version>

Modified: geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java?rev=225338&r1=225337&r2=225338&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
(original)
+++ geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/DisconnectedDeploymentManager.java
Tue Jul 26 09:07:17 2005
@@ -32,7 +32,6 @@
 import java.io.InputStream;
 import org.apache.geronimo.connector.deployment.RARConfigurer;
 import org.apache.geronimo.web.deployment.WARConfigurer;
-import org.openejb.deployment.EJBConfigurer;
 
 /**
  * Implementation of a disconnected JSR88 DeploymentManager.
@@ -41,14 +40,19 @@
  * @version $Rev: 46019 $ $Date: 2004-09-14 02:56:06 -0700 (Tue, 14 Sep 2004) $
  */
 public class DisconnectedDeploymentManager implements DeploymentManager {
-
     public DeploymentConfiguration createConfiguration(DeployableObject dObj) throws InvalidModuleException
{
         if(dObj.getType().equals(ModuleType.CAR)) {
             //todo: need a client configurer
         } else if(dObj.getType().equals(ModuleType.EAR)) {
             //todo: need an EAR configurer
         } else if(dObj.getType().equals(ModuleType.EJB)) {
-            return new EJBConfigurer().createConfiguration(dObj);
+            try {
+                Class cls = Class.forName("org.openejb.deployment.EJBConfigurer");
+                return (DeploymentConfiguration)cls.getMethod("createConfiguration", new
Class[]{DeployableObject.class}).invoke(cls.newInstance(), new Object[]{dObj});
+            } catch (Exception e) {
+                System.err.println("Unable to invoke EJB deployer");
+                e.printStackTrace();
+            }
         } else if(dObj.getType().equals(ModuleType.RAR)) {
             return new RARConfigurer().createConfiguration(dObj);
         } else if(dObj.getType().equals(ModuleType.WAR)) {

Modified: geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
URL: http://svn.apache.org/viewcvs/geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java?rev=225338&r1=225337&r2=225338&view=diff
==============================================================================
--- geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
(original)
+++ geronimo/branches/v1_0_M4-QA/modules/deploy-jsr88/src/java/org/apache/geronimo/deployment/plugin/jmx/JMXDeploymentManager.java
Tue Jul 26 09:07:17 2005
@@ -54,7 +54,6 @@
 import org.apache.geronimo.kernel.Kernel;
 import org.apache.geronimo.connector.deployment.RARConfigurer;
 import org.apache.geronimo.web.deployment.WARConfigurer;
-import org.openejb.deployment.EJBConfigurer;
 
 
 /**
@@ -276,7 +275,13 @@
         } else if(dObj.getType().equals(ModuleType.EAR)) {
             //todo: need an EAR configurer
         } else if(dObj.getType().equals(ModuleType.EJB)) {
-            return new EJBConfigurer().createConfiguration(dObj);
+            try {
+                Class cls = Class.forName("org.openejb.deployment.EJBConfigurer");
+                return (DeploymentConfiguration)cls.getMethod("createConfiguration", new
Class[]{DeployableObject.class}).invoke(cls.newInstance(), new Object[]{dObj});
+            } catch (Exception e) {
+                System.err.println("Unable to invoke EJB deployer");
+                e.printStackTrace();
+            }
         } else if(dObj.getType().equals(ModuleType.RAR)) {
             return new RARConfigurer().createConfiguration(dObj);
         } else if(dObj.getType().equals(ModuleType.WAR)) {



Mime
View raw message