Converted all instances of $SHIB_HOME$ to $IDP_HOME$ or $SP_HOME$ to be consistant...

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

diff --git a/build.xml b/build.xml
index 0bd062e..50f0852 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -257,7 +257,7 @@
     <target name="package-idp" depends="compile, install.url" description="Creates the IdP war file and moves it to ${dist}">
        <!-- copy values to deployment descriptor -->
         <copy file="${configroot}/${idp.deployment.descriptor}" tofile="${configroot}/idp.xml" overwrite="true" />
-        <replace file="${configroot}/idp.xml" token="$SHIB_HOME$" value="${idp.home.url}" />
+        <replace file="${configroot}/idp.xml" token="$IDP_HOME$" value="${idp.home.url}" />
        
        <!-- create the war -->
         <war warfile="${dist}/${idp.webapp.name}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" />
@@ -273,7 +273,7 @@
     <target name="package-sp" depends="compile, install.url" description="Creates the Java SP war and moves it to ${dist}">
        <!-- copy values to deployment descriptor -->
         <copy file="${configroot}/${sp.deployment.descriptor}" tofile="${configroot}/sp.xml" overwrite="true" />
-        <replace file="${configroot}/sp.xml" token="$SHIB_HOME$" value="${sp.home.url}" />
+        <replace file="${configroot}/sp.xml" token="$SP_HOME$" value="${sp.home.url}" />
        
        <!-- create the war -->
         <war warfile="${dist}/${sp.webapp.name}.war" webxml="${configroot}/sp.xml" basedir="${approot}" update="no" />
@@ -407,24 +407,24 @@
     </target>
        
        
-    <!-- copy shibboleth configuration to $SHIB_HOME/etc, overwriting any existing configuration -->
+    <!-- copy shibboleth configuration to $IDP_HOME/etc, overwriting any existing configuration -->
        <target name="install.idp.filesystem.config" depends="init, install.init, install.url">
         <mkdir dir="${idp.home}/etc" />
         <copy todir="${idp.home}/etc" overwrite="true">
             <fileset dir="${src}/conf" includesfile="conf/idp-conf.include"/>
         </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="$SHIB_HOME$" value="${idp.home.url}" />
+        <replace file="${idp.home}/etc/idp.xml" token="$IDP_HOME$" value="${idp.home.url}" />
     </target>
        
-    <!-- copy SP configuration to $SHIB_HOME$/etc, overwriting any existing configuration -->
+    <!-- copy SP configuration to $SP_HOME$/etc, overwriting any existing configuration -->
        <target name="install.sp.filesystem.config" depends="init, install.init">
         <mkdir dir="${sp.home}/etc" />
         <copy todir="${sp.home}/etc" overwrite="true">
             <fileset dir="${src}/conf" includesfile="conf/sp-conf.include"/>
         </copy>
                <move file="${sp.home}/etc/dist.sp.xml" tofile="${sp.home}/etc/sp.xml" overwrite="true" />
-        <replace file="${sp.home}/etc/sp.xml" token="$SHIB_HOME$" value="${sp.home.url}" />
+        <replace file="${sp.home}/etc/sp.xml" token="$SP_HOME$" value="${sp.home.url}" />
     </target>
 
     <!-- install Shibboleth-IdP war using tomcat's manager app -->

diff --git a/webAppConfig/dist.idp-client-cert.xml b/webAppConfig/dist.idp-client-cert.xml
index 93a9ca9..b6f42fa 100644 (file)
--- a/webAppConfig/dist.idp-client-cert.xml
+++ b/webAppConfig/dist.idp-client-cert.xml
@@ -26,7 +26,7 @@
 
        <context-param>
         <param-name>IdPConfigFile</param-name>
-        <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+        <param-value>$IDP_HOME$/etc/idp.xml</param-value>
     </context-param>
 
     <servlet>

diff --git a/webAppConfig/dist.idp-container-security-example.xml b/webAppConfig/dist.idp-container-security-example.xml
index eff1b2f..d202ca7 100644 (file)
--- a/webAppConfig/dist.idp-container-security-example.xml
+++ b/webAppConfig/dist.idp-container-security-example.xml
@@ -8,7 +8,7 @@
 
        <context-param>
         <param-name>IdPConfigFile</param-name>
-        <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+        <param-value>$IDP_HOME$/etc/idp.xml</param-value>
     </context-param>
 
     <servlet>

diff --git a/webAppConfig/dist.idp.xml b/webAppConfig/dist.idp.xml
index 9ddbdbf..0fdc97c 100644 (file)
--- a/webAppConfig/dist.idp.xml
+++ b/webAppConfig/dist.idp.xml
@@ -7,7 +7,7 @@
 <web-app>
     <context-param>
         <param-name>IdPConfigFile</param-name>
-        <param-value>$SHIB_HOME$/etc/idp.xml</param-value>
+        <param-value>$IDP_HOME$/etc/idp.xml</param-value>
     </context-param>
 
     <servlet>

diff --git a/webAppConfig/dist.sp.xml b/webAppConfig/dist.sp.xml
index ca76d0d..46a192d 100644 (file)
--- a/webAppConfig/dist.sp.xml
+++ b/webAppConfig/dist.sp.xml
@@ -15,11 +15,11 @@
        
        <context-param>
                <param-name>ServiceProviderConfigFile</param-name>
-               <param-value>$SHIB_HOME$/etc/sp.xml</param-value>
+               <param-value>$SP_HOME$/etc/sp.xml</param-value>
        </context-param>
        <context-param>
                <param-name>InitializationLog</param-name>
-               <param-value>$SHIB_HOME$/logs/sp-init.log</param-value>
+               <param-value>$SP_HOME$/logs/sp-init.log</param-value>
        </context-param>
        
        <filter>