r1005 - xwiki/trunk

[Ludovic Dubost]

Author: ludovic
Date: 2006-03-28 21:19:15 +0200 (Tue, 28 Mar 2006)
New Revision: 1005

Modified:
   xwiki/trunk/build.xml
Log:
Updated build for exo war

Modified: xwiki/trunk/build.xml
===================================================================
--- xwiki/trunk/build.xml	2006-03-28 16:47:45 UTC (rev 1004)
+++ xwiki/trunk/build.xml	2006-03-28 19:19:15 UTC (rev 1005)
@@ -81,8 +81,11 @@
     
     <fileset id="libs.xwiki.fileset" dir="${release.dir}" includes="xwiki.jar" />
 
+    <fileset id="libs.hib.fileset" dir="${lib.dir}"
+      includes="hibernate-3.0.3.jar" />
+
     <fileset id="libs.main.fileset" dir="${lib.dir}"
-      includes="hibernate-3.0.3.jar,c3p0-0.8.4.5.jar,cglib-2.1.jar,dom4j-1.6.jar,ehcache-1.1.jar,hibernate-tools-2.1.3.jar,mysql-connector-java-3.1.7-bin.jar,hsqldb-1.7.3.jar,odmg-3.0.jar,oscache-2.0.2.jar,jgroups-2.2.5.jar,swarmcache.jar,xalan-2.6.0.jar,xerces-2.4.0.jar,xml-apis-2.0.2.jar,jta.jar,antlr-2.7.5.jar,asm-1.5.3.jar,asm-util-1.5.3.jar,
+      includes="c3p0-0.8.4.5.jar,cglib-2.1.jar,dom4j-1.6.jar,ehcache-1.1.jar,hibernate-tools-2.1.3.jar,mysql-connector-java-3.1.7-bin.jar,hsqldb-1.7.3.jar,odmg-3.0.jar,oscache-2.0.2.jar,jgroups-2.2.5.jar,swarmcache.jar,xalan-2.6.0.jar,xerces-2.4.0.jar,xml-apis-2.0.2.jar,jta.jar,antlr-2.7.5.jar,asm-1.5.3.jar,asm-util-1.5.3.jar,
      	commons-beanutils-1.7.0.jar,commons-codec-1.3.jar,commons-collections-3.1.jar,commons-dbcp-1.2.1.jar,commons-digester-1.6.jar,commons-fileupload-1.0.jar,commons-lang-2.1.jar,commons-logging-1.0.4.jar,commons-pool-1.1.jar,commons-net-1.1.0.jar,commons-httpclient-2.0.2.jar,ecs-1.4.2.jar,oro-2.0.8.jar,log4j-1.2.8.jar,
      	org.apache.commons.jrcs.rcs.jar,
      	struts-1.2.4.jar,
@@ -119,11 +122,12 @@
         includes="cactus-1.7.jar,cactus-ant-1.7.jar,aspectjrt-1.2.1.jar,httpunit-1.6.jar,junit-3.8.1.jar,nekohtml-0.9.1.jar,clover-1.3.9.jar,jmock-1.0.1.jar,jmock-cglib-1.0.1.jar,org.mortbay.jetty-5.1.3.jar" />
 
     <pathconvert pathsep=";" property="libs.main" refid="libs.main.fileset" />
+    <pathconvert pathsep=";" property="libs.hib" refid="libs.hib.fileset" />
     <pathconvert pathsep=";" property="libs.exo" refid="libs.exo.fileset" />
     <pathconvert pathsep=";" property="libs.servlet" refid="libs.servlet.fileset" />
     <pathconvert pathsep=";" property="libs.tests" refid="libs.tests.fileset"/>
 
-    <property name="libs" value="${libs.main};${libs.exo};${libs.servlet}" />
+    <property name="libs" value="${libs.main};${libs.hib};${libs.exo};${libs.servlet}" />
 
     <property name="clover.initstring" location="${test.clover.dir}/clover"/>
     <available property="junit.available" classname="junit.framework.TestCase"/>
@@ -320,7 +324,8 @@
         <exclude name="**/xwiki-*.cfg" />
         <exclude name="**/hibernate.cfg.xml" />
         <lib refid="libs.main.fileset" />
-        <lib refid="libs.xwiki.fileset" exclude="**/hibernate-3.0.3.jar" />
+        <lib refid="libs.hib.fileset" />
+        <lib refid="libs.xwiki.fileset" />
         <lib refid="libs.tests.fileset" />
         <lib refid="libs.exo.fileset" />
       </war>
@@ -415,6 +420,7 @@
       </copy>
       <copy todir="${release.dir}/web/WEB-INF/lib">
         <fileset refid="libs.main.fileset" />
+        <fileset refid="libs.hib.fileset" />
         <fileset refid="libs.exo.fileset" />
         <fileset refid="libs.xwiki.fileset" />
 	</copy>
@@ -428,6 +434,7 @@
         <exclude name="**/web*.xml" />
         <exclude name="**/xwiki-*.cfg" />
         <lib refid="libs.main.fileset" />
+        <lib refid="libs.hib.fileset" />
         <lib refid="libs.exo.fileset" />
         <lib refid="libs.xwiki.fileset" />
       </war>