Template webapp name. Bugzilla #372

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

diff --git a/build.xml b/build.xml
index a65a53b..f4056a8 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -432,6 +432,7 @@
         </copy>
                <move file="${idp.home}/etc/dist.idp.xml" tofile="${idp.home}/etc/idp.xml" overwrite="true" />
         <replace file="${idp.home}/etc/idp.xml" token="$IDP_HOME$" value="${idp.home.url}" />
+               <replace file="${idp.home}/etc/idp.xml" token="$IDP_WEBAPP_NAME$" value="${idp.webapp.name}" />
     </target>
        
     <!-- copy SP configuration to $SP_HOME$/etc, overwriting any existing configuration -->

diff --git a/src/conf/dist.idp.xml b/src/conf/dist.idp.xml
index e81cc91..0d42a17 100644 (file)
--- a/src/conf/dist.idp.xml
+++ b/src/conf/dist.idp.xml
@@ -96,13 +96,13 @@
        <!-- Protocol handlers specify what type of requests the IdP can respond to.  The default set listed here should work 
                for most configurations.  Modifications to this section may require modifications to the deployment descriptor -->
        <ProtocolHandler implementation="edu.internet2.middleware.shibboleth.idp.provider.ShibbolethV1SSOHandler">
-               <Location>https?://[^:/]+(:(443|80))?/shibboleth-idp/SSO</Location> <!-- regex works when using default protocol ports -->
+               <Location>https?://[^:/]+(:(443|80))?/$IDP_WEBAPP_NAME$/SSO</Location> <!-- regex works when using default protocol ports -->
        </ProtocolHandler>
        <ProtocolHandler implementation="edu.internet2.middleware.shibboleth.idp.provider.SAMLv1_AttributeQueryHandler">
-               <Location>.+:8443/shibboleth-idp/AA</Location>
+               <Location>.+:8443/$IDP_WEBAPP_NAME$/AA</Location>
        </ProtocolHandler>
        <ProtocolHandler implementation="edu.internet2.middleware.shibboleth.idp.provider.SAMLv1_1ArtifactQueryHandler">
-               <Location>.+:8443/shibboleth-idp/Artifact</Location>
+               <Location>.+:8443/$IDP_WEBAPP_NAME$/Artifact</Location>
        </ProtocolHandler>