Automated merge with https://gss.googlecode.com/hg/
[pithos] / build.xml
index a79cd80..25dbdef 100644 (file)
--- a/build.xml
+++ b/build.xml
@@ -13,6 +13,8 @@
     <property name="jboss.home" value="${deps.dir}/jboss-5.1.0.GA" />
     <property name="jboss.args" value="" />
        <property name="solr.root" value="${deps.dir}/apache-solr-1.4.1"/>
+    <property name="solr.lib" value="${solr.root}/lib"/>
+    <property name="solr.dist" value="${solr.root}/dist"/>
        <property name="solr.home" value="${deps.dir}/apache-solr-1.4.1/example/solr"/>
 
        <!-- Library and runtime dependencies -->
     <property name="solr.filename" value="apache-solr-1.4.1.zip"/>
        <property name="solr.download.url" value="http://apache.ntua.gr/lucene/solr/${solr.version}/${solr.filename}"/>
        <property name="solrj.version" value="1.4.1"/>
-       <property name="solr.dist.path" value="${solr.root}/dist"/>
        <property name="solrj.jar" value="apache-solr-solrj-${solrj.version}.jar"/>
-    <property name="gwt.path" value="${deps.dir}/gwt-2.0.4"/>
-    <property name="gwt.filename" value="gwt-2.0.4.zip"/>
-       <property name="gwt.download.url" value="http://google-web-toolkit.googlecode.com/files/gwt-2.0.4.zip"/>
+       <!--
+       <property name="gwt.path" value="${deps.dir}/gwt-2.2-M1"/>
+       <property name="gwt.filename" value="gwt-2.2-M1.zip"/>
+       <property name="gwt.download.url" value="http://google-web-toolkit.googlecode.com/files/gwt-2.2-M1.zip"/>
+       -->
+        
+       <property name="gwt.path" value="${deps.dir}/gwt-2.1.1"/>
+    <property name="gwt.filename" value="gwt-2.1.1.zip"/>
+    <property name="gwt.download.url" value="http://google-web-toolkit.googlecode.com/files/gwt-2.1.1.zip"/>
+    
+       
+       
     <property name="hornetq.path" value="${deps.dir}/hornetq-2.0.0.GA" />
     <property name="hornetq.filename" value="hornetq-2.0.0.GA.zip/"/>
     <property name="hornetq.download.url" value="http://sourceforge.net/projects/hornetq/files/2.0.0.GA/hornetq-2.0.0.GA.zip/download"/>
-    <property name="junit.path" value="${deps.dir}/junit3.8.1" />
-    <property name="junit.filename" value="junit3.8.1.zip"/>
-    <property name="junit.download.url" value="http://sourceforge.net/projects/junit/files/junit/3.8.1/junit3.8.1.zip/download"/>
+       <property name="junit.path" value="${deps.dir}/junit4.8.1"/>
+       <property name="junit.filename" value="junit4.8.1.zip"/>
+       <property name="junit.download.url" value="http://sourceforge.net/projects/junit/files/junit/4.8.1/junit4.8.1.zip/download"/>    
     <property name="gwt-dnd.filename" value="gwt-dnd-3.0.1.jar"/>
     <property name="gwt-dnd.download.url" value="http://gwt-dnd.googlecode.com/files/gwt-dnd-3.0.1.jar"/>
     <property name="gwt-gears.path" value="${deps.dir}/gwt-gears-1.3.0" />
     <property name="gwt-visualization.path" value="${deps.dir}/gwt-visualization-1.1.0" />
     <property name="gwt-visualization.filename" value="gwt-visualization-1.1.0.zip"/>
     <property name="gwt-visualization.download.url" value="http://gwt-google-apis.googlecode.com/files/gwt-visualization-1.1.0.zip"/>
