[java-identity-provider COMMIT] in /trunk/idp-distribution/src/main/resources/jetty-base: etc/jetty-deploy.xml etc/je...

[noreply at shibboleth.net]

Author: tzeller
Date: Wed Jun 11 14:07:28 2014
New Revision: 6076

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6076&view=rev
Log:
Remove references to the 'idp.home' system property from Jetty configuration files in lieu of paths relative to ${jetty.base}.

Modified:
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml
    trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml

Modified: trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml?rev=6076&r1=6075&r2=6076&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty-deploy.xml Wed Jun 11 14:07:28 2014
@@ -46,7 +46,7 @@
               <Set name="configurationManager">
                 <New class="org.eclipse.jetty.deploy.PropertiesConfigurationManager">
                   <!-- file of context configuration properties -->
-                  <Set name="file"><SystemProperty name="idp.home"/>/conf/idp.properties</Set>
+                  <Set name="file"><Property name="jetty.base"/>/start.d/idp.ini</Set>
                   <!-- set a context configuration property
                   <Call name="put"><Arg>name</Arg><Arg>value</Arg></Call>
                   -->

Modified: trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml?rev=6076&r1=6075&r2=6076&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/etc/jetty.xml Wed Jun 11 14:07:28 2014
@@ -121,7 +121,7 @@
     <!-- Configure a TLS (SSL) Context Factory                         -->
     <!-- ============================================================= -->
     <New id="sslContextFactory" class="org.eclipse.jetty.util.ssl.SslContextFactory">
-      <Set name="KeyStorePath"><SystemProperty name="idp.home" />/<Property name="jetty.keystore.path" /></Set>
+      <Set name="KeyStorePath"><Property name="jetty.keystore.path" /></Set>
       <Set name="KeyStoreType"><Property name="jetty.keystore.type" /></Set>
       <Set name="KeyStorePassword"><Property name="jetty.keystore.password" /></Set>
       <Set name="EndpointIdentificationAlgorithm"></Set>
@@ -144,7 +144,7 @@
     <!-- Configure a No-Validation TLS (SSL) Context Factory           -->
     <!-- ============================================================= -->
     <New id="shibContextFactory" class="net.shibboleth.utilities.jetty9.DelegateToApplicationSslContextFactory">
-      <Set name="KeyStorePath"><SystemProperty name="idp.home" />/<Property name="jetty.keystore.path" /></Set>
+      <Set name="KeyStorePath"><Property name="jetty.keystore.path" /></Set>
       <Set name="KeyStoreType"><Property name="jetty.keystore.type" /></Set>
       <Set name="KeyStorePassword"><Property name="jetty.keystore.password" /></Set>
       <Set name="EndpointIdentificationAlgorithm"></Set>

Modified: trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini?rev=6076&r1=6075&r2=6076&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini Wed Jun 11 14:07:28 2014
@@ -1,11 +1,12 @@
+# Paths are relative to ${jetty.base} then ${jetty.home}
 jetty.host=localhost
 jetty.port=8080
 jetty.secure.port=8443
 jetty.https.port=8443
 jetty.backchannel.port=9443
-jetty.keystore.path=creds/localhost.p12
+jetty.keystore.path=../creds/localhost.p12
 jetty.keystore.password=changeit
 jetty.keystore.type=PKCS12
-jetty.context.path = /idp
-jetty.war.path = war/idp.war
-jetty.jaas.path=conf/authn/jaas.config
+jetty.context.path=/idp
+jetty.war.path=../war/idp.war
+jetty.jaas.path=../conf/authn/jaas.config

Modified: trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml?rev=6076&r1=6075&r2=6076&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml (original)
+++ trunk/idp-distribution/src/main/resources/jetty-base/webapps/idp.xml Wed Jun 11 14:07:28 2014
@@ -5,8 +5,8 @@

[... 20 lines stripped ...]