[java-idp-integration-tests] branch master updated: Undo additional changes.

[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=be6d08e9c504dc76f7440fccd98f9d8b9e7897d5

The following commit(s) were added to refs/heads/master by this push:
       new  be6d08e   Undo additional changes.
be6d08e is described below

commit be6d08e9c504dc76f7440fccd98f9d8b9e7897d5
Author: Scott Cantor <cantor.2 at osu.edu>
AuthorDate: Mon Feb 20 14:12:24 2017 -0500

    Undo additional changes.
---
 .../java/net/shibboleth/idp/test/BaseIntegrationTest.java    | 12 ++++--------
 1 file changed, 4 insertions(+), 8 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index 615d782..a872d82 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\"", "/dist/webapp/\"");
+            replaceFile(pathToIdpXML, "/war/idp.war\"", "/webapp/\"");
         }
     }
 
@@ -471,10 +471,6 @@ 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");
         }
     }
 
@@ -916,13 +912,13 @@ public abstract class BaseIntegrationTest
     }
 
     /**
-     * Restore conf/idp.properties from dist/conf/idp.properties.dist.
+     * Restore conf/idp.properties from dist/conf/idp.properties.
      * 
      * @throws IOException if an I/O error occurs
      */
     public void restoreIdPProperties() throws IOException {
         final Path pathToIdPPropertiesDist =
-                Paths.get(pathToIdPHome.toAbsolutePath().toString(), "dist", "conf", "idp.properties.dist");
+                Paths.get(pathToIdPHome.toAbsolutePath().toString(), "dist", "conf", "idp.properties");
         Assert.assertTrue(pathToIdPPropertiesDist.toFile().exists());
 
         Files.copy(pathToIdPPropertiesDist, pathToIdPProperties, StandardCopyOption.REPLACE_EXISTING);
@@ -939,7 +935,7 @@ public abstract class BaseIntegrationTest
         Assert.assertTrue(pathToRelyingParty.toFile().exists());
 
         final Path pathToRelyingPartyDist =
-                Paths.get(pathToIdPHome.toAbsolutePath().toString(), "dist", "conf", "relying-party.xml.dist");
+                Paths.get(pathToIdPHome.toAbsolutePath().toString(), "dist", "conf", "relying-party.xml");
         Assert.assertTrue(pathToRelyingPartyDist.toFile().exists());
 
         Files.copy(pathToRelyingPartyDist, pathToRelyingParty, StandardCopyOption.REPLACE_EXISTING);

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