Try explicitly setting property to not overwrite configs (even though this is suppose...
authorlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 20 Jun 2007 21:46:31 +0000 (21:46 +0000)
committerlajoie <lajoie@ab3bd59b-922f-494d-bb5f-6f0a3c29deca>
Wed, 20 Jun 2007 21:46:31 +0000 (21:46 +0000)
git-svn-id: https://subversion.switch.ch/svn/shibboleth/java-idp/trunk@2265 ab3bd59b-922f-494d-bb5f-6f0a3c29deca

build.xml

index 13fa751..8567941 100755 (executable)
--- a/build.xml
+++ b/build.xml
                        <fileset file="${dist.dir}/${jar.name}" />
                </copy>
 
-               <copy todir="${idp.home}/conf" preservelastmodified="true">
+               <copy todir="${idp.home}/conf" preservelastmodified="true" overwrite="${idp.overwrite-config}">
                        <fileset dir="${conf.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">
+               <jar destfile="${idp.home}/war/${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>