-    <property name="gwt-incubator.filename" value="gwt-incubator-20100204-r1747.jar"/>
-    <property name="gwt-incubator.download.url" value="http://google-web-toolkit-incubator.googlecode.com/files/gwt-incubator-20100204-r1747.jar"/>
-
+    <property name="gwt-incubator.filename" value="gwt-incubator-20101117-r1766.jar"/>
+    <property name="gwt-incubator.download.url" value="http://google-web-toolkit-incubator.googlecode.com/files/gwt-incubator-20101117-r1766.jar"/>
+       <property name="selenium-server.filename" value="selenium-server-standalone-2.0b1.jar"/>
+       <property name="selenium-server.download.url" value="http://selenium.googlecode.com/files/selenium-server-standalone-2.0b1.jar"/>
+       
+       <!-- DND SUPPORT -->
+               <property name="gquery.filename" value="gwtquery-1.0.0-SNAPSHOT.jar"/>
+               <property name="gquery-dnd-bundle.filename" value="gquery-dnd-bundle-1.0.2.jar"/>
+               <property name="gquery-dnd-bundle.download.url" value="http://gwtquery-plugins.googlecode.com/files/gquery-dnd-bundle-1.0.2.jar"/>
+               
+       
        <!-- Source and runtime layout configuration -->
        <property name="jboss_run_configuration" value="default" />
     <property name="root.context" value="gss" />
@@ -76,7 +94,6 @@
 
        <!-- JUnit dirs -->
        <property name="test.dir" value="${basedir}/test" />
-       <property name="test.src.dir" value="${test.dir}/src"/>
 
        <!-- Build dirs -->
     <property  name="src.dir" value="${basedir}/src}"/>
        <property name="ear.dir" value="${basedir}/ear" />
        <property name="ear.lib.dir" value="${ear.dir}/lib" />
        <property name="mbeans.dist.file" value="${ant.project.name}-mbeans.sar"/>
-
+       <property name="lib.dir" value="${basedir}/lib" />
+       
        <!-- set classpath -->
        <path id="project.class.path">
                <pathelement path="${java.class.path}/" />
+               <!-- DO NOT MOVE THESE JARS BELOW MUST BE FIRST ON CLASSPATH -->
+               <pathelement location="${lib.dir}/gwtquery-1.0.0-20110116.074055-7.jar"/>
+               <pathelement location="${lib.dir}/droppable-plugin-1.0.2.jar"/> 
+               <pathelement location="${lib.dir}/draggable-plugin-1.0.2.jar"/>
+               <pathelement location="${lib.dir}/commonui-plugin-1.0.3.jar"/>
+               <!-- END OF DO NOT MOVE THESE JARS BELOW MUST BE FIRST ON CLASSPATH -->
                <pathelement path="${gwt.path}/gwt-user.jar" />
                <pathelement location="${jboss.common.lib.dir}/commons-logging.jar"/>
                <pathelement location="${jboss.common.lib.dir}/ejb3-persistence.jar"/>
                <pathelement location="${gwt-gears.path}/gwt-gears.jar"/>
                <pathelement location="${deps.dir}/${gwt-incubator.filename}"/>
                <pathelement location="${gwt-visualization.path}/gwt-visualization.jar"/>
-               <pathelement location="${solr.dist.path}/${solrj.jar}"/>
+               <pathelement location="${solr.dist}/${solrj.jar}"/>
+        <pathelement location="${solr.dist}/apache-solr-core-1.4.1.jar"/>
+        <pathelement location="${solr.lib}/lucene-core-2.9.3.jar"/>
+        <pathelement location="${solr.lib}/lucene-analyzers-2.9.3.jar"/>
+               <pathelement location="${deps.dir}/${selenium-server.filename}"/>               
+               <fileset dir="${lib.dir}/milton">
+               <include name="**/*.jar" />
+               </fileset>
        </path>
 
        <target name="check-jboss">
                <available file="${jboss.home}" type="dir" property="jboss.home.present"/>
        </target>
 
-    <target name="fetch-dependencies" description="Fetch the dpendencies" unless="jboss.home.present" depends="check-jboss">
+    <target name="fetch-dependencies" description="Fetch the dpendencies" depends="check-jboss">
        <mkdir dir="${deps.dir}"/>
-        <get src="${gwt.download.url}" dest="${deps.dir}/${gwt.filename}" usetimestamp="true"/>
-        <get src="${gwt-dnd.download.url}" dest="${deps.dir}/${gwt-dnd.filename}" usetimestamp="true"/>
+       <!--
+       <get src="${gwt-dnd.download.url}" dest="${deps.dir}/${gwt-dnd.filename}" usetimestamp="true"/>
         <get src="${gwt-gears.download.url}" dest="${deps.dir}/${gwt-gears.filename}" usetimestamp="true"/>
