You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@brooklyn.apache.org by he...@apache.org on 2014/07/29 21:32:09 UTC
[14/31] git commit: map target name to right format on cluster-level
undeploy
map target name to right format on cluster-level undeploy
Project: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/commit/e3a3df9a
Tree: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/tree/e3a3df9a
Diff: http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/diff/e3a3df9a
Branch: refs/heads/master
Commit: e3a3df9a9182f450fcf9c7700adf017183b8d7fc
Parents: 1d8551e
Author: Alex Heneveld <al...@cloudsoftcorp.com>
Authored: Tue Jul 22 13:23:31 2014 -0700
Committer: Alex Heneveld <al...@cloudsoftcorp.com>
Committed: Tue Jul 29 10:42:07 2014 -0400
----------------------------------------------------------------------
.../java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e3a3df9a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java
index f62f8eb..7eb6e25 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/DynamicWebAppClusterImpl.java
@@ -233,7 +233,8 @@ public class DynamicWebAppClusterImpl extends DynamicClusterImpl implements Dyna
@Effector(description="Undeploys the given context/artifact")
public void undeploy(@EffectorParam(name="targetName") String targetName) {
checkNotNull(targetName, "targetName");
-
+ targetName = filenameToWebContextMapper.convertDeploymentTargetNameToContext(targetName);
+
// set it up so future nodes get the right wars
removeFromWarsByContext(this, targetName);