[java-idp-integration-tests] 01/02: Remove old way of deploying the testbed

[Tom Zeller]

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

tzeller pushed a commit to branch main
in repository java-idp-integration-tests.

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

commit ae8baf1b68aa00c2936aa001b00171151ffc5fd3
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed May 8 17:13:56 2024 -0500

    Remove old way of deploying the testbed
    
    New way is copying src/test/jetty-base/webapps/testbed.xml via Maven
---
 .../idp/integration/tests/BaseIntegrationTest.java | 39 ----------------------
 1 file changed, 39 deletions(-)

diff --git a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
index 373320c..505bd83 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -698,45 +698,6 @@ public abstract class BaseIntegrationTest {
             Assert.fail("Unable to find idp.ini");
         }
     }
-
-    /**
-     * Add testbed webapp to Jetty.
-     * 
-     * <ul>
-     * <li>Add "testbed.xml" to either start.ini for Jetty 9.3 or start.d/idp.ini for Jetty 9.4</li>
-     * <li>Modify path to IdP webapp in webapps/idp.xml for Jetty 9.4</li>
-     * </ul>
-     * 
-     * Must run after {@link #setUpEndpoints()} so that {@link PropertiesWithComments} does not add a breaking "=" to
-     * "testbed.xml".
-     * 
-     * @throws IOException ...
-     */
-    @BeforeClass(enabled = true, dependsOnMethods = {"setUpEndpoints"}) // must run after setUpEndpoints
-    public void setUpJettyTestbed() throws IOException {
-
-        if (pathToJettyBase == null) {
-            log.debug("Not setting up jetty-base because directory does not exist.");
-            return;
-        }
-
-        // Jetty 9.3
-        final Path startIni = pathToJettyBase.resolve("start.ini");
-        log.debug("Path to start.ini '{}'", startIni.toAbsolutePath());
-
-        // Jetty 9.4
-        final Path idpIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
-        log.debug("Path to idp.ini '{}'", idpIni.toAbsolutePath());
-
-        // Add testbed to either start.ini or start.d/idp.ini
-        if (startIni.toAbsolutePath().toFile().exists()) {
-            replaceFile(startIni, "\\z", System.lineSeparator() + "testbed.xml");
-        } else if (idpIni.toAbsolutePath().toFile().exists()) {
-            replaceFile(idpIni, "\\z", System.lineSeparator() + "testbed.xml");
-        } else {
-            Assert.fail("Unable to find start.ini or idp.ini");
-        }
-    }
  
     /**
      * Set up addresses the web server listens on and clients connect to.

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