-        <get src="${gwt-visualization.download.url}" dest="${deps.dir}/${gwt-visualization.filename}" usetimestamp="true"/>
-        <get src="${gwt-incubator.download.url}" dest="${deps.dir}/${gwt-incubator.filename}" usetimestamp="true"/>
-        <get src="${hornetq.download.url}" dest="${deps.dir}/${hornetq.filename}" usetimestamp="true"/>
-        <get src="${junit.download.url}" dest="${deps.dir}/${junit.filename}" usetimestamp="true"/>
+        <get src="${gwt-visualization.download.url}" dest="${deps.dir}/${gwt-visualization.filename}" usetimestamp="true"/>       
+        <get src="${hornetq.download.url}" dest="${deps.dir}/${hornetq.filename}" usetimestamp="true"/>        
         <get src="${jboss.download.url}" dest="${deps.dir}/${jboss.filename}" usetimestamp="true"/>
+        -->            
+       <!--
+       <get src="${gwt.download.url}" dest="${deps.dir}/${gwt.filename}" usetimestamp="true"/>
+       
+       -->
+       <get src="${gwt-incubator.download.url}" dest="${deps.dir}/${gwt-incubator.filename}" usetimestamp="true"/>
+       <get src="${junit.download.url}" dest="${deps.dir}/${junit.filename}" usetimestamp="true"/>
+       <get src="${selenium-server.download.url}" dest="${deps.dir}/${selenium-server.filename}" usetimestamp="true"/>         
        <unzip src="${deps.dir}/${gwt.filename}" dest="${deps.dir}"/>
-        <unzip src="${deps.dir}/${gwt-gears.filename}" dest="${deps.dir}"/>
+       <unzip src="${deps.dir}/${junit.filename}" dest="${deps.dir}"/>         
+       <!--
+       <unzip src="${deps.dir}/${gwt-gears.filename}" dest="${deps.dir}"/>
         <unzip src="${deps.dir}/${gwt-visualization.filename}" dest="${deps.dir}"/>
-        <unzip src="${deps.dir}/${hornetq.filename}" dest="${deps.dir}"/>
-        <unzip src="${deps.dir}/${junit.filename}" dest="${deps.dir}"/>
+        <unzip src="${deps.dir}/${hornetq.filename}" dest="${deps.dir}"/>        
         <unzip src="${deps.dir}/${jboss.filename}" dest="${jboss.home}/.."/>
+        -->
     </target>
 
        <target name="install" depends="fetch-dependencies, install-solr" description="Installs the configuration files of the application server">
 
        <target name="compile" description="Compile src to bin">
                <mkdir dir="${build.dir}" />
-               <javac srcdir="${src.dir}:${test.src.dir}" destdir="${build.dir}" debug="on" debuglevel="lines,vars,source" source="1.6">
+               <javac srcdir="${src.dir}:${test.dir}" destdir="${build.dir}" debug="on" debuglevel="lines,vars,source" source="1.6">
                        <classpath refid="project.class.path" />
                </javac>
        </target>
                        <arg value="-war"/>
                        <arg value="${gwt.www.admin.dir}"/>
                        <arg value="${gwt.admin.module}"/>
-            <jvmarg value="-Xmx128m"/>                                         
+            <jvmarg value="-Xmx256m"/>                                         
                    <classpath>
                        <pathelement path="${gwt-dev-lib}"/>
                                <path refid="project.class.path" />
                        <zipfileset dir="${build.dir}" prefix="WEB-INF/lib">
                                <include name="webdav.jar" />
                        </zipfileset>
+                       <zipfileset dir="${lib.dir}/milton" prefix="WEB-INF/lib">
+                       <include name="**/*.jar" />
+                       </zipfileset>
                </jar>
        </target>
 
                </jar>
        </target>
        
-       <target name="package-ear" depends="package-admin-war, package-war, package-webdav-war, package-ejb, package-mbeans" description="Package up the project as an ear">
+       <target name="package-ear" depends=" package-war,package-admin-war,package-webdav-war, package-ejb, package-mbeans" description="Package up the project as an ear">
                <jar destfile="${build.dir}/${dist.ear}">
                        <zipfileset dir="${ear.dir}" />
                        <zipfileset dir="${build.dir}" >
                                <include name="ejbs.jar" />
                                <include name="${dist.war}" />
                                <include name="${webdav.war}" />
-                <include name="${dist.admin.war}" />
+                               <include name="${dist.admin.war}" />
                                <include name="${mbeans.dist.file}"/>
                        </zipfileset>
-               <zipfileset dir="${solr.dist.path}" prefix="lib">
+               <zipfileset dir="${solr.dist}" prefix="lib">
                                <include name="${solrj.jar}" />
                        </zipfileset>
                </jar>