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

[noreply at shibboleth.net]

Author: rdw
Date: Fri Nov  7 04:42:23 2014
New Revision: 6858

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6858&view=rev
Log:
IDP-251 Add HTTP: listener to captive jetty config

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

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=6858&r1=6857&r2=6858&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 Fri Nov  7 04:42:23 2014
@@ -108,7 +108,7 @@
     <!-- o.e.j.server.HttpConnectionFactory for all configuration    -->
     <!-- that may be set here.                                       -->
     <!-- =========================================================== -->
-    <!-- 
+
     <Call name="addConnector">
       <Arg>
         <New class="org.eclipse.jetty.server.ServerConnector">
@@ -122,15 +122,13 @@
               </Item>
             </Array>
           </Arg>
-          <Set name="host"><Property name="jetty.host" default="localhost" /></Set>
-          <Set name="port"><Property name="jetty.port" default="8080" /></Set>
+          <Set name="host"><Property name="jetty.nonhttps.host" default="localhost" /></Set>
+          <Set name="port"><Property name="jetty.nonhttps.port" default="8080" /></Set>
           <Set name="idleTimeout"><Property name="http.timeout" default="30000" /></Set>
           <Set name="soLingerTime"><Property name="http.soLingerTime" default="-1"/></Set>
         </New>
       </Arg>
     </Call>
-    -->
-
 
     <!-- ============================================================= -->
     <!-- Configure a TLS (SSL) Context Factory                         -->

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=6858&r1=6857&r2=6858&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 Fri Nov  7 04:42:23 2014
@@ -2,7 +2,9 @@
 # Note for Windows users:
 #
 # These are the only properties which are guaranteed to work between upgrades.  You may find 
-# more in jetty.xml and add them here and they may work, but to repeat, they are not guaranteed.  
+# more in jetty.xml and add them here and they may work. 
+# 
+# To repeat, only properties listed below are guarantee to work between upgrades.
 #
 
 # The interface to listen on. To listen on all interfaces, set jetty.host = 0.0.0.0
@@ -34,3 +36,11 @@
 
 # Path to JAAS config
 jetty.jaas.path=conf/authn/jaas.config
+
+#
+# Configuration for the non https connection.
+# 
+# In general, do not modify these values
+#
+jetty.nonhttps.host=localhost
+jetty.nonhttps.port=80