[java-idp-integration-tests] branch master updated: Adjust for new location of webapp tree in distribution.

[Scott Cantor]

This is an automated email from the git hooks/post-receive script.

scantor pushed a commit to branch master
in repository java-idp-integration-tests.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-integration-tests.git;a=commit;h=c73da6d81353ece2197ed04f0a3a40b46c6e805c

The following commit(s) were added to refs/heads/master by this push:
       new  c73da6d   Adjust for new location of webapp tree in distribution.
c73da6d is described below

commit c73da6d81353ece2197ed04f0a3a40b46c6e805c
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Tue Feb 14 20:07:07 2017 -0500

    Adjust for new location of webapp tree in distribution.
---
 pom.xml                                                        | 2 +-
 src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java | 8 ++++++--
 2 files changed, 7 insertions(+), 3 deletions(-)

diff --git a/pom.xml b/pom.xml
index 7897318..87cc726 100644
--- a/pom.xml
+++ b/pom.xml
@@ -383,7 +383,7 @@
                                     <classifier>${testbed.classifier}</classifier>
                                 </artifactItem>
                             </artifactItems>
-                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/webapp/WEB-INF/lib/</outputDirectory>
+                            <outputDirectory>${test-distributions.directory}/shibboleth-identity-provider-${idp.version}/dist/webapp/WEB-INF/lib/</outputDirectory>
                         </configuration>
                     </execution>
                 </executions>
diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index ed7527c..5a8451f 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -425,7 +425,7 @@ public abstract class BaseIntegrationTest
             // Modify context descriptor with per-test idp.home directory
             final Path pathToIdpXML = pathToTomcatBase.resolve(Paths.get("conf", "Catalina", "localhost", "idp.xml"));
             Assert.assertTrue(pathToIdpXML.toAbsolutePath().toFile().exists(), "Path to idp.xml not found");
-            replaceFile(pathToIdpXML, "/war/idp.war\"", "/webapp/\"");
+            replaceFile(pathToIdpXML, "/war/idp.war\"", "/dist/webapp/\"");
         }
     }
 
@@ -471,6 +471,10 @@ public abstract class BaseIntegrationTest
             log.debug("Path to start.ini '{}'", startIni.toAbsolutePath());
             Assert.assertTrue(startIni.toAbsolutePath().toFile().exists(), "Path to start.ini not found");
             replaceFile(startIni, "\\Z", System.lineSeparator() + "testbed.xml");
+            
+            // Set IdP webapp location
+            final Path pathToJettyIdPIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
+            replaceProperty(pathToJettyIdPIni, "jetty.war.path", "../dist/webapp");
         }
     }
 
@@ -651,7 +655,7 @@ public abstract class BaseIntegrationTest
     @BeforeClass(enabled = true, dependsOnMethods = {"setUpIdPPaths"})
     public void setUpStorageServlet() throws Exception {
 
-        final Path pathToIdPWebXML = pathToIdPHome.resolve(Paths.get("webapp", "WEB-INF", "web.xml"));
+        final Path pathToIdPWebXML = pathToIdPHome.resolve(Paths.get("dist", "webapp", "WEB-INF", "web.xml"));
         Assert.assertTrue(pathToIdPWebXML.toAbsolutePath().toFile().exists(), "Path to IdP web.xml not found");
 
         final String oldText = "</web-app>";

-- 
To stop receiving notification emails like this one, please contact
the administrator of this repository.