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

[java-idp.git] / build.xml

diff --git a/build.xml b/build.xml
index 937b2bd..256cb9d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -3,7 +3,8 @@
 <project name="Shibboleth" default="install" basedir=".">
 
     <!-- Set global properties for this build -->
-    <property name="distname" value="shibboleth" />
+    <property name="distname" value="shibboleth-idp" />
+    <property name="distnameWayf" value="shibboleth-wayf" />
     <property name="root" value="." />
     <property name="src" value="${root}/src/" />
     <property name="tests" value="${root}/tests/" />
@@ -54,11 +55,6 @@
         <property file="build.properties" />
     </target>
 
-    <target name="install.init">
-       <taskdef name="xinput" classname="edu.internet2.middleware.shibboleth.utils.ant.XInput" classpath="${build}"/>
-       <typedef name="xoption" classname="edu.internet2.middleware.shibboleth.utils.ant.XInputOption" classpath="${build}"/>
-    </target>
-
 
     <!-- This target should be run before checking code into the repository -->
     <target name="pre-checkin" depends="compile, test-all, clean-all" />
@@ -225,9 +221,14 @@
                        dname="cn=shibboleth.example.org, o=example.org, c=US"
                />
        </target>
-       
-       
+
+
     <!-- Install Shibboleth -->
+    <target name="install.init">
+       <taskdef name="xinput" classname="edu.internet2.middleware.shibboleth.utils.ant.XInput" classpath="${build}"/>
+       <typedef name="xoption" classname="edu.internet2.middleware.shibboleth.utils.ant.XInputOption" classpath="${build}"/>
+    </target>
+
     <target name="install" depends="init, install.init" description="Install Shibboleth">
         <if>
             <xinput type="confirm" defaultvalue="y">Do you want to install the Shibboleth Identity Provider?</xinput>
@@ -264,6 +265,7 @@
         <copy file="${configroot}/idp.xml.dist" tofile="${configroot}/idp.xml" overwrite="true" />
         <replace file="${configroot}/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
         <war warfile="${dist}/${distname}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" />
+               <delete file="${configroot}/idp.xml"/>
         <copy file="${dist}/${distname}.war" tofile="${tomcat.home}/webapps/${shib.webapp.name}.war" />
 
         <if>
@@ -289,6 +291,7 @@
         <copy todir="${shib.home}/bin">
             <fileset dir="bin"/>
         </copy>
+               <chmod dir="${shib.home}/bin" perm="ug+rx" includes="**/*"/>
 
         <mkdir dir="${shib.home}/logs" />
 
@@ -336,10 +339,21 @@
         </propertyfile>
     </target>
 
+
+       <!-- Create an IdP war and copy it to the pre-configured tomcat directory -->
+       <target name="copy-IdP" depends="compile" description="Copy shibboleth.war to {tomcat.home}/webapps (Tomcat must be stopped first)">
+               <!-- This task assumes that a pre-existing properties file has the correct path information -->
+        <copy file="${configroot}/idp.xml.dist" tofile="${configroot}/idp.xml" overwrite="true" />
+        <replace file="${configroot}/idp.xml" token="$SHIB_HOME$" value="${shib.home}" />
+        <war warfile="${dist}/${distname}.war" webxml="${configroot}/idp.xml" basedir="${approot}" update="no" />
+        <copy file="${dist}/${distname}.war" tofile="${tomcat.home}/webapps/${shib.webapp.name}.war" />
+               <delete dir="${tomcat.home}/webapps/${distname}" quiet="yes" />
+       </target>
+
+
     <!-- Create WAYF and move it to ${dist} -->
-    <target name="dist-wayf" depends="compile, package-wayf, clean-build" />
-    <target name="package-wayf">
-        <war warfile="${dist}/${distname}-wayf.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
+    <target name="package-wayf" depends="compile, clean-build">
+        <war warfile="${dist}/${distnameWayf}.war" webxml="${configroot}/wayf.xml" basedir="${approot}" update="no" />
     </target>
     
 </project>