geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xuhaih...@apache.org
Subject svn commit: r1051776 - in /geronimo/server/branches/2.2: plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java pom.xml
Date Wed, 22 Dec 2010 07:03:52 GMT
Author: xuhaihong
Date: Wed Dec 22 07:03:51 2010
New Revision: 1051776

URL: http://svn.apache.org/viewvc?rev=1051776&view=rev
Log:
GERONIMO-5740 Use filtrable DeploymentLoader in openejb plugin

Modified:
    geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
    geronimo/server/branches/2.2/pom.xml

Modified: geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1051776&r1=1051775&r2=1051776&view=diff
==============================================================================
--- geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/branches/2.2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Wed Dec 22 07:03:51 2010
@@ -23,6 +23,7 @@ import java.net.URL;
 import java.util.Collection;
 import java.util.Collections;
 import java.util.HashMap;
+import java.util.HashSet;
 import java.util.Iterator;
 import java.util.LinkedHashSet;
 import java.util.LinkedList;
@@ -96,6 +97,7 @@ import org.apache.openejb.assembler.clas
 import org.apache.openejb.config.AppModule;
 import org.apache.openejb.config.ConfigurationFactory;
 import org.apache.openejb.config.DeploymentLoader;
+import org.apache.openejb.config.DeploymentModule;
 import org.apache.openejb.config.ReadDescriptors;
 import org.apache.openejb.config.UnknownModuleTypeException;
 import org.apache.openejb.config.UnsupportedModuleTypeException;
@@ -228,7 +230,10 @@ public class EjbModuleBuilder implements
         if (targetPath.endsWith("/")) throw new IllegalArgumentException("targetPath must
not end with a '/'");
 
         // Load the module file
-        DeploymentLoader loader = new DeploymentLoader();
+        Set<Class<? extends DeploymentModule>> loadingRequiredModuleTypes = new
HashSet<Class<? extends DeploymentModule>>();
+        loadingRequiredModuleTypes.add(org.apache.openejb.config.EjbModule.class);
+        loadingRequiredModuleTypes.add(org.apache.openejb.config.WsModule.class);
+        DeploymentLoader loader = new DeploymentLoader(loadingRequiredModuleTypes);
         AppModule appModule;
         try {
             appModule = loader.load(new File(moduleFile.getName()));
@@ -394,7 +399,7 @@ public class EjbModuleBuilder implements
                 } else if (ref.getType().equals(MessageDrivenContext.class.getName())) {
                     iterator.remove();
                 } else if (ref.getType().equals(TimerService.class.getName())) {
-                    iterator.remove();   
+                    iterator.remove();
                 } else if (ref.getType().equals(WebServiceContext.class.getName())) {
                     iterator.remove();
                 } else {
@@ -621,7 +626,7 @@ public class EjbModuleBuilder implements
         openEjbConfiguration.containerSystem = new ContainerSystemInfo();
         openEjbConfiguration.facilities = new FacilitiesInfo();
         boolean offline = true;
-        
+
         ConfigurationFactory configurationFactory = new ConfigurationFactory(offline,
             ejbModule.getPreAutoConfigDeployer(),
             openEjbConfiguration);

Modified: geronimo/server/branches/2.2/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/branches/2.2/pom.xml?rev=1051776&r1=1051775&r2=1051776&view=diff
==============================================================================
--- geronimo/server/branches/2.2/pom.xml (original)
+++ geronimo/server/branches/2.2/pom.xml Wed Dec 22 07:03:51 2010
@@ -65,7 +65,7 @@
         <tomcatVersion>6.0.29.0</tomcatVersion>
         <tomcatGroupId>org.apache.geronimo.ext.tomcat</tomcatGroupId>
 
-        <openejbVersion>3.1.4</openejbVersion>
+        <openejbVersion>3.1.5-SNAPSHOT</openejbVersion>
         <derbyVersion>10.5.3.0_1</derbyVersion>
         <cxfVersion>2.1.10</cxfVersion>
         <axis2Version>1.5.2</axis2Version>



Mime
View raw message