[java-idp-plugin-jetty] 51/186: IDP-1110 - Prefix IdP properties with 'idp' rather than 'jetty'.

[Rod Widdowson]

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

rdw pushed a commit to branch dev/foo
in repository java-idp-plugin-jetty.

View the commit online:
http://git.shibboleth.net/view/?p=java-idp-plugin-jetty.git;a=commit;h=e72d695bff516d065b9347ae4ba2b30e2f01792d

commit e72d695bff516d065b9347ae4ba2b30e2f01792d
Author: Tom Zeller <tzeller at dragonacea.biz>
AuthorDate: Wed Aug 29 16:00:28 2018 -0500

    IDP-1110 - Prefix IdP properties with 'idp' rather than 'jetty'.
    
    https://issues.shibboleth.net/jira/browse/IDP-1110
---
 src/main/resources/jetty-base/etc/idp-backchannel.xml     | 10 +++++-----
 src/main/resources/jetty-base/start.d/idp-backchannel.ini | 10 +++++-----
 src/main/resources/jetty-base/start.d/idp.ini             |  2 +-
 src/main/resources/jetty-base/webapps/idp.xml             |  4 ++--
 4 files changed, 13 insertions(+), 13 deletions(-)

diff --git a/src/main/resources/jetty-base/etc/idp-backchannel.xml b/src/main/resources/jetty-base/etc/idp-backchannel.xml
index 4c0353d..1f06d54 100644
--- a/src/main/resources/jetty-base/etc/idp-backchannel.xml
+++ b/src/main/resources/jetty-base/etc/idp-backchannel.xml
@@ -7,9 +7,9 @@
   <!-- for backchannel (SOAP) communication to IdP                   -->
   <!-- ============================================================= -->
   <New id="shibContextFactory" class="net.shibboleth.utilities.jetty9.DelegateToApplicationSslContextFactory">
-    <Set name="KeyStorePath"><Property name="jetty.backchannel.keystore.path" default="../credentials/idp-backchannel.p12" /></Set>
-    <Set name="KeyStoreType"><Property name="jetty.backchannel.keystore.type" default="PKCS12" /></Set>
-    <Set name="KeyStorePassword"><Property name="jetty.backchannel.keystore.password" default="changeit" /></Set>
+    <Set name="KeyStorePath"><Property name="idp.backchannel.keystore.path" default="../credentials/idp-backchannel.p12" /></Set>
+    <Set name="KeyStoreType"><Property name="idp.backchannel.keystore.type" default="PKCS12" /></Set>
+    <Set name="KeyStorePassword"><Property name="idp.backchannel.keystore.password" default="changeit" /></Set>
     <Set name="EndpointIdentificationAlgorithm"></Set>
     <Set name="renegotiationAllowed">false</Set>
     <Set name="useCipherSuitesOrder">true</Set>
@@ -50,8 +50,8 @@
             </Item>
           </Array>
         </Arg>
-        <Set name="host"><Property name="jetty.backchannel.host" default="0.0.0.0" /></Set>
-        <Set name="port"><Property name="jetty.backchannel.port" default="8443" /></Set>
+        <Set name="host"><Property name="idp.backchannel.host" default="0.0.0.0" /></Set>
+        <Set name="port"><Property name="idp.backchannel.port" default="8443" /></Set>
         <Set name="idleTimeout"><Property name="jetty.ssl.timeout" default="30000"/></Set>
         <Set name="soLingerTime"><Property name="jetty.ssl.soLingerTime" default="-1"/></Set>
         <Set name="acceptorPriorityDelta"><Property name="jetty.ssl.acceptorPriorityDelta" default="0"/></Set>
diff --git a/src/main/resources/jetty-base/start.d/idp-backchannel.ini b/src/main/resources/jetty-base/start.d/idp-backchannel.ini
index 04d8874..114bc92 100644
--- a/src/main/resources/jetty-base/start.d/idp-backchannel.ini
+++ b/src/main/resources/jetty-base/start.d/idp-backchannel.ini
@@ -5,16 +5,16 @@
 --module=idp-backchannel
 
 ## Backchannel connector host/address to bind to
-# jetty.backchannel.host=0.0.0.0
+# idp.backchannel.host=0.0.0.0
 
 ## Backchannel connector port to listen on
-# jetty.backchannel.port=8443
+# idp.backchannel.port=8443
 
 ## Backchannel keystore file path (relative to $jetty.base)
-# jetty.backchannel.keystore.path=../credentials/idp-backchannel.p12
+# idp.backchannel.keystore.path=../credentials/idp-backchannel.p12
 
 ## Backchannel keystore password
-# jetty.backchannel.keystore.password=changeit
+# idp.backchannel.keystore.password=changeit
 
 ## Backchannel keystore type
-# jetty.backchannel.keystore.type=PKCS12
+# idp.backchannel.keystore.type=PKCS12
diff --git a/src/main/resources/jetty-base/start.d/idp.ini b/src/main/resources/jetty-base/start.d/idp.ini
index fca68a2..e7d6201 100644
--- a/src/main/resources/jetty-base/start.d/idp.ini
+++ b/src/main/resources/jetty-base/start.d/idp.ini
@@ -31,4 +31,4 @@ jetty.sslContext.renegotiationAllowed=false
 jetty.ssl.port=443
 
 ## Path to IdP WAR (dir or file), relative to ${jetty.base} directory
-# jetty.war.path=../war/idp.war
+# idp.war.path=../war/idp.war
diff --git a/src/main/resources/jetty-base/webapps/idp.xml b/src/main/resources/jetty-base/webapps/idp.xml
index 6267408..ffb3007 100644
--- a/src/main/resources/jetty-base/webapps/idp.xml
+++ b/src/main/resources/jetty-base/webapps/idp.xml
@@ -4,8 +4,8 @@
 <!-- Configure the Shibboleth IdP webapp                             -->
 <!-- =============================================================== -->
 <Configure class="org.eclipse.jetty.webapp.WebAppContext">
-  <Set name="war"><SystemProperty name="jetty.war.path" default="../war/idp.war" /></Set>
-  <Set name="contextPath"><SystemProperty name="jetty.context.path" default="/idp" /></Set>
+  <Set name="war"><SystemProperty name="idp.war.path" default="../war/idp.war" /></Set>
+  <Set name="contextPath"><SystemProperty name="idp.context.path" default="/idp" /></Set>
   <Set name="extractWAR">false</Set>
   <Set name="copyWebDir">false</Set>
   <Set name="copyWebInf">true</Set>

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