You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by rm...@apache.org on 2012/06/18 17:06:37 UTC
svn commit: r1351379 -
/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Author: rmannibucau
Date: Mon Jun 18 15:06:37 2012
New Revision: 1351379
URL: http://svn.apache.org/viewvc?rev=1351379&view=rev
Log:
TOMEE-223 ability to override contextroot using properties and the deployerEjb
Modified:
openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Modified: openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1351379&r1=1351378&r2=1351379&view=diff
==============================================================================
--- openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ openejb/trunk/openejb/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Mon Jun 18 15:06:37 2012
@@ -28,6 +28,7 @@ import org.apache.openejb.config.AppModu
import org.apache.openejb.config.ConfigurationFactory;
import org.apache.openejb.config.DeploymentLoader;
import org.apache.openejb.config.DeploymentModule;
+import org.apache.openejb.config.WebModule;
import org.apache.openejb.config.sys.AdditionalDeployments;
import org.apache.openejb.config.sys.Deployments;
import org.apache.openejb.config.sys.JaxbOpenejb;
@@ -145,7 +146,11 @@ public class DeployerEjb implements Depl
for (DeploymentModule module : appModule.getClientModules()) {
modules.put(module.getModuleId(), module);
}
- for (DeploymentModule module : appModule.getWebModules()) {
+ for (WebModule module : appModule.getWebModules()) {
+ final String contextRoot = properties.getProperty("webapp." + module.getJarLocation() + ".context-root");
+ if (contextRoot != null) {
+ module.setContextRoot(contextRoot);
+ }
modules.put(module.getModuleId(), module);
}
for (DeploymentModule module : appModule.getConnectorModules()) {