r1367 - xwiki-apps/gelc/gelcv1/trunk

[Ludovic Dubost]

Author: ludovic
Date: 2006-10-06 09:55:33 +0200 (Fri, 06 Oct 2006)
New Revision: 1367

Modified:
   xwiki-apps/gelc/gelcv1/trunk/build.xml
Log:
GELC build file building full GELC webapp

Modified: xwiki-apps/gelc/gelcv1/trunk/build.xml
===================================================================
--- xwiki-apps/gelc/gelcv1/trunk/build.xml	2006-10-06 07:27:56 UTC (rev 1366)
+++ xwiki-apps/gelc/gelcv1/trunk/build.xml	2006-10-06 07:55:33 UTC (rev 1367)
@@ -12,14 +12,14 @@
     <property name="xwiki.jar" value="${release.dir}/xwiki.jar" />
 
     <property name="gelcplugins.dir" value="${basedir}/gelcplugins" />
-    <property name="gelcplugins.src" value="${gelcplugins.dir}/src/main/java" />
-    <property name="gelcplugins.res" value="${gelcplugins.dir}/src/main/resources" />
+    <property name="gelcplugins.src.dir" value="${gelcplugins.dir}/src/main/java" />
+    <property name="gelcplugins.res.dir" value="${gelcplugins.dir}/src/main/resources" />
     <property name="gelcplugins.jar" value="${release.dir}/gelcplugins.jar" />
 
     <property name="gelc.dir" value="${basedir}/gelc" />
-    <property name="gelc.web" value="${gelc.dir}/src/main/web" />
+    <property name="gelc.web.dir" value="${gelc.dir}/src/main/web" />
 
-    <property name="webapp.war" value="xwiki.war"/>
+    <property name="webapp.war" value="xwiki-gelc.war"/>
 
 	
 <!-- groovy setup -->
@@ -30,8 +30,10 @@
     		includes="*.jar" />
     <fileset id="libs.gelc.fileset" dir="${lib.dir}"
     		includes="*.jar" />
-    <!-- includes="hibernate-3.0.3.jar,c3p0-0.8.4.5.jar,cglib-2.1.3.jar,dom4j-1.6.1.jar,ehcache-1.1.jar,hibernate-tools-2.1.3.jar,mysql-connector-java-3.1.7-bin.jar,odmg-3.0.jar,oscache-2.3.2M.jar,jgroups-2.2.9.3.jar,swarmcache.jar,xalan-2.6.0.jar,xerces-2.7.1.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, securityfilter-2.0.jar, radeox.jar, velocity-1.4.jar,velocity-tools-1.1.jar, xalan-2.6.0.jar,xerces.jar-2.4.0,xml-apis-2.0.2,jdom-1.0.jar, servlet-api-2.4.jar, portlet.jar, struts-1.2.4.jar, xmlrpc-1.2.jar" /> -->
 
+    <pathconvert pathsep=";" property="libs.gelc" refid="libs.gelc.fileset"/>
+    <pathconvert pathsep=";" property="libs.xwiki" refid="libs.xwiki.fileset"/>
+
     <path id="libs.groovy">
         <fileset refid="libs.groovy.fileset" />
         <fileset dir="${xwiki.lib}">
@@ -77,15 +79,20 @@
         </ant>
         <mkdir dir="${build.dir}/web" />
         <copy todir="${build.dir}/web/" overwrite="true">
-         <fileset dir="${gelc.web}">
+         <fileset dir="${gelc.web.dir}">
           <exclude name="**/web-*.xml" />
 	 </fileset>
         </copy>
-        <move todir="${build.dir}/web/lib/" overwrite="true">
+        <copy todir="${build.dir}/web/lib/" overwrite="true">
          <fileset dir="${build.dir}">
 	  <include name="xwiki.jar" />
          </fileset>
-        </move>
+        </copy>
+        <copy todir="${release.dir}" overwrite="true">
+         <fileset dir="${build.dir}">
+	  <include name="xwiki.jar" />
+         </fileset>
+        </copy>
     </target>
 
     <target name="gelcplugins" depends="xwiki">
@@ -93,11 +100,16 @@
 	<javac srcdir="${gelcplugins.src.dir}"
 	       destdir="${build.dir}/gelcplugins" debug="true"
 			optimize="true" deprecation="true"
-			classpathref="lib.classpath" fork="true">
+			fork="true">
+                <classpath>
+			<fileset refid="libs.xwiki.fileset" />
+			<fileset refid="libs.gelc.fileset" />
+			<pathelement location="${release.dir}/xwiki.jar" />
+		</classpath>
 		</javac>
 		<jar destfile="${release.dir}/gelcplugins.jar">
 			<!--  classes -->
-		<fileset dir="${classes.dir}">
+		<fileset dir="${build.dir}/gelcplugins">
 		        <include name="**/*.class"/>
 		    </fileset>
 		    <!-- resources -->
@@ -107,36 +119,19 @@
 		</jar>
     </target>
 
-    <target name="gelc" depends="xwiki, gelcplugins">
-      <mkdir dir="${release.dir}" />
-      <war warfile="${release.war}" basedir="${build.dir}/web" webxml="${main.src.dir}/web.xml" >
-        <exclude name="**/web*.xml" />
-        <exclude name="**/xwiki-*.cfg" />
-        <lib refid="libs.gelc.fileset" />
-        <lib refid="libs.xwiki.fileset" />
-      </war>
-      <copy file="${build.dir}/web/WEB-INF/xwiki.cfg" tofile="${build.dir}/web/WEB-INF/xwiki-normal.cfg" overwrite="true" />
-      <copy file="${build.dir}/web/WEB-INF/xwiki-exo.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
-      <war warfile="${exo.warfile}" basedir="${build.dir}/web" webxml="${main.src.dir}/web-exo.xml" >
-        <exclude name="**/web*.xml" />
-        <exclude name="**/xwiki-*.cfg" />
-          <lib refid="libs.gelc.fileset" />
-          <lib refid="libs.xwiki.fileset" />
-      </war>
-      <copy file="${build.dir}/web/WEB-INF/xwiki-normal.cfg" tofile="${build.dir}/web/WEB-INF/xwiki.cfg" overwrite="true" />
-    </target>
-
-    <target name="release" depends="gelc">
-         <war destfile="${release.dir}/xwiki.war" webxml="${xwiki.dir}/src/main/web.xml">
+    <target name="release" depends="xwiki, gelcplugins">
+         <mkdir dir="${release.dir}" />
+         <war destfile="${release.dir}/${webapp.war}" webxml="${build.dir}/web/WEB-INF/web.xml">
           <fileset dir="${build.dir}/web">
             <exclude name="**/web*.xml" />
+            <exclude name="**/xwiki-*.cfg" />
           </fileset>
-          <lib dir="${build.dir}/lib">
-            <include name="*.jar"/>
+          <lib dir="${release.dir}">
+            <include name="xwiki.jar"/>
+            <include name="gelcplugins.jar"/>
           </lib>
-          <lib dir="${lib.dir}">
-            <include name="*.jar"/>
-          </lib>
+          <lib refid="libs.gelc.fileset" />
+          <lib refid="libs.xwiki.fileset" />
         </war>
 	</target>
 </project>