Small fixes.
authorwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 19 May 2005 03:51:17 +0000 (03:51 +0000)
committerwassa <wassa@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Thu, 19 May 2005 03:51:17 +0000 (03:51 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@1529 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

build.xml

index fcc2c6c..5afba28 100755 (executable)
--- a/build.xml
+++ b/build.xml
         <copy todir="${build}/schemas">
             <fileset dir="${src}/schemas"/>
         </copy>
-        <!-- configuration is now stored outside of shibboleth.war
-        <copy todir="${build}/conf">
-            <fileset dir="${src}/conf"/>
-        </copy>
-        -->
     </target>
     
     <target name="compile-tests" depends="compile">
         </javadoc>
        </target>
 
-    <!-- Create various product distributions and move them to ${dist} -->
-
-    <target name="dist-all" depends="compile, test-all, package-all, clean-build" />
-       
-    <target name="package-all">
-        <war warfile="${dist}/${distname}.war" webxml="${configroot}/all.xml" basedir="${approot}" update="no" />
-    </target>
-
-    <target name="dist-IdP-SP" depends="compile, package-IdP-SP, clean-build" 
-       description="Build application from source, create shibboleth.war file for IdP and SP"/>
-    <target name="package-IdP-SP" depends="compile"
-       description="Create shibboleth.war file from build output and IdP-SP deployment descriptor">
-        <war warfile="${dist}/${distname}.war" webxml="${configroot}/IdP-SP.xml" basedir="${approot}" update="no" />
-    </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" />
         <if>
             <xinput type="confirm" defaultvalue="y">Do you want to install the Shibboleth Identity Provider?</xinput>
             <then>
-                <input message="What name do you want to use for the web application? [default: ${shib.webapp.name}]" 
+                <input message="What name do you want to use for the Identity Provider web application? [default: ${shib.webapp.name}]" 
                     addproperty="shib.webapp.name.input" defaultValue="${shib.webapp.name}" />
                 <var name="shib.webapp.name" value="${shib.webapp.name.input}" />
 
     </target>
 
        <target name="install.idp" depends="init, install.init">
-        <xinput message="Deploying java web application.  Do you want to install it directly onto the filesystem or use the tomcat manager application?" 
+        <xinput message="Deploying the java web application.  Do you want to install it directly onto the filesystem or use the tomcat manager application?" 
             addproperty="idp.install-type.input" type="menu" casesensitive="no" defaultValue="${idp.install-type}">
             <xoption>filesystem</xoption>
             <xoption>manager</xoption>
     </target>
 
     <target name="install.idp.filesystem" depends="init, install.init, build-util">
-        <input message="Enter Shibboleth install directory [default: ${shib.home}]"
+        <input message="Select an installation base for the Shibboleth Identity Provider [default: ${shib.home}]"
             addproperty="shib.home.input" defaultvalue="${shib.home}" />
         <var name="shib.home" value="${shib.home.input}" />
 
         <copy file="${dist}/${distname}.war" tofile="${tomcat.home}/webapps/${shib.webapp.name}.war" />
 
         <if>
-            <available file="${shib.home}" />
+                       <available file="${shib.home}/etc" />
             <then>
                 <if>
                     <xinput type="confirm">WARNING!! The directory `${shib.home}/etc` already exists.  Do you want to overwrite the existing configuration?</xinput>