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

[noreply at shibboleth.net]

Author: rdw
Date: Tue Nov 11 03:44:12 2014
New Revision: 6876

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=6876&view=rev
Log:
Make the distro version of jetty use 8080 for the http:\\ connector and overwrite the config for windows installer.  Plays better with the integration tests that way

Modified:
    trunk/idp-distribution/src/main/resources/jetty-base/start.d/idp.ini
    trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs

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=6876&r1=6875&r2=6876&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 Tue Nov 11 03:44:12 2014
@@ -43,4 +43,4 @@
 # In general, do not modify these values
 #
 jetty.nonhttps.host=localhost
-jetty.nonhttps.port=80
+jetty.nonhttps.port=8080

Modified: trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs?rev=6876&r1=6875&r2=6876&view=diff
==============================================================================
--- trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs (original)
+++ trunk/idp-installer/src/main/wix/scripts/shib_write_configs.vbs Tue Nov 11 03:44:12 2014
@@ -128,6 +128,9 @@
 	JettyFile.WriteLine "jetty.browser.keystore.type=PKCS12"
 	JettyFile.WriteLine "jetty.war.path=" & InstallDirJava & "/war/idp.war"
 	JettyFile.WriteLine "jetty.jaas.path=" & InstallDirJava & "/conf/authn/jaas.config"
+	JettyFile.WriteLine "jetty.nonhttps.host=localhost"
+	JettyFile.WriteLine "jetty.nonhttps.port=80"
+
 	JettyFile.Close
     else
 	LogFile.Writeline "jetty failed " & Err