Cleanup.
[java-idp.git] / build.xml
index 85d68f4..441a0f7 100755 (executable)
--- a/build.xml
+++ b/build.xml
 
        <!-- Construct the CLASSPATH -->
        <path id="build.path">
-               <pathelement path="${classpath}" />
                <pathelement location="${build}" />
-               <fileset dir="${custom}">
-                       <include name="**/*.jar" />
-               </fileset>
                <fileset dir="${endorsed}">
                        <include name="**/*.jar" />
                </fileset>
 
 
        <!-- Tomcat Management -->
-       <target name="setupTomcatTasks">
+       <target name="setupTomcatTasks" depends="init">
                <path id="tomcat.classpath">
                        <fileset dir="${tomcat.home}/server/lib" includes="catalina-ant.jar"/>
                </path>
                        <fileset dir="lib" includesfile="conf/idp-lib.include" />
                </copy>
 
+               <copy todir="${idp.home}/endorsed">
+                       <fileset dir="endorsed" />
+               </copy>
+
                <copy todir="${idp.home}/bin">
                        <fileset dir="bin"/>
                </copy>
 
         <antcall target="ext-invoke">
             <param name="exts.dir" value="${custom}"/>
-            <param name="ext.build.function" value="${ext-install-filesystem}"/>
+            <param name="ext.build.function" value="ext-install-filesystem"/>
             <param name="ext.filesystem.home" value="${sp.home}"/>
             <param name="ext.home.token" value="$SP_HOME$"/>
         </antcall>      
                <input message="Enter tomcat password [default: ${tomcat.password}]" addproperty="tomcat.password.input" defaultValue="${tomcat.password}" />
                <var name="tomcat.password" value="${tomcat.password.input}" />
 
+        <antcall target="package-idp" />
                <antcall target="tomcat.deploy" />
                <antcall target="savePropertyFile" />
        </target>