Author: rmannibucau
Date: Mon Sep 17 21:22:55 2012
New Revision: 1386850
URL: http://svn.apache.org/viewvc?rev=1386850&view=rev
Log:
system property for moduleid was no more respected
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java?rev=1386850&r1=1386849&r2=1386850&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentLoader.java
Mon Sep 17 21:22:55 2012
@@ -152,7 +152,7 @@ public class DeploymentLoader implements
final AppModule appModule;
//final Class<? extends DeploymentModule> o = EjbModule.class;
- final EjbModule ejbModule = createEjbModule(baseUrl, jarPath,
classLoader, getModuleId(jarFile));
+ final EjbModule ejbModule = createEjbModule(baseUrl, jarPath,
classLoader, null);
// wrap the EJB Module with an Application Module
appModule = new AppModule(ejbModule);
@@ -164,7 +164,7 @@ public class DeploymentLoader implements
if (ClientModule.class.equals(moduleClass)) {
final String jarLocation = URLs.toFilePath(baseUrl);
- final ClientModule clientModule = createClientModule(baseUrl,
jarLocation, getOpenEJBClassLoader(), getModuleId(jarFile));
+ final ClientModule clientModule = createClientModule(baseUrl,
jarLocation, getOpenEJBClassLoader(), null);
// Wrap the resource module with an Application Module
return new AppModule(clientModule);
@@ -172,7 +172,7 @@ public class DeploymentLoader implements
if (ConnectorModule.class.equals(moduleClass)) {
final String jarLocation = URLs.toFilePath(baseUrl);
- final ConnectorModule connectorModule =
createConnectorModule(jarLocation, jarLocation, getOpenEJBClassLoader(),
getModuleId(jarFile));
+ final ConnectorModule connectorModule =
createConnectorModule(jarLocation, jarLocation, getOpenEJBClassLoader(), null);
// Wrap the resource module with an Application Module
return new AppModule(connectorModule);
@@ -270,11 +270,6 @@ public class DeploymentLoader implements
}
}
- private String getModuleId(final File file) {
- final String filename = file.getName();
- return SystemInstance.get().getOptions().get(filename + ".moduleId",
(String) null);
- }
-
protected AppModule createAppModule(final File jarFile, final String
jarPath) throws OpenEJBException {
File appDir = unpack(jarFile);
try {
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java?rev=1386850&r1=1386849&r2=1386850&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/DeploymentModule.java
Mon Sep 17 21:22:55 2012
@@ -17,7 +17,6 @@
package org.apache.openejb.config;
import org.apache.openejb.jee.NamedModule;
-import org.apache.openejb.jee.jpa.unit.Properties;
import org.apache.openejb.loader.SystemInstance;
import java.io.File;
@@ -59,6 +58,7 @@ public interface DeploymentModule {
private final String name;
private final File location;
private final URI uri;
+ private boolean overriden = false;
public ID(NamedModule vendorDd, NamedModule specDd, String name, File
location, URI uri, DeploymentModule module) {
this.name = name(vendorDd, specDd, uri, location, name, module);
@@ -79,6 +79,14 @@ public interface DeploymentModule {
}
private String name(NamedModule vendor, NamedModule spec, URI uri,
File location, String name, DeploymentModule module) {
+ if (location != null) {
+ final String systPropName =
SystemInstance.get().getOptions().get(location.getName() + ".moduleId",
(String) null);
+ if (systPropName != null) {
+ overriden = true;
+ return systPropName;
+ }
+ }
+
if (spec != null && spec.getModuleName() != null) return
spec.getModuleName().trim(); // used to override defaults so do it first
if (name != null && !name.startsWith("@")) return name;
if (vendor != null && vendor.getModuleName() != null) return
vendor.getModuleName().trim();
@@ -91,6 +99,10 @@ public interface DeploymentModule {
return "@" + module.getClass().getSimpleName() + module.hashCode();
}
+ public boolean isOverriden() {
+ return overriden;
+ }
+
private String moduleName(File location) {
List<String> invalid = new ArrayList<String>();
invalid.add("classes");
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
URL:
http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java?rev=1386850&r1=1386849&r2=1386850&view=diff
==============================================================================
---
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
(original)
+++
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/config/EjbModule.java
Mon Sep 17 21:22:55 2012
@@ -20,6 +20,7 @@ import org.apache.openejb.jee.Beans;
import org.apache.openejb.jee.EjbJar;
import org.apache.openejb.jee.Webservices;
import org.apache.openejb.jee.oejb3.OpenejbJar;
+import org.apache.openejb.loader.SystemInstance;
import org.apache.xbean.finder.IAnnotationFinder;
import java.io.File;
@@ -70,6 +71,9 @@ public class EjbModule extends Module im
if (jarURI != null) file = new File(jarURI);
this.id = new ID(openejbJar, ejbJar, moduleId, file, null, this);
+ if (id.isOverriden() && ejbJar != null) {
+ ejbJar.setModuleName(id.getName());
+ }
this.validation = new ValidationContext(this);
}
