Create war during install process instead of package so that install properties are...
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 20 Jun 2007 21:40:34 +0000 (21:40 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 20 Jun 2007 21:40:34 +0000 (21:40 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2264 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

build.xml

index ec1150e..13fa751 100755 (executable)
--- a/build.xml
+++ b/build.xml
 
                <jar destfile="${dist.dir}/${jar.name}" whenempty="fail">
                        <fileset dir="${classpathres.dir}" />
-                       <zipfileset dir="${metainf.dir}" prefix="META-INF/"/>
+                       <zipfileset dir="${metainf.dir}" prefix="META-INF/" />
                        <zipfileset dir="${core-classes.dir}" />
                </jar>
 
-               <copy todir="${webinf-temp.dir}">
-                       <fileset dir="${webinf.dir}" />
-                       <filterset begintoken="$" endtoken="$">
-                               <filter token="IDP_HOME" value="${idp.home}" />
-                               <filter token="IDP_VERSION" value="${version}" />
-                       </filterset>
-               </copy>
-
-               <jar destfile="${dist.dir}/${war.name}" whenempty="fail">
-                       <zipfileset dir="${webinf-temp.dir}" prefix="WEB-INF/" />
-                       <zipfileset dir="${webpages.dir}" prefix="" />
-                       <zipfileset dir="${lib.dir}" prefix="WEB-INF/lib/" excludes="**/log4j*.jar"/>
-                       <zipfileset file="${dist.dir}/${jar.name}" prefix="WEB-INF/lib/" />
-               </jar>
-
        </target>
 
        <target name="install" depends="package" description="Installs the identity provider software.">
                        </filterset>
                </copy>
 
-               <symlink link="${idp.home}/bin/aacli.sh" resource="shib-tools.sh" overwrite="true"/>
+               <symlink link="${idp.home}/bin/aacli.sh" resource="shib-tools.sh" overwrite="true" />
                <chmod file="${idp.home}/bin/*.sh" perm="+x" />
 
+               <copy todir="${webinf-temp.dir}">
+                       <fileset dir="${webinf.dir}" />
+                       <filterset begintoken="$" endtoken="$">
+                               <filter token="IDP_HOME" value="${idp.home}" />
+                               <filter token="IDP_VERSION" value="${version}" />
+                       </filterset>
+               </copy>
+               <jar destfile="${dist.dir}/${war.name}" whenempty="fail">
+                       <zipfileset dir="${webinf-temp.dir}" prefix="WEB-INF/" />
+                       <zipfileset dir="${webpages.dir}" prefix="" />
+                       <zipfileset dir="${lib.dir}" prefix="WEB-INF/lib/" excludes="**/log4j*.jar" />
+                       <zipfileset file="${dist.dir}/${jar.name}" prefix="WEB-INF/lib/" />
+               </jar>
                <copy todir="${idp.home}/war" file="${dist.dir}/${war.name}" preservelastmodified="true" />
 
        </target>