change .target to .serviceprovider

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

diff --git a/src/conf/shibboleth.xml b/src/conf/shibboleth.xml
index b09b8e2..6743547 100644 (file)
--- a/src/conf/shibboleth.xml
+++ b/src/conf/shibboleth.xml
@@ -9,7 +9,7 @@
      </SHAR>
 
     <SHIRE>
-        <RequestMapProvider type="edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap">
+        <RequestMapProvider type="edu.internet2.middleware.shibboleth.serviceprovider.XMLRequestMap">
             <RequestMap applicationId="default">
                <Host name="shibdev.sample.edu" scheme="https">
                     <Path name="secure" requireSession="true" exportAssertion="true" />
@@ -42,12 +42,12 @@
         You should customize these pages! You can add attributes with values that can be plugged
         into your templates.
         -->
-        <Errors shire="shireError.html"
-            rm="rmError.html"
-            access="accessError.html"
+        <Errors shire="shibboleth/shireError.html"
+            rm="shibboleth/rmError.html"
+            access="shibboleth/accessError.html"
             supportContact="root@localhost"
-            logoLocation="/shibtarget/logo.jpg"
-            styleSheet="/shibtarget/main.css"/>
+            logoLocation="/shibboleth/logo.jpg"
+            styleSheet="/shibboleth/main.css"/>
 
         <!-- Indicates what credentials to use when communicating -->
         <CredentialUse TLS="defcreds" Signing="defcreds">
@@ -63,14 +63,14 @@
             AttributeNamespace="urn:mace:shibboleth:1.0:attributeNamespace:uri"/>
 
         <!-- AAP can be inline or in a separate file -->
-        <AAPProvider type="edu.internet2.middleware.shibboleth.target.provider.XMLAAP"
+        <AAPProvider type="edu.internet2.middleware.shibboleth.serviceprovider.XMLAAP"
         uri="/conf/AAP.xml"/>
 
         <!-- Metadata consists of site/operational metadata, trust, revocation providers. Can be external or inline. -->
         <FederationProvider type="edu.internet2.middleware.shibboleth.common.provider.XMLMetadata"
             uri="/conf/testsites.xml"/>
                        
-               <FederationProvider type="edu.internet2.middleware.shibboleth.target.SAML2MetadataImpl"
+               <FederationProvider type="edu.internet2.middleware.shibboleth.serviceprovider.SAML2MetadataImpl"
                        uri="/conf/SAML2Metadata.xml" />        
                        
                <!-- Creater an inline just to test the inline parse logic -->  

diff --git a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
index c2d20e2..385e238 100644 (file)
--- a/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
+++ b/src/edu/internet2/middleware/shibboleth/serviceprovider/ServiceProviderConfig.java
@@ -284,13 +284,13 @@ public class ServiceProviderConfig {
        private static final String XMLTRUSTPROVIDERTYPE = 
                "edu.internet2.middleware.shibboleth.common.provider.XMLTrust";
        private static final String XMLAAPPROVIDERTYPE = 
-               "edu.internet2.middleware.shibboleth.target.provider.XMLAAP";
+               "edu.internet2.middleware.shibboleth.serviceprovider.XMLAAP";
        private static final String XMLFEDERATIONPROVIDERTYPE = 
                "edu.internet2.middleware.shibboleth.common.provider.XMLMetadata";
        private static final String XMLREVOCATIONPROVIDERTYPE =
            "edu.internet2.middleware.shibboleth.common.provider.XMLRevocation";
        private static final String XMLREQUESTMAPPROVIDERTYPE = 
-           "edu.internet2.middleware.shibboleth.target.provider.XMLRequestMap";
+           "edu.internet2.middleware.shibboleth.serviceprovider.XMLRequestMap";
        private static final String XMLCREDENTIALSPROVIDERTYPE = 
            "edu.internet2.middleware.shibboleth.common.Credentials";