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

[guillaume at wyona.com]

Author: guillaume
Date: 2009-05-07 13:40:30 +0200 (Thu, 07 May 2009)
New Revision: 42736

Modified:
   public/yanel/trunk/src/build/targets/webapp/webapp.xml
Log:
Now copying explicitely only the webapp-needed Yanel constituting JARs:
 the Yanel command-line one is no longer shipped in the webapp.

Alos removed a related hack and an obsolete comment about the "invoice" resource-type.


Modified: public/yanel/trunk/src/build/targets/webapp/webapp.xml
===================================================================
--- public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-05-07 11:05:25 UTC (rev 42735)
+++ public/yanel/trunk/src/build/targets/webapp/webapp.xml	2009-05-07 11:40:30 UTC (rev 42736)
@@ -23,7 +23,6 @@
     <antcall target="final-message"/>
   </target>
   
-     <!-- TODO: Invoice depends on impl ...! -->
   <target name="webapp" description="Build webapp" depends="init, compile-core, compile-impl, compile-webapp, build-resources, build-realms">
 <!--
   <target name="webapp" description="Build webapp" depends="init, compile-webapp">
@@ -140,9 +139,12 @@
   </target>
 
   <target name="copy-basic-webapp-libs" description="Copy basic webapp libraries (core, impl, webapp)" depends="init">
-    <!-- TODO: Copy only core, impl, webapp, but NOT cmdl, etc. -->
     <copy todir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib">
-      <fileset dir="${yanel.source.home}/build/lib"/>
+      <fileset dir="${yanel.source.home}/build/lib">
+        <include name="yanel-core-${yanel.source.version}.jar"/>
+        <include name="yanel-impl-${yanel.source.version}.jar"/>
+        <include name="yanel-webapp-${yanel.source.version}.jar"/>
+      </fileset>
     </copy>
   </target>
 
@@ -230,12 +232,6 @@
     <delete>
       <fileset dir="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/" includes="${duplicated.libs}"/>
     </delete>
-
-    <!-- TODO: The following should not be copied in the first place -->
-    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-cmdl.xml"/>
-    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-core.xml"/>
-    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-impl.xml"/>
-    <delete file="${build.dir}/webapps/${servlet.context.prefix}/WEB-INF/lib/pom-webapp.xml"/>
   </target>
 
 </project>