[java-identity-provider COMMIT] /trunk/idp-distribution/src/main/resources/bin/build.xml

[noreply at shibboleth.net]

Author: rdw
Date: Tue Dec 16 11:08:23 2014
New Revision: 7116

URL: http://svn.shibboleth.net/view/java-identity-provider?rev=7116&view=rev
Log:
IDP-541 one-time only populate the css and images directories in edit-webapp

Modified:
    trunk/idp-distribution/src/main/resources/bin/build.xml

Modified: trunk/idp-distribution/src/main/resources/bin/build.xml
URL: http://svn.shibboleth.net/view/java-identity-provider/trunk/idp-distribution/src/main/resources/bin/build.xml?rev=7116&r1=7115&r2=7116&view=diff
==============================================================================
--- trunk/idp-distribution/src/main/resources/bin/build.xml (original)
+++ trunk/idp-distribution/src/main/resources/bin/build.xml Tue Dec 16 11:08:23 2014
@@ -403,14 +403,9 @@
      GENERAL V3 TO V3 UPGRADE
     -->
 
-	<target name="upgrade" depends="editproperties, editservicesproperties, editnameidproperties, editldapproperties">
+	<target name="upgrade" depends="editproperties, editservicesproperties, editnameidproperties, editldapproperties, handleeditwebapp">
 		<echo append="true" file="idp_ant.log">target: upgrade
 		</echo>
-		<!-- Create edit-webapp tree -->
-        <mkdir dir="${idp.target.dir}/edit-webapp" />
-        <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF" />
-		<mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF/lib" />
-		<mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF/classes" />
 		
 		<!-- conf: copy from dist if not already present -->
 		<mkdir dir="${idp.target.dir}/conf" />
@@ -494,6 +489,31 @@
 		</echo>
 		<mkdir dir="${idp.target.dir}/metadata"/>
 		<metadatagenerate dnsName="${idp.host.name}" idpHome="${idp.target.dir}" backChannelCert="${idp.target.dir}/credentials/idp-backchannel.crt" output="${idp.target.dir}/metadata/idp-metadata.xml"/>
+	</target>
+	
+    <target name="handleeditwebapp" depends="makeeditwebapp, populateeditwebapp"/>
+
+    <target name="makeeditwebapp">
+        <echo append="true" file="idp_ant.log">target: makeeditwebapp
+        </echo>
+        <!-- Create edit-webapp tree -->
+        <mkdir dir="${idp.target.dir}/edit-webapp" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/css" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/images" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF/lib" />
+        <mkdir dir="${idp.target.dir}/edit-webapp/WEB-INF/classes" />
+	</target>
+	
+	<target name="populateeditwebapp" unless="idp.properties.present">
+        <echo append="true" file="idp_ant.log">target: populateeditwebapp
+        </echo>
+        <copy todir="${idp.target.dir}/edit-webapp/css" failonerror="false">
+            <fileset dir="${idp.target.dir}/webapp/css" />
+        </copy>
+        <copy todir="${idp.target.dir}/edit-webapp/images" failonerror="false">
+            <fileset dir="${idp.target.dir}/webapp/images" />
+        </copy>
 	</target>
 	
 	<!--