svn commit: r1125798 - in /openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config: AppInfoBuilder.java ConnectorModule.java DeploymentLoader.java

[jgallimore]

Author: jgallimore
Date: Sat May 21 20:23:16 2011
New Revision: 1125798

URL: http://svn.apache.org/viewvc?rev=1125798&view=rev
Log:
OPENEJB-1555 allow appId for a particular app to be set using a system property

Modified:
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
    
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java?rev=1125798&r1=1125797&r2=1125798&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/AppInfoBuilder.java
 Sat May 21 20:23:16 2011
@@ -390,7 +390,9 @@ class AppInfoBuilder {
                         }
                     }
                     properties.setProperty("TransactionSupport", 
transactionSupport);
-                    properties.setProperty("ResourceAdapter", 
connectorInfo.resourceAdapter.id);
+                    if (connectorInfo.resourceAdapter != null) {
+                       properties.setProperty("ResourceAdapter", 
connectorInfo.resourceAdapter.id);
+                    }
 
                     ResourceInfo resourceInfo = 
configFactory.configureService(resource, ResourceInfo.class);
                     connectorInfo.outbound.add(resourceInfo);

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java?rev=1125798&r1=1125797&r2=1125798&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/ConnectorModule.java
 Sat May 21 20:23:16 2011
@@ -50,7 +50,7 @@ public class ConnectorModule extends Mod
         this.classLoader = classLoader;
 
         File file = (jarLocation == null) ? null : new File(jarLocation);
-        this.id = new ID(null, connector, null, file, null, this);
+        this.id = new ID(null, connector, moduleId, file, null, this);
         this.validation = new ValidationContext(this);
     }
 

Modified: 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL: 
http://svn.apache.org/viewvc/openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1125798&r1=1125797&r2=1125798&view=diff
==============================================================================
--- 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 (original)
+++ 
openejb/trunk/openejb3/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
 Sat May 21 20:23:16 2011
@@ -151,7 +151,7 @@ public class DeploymentLoader implements
 
                 AppModule appModule;
                 Class<? extends DeploymentModule> o = EjbModule.class;
-                EjbModule ejbModule = createEjbModule(baseUrl, jarPath, 
classLoader, null);
+                EjbModule ejbModule = createEjbModule(baseUrl, jarPath, 
classLoader, getModuleId(jarFile));
 
                 // wrap the EJB Module with an Application Module
                 appModule = new AppModule(ejbModule);
@@ -163,7 +163,7 @@ public class DeploymentLoader implements
 
             if (ClientModule.class.equals(moduleClass)) {
                 String jarLocation = URLs.toFilePath(baseUrl);
-                ClientModule clientModule = createClientModule(baseUrl, 
jarLocation, OpenEJB.class.getClassLoader(), null);
+                ClientModule clientModule = createClientModule(baseUrl, 
jarLocation, OpenEJB.class.getClassLoader(), getModuleId(jarFile));
 
                 // Wrap the resource module with an Application Module
                 return new AppModule(clientModule);
@@ -171,7 +171,7 @@ public class DeploymentLoader implements
 
             if (ConnectorModule.class.equals(moduleClass)) {
                 String jarLocation = URLs.toFilePath(baseUrl);
-                ConnectorModule connectorModule = 
createConnectorModule(jarLocation, jarLocation, OpenEJB.class.getClassLoader(), 
null);
+                ConnectorModule connectorModule = 
createConnectorModule(jarLocation, jarLocation, OpenEJB.class.getClassLoader(), 
getModuleId(jarFile));
 
                 // Wrap the resource module with an Application Module
                 return new AppModule(connectorModule);
@@ -234,7 +234,12 @@ public class DeploymentLoader implements
         }
     }
 
-    protected AppModule createAppModule(File jarFile, String jarPath) throws 
OpenEJBException {
+    private String getModuleId(File file) {
+       String filename = file.getName();
+       return System.getProperty(filename + ".moduleId");
+       }
+
+       protected AppModule createAppModule(File jarFile, String jarPath) 
throws OpenEJBException {
         File appDir = unpack(jarFile);
         try {
             appDir = appDir.getCanonicalFile();