Tenatively final default config settings for alpha2

git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@203 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

diff --git a/webAppConfig/target-includewayf.xml b/webAppConfig/target-includewayf.xml
index b9b4f37..89eaa45 100755 (executable)
--- a/webAppConfig/target-includewayf.xml
+++ b/webAppConfig/target-includewayf.xml
@@ -18,6 +18,10 @@
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
+                <init-param>
+                    <param-name>SiteConfigFileLocation</param-name>
+                    <param-value>/sites.xml</param-value>
+                </init-param>
        </servlet>
        <servlet>
                <servlet-name>WAYFTester</servlet-name>
@@ -62,7 +66,7 @@
        </init-param>
        <init-param>
                <param-name>registry-uri</param-name>
-               <param-value>http://newman.uts.ohio-state.edu/shibsites.xml</param-value>
+               <param-value>http://shib1.internet2.edu:88/shibboleth-target/sites.xml</param-value>
        </init-param>
        </servlet>
        

diff --git a/webAppConfig/target.xml b/webAppConfig/target.xml
index b03c77a..728523c 100755 (executable)
--- a/webAppConfig/target.xml
+++ b/webAppConfig/target.xml
@@ -52,7 +52,7 @@
        </init-param>
        <init-param>
                <param-name>registry-uri</param-name>
-               <param-value>http://newman.uts.ohio-state.edu/shibsites.xml</param-value>
+               <param-value>http://shib1.internet2.edu:88/shibboleth-target/sites.xml</param-value>
        </init-param>
        </servlet>
      <servlet-mapping>

diff --git a/webAppConfig/wayf.xml b/webAppConfig/wayf.xml
index d2f15fc..94ca936 100755 (executable)
--- a/webAppConfig/wayf.xml
+++ b/webAppConfig/wayf.xml
@@ -18,6 +18,10 @@
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
+                <init-param>
+                    <param-name>SiteConfigFileLocation</param-name>
+                    <param-value>/sites.xml</param-value>
+                </init-param>
        </servlet>
        <servlet>
                <servlet-name>WAYFTester</servlet-name>

diff --git a/webApplication/WEB-INF/web.xml b/webApplication/WEB-INF/web.xml
index 02fc454..e553837 100755 (executable)
--- a/webApplication/WEB-INF/web.xml
+++ b/webApplication/WEB-INF/web.xml
@@ -110,6 +110,10 @@
                <servlet-name>WAYF</servlet-name>
                <display-name>Shibboleth WAYF Service</display-name>
                <servlet-class>edu.internet2.middleware.shibboleth.wayf.WayfService</servlet-class>
+                <init-param>
+                    <param-name>SiteConfigFileLocation</param-name>
+                    <param-value>/sites.xml</param-value>
+                </init-param>
        </servlet>
        <servlet>
                <servlet-name>WAYFTester</servlet-name>
@@ -154,7 +158,7 @@
        </init-param>
        <init-param>
                <param-name>registry-uri</param-name>
-               <param-value>http://newman.uts.ohio-state.edu/shibsites.xml</param-value>
+               <param-value>http://shib1.internet2.edu:88/shibboleth-target/sites.xml</param-value>
        </init-param>
        </servlet>