[Yanel-commits] rev 42282 - public/yanel/trunk/src/build/targets/webapp

[guillaume at wyona.com]

Author: guillaume
Date: 2009-04-06 18:53:09 +0200 (Mon, 06 Apr 2009)
New Revision: 42282

Modified:
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
Refacoring: extracted the configuration from the huge "webapp" Ant target
 and made another (internal) "webapp-configuration" target out of it.

Issue: 6888


Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-04-06 15:07:41 UTC (rev 42281)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-04-06 16:53:09 UTC (rev 42282)
@@ -47,6 +47,23 @@
       </fileset>
     </copy>
 -->
+    <antcall target="webapp-configuration"/>
+
+    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
+      <fileset refid="maven2.fileset"/>
+      <mapper type="flatten"/>
+    </copy>
+
+    <antcall target="generate-javadoc"/>
+
+    <ant antfile="${yanel.source.home}/build/build-resource-types.xml" target="copy-resources-dependencies"/>
+
+    <antcall target="deploy-libs-of-realms"/>
+
+    <antcall target="remove-ambiguous-libs"/>
+  </target>
+
+  <target name="webapp-configuration" depends="init">
     <copy file="${yanel.source.home}/conf/CatalogManager.properties" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
     <copy file="${yanel.source.home}/conf/catalog.xml" todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes" overwrite="false"/>
     <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/classes/entities" overwrite="false">
@@ -122,19 +139,6 @@
       <replacetoken>@LOG4J_FILE@</replacetoken>
     </replace>
     <touch file="${log4j.file}"/>
-
-    <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset refid="maven2.fileset"/>
-      <mapper type="flatten"/>
-    </copy>
-
-    <antcall target="generate-javadoc"/>
-
-    <ant antfile="${yanel.source.home}/build/build-resource-types.xml" target="copy-resources-dependencies"/>
-
-    <antcall target="deploy-libs-of-realms"/>
-
-    <antcall target="remove-ambiguous-libs"/>
   </target>
 
   <target name="copy-basic-webapp-libs" description="Copy basic webapp libraries (core, impl, webapp)" depends="init">