You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by ge...@apache.org on 2011/02/28 08:30:34 UTC
svn commit: r1075227 - in
/geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment:
EjbModuleBuilder.java GeronimoDeploymentLoader.java
Author: genspring
Date: Mon Feb 28 07:30:34 2011
New Revision: 1075227
URL: http://svn.apache.org/viewvc?rev=1075227&view=rev
Log:
svn merge --non-interactive -c 1075055 https://svn.apache.org/repos/asf/geronimo/server/trunk . 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
Added:
geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java
- copied unchanged from r1075055, geronimo/server/trunk/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/GeronimoDeploymentLoader.java
Modified:
geronimo/server/branches/3.0-M2/plugins/openejb/geronimo-openejb-builder/src/main/java/org/apache/geronimo/openejb/deployment/EjbModuleBuilder.java
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=1075227&r1=1075226&r2=1075227&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 Mon Feb 28 07:30:34 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 DeploymentLoader(ddDir, loadingRequiredModuleTypes);
+ DeploymentLoader loader = new GeronimoDeploymentLoader(ddDir, loadingRequiredModuleTypes);
AppModule appModule;
try {
appModule = loader.load(new File(moduleFile.getName()));