brooklyn-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From aleds...@apache.org
Subject [5/9] git commit: Fix JBoss 6 tests: use hello-world-no-mapping
Date Thu, 30 Oct 2014 21:44:45 GMT
Fix JBoss 6 tests: use hello-world-no-mapping

- The default hello-world.war caused contained url-pattern in web.xml,
  which is not supported in JBoss6.
- Switched tests to use the simpler hello-world-no-mapping.war


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

Branch: refs/heads/master
Commit: e46a3114329ebdfa916718fcc2181f518276b335
Parents: 06a1aef
Author: Aled Sage <aled.sage@gmail.com>
Authored: Thu Oct 30 11:35:02 2014 +0000
Committer: Aled Sage <aled.sage@gmail.com>
Committed: Thu Oct 30 21:25:07 2014 +0000

----------------------------------------------------------------------
 .../entity/webapp/AbstractWebAppFixtureIntegrationTest.java    | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-brooklyn/blob/e46a3114/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
----------------------------------------------------------------------
diff --git a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
index 81c36bd..5fbeeed 100644
--- a/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
+++ b/software/webapp/src/test/java/brooklyn/entity/webapp/AbstractWebAppFixtureIntegrationTest.java
@@ -400,6 +400,8 @@ public abstract class AbstractWebAppFixtureIntegrationTest {
      * pinging the given URL.
      *
      * Everything can deploy hello world. Some subclasses deploy add'l apps.
+     * We're using the simplest hello-world (with no URL mapping) because JBoss 6 does not
+     * support URL mappings.
      */
     @DataProvider(name = "entitiesWithWarAndURL")
     public Object[][] entitiesWithWar() {
@@ -408,8 +410,8 @@ public abstract class AbstractWebAppFixtureIntegrationTest {
         for (Object[] entity : basicEntities()) {
             result.add(new Object[] {
                     entity[0],
-                    "hello-world.war",
-                    "hello-world/",
+                    "hello-world-no-mapping.war",
+                    "hello-world-no-mapping/",
                     "" // no sub-page path
                     });
         }


Mime
View raw message