You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tomee.apache.org by jl...@apache.org on 2014/08/27 11:11:42 UTC
svn commit: r1620826 -
/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Author: jlmonteiro
Date: Wed Aug 27 09:11:42 2014
New Revision: 1620826
URL: http://svn.apache.org/r1620826
Log:
TOMEE-1335 fix the save deployments for WARs
Modified:
tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
Modified: tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java
URL: http://svn.apache.org/viewvc/tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java?rev=1620826&r1=1620825&r2=1620826&view=diff
==============================================================================
--- tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java (original)
+++ tomee/tomee/branches/tomee-1.7.x/container/openejb-core/src/main/java/org/apache/openejb/assembler/DeployerEjb.java Wed Aug 27 09:11:42 2014
@@ -172,8 +172,10 @@ public class DeployerEjb implements Depl
if (WebAppDeployer.Helper.isWebApp(file) && !oldWarDeployer) {
AUTO_DEPLOY.set(autoDeploy);
try {
- return SystemInstance.get().getComponent(WebAppDeployer.class)
- .deploy(host, contextRoot(properties, file.getAbsolutePath()), file);
+ final AppInfo appInfo = SystemInstance.get().getComponent(WebAppDeployer.class)
+ .deploy(host, contextRoot(properties, file.getAbsolutePath()), file);
+ saveIfNeeded(properties, file, appInfo);
+ return appInfo;
} finally {
AUTO_DEPLOY.remove();
}
@@ -240,9 +242,7 @@ public class DeployerEjb implements Depl
assembler.createApplication(appInfo);
- if (SAVE_DEPLOYMENTS || "true".equalsIgnoreCase(properties.getProperty(OPENEJB_DEPLOYER_SAVE_DEPLOYMENTS, "false"))) {
- saveDeployment(file, true);
- }
+ saveIfNeeded(properties, file, appInfo);
return appInfo;
@@ -272,6 +272,13 @@ public class DeployerEjb implements Depl
}
}
+ private void saveIfNeeded(Properties properties, File file, AppInfo appInfo) {
+ if (SAVE_DEPLOYMENTS || "true".equalsIgnoreCase(properties.getProperty(OPENEJB_DEPLOYER_SAVE_DEPLOYMENTS, "false"))) {
+ appInfo.properties.setProperty("save-deployment", "true");
+ saveDeployment(file, true);
+ }
+ }
+
private static File copyBinaries(final Properties props) throws OpenEJBException {
final File dump = ProvisioningUtil.cacheFile(props.getProperty(OPENEJB_PATH_BINARIES, "dump.war"));
if (dump.exists()) {