Renamed sites files to avoid colliding with 1.2, changed providerId to match metadata

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

diff --git a/src/conf/IQ-sites.xml b/src/conf/IQ-metadata.xml
similarity index 100%
rename from src/conf/IQ-sites.xml
rename to src/conf/IQ-metadata.xml

diff --git a/src/conf/example-sites.xml b/src/conf/example-metadata.xml
similarity index 100%
rename from src/conf/example-sites.xml
rename to src/conf/example-metadata.xml

diff --git a/src/conf/idp.xml.dist b/src/conf/idp.xml.dist
index 2bf9ca8..b626c25 100644 (file)
--- a/src/conf/idp.xml.dist
+++ b/src/conf/idp.xml.dist
@@ -11,7 +11,7 @@
        AAUrl="https://idp.example.org:8443/shibboleth-idp/AA" 
        resolverConfig="$SHIB_HOME$/etc/resolver.xml"
        defaultRelyingParty="urn:mace:inqueue" 
-       providerId="https://idp.example.org/shibboleth-idp">
+       providerId="https://idp.example.org/shibboleth">
 
 
        <!-- This section contains configuration options that apply only to a site or group of sites
@@ -90,9 +90,9 @@
                how to authenticate them.  The metadatatool utility can be used to keep federation metadata files in synch.
                Metadata can also be placed directly within this these elements. -->
        <MetadataProvider type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata"
-                uri="$SHIB_HOME$/etc/example-sites.xml"/>
+                uri="$SHIB_HOME$/etc/example-metadata.xml"/>
        <MetadataProvider type="edu.internet2.middleware.shibboleth.metadata.provider.XMLMetadata"
-                uri="$SHIB_HOME$/etc/example-sites.xml"/>
+                uri="$SHIB_HOME$/etc/IQ-metadata.xml"/>
 
 </IdPConfig>