geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From genspr...@apache.org
Subject svn commit: r1075637 - in /geronimo/server/branches/3.0-M2/plugins/openejb: ./ geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/
Date Tue, 01 Mar 2011 03:38:59 GMT
Author: genspring
Date: Tue Mar  1 03:38:59 2011
New Revision: 1075637

URL: http://svn.apache.org/viewvc?rev=1075637&view=rev
Log:
revert "Create a GeronimoDeploymentLoader as a workaround, as the DeploymentLoader from OpenEJB
breaks most application deployment, need to remove it once the changes in OpenEJB is done"

Removed:
    geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java
Modified:
    geronimo/server/branches/3.0-M2/plugins/openejb/   (props changed)
    geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java

Propchange: geronimo/server/branches/3.0-M2/plugins/openejb/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar  1 03:38:59 2011
@@ -1,4 +1,4 @@
 /geronimo/server/branches/2.2/plugins/openejb:830343,830385,830420,830443,830766,831498,831811,832538,885058,941914
 /geronimo/server/branches/3.0-M1/plugins/openejb:948864,951792
 /geronimo/server/trunk/plugins/j2ee/openejb:887507
-/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183
+/geronimo/server/trunk/plugins/openejb:1056676,1057959-1057962,1064377,1064432-1064433,1071183,1074421,1075055

Modified: geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
URL: http://svn.apache.org/viewvc/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java?rev=1075637&r1=1075636&r2=1075637&view=diff
==============================================================================
--- geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
(original)
+++ geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
Tue Mar  1 03:38:59 2011
@@ -303,7 +303,7 @@ public class EjbModuleBuilder implements
         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 GeronimoDeploymentLoader(ddDir, loadingRequiredModuleTypes);
+        DeploymentLoader loader = new DeploymentLoader(ddDir, loadingRequiredModuleTypes);
         AppModule appModule;
         try {
             appModule = loader.load(new File(moduleFile.getName()));



Mime
View raw message