[java-idp-integration-tests] 02/02: IDP-1110 - Adjust host and ports for Jetty 9.4 and Jetty 9.3

[Tom Zeller]

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

tzeller 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=d7f67c09512269ae356ec125131d3de7fd2f441e

commit d7f67c09512269ae356ec125131d3de7fd2f441e
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Fri Nov 10 10:51:43 2017 -0600

    IDP-1110 - Adjust host and ports for Jetty 9.4 and Jetty 9.3
    
    Add http module to Jetty 9.4.
    
    Add host and port properties for Jetty 9.4.
    
    Backchannel host and port in start.d not start.ini for Jetty 9.4.
---
 .../shibboleth/idp/test/BaseIntegrationTest.java    | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)

diff --git a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
index eb79e56..3f100ae 100644
--- a/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/test/BaseIntegrationTest.java
@@ -618,11 +618,32 @@ public abstract class BaseIntegrationTest
         // Jetty endpoints.
         if (pathToJettyBase != null) {
             final Path pathToJettyIdPIni = pathToJettyBase.resolve(Paths.get("start.d", "idp.ini"));
+            // Jetty 9.3
             replaceProperty(pathToJettyIdPIni, "jetty.host", privateSecureAddress);
             replaceProperty(pathToJettyIdPIni, "jetty.https.port", Integer.toString(securePort));
+            replaceProperty(pathToJettyIdPIni, "jetty.backchannel.host", privateSecureAddress);
             replaceProperty(pathToJettyIdPIni, "jetty.backchannel.port", Integer.toString(backchannelPort));
             replaceProperty(pathToJettyIdPIni, "jetty.nonhttps.host", privateAddress);
             replaceProperty(pathToJettyIdPIni, "jetty.nonhttps.port", Integer.toString(port));
+
+            // Jetty 9.4 add http module
+            replaceFile(pathToJettyIdPIni, "--module=\\s*idp",
+                    "--module=idp" + System.lineSeparator() + "--module=http");
+
+            // Jetty 9.4 http host and port
+            replaceProperty(pathToJettyIdPIni, "jetty.http.host", privateAddress);
+            replaceProperty(pathToJettyIdPIni, "jetty.http.port", Integer.toString(port));
+
+            // Jetty 9.4 https host and port
+            replaceProperty(pathToJettyIdPIni, "jetty.ssl.host", privateSecureAddress);
+            replaceProperty(pathToJettyIdPIni, "jetty.ssl.port", Integer.toString(securePort));
+
+            // Jetty 9.4 backchannel host and port
+            final Path backchannelIni = pathToJettyBase.resolve(Paths.get("start.d", "idp-backchannel.ini"));
+            if (backchannelIni.toAbsolutePath().toFile().exists()) {
+                replaceProperty(backchannelIni, "jetty.backchannel.host", privateSecureAddress);
+                replaceProperty(backchannelIni, "jetty.backchannel.port", Integer.toString(backchannelPort));
+            }
         }
         
         // Tomcat endpoints.

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