[java-idp-integration-tests] branch main updated: Update Tomcat host and port property replacement

Tom Zeller tzeller at dragonacea.biz
Mon May 8 22:05:15 UTC 2023


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=e734b47b010c0ec1b5201fc3e0d643c935e9007a

The following commit(s) were added to refs/heads/main by this push:
     new e734b47  Update Tomcat host and port property replacement
e734b47 is described below

commit e734b47b010c0ec1b5201fc3e0d643c935e9007a
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Mon May 8 17:05:07 2023 -0500

    Update Tomcat host and port property replacement
---
 .../net/shibboleth/idp/integration/tests/BaseIntegrationTest.java     | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

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 36690f5..d63ba53 100644
--- a/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
+++ b/src/test/java/net/shibboleth/idp/integration/tests/BaseIntegrationTest.java
@@ -888,7 +888,9 @@ public abstract class BaseIntegrationTest {
         // Tomcat endpoints.
         if (pathToTomcatBase != null) {
             final Path pathToCatalinaProperties = pathToTomcatBase.resolve(Paths.get("conf", "catalina.properties"));
-            replaceFile(pathToCatalinaProperties, "tomcat.host=.*", "tomcat.host=" + privateSecureAddress);
+            replaceFile(pathToCatalinaProperties, "tomcat.http.host=.*", "tomcat.http.host=" + privateSecureAddress);
+            replaceFile(pathToCatalinaProperties, "tomcat.http.port=.*", "tomcat.http.port=" + Integer.toString(port));
+            replaceFile(pathToCatalinaProperties, "tomcat.https.host=.*", "tomcat.https.host=" + secureAddress);
             replaceFile(pathToCatalinaProperties, "tomcat.https.port=.*", "tomcat.https.port=" + Integer.toString(securePort));
             replaceFile(pathToCatalinaProperties, "tomcat.backchannel.port=.*", "tomcat.backchannel.port=" + Integer.toString(backchannelPort));
         }

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


More information about the commits mailing list