brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From henev...@apache.org
Subject [04/50] brooklyn-library git commit: fix java web app integration test and javadoc in response to recent change
Date Mon, 01 Feb 2016 17:46:07 GMT
fix java web app integration test and javadoc in response to recent change


Project: http://git-wip-us.apache.org/repos/asf/brooklyn-library/repo
Commit: http://git-wip-us.apache.org/repos/asf/brooklyn-library/commit/22de8c5f
Tree: http://git-wip-us.apache.org/repos/asf/brooklyn-library/tree/22de8c5f
Diff: http://git-wip-us.apache.org/repos/asf/brooklyn-library/diff/22de8c5f

Branch: refs/heads/0.4.0
Commit: 22de8c5f2536e97b08891540bcd84eb40728894c
Parents: 3a37943
Author: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Authored: Thu Sep 20 17:13:48 2012 +0100
Committer: Alex Heneveld <alex.heneveld@cloudsoftcorp.com>
Committed: Thu Sep 20 17:13:48 2012 +0100

----------------------------------------------------------------------
 .../java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java    | 2 --
 .../src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java | 3 +--
 .../test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy | 2 +-
 3 files changed, 2 insertions(+), 5 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/22de8c5f/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
index c947f25..5c3c430 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSoftwareProcess.java
@@ -7,8 +7,6 @@ import java.util.LinkedHashMap;
 import java.util.List;
 import java.util.Map;
 import java.util.Set;
-import java.util.regex.Matcher;
-import java.util.regex.Pattern;
 
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/22de8c5f/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java
b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java
index 876572d..3316d06 100644
--- a/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java
+++ b/software/webapp/src/main/java/brooklyn/entity/webapp/JavaWebAppSshDriver.java
@@ -62,8 +62,7 @@ public abstract class JavaWebAppSshDriver extends JavaSoftwareProcessSshDriver
i
 
     /** deploys a URL as a webapp at the appserver;
      * returns a token which can be used as an argument to undeploy,
-     * typically the web application archive (eg WAR, EAR, JAR) filename (if copying files)
-     * or the web context (if using an API to manage).
+     * typically the web context with leading slash where the app can be reached (just "/"
for ROOT)
      * <p>
      * see {@link JavaWebAppSoftwareProcess#deploy(String, String)} for details of how input
filenames are handled */
     @Override

http://git-wip-us.apache.org/repos/asf/brooklyn-library/blob/22de8c5f/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
index d0d7132..aed1b2f 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/WebAppIntegrationTest.groovy
@@ -413,7 +413,7 @@ public class WebAppIntegrationTest {
         executeUntilSucceeds(abortOnError:false, timeout:60*SECONDS) {
             // TODO get this URL from a WAR file entity
             assertTrue urlRespondsWithStatusCode200(entity.getAttribute(WebAppService.ROOT_URL)+"myartifactname/"+urlSubPathToPageToQuery)
-            assertEquals(entity.getAttribute(JavaWebAppSoftwareProcess.DEPLOYED_WARS), ImmutableSet.of("myartifactname.war"))
+            assertEquals(entity.getAttribute(JavaWebAppSoftwareProcess.DEPLOYED_WARS), ImmutableSet.of("/myartifactname"))
             true
         }
         


Mime
View raw message