incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1231739 [1/2] - in /incubator/lcf/trunk: ./ connectors/ connectors/activedirectory/ connectors/activedirectory/connector/src/main/resource/ connectors/alfresco/ connectors/cmis/ connectors/documentum/ connectors/documentum/connector/src/ma...
Date Sun, 15 Jan 2012 20:03:31 GMT
Author: kwright
Date: Sun Jan 15 20:03:30 2012
New Revision: 1231739

URL: http://svn.apache.org/viewvc?rev=1231739&view=rev
Log:
Introduce a build hierarchy, and start to populate it with useful stuff.  This is the first checkin of many for CONNECTORS-384, and also fixes a couple of cases where resources were not in the standard place.

Added:
    incubator/lcf/trunk/common-build.xml   (with props)
    incubator/lcf/trunk/connectors/connector-build.xml   (with props)
    incubator/lcf/trunk/connectors/meridio/connector/src/main/resources/
      - copied from r1231282, incubator/lcf/trunk/connectors/meridio/connector/src/main/resource/
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/resources/
      - copied from r1231282, incubator/lcf/trunk/connectors/sharepoint/connector/src/main/resource/
    incubator/lcf/trunk/tests/activedirectory/build.xml   (with props)
    incubator/lcf/trunk/tests/alfresco/build.xml   (with props)
    incubator/lcf/trunk/tests/cmis/build.xml   (with props)
    incubator/lcf/trunk/tests/filesystem/build.xml   (with props)
    incubator/lcf/trunk/tests/gts/build.xml   (with props)
    incubator/lcf/trunk/tests/ifs-test-build.xml   (with props)
    incubator/lcf/trunk/tests/ino-test-build.xml   (with props)
    incubator/lcf/trunk/tests/jcifs/build.xml   (with props)
    incubator/lcf/trunk/tests/jdbc/build.xml   (with props)
    incubator/lcf/trunk/tests/rss/build.xml   (with props)
    incubator/lcf/trunk/tests/sharepoint/build.xml   (with props)
    incubator/lcf/trunk/tests/solr/build.xml   (with props)
    incubator/lcf/trunk/tests/test-build.xml   (with props)
    incubator/lcf/trunk/tests/webcrawler/build.xml   (with props)
    incubator/lcf/trunk/tests/wiki/build.xml   (with props)
Removed:
    incubator/lcf/trunk/connectors/activedirectory/connector/src/main/resource/
    incubator/lcf/trunk/connectors/documentum/connector/src/main/resource/
    incubator/lcf/trunk/connectors/documentum/connector/src/test/
    incubator/lcf/trunk/connectors/meridio/connector/src/main/resource/
    incubator/lcf/trunk/connectors/sharepoint/connector/src/main/resource/
Modified:
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/activedirectory/build.xml
    incubator/lcf/trunk/connectors/alfresco/build.xml
    incubator/lcf/trunk/connectors/cmis/build.xml
    incubator/lcf/trunk/connectors/documentum/build.xml
    incubator/lcf/trunk/connectors/filenet/build.xml
    incubator/lcf/trunk/connectors/filesystem/build.xml
    incubator/lcf/trunk/connectors/gts/build.xml
    incubator/lcf/trunk/connectors/jcifs/build.xml
    incubator/lcf/trunk/connectors/jdbc/build.xml
    incubator/lcf/trunk/connectors/livelink/build.xml
    incubator/lcf/trunk/connectors/memex/build.xml
    incubator/lcf/trunk/connectors/meridio/build.xml
    incubator/lcf/trunk/connectors/nullauthority/build.xml
    incubator/lcf/trunk/connectors/nulloutput/build.xml
    incubator/lcf/trunk/connectors/opensearchserver/build.xml
    incubator/lcf/trunk/connectors/rss/build.xml
    incubator/lcf/trunk/connectors/sharepoint/build.xml
    incubator/lcf/trunk/connectors/solr/build.xml
    incubator/lcf/trunk/connectors/webcrawler/build.xml
    incubator/lcf/trunk/connectors/wiki/build.xml

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Sun Jan 15 20:03:30 2012
@@ -73,6 +73,11 @@
         <delete dir="connectors/webcrawler/lib"/>
         <ant dir="connectors/wiki" target="clean"/>
         <delete dir="connectors/wiki/lib"/>
+        
+        <ant dir="tests/activedirectory" target="clean"/>
+        <ant dir="tests/alfresco" target="clean"/>
+        <ant dir="tests/cmis" target="clean"/>
+
     </target>
 
     <target name="cleanup-afterbuild">
@@ -127,6 +132,7 @@
         <delete dir="connectors/webcrawler/lib"/>
         <ant dir="connectors/wiki" target="clean"/>
         <delete dir="connectors/wiki/lib"/>
+        
     </target>
     
     <target name="build-site">
@@ -2142,29 +2148,6 @@
         </javac>
     </target>
 
-    <target name="compile-activedirectory-tests" depends="build-framework,build-activedirectory-connector,calculate-activedirectory-tests-condition,build-tests-activedirectory-connector" if="activedirectory-tests.include">
-        <mkdir dir="build/activedirectory-tests/classes"/>
-        <javac srcdir="tests/activedirectory/src/test/java" destdir="build/activedirectory-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/activedirectory/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/activedirectory/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
     <target name="compile-solr-tests" depends="build-framework,build-filesystem-connector,build-solr-connector,calculate-solr-tests-condition,build-tests-filesystem-connector,build-tests-solr-connector" if="solr-tests.include">
         <mkdir dir="build/solr-tests/classes"/>
         <javac srcdir="tests/solr/src/test/java" destdir="build/solr-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2339,90 +2322,8 @@
         </javac>
     </target>
 
-    <target name="compile-alfresco-tests" depends="build-framework,build-alfresco-connector,build-nulloutput-connector,calculate-alfresco-tests-condition,build-tests-alfresco-connector,build-tests-nulloutput-connector" if="alfresco-tests.include">
-        <mkdir dir="build/alfresco-tests/classes"/>
-        <javac srcdir="tests/alfresco/src/test/java" destdir="build/alfresco-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-cmis-tests" depends="build-framework,build-cmis-connector,build-nulloutput-connector,calculate-cmis-tests-condition,build-tests-cmis-connector,build-tests-nulloutput-connector" if="cmis-tests.include">
-        <mkdir dir="build/cmis-tests/classes"/>
-        <javac srcdir="tests/cmis/src/test/java" destdir="build/cmis-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="framework/lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="run-activedirectory-UI-tests-derby" depends="compile-activedirectory-tests,calculate-activedirectory-tests-condition" if="activedirectory-tests.include">
-        <mkdir dir="test-derby-output/activedirectory"/>
-        <junit fork="true" maxmemory="128m" dir="test-derby-output/activedirectory" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/activedirectory/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/activedirectory/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/activedirectory-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.activedirectory_tests.NavigationDerbyUI" todir="test-derby-output/activedirectory"/>
-            <!-- MHL -->
-        </junit>
+    <target name="run-activedirectory-UI-tests-derby" depends="build-tests-framework,build-tests-activedirectory-connector,calculate-activedirectory-tests-condition" if="activedirectory-tests.include">
+        <ant dir="tests/activedirectory" target="run-UI-derby"/>
     </target>
 
     <target name="run-filesystem-tests-derby" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
@@ -2991,177 +2892,24 @@
         </junit>
     </target>
     
-    <target name="run-alfresco-tests-derby" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-derby-output/alfresco"/>
-        <junit fork="true" dir="test-derby-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <jvmarg value="-Xms512m"/>
-            <jvmarg value="-Xmx1024m"/>
-            <jvmarg value="-Xss1024k"/>
-            <jvmarg value="-XX:MaxPermSize=256m"/>
-            <jvmarg value="-XX:NewSize=256m"/>
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-              
-            <test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-derby-output/alfresco"/>
-        	
-        </junit>
+    <target name="run-alfresco-tests-derby" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-derby"/>
     </target>
 
-    <target name="run-cmis-tests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-derby-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-derby-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-            <test name="org.apache.manifoldcf.cmis_tests.APISanityIT" todir="test-derby-output/cmis"/>
-
-        </junit>
+    <target name="run-cmis-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-derby"/>
     </target>
 
-    <target name="run-cmis-UI-tests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-derby-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-derby-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-
-            <test name="org.apache.manifoldcf.cmis_tests.NavigationDerbyUI" todir="test-derby-output/cmis"/>
-            <!-- MHL -->
-        </junit>
+    <target name="run-cmis-UI-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-UI-derby"/>
     </target>
 
-    <target name="run-cmis-loadtests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-derby-output/cmis"/>
-        <junit fork="true" maxmemory="1024m" dir="test-derby-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-cmis-loadtests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-load-derby"/>
     </target>
     
-    <target name="run-alfresco-loadtests-derby" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-derby-output/alfresco"/>
-        <junit fork="true" maxmemory="1024m" dir="test-derby-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-alfresco-loadtests-derby" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-load-derby"/>
     </target>
 
     <target name="run-sharepoint-tests-derby" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
@@ -3512,266 +3260,36 @@
         </junit>
     </target>
 
-    <target name="run-alfresco-tests-postgresql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-postgresql-output/alfresco"/>
-        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	<!-- test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-postgresql-output/alfresco"/ -->
-        </junit>
+    <target name="run-alfresco-tests-postgresql" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-postgresql"/>
     </target>
 
-    <target name="run-alfresco-tests-mysql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-mysql-output/alfresco"/>
-        <junit fork="true" maxmemory="128m" dir="test-mysql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	<!-- test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-mysql-output/alfresco"/ -->
-        </junit>
+    <target name="run-alfresco-tests-mysql" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-mysql"/>
     </target>
 
-    <target name="run-cmis-tests-postgresql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-postgresql-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-            <!-- MHL -->
-        </junit>
+    <target name="run-cmis-tests-postgresql" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-postgresql"/>
     </target>
 
-    <target name="run-cmis-tests-mysql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-mysql-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-mysql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-            <!-- MHL -->
-        </junit>
+    <target name="run-cmis-tests-mysql" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-mysql"/>
     </target>
 
-    <target name="run-alfresco-loadtests-postgresql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-postgresql-output/alfresco"/>
-        <junit fork="true" maxmemory="1024m" dir="test-postgresql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        </junit>
+    <target name="run-alfresco-loadtests-postgresql" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-load-postgresql"/>
     </target>
 
-    <target name="run-alfresco-loadtests-mysql" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-mysql-output/alfresco"/>
-        <junit fork="true" maxmemory="1024m" dir="test-mysql-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        </junit>
+    <target name="run-alfresco-loadtests-mysql" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-load-mysql"/>
     </target>
 
-    <target name="run-cmis-loadtests-postgresql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-postgresql-output/cmis"/>
-        <junit fork="true" maxmemory="1024m" dir="test-postgresql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-cmis-loadtests-postgresql" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-load-postgresql"/>
     </target>
 
-    <target name="run-cmis-loadtests-mysql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-mysql-output/cmis"/>
-        <junit fork="true" maxmemory="1024m" dir="test-mysql-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-cmis-loadtests-mysql" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-load-mysql"/>
     </target>
 
     <target name="run-filesystem-tests-HSQLDB" depends="compile-filesystem-tests,calculate-filesystem-tests-condition" if="filesystem-tests.include">
@@ -4046,141 +3564,20 @@
         </junit>
     </target>
 
-    <target name="run-alfresco-tests-HSQLDB" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-HSQLDB-output/alfresco"/>
-        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	  <!-- test name="org.apache.manifoldcf.alfresco_tests.APISanityIT" todir="test-HSQLDB-output/alfresco"/ -->
-        	 
-        </junit>
+    <target name="run-alfresco-tests-HSQLDB" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-HSQLDB"/>
     </target>
 
-    <target name="run-cmis-tests-HSQLDB" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-HSQLDB-output/cmis"/>
-        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/libr">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-cmis-tests-HSQLDB" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-HSQLDB"/>
     </target>
     
-    <target name="run-alfresco-loadtests-HSQLDB" depends="compile-alfresco-tests,calculate-alfresco-tests-condition" if="alfresco-tests.include">
-        <mkdir dir="test-HSQLDB-output/alfresco"/>
-        <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output/alfresco" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-            	<fileset dir="lib">
-            	            <include name="h2*.jar"/>
-            	          </fileset>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/alfresco/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/alfresco-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-       	
-        </junit>
+    <target name="run-alfresco-loadtests-HSQLDB" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
+        <ant dir="tests/alfresco" target="run-load-HSQLDB"/>
     </target>
 
-    <target name="run-cmis-loadtests-HSQLDB" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
-        <mkdir dir="test-HSQLDB-output/cmis"/>
-        <junit fork="true" maxmemory="1024m" dir="test-HSQLDB-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
-            <classpath>
-                <fileset dir="framework/lib">
-                    <include name="*.jar"/>
-                </fileset>
-	      <fileset dir="framework/build/jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="framework/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/cmis/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/dist/lib">
-		<include name="*.jar"/>
-	      </fileset>
-	      <fileset dir="connectors/nulloutput/build/test-jar">
-		<include name="*.jar"/>
-	      </fileset>
-                <pathelement location="build/cmis-tests/classes"/>
-            </classpath>
-            <formatter type="brief" usefile="false"/>
-	    
-        	
-        </junit>
+    <target name="run-cmis-loadtests-HSQLDB" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
+        <ant dir="tests/cmis" target="run-load-HSQLDB"/>
     </target>
 
     <target name="run-sharepoint-tests-HSQLDB" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">

Added: incubator/lcf/trunk/common-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/common-build.xml?rev=1231739&view=auto
==============================================================================
--- incubator/lcf/trunk/common-build.xml (added)
+++ incubator/lcf/trunk/common-build.xml Sun Jan 15 20:03:30 2012
@@ -0,0 +1,21 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="mcf-common-build">
+
+
+</project>

Propchange: incubator/lcf/trunk/common-build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/trunk/common-build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/trunk/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/activedirectory/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/activedirectory/build.xml (original)
+++ incubator/lcf/trunk/connectors/activedirectory/build.xml Sun Jan 15 20:03:30 2012
@@ -15,55 +15,9 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="activedirectory-connector" default="all">
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-    </target>
-
-    <target name="doc">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
-
-    <target name="compile-connector">
-        <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-        </javac>
-        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
-    </target>
-
-    <target name="jar-connector" depends="compile-connector">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-activedirectory-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <!-- fileset dir="connector/src/main/resource"/ -->
-        </jar>
-    </target>
-
-    <target name="lib" depends="jar-connector">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib" file="build/jar/mcf-activedirectory-connector.jar"/>
-    </target>
-
-    <target name="build" depends="lib"/>
-    <target name="build-tests" depends="lib">
-      <mkdir dir="build/test-jar"/>
-    </target>
-    <target name="run-tests"/>
-    <target name="run-tests-derby"/>
-    <target name="run-tests-postgresql"/>
-    <target name="run-tests-mysql"/>
-    <target name="run-tests-HSQLDB"/>
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
+    <import file="../connector-build.xml"/>
+    
     
 </project>

Modified: incubator/lcf/trunk/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/alfresco/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/alfresco/build.xml (original)
+++ incubator/lcf/trunk/connectors/alfresco/build.xml Sun Jan 15 20:03:30 2012
@@ -15,7 +15,9 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="alfresco-connector" default="all">
+
+    <import file="../connector-build.xml"/>
 
     <target name="clean">
         <delete dir="build"/>

Modified: incubator/lcf/trunk/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/cmis/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/cmis/build.xml (original)
+++ incubator/lcf/trunk/connectors/cmis/build.xml Sun Jan 15 20:03:30 2012
@@ -15,48 +15,13 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="cmis-connector" default="all">
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-derby-output"/>
-    </target>
+    <import file="../connector-build.xml"/>
     
-    <target name="doc">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
-
-    <target name="compile-connector">
-        <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-        </javac>
-        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
-    </target>
-
-    <target name="jar-connector" depends="compile-connector">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-cmis-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <fileset dir="connector/src/main/resources"/>
-        </jar>
-    </target>
-
-    <target name="lib" depends="jar-connector">
+    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
-            <fileset dir="build/jar">
-                <include name="mcf-cmis-connector.jar"/>
-            </fileset>
             <fileset dir="lib">
                 <include name="chemistry*.jar"/>
                 <include name="saaj*.jar"/>
@@ -75,26 +40,7 @@
         </copy>
     </target>
 
-    <target name="compile-tests" depends="compile-connector">
-        <mkdir dir="build/connector-tests/classes"/>
-        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <pathelement location="build/connector/classes"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="build" depends="lib"/>
-    <target name="build-tests" depends="lib">
-      <mkdir dir="build/test-jar"/>
-    </target>
-    
-    <target name="run-tests"/>
-    
-    <target name="run-tests-derby" depends="compile-tests">
+    <target name="run-tests-derby" depends="build-tests">
         <mkdir dir="test-derby-output"/>
         <junit fork="true" maxmemory="128m" dir="test-derby-output" outputtoformatters="true" showoutput="true" haltonfailure="true">
             <classpath>
@@ -111,12 +57,4 @@
         </junit>
     </target>
     
-    <target name="run-tests-postgresql"/>
-    
-    <target name="run-tests-mysql"/>
-    
-    <target name="run-tests-HSQLDB"/>
-    
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
-    
 </project>

Added: incubator/lcf/trunk/connectors/connector-build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/connector-build.xml?rev=1231739&view=auto
==============================================================================
--- incubator/lcf/trunk/connectors/connector-build.xml (added)
+++ incubator/lcf/trunk/connectors/connector-build.xml Sun Jan 15 20:03:30 2012
@@ -0,0 +1,399 @@
+<!--
+ Licensed to the Apache Software Foundation (ASF) under one or more
+ contributor license agreements.  See the NOTICE file distributed with
+ this work for additional information regarding copyright ownership.
+ The ASF licenses this file to You under the Apache License, Version 2.0
+ (the "License"); you may not use this file except in compliance with
+ the License.  You may obtain a copy of the License at
+
+     http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing, software
+ distributed under the License is distributed on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ See the License for the specific language governing permissions and
+ limitations under the License.
+-->
+
+<project name="mcf-connector-build">
+
+    <import file="../common-build.xml"/>
+    
+    <target name="clean">
+        <delete dir="build"/>
+        <delete dir="dist"/>
+        <delete dir="test-derby-output"/>
+        <delete dir="test-postgresql-output"/>
+        <delete dir="test-mysql-output"/>
+        <delete dir="test-HSQLDB-output"/>
+        <delete dir="test-HSQLDBext-output"/>
+    </target>
+
+    <path id="mcf-connector-build.connector-classpath">
+        <fileset dir="lib" includes="*.jar"/>
+        <pathelement location="build/wsdlclasses"/>
+        <pathelement location="build/xsdclasses"/>
+        <pathelement location="build/interface/classes"/>
+        <pathelement location="build/rmistub/classes"/>
+    </path>
+    
+    <path id="connector-classpath">
+        <path refid="mcf-connector-build.connector-classpath"/>
+    </path>
+
+    <path id="mcf-connector-build.implementation-classpath">
+        <pathelement location="build/interface/classes"/>
+    </path>
+
+    <path id="implementation-classpath">
+        <path refid="mcf-connector-build.implementation-classpath"/>
+    </path>
+
+    <path id="mcf-connector-build.interface-classpath">
+    </path>
+
+    <path id="interface-classpath">
+        <path refid="mcf-connector-build.interface-classpath"/>
+    </path>
+
+    <target name="calculate-condition">
+        <available file="build.xml" property="canBuild"/>
+    </target>
+
+    <target name="precompile-check" depends="calculate-condition" unless="canBuild"/>
+
+    <target name="has-native2ascii-check" depends="precompile-check" if="canBuild">
+        <available file="connector/src/main/native2ascii" property="hasNative2Ascii"/>
+    </target>
+
+    <target name="has-resources-check" depends="precompile-check" if="canBuild">
+        <available file="connector/src/main/resources" property="hasResources"/>
+    </target>
+
+    <target name="has-RMI-check" depends="precompile-check" if="canBuild">
+        <available file="implementation" property="hasImplementation"/>
+        <available file="interface" property="hasInterface"/>
+        <available file="server" property="hasServer"/>
+        <available file="registry" property="hasRegistry"/>
+        <condition property="hasRMI">
+            <and>
+                <isset property="hasImplementation"/>
+                <isset property="hasInterface"/>
+                <isset property="hasServer"/>
+                <isset property="hasRegistry"/>
+            </and>
+        </condition>
+    </target>
+    
+    <target name="has-tests-check" depends="precompile-check" if="canBuild">
+        <available file="connector/src/test" property="hasTests"/>
+    </target>
+
+    <target name="has-test-resources-check" depends="has-tests-check" if="hasTests">
+        <available file="connector/src/test/resources" property="hasTestResources"/>
+    </target>
+
+    <target name="classcreate-wsdl">
+        <mkdir dir="build/wsdljava"/>
+        <java classname="org.apache.axis.wsdl.WSDL2Java" fork="true">
+            <classpath>
+                <fileset dir="lib" includes="*.jar"/>
+            </classpath>
+            <arg value="--timeout"/>
+            <arg value="0"/>
+            <arg value="--noImports"/>
+            <arg value="-o"/>
+            <arg value="build/wsdljava"/>
+            <arg value="${wsdlname}"/>
+        </java>
+    </target>
+
+    <target name="classcreate-xsd">
+        <mkdir dir="build/xsdjava"/>
+        <java classname="org.exolab.castor.builder.SourceGeneratorMain" fork="true">
+            <classpath>
+                <fileset dir="lib">
+                    <include name="*.jar"/>
+                </fileset>
+            </classpath>
+            <arg value="-i"/>
+            <arg value="${xsdname}"/>
+            <arg value="=f"/>
+            <arg value="-dest"/>
+            <arg value="build/xsdjava"/>
+            <arg value="-package"/>
+            <arg value="org.apache.manifoldcf.crawler.connectors.${packagename}"/>
+        </java>
+    </target>
+
+    <target name="classcreate-wsdls"/>
+
+    <target name="has-wsdls-check" depends="classcreate-wsdls,precompile-check" if="canBuild">
+        <available file="build/wsdljava" property="hasWSDLs"/>
+    </target>
+
+    <target name="compile-wsdls" depends="has-wsdls-check" if="hasWSDLs">
+        <mkdir dir="build/wsdlclasses"/>
+        <javac srcdir="build/wsdljava" destdir="build/wsdlclasses" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <fileset dir="lib" includes="*.jar"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="classcreate-xsds"/>
+    
+    <target name="has-xsds-check" depends="classcreate-xsds,precompile-check" if="canBuild">
+        <available file="build/xsdjava" property="hasXSDs"/>
+    </target>
+
+    <target name="compile-xsds" depends="has-xsds-check" if="hasXSDs">
+        <mkdir dir="build/xsdclasses"/>
+        <javac srcdir="build/xsdjava" destdir="build/xsdclasses" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <fileset dir="lib" includes="*.jar"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="setup-rmic" depends="has-RMI-check" if="hasRMI">
+        <mkdir dir="build/rmijava"/>
+        <copy todir="build/rmijava">
+            <fileset dir="implementation/src/main/java"/>
+        </copy>
+    </target>
+
+    <target name="rmic-build">
+        <rmic base="build/rmijava" classname="${classname}">
+            <classpath>
+                <path refid="implementation-classpath"/>
+                <pathelement location="build/implementation/classes"/>
+            </classpath>
+        </rmic>
+    </target>
+
+    <target name="rmic-build-all" depends="compile-implementation,compile-interface,setup-rmic,has-RMI-check" if="hasRMI"/>
+
+    <target name="doc-rmi" depends="compile-wsdls,compile-xsds,has-RMI-check" if="hasRMI">
+        <mkdir dir="dist/doc"/>
+        <javadoc destdir="dist/doc" source="1.5">
+            <classpath>
+                <path refid="connector-classpath"/>
+            </classpath>
+            <fileset dir="interface/src/main/java" includes="**/*.java"/>
+        </javadoc>
+    </target>
+
+    <target name="doc" depends="doc-rmi,compile-wsdls,compile-xsds,precompile-check" if="canBuild">
+        <mkdir dir="dist/doc"/>
+        <javadoc destdir="dist/doc" source="1.5">
+            <classpath>
+                <path refid="connector-classpath"/>
+            </classpath>
+            <fileset dir="connector/src/main/java" includes="**/*.java"/>
+        </javadoc>
+    </target>
+
+    <target name="compile-connector-resources" depends="has-resources-check" if="hasResources">
+        <mkdir dir="build/connector/classes"/>
+        <copy todir="build/connector/classes">
+            <fileset dir="connector/src/main/resources"/>
+        </copy>
+    </target>
+
+    <target name="compile-connector-native2ascii" depends="has-native2ascii-check" if="hasNative2Ascii">
+        <mkdir dir="build/connector/classes"/>
+        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
+    </target>
+    
+    <target name="compile-rmic" depends="rmic-build-all,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/rmiskel/classes"/>
+        <copy todir="build/rmiskel/classes">
+            <fileset dir="build/rmijava">
+                <include name="**/*_Skel.class"/>
+            </fileset>
+        </copy>
+        <mkdir dir="build/rmistub/classes"/>
+        <copy todir="build/rmistub/classes">
+            <fileset dir="build/rmijava">
+                <include name="**/*_Stub.class"/>
+            </fileset>
+        </copy>
+    </target>
+    
+    <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/server/classes"/>
+        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <pathelement location="build/interface/classes"/>
+                <pathelement location="build/implementation/classes"/>
+                <pathelement location="build/rmistub/classes"/>
+                <pathelement location="build/rmiskel/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-registry" depends="compile-interface,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/registry/classes"/>
+        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <pathelement location="build/interface/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-connector" depends="compile-connector-native2ascii,compile-connector-resources,compile-wsdls,compile-xsds,compile-interface,compile-rmic,precompile-check" if="canBuild">
+        <mkdir dir="build/connector/classes"/>
+        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="connector-classpath"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-implementation" depends="compile-interface,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/implementation/classes"/>
+        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="implementation-classpath"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-interface" depends="has-RMI-check" if="hasRMI">
+        <mkdir dir="build/interface/classes"/>
+        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="interface-classpath"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-test-resources" depends="has-test-resources-check" if="hasTestResources">
+        <mkdir dir="build/connector-test/classes"/>
+        <copy todir="build/connector-test/classes">
+            <fileset dir="connector/src/test/resources"/>
+        </copy>
+    </target>
+
+    <target name="compile-tests" depends="compile-connector,compile-test-resources,has-tests-check" if="hasTests">
+        <mkdir dir="build/connector-tests/classes"/>
+        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                <path refid="connector-classpath"/>
+                <pathelement location="build/connector/classes"/>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
+        <mkdir dir="build/xsdclasses"/>
+        <mkdir dir="build/wsdlclasses"/>
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}.jar">
+        	<fileset dir="build/connector/classes"/>
+          <fileset dir="build/xsdclasses"/>
+          <fileset dir="build/wsdlclasses"/>
+        </jar>
+    </target>
+
+    <target name="jar-tests" depends="compile-tests,has-tests-check" if="hasTests">
+        <mkdir dir="build/test-jar"/>
+        <jar destfile="build/test-jar/mcf-${ant.project.name}-tests.jar" basedir="build/connector-tests/classes"/>
+    </target>
+
+    <target name="jar-interface" depends="compile-interface,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-interface.jar" basedir="build/interface/classes"/>
+    </target>
+
+    <target name="jar-implementation" depends="compile-implementation,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-implementation.jar" basedir="build/implementation/classes"/>
+    </target>
+
+    <target name="jar-rmiskel" depends="compile-rmic,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-rmiskel.jar" basedir="build/rmiskel/classes"/>
+    </target>
+
+    <target name="jar-rmistub" depends="compile-rmic,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-rmistub.jar" basedir="build/rmistub/classes"/>
+    </target>
+
+    <target name="jar-server" depends="compile-server,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-server.jar" basedir="build/server/classes"/>
+    </target>
+
+    <target name="jar-registry" depends="compile-registry,has-RMI-check" if="hasRMI">
+        <mkdir dir="build/jar"/>
+        <jar destfile="build/jar/mcf-${ant.project.name}-registry.jar" basedir="build/registry/classes"/>
+    </target>
+
+    <target name="lib-rmi" depends="jar-interface,jar-rmistub,has-RMI-check" if="hasRMI">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}-rmistub.jar"/>
+        <copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}-interface.jar"/>
+    </target>
+    
+    <target name="lib" depends="lib-rmi,jar-connector,precompile-check" if="canBuild">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib" file="build/jar/mcf-${ant.project.name}.jar"/>
+    </target>
+
+    <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,has-RMI-check" if="hasRMI">
+        <mkdir dir="dist/server-process/jar"/>
+        <mkdir dir="dist/server-process/script"/>
+        <copy todir="dist/server-process/jar">
+            <fileset dir="build/jar">
+                <include name="mcf-${ant.project.name}-server.jar"/>
+                <include name="mcf-${ant.project.name}-interface.jar"/>
+                <include name="mcf-${ant.project.name}-rmiskel.jar"/>
+                <include name="mcf-${ant.project.name}-implementation.jar"/>
+            </fileset>
+        </copy>
+        <copy todir="dist/server-process/script">
+            <fileset dir="server-scripts">
+                <include name="*.sh"/>
+                <include name="*.bat"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="registry-process" depends="jar-registry,has-RMI-check" if="hasRMI">
+        <mkdir dir="dist/registry-process/jar"/>
+        <mkdir dir="dist/registry-process/script"/>
+        <copy todir="dist/registry-process/jar">
+            <fileset dir="build/jar">
+                <include name="mcf-${ant.project.name}-registry.jar"/>
+                <include name="mcf-${ant.project.name}-interface.jar"/>
+            </fileset>
+        </copy>
+        <copy todir="dist/registry-process/script">
+            <fileset dir="registry-scripts">
+                <include name="*.sh"/>
+                <include name="*.bat"/>
+            </fileset>
+        </copy>
+    </target>
+
+    <target name="integration"/>
+
+    <target name="build" depends="lib,server-process,registry-process,integration"/>
+    
+    <target name="build-tests" depends="build,jar-tests"/>
+
+    <target name="run-tests"/>
+    <target name="run-tests-derby"/>
+    <target name="run-tests-postgresql"/>
+    <target name="run-tests-mysql"/>
+    <target name="run-tests-HSQLDB"/>
+    <target name="run-tests-HSQLDBext"/>
+    
+    <target name="download-dependencies"/>
+
+    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
+
+</project>

Propchange: incubator/lcf/trunk/connectors/connector-build.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: incubator/lcf/trunk/connectors/connector-build.xml
------------------------------------------------------------------------------
    svn:keywords = Id

Modified: incubator/lcf/trunk/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/documentum/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/documentum/build.xml (original)
+++ incubator/lcf/trunk/connectors/documentum/build.xml Sun Jan 15 20:03:30 2012
@@ -15,12 +15,9 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="documentum-connector" default="all">
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-    </target>
+    <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
         <available file="dfc/dfc.jar" property="dfcStatus"/>
@@ -39,51 +36,14 @@
         <echo message="Documentum Connector cannot be built without dfc.jar, dfcbase.jar, and dctm.jar"/>
     </target>
 
-    <target name="doc" depends="precompile-check" if="canBuild">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-            <fileset dir="interface/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
-
-    <target name="compile-interface" depends="precompile-check" if="canBuild">
-        <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
-    </target>
-
-    <target name="compile-implementation" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath id="implementation.classpath">
-                <fileset dir="dfc"> 
-                    <include name="*.jar"/> 
-                </fileset> 
-                <pathelement location="build/interface/classes"/>
-            </classpath>
-        </javac>
-    </target>
+    <path id="implementation-classpath">
+        <path refid="mcf-connector-build.implementation-classpath"/>
+        <fileset dir="dfc"> 
+            <include name="*.jar"/> 
+        </fileset> 
+    </path>
 
-    <target name="rmic-build">
-        <rmic base="build/rmijava" classname="${classname}">
-            <classpath id="rmi.classpath">
-                <fileset dir="dfc"> 
-                    <include name="*.jar"/> 
-                </fileset> 
-                <pathelement location="build/interface/classes"/>
-                <pathelement location="build/implementation/classes"/>
-            </classpath>
-        </rmic>
-    </target>
-    
-    <target name="compile-rmic" depends="compile-implementation,compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/rmijava"/>
-        <copy todir="build/rmijava">
-            <fileset dir="implementation/src/main/java"/>
-        </copy>
+    <target name="rmic-build-all" depends="compile-implementation,compile-interface,setup-rmic,has-RMI-check" if="hasRMI">
         <!-- The ant version I have doesn't seem to handle class specifications based on file names, so this is the best I could come up with -->
         <antcall target="rmic-build">
             <param name="classname" value="org.apache.manifoldcf.crawler.common.DCTM.DocumentumFactoryImpl"/>
@@ -97,139 +57,14 @@
         <antcall target="rmic-build">
             <param name="classname" value="org.apache.manifoldcf.crawler.common.DCTM.DocumentumResultImpl"/>
         </antcall>
-        <mkdir dir="build/rmiskel/classes"/>
-        <copy todir="build/rmiskel/classes">
-            <fileset dir="build/rmijava">
-                <include name="**/*_Skel.class"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/rmistub/classes"/>
-        <copy todir="build/rmistub/classes">
-            <fileset dir="build/rmijava">
-                <include name="**/*_Stub.class"/>
-            </fileset>
-        </copy>
     </target>
     
-    <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" classpath="build/interface/classes:build/implementation/classes:build/rmistub/classes:build/rmiskel/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
-    </target>
-
-    <target name="compile-registry" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
-    </target>
-
-    <target name="compile-connector" depends="compile-interface,compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-                <pathelement location="build/interface/classes"/>
-                <pathelement location="build/rmistub/classes"/>
-            </classpath>
-        </javac>
-        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
-    </target>
-
-    <target name="jar-interface" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-interface.jar" basedir="build/interface/classes"/>
-    </target>
-
-    <target name="jar-implementation" depends="compile-implementation,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-implementation.jar" basedir="build/implementation/classes"/>
-    </target>
-
-    <target name="jar-rmiskel" depends="compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-rmiskel.jar" basedir="build/rmiskel/classes"/>
-    </target>
-
-    <target name="jar-rmistub" depends="compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-rmistub.jar" basedir="build/rmistub/classes"/>
-    </target>
-
-    <target name="jar-server" depends="compile-server,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-server.jar" basedir="build/server/classes"/>
-    </target>
-
-    <target name="jar-registry" depends="compile-registry,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-registry.jar" basedir="build/registry/classes"/>
-    </target>
     
-    <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-documentum-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <!-- fileset dir="connector/src/main/resource"/ -->
-        </jar>
-    </target>
-
-    <target name="lib" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="build/jar">
-                <include name="mcf-documentum-connector.jar"/>
-                <include name="mcf-documentum-rmistub.jar"/>
-                <include name="mcf-documentum-interface.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,precompile-check" if="canBuild">
+    <target name="server-process" depends="mcf-connector-build.server-process,has-RMI-check" if="hasRMI">
         <mkdir dir="dist/server-process/jar"/>
-        <mkdir dir="dist/server-process/script"/>
         <copy todir="dist/server-process/jar">
             <fileset dir="dfc" includes="*.jar"/>
         </copy>
-        <copy todir="dist/server-process/jar">
-            <fileset dir="build/jar">
-                <include name="mcf-document-server.jar"/>
-                <include name="mcf-documentum-interface.jar"/>
-                <include name="mcf-documentum-rmiskel.jar"/>
-                <include name="mcf-documentum-implementation.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="dist/server-process/script">
-            <fileset dir="server-scripts">
-                <include name="*.sh"/>
-                <include name="*.bat"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="registry-process" depends="jar-registry,precompile-check" if="canBuild">
-        <mkdir dir="dist/registry-process/jar"/>
-        <mkdir dir="dist/registry-process/script"/>
-        <copy todir="dist/registry-process/jar">
-            <fileset dir="build/jar">
-                <include name="mcf-documentum-registry.jar"/>
-                <include name="mcf-documentum-interface.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="dist/registry-process/script">
-            <fileset dir="registry-scripts">
-                <include name="*.sh"/>
-                <include name="*.bat"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="build" depends="lib,server-process,registry-process"/>
-    <target name="build-tests" depends="lib,server-process,registry-process,precompile-check" if="canBuild">
-      <mkdir dir="build/test-jar"/>
     </target>
-    <target name="run-tests"/>
-    <target name="run-tests-derby"/>
-    <target name="run-tests-postgresql"/>
-    <target name="run-tests-mysql"/>
-    <target name="run-tests-HSQLDB"/>
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
 
 </project>

Modified: incubator/lcf/trunk/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filenet/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filenet/build.xml (original)
+++ incubator/lcf/trunk/connectors/filenet/build.xml Sun Jan 15 20:03:30 2012
@@ -15,12 +15,9 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="filenet-connector" default="all">
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-    </target>
+    <import file="../connector-build.xml"/>
 
     <target name="calculate-condition">
         <available file="filenet-api/Jace.jar" property="JaceStatus"/>
@@ -33,51 +30,14 @@
         <echo message="FileNet Connector cannot be built without Jace.jar"/>
     </target>
 
-    <target name="doc" depends="precompile-check" if="canBuild">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-            <fileset dir="interface/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
-
-    <target name="compile-interface" depends="precompile-check" if="canBuild">
-        <mkdir dir="build/interface/classes"/>
-        <javac srcdir="interface/src/main/java" destdir="build/interface/classes" classpath="" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source"/>
-    </target>
-
-    <target name="compile-implementation" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/implementation/classes"/>
-        <javac srcdir="implementation/src/main/java" destdir="build/implementation/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath id="implementation.classpath">
-                <fileset dir="filenet-api"> 
-                    <include name="*.jar"/> 
-                </fileset> 
-                <pathelement location="build/interface/classes"/>
-            </classpath>
-        </javac>
-    </target>
+    <path id="implementation-classpath">
+        <path refid="mcf-connector-build.implementation-classpath"/>
+        <fileset dir="filenet-api"> 
+            <include name="*.jar"/> 
+        </fileset> 
+    </path>
 
-    <target name="rmic-build">
-        <rmic base="build/rmijava" classname="${classname}">
-            <classpath id="rmi.classpath">
-                <fileset dir="filenet-api"> 
-                    <include name="*.jar"/> 
-                </fileset> 
-                <pathelement location="build/interface/classes"/>
-                <pathelement location="build/implementation/classes"/>
-            </classpath>
-        </rmic>
-    </target>
-    
-    <target name="compile-rmic" depends="compile-implementation,compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/rmijava"/>
-        <copy todir="build/rmijava">
-            <fileset dir="implementation"/>
-        </copy>
+    <target name="rmic-build-all" depends="compile-implementation,compile-interface,setup-rmic,has-RMI-check" if="hasRMI">
         <!-- The ant version I have doesn't seem to handle class specifications based on file names, so this is the best I could come up with -->
         <antcall target="rmic-build">
             <param name="classname" value="org.apache.manifoldcf.crawler.common.filenet.FilenetFactoryImpl"/>
@@ -85,146 +45,13 @@
         <antcall target="rmic-build">
             <param name="classname" value="org.apache.manifoldcf.crawler.common.filenet.FilenetImpl"/>
         </antcall>
-        <mkdir dir="build/rmiskel/classes"/>
-        <copy todir="build/rmiskel/classes">
-            <fileset dir="build/rmijava">
-                <include name="**/*_Skel.class"/>
-            </fileset>
-        </copy>
-        <mkdir dir="build/rmistub/classes"/>
-        <copy todir="build/rmistub/classes">
-            <fileset dir="build/rmijava">
-                <include name="**/*_Stub.class"/>
-            </fileset>
-        </copy>
     </target>
     
-    <target name="compile-server" depends="compile-interface,compile-implementation,compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/server/classes"/>
-        <javac srcdir="server/src/main/java" destdir="build/server/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <pathelement location="build/interface/classes"/>
-                <pathelement location="build/implementation/classes"/>
-                <pathelement location="build/rmistub/classes"/>
-                <pathelement location="build/rmiskel/classes"/>
-            </classpath>
-        </javac>
-    </target>
-
-    <target name="compile-registry" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/registry/classes"/>
-        <javac srcdir="registry/src/main/java" destdir="build/registry/classes" classpath="build/interface/classes" target="1.5" source="1.5"/>
-    </target>
-
-    <target name="compile-connector" depends="compile-interface,compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-                <pathelement location="build/interface/classes"/>
-                <pathelement location="build/rmistub/classes"/>
-            </classpath>
-        </javac>
-        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
-    </target>
-
-    <target name="jar-interface" depends="compile-interface,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-interface.jar" basedir="build/interface/classes"/>
-    </target>
-
-    <target name="jar-implementation" depends="compile-implementation,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-implementation.jar" basedir="build/implementation/classes"/>
-    </target>
-
-    <target name="jar-rmiskel" depends="compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-rmiskel.jar" basedir="build/rmiskel/classes"/>
-    </target>
-
-    <target name="jar-rmistub" depends="compile-rmic,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-rmistub.jar" basedir="build/rmistub/classes"/>
-    </target>
-
-    <target name="jar-server" depends="compile-server,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-server.jar" basedir="build/server/classes"/>
-    </target>
-
-    <target name="jar-registry" depends="compile-registry,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-registry.jar" basedir="build/registry/classes"/>
-    </target>
-    
-    <target name="jar-connector" depends="compile-connector,precompile-check" if="canBuild">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filenet-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <!-- fileset dir="connector/src/main/resource"/ -->
-        </jar>
-    </target>
-
-    <target name="lib" depends="jar-interface,jar-rmistub,jar-connector,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="build/jar">
-                <include name="mcf-filenet-interface.jar"/>
-                <include name="mcf-filenet-rmistub.jar"/>
-                <include name="mcf-filenet-connector.jar"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="server-process" depends="jar-interface,jar-implementation,jar-rmiskel,jar-server,precompile-check" if="canBuild">
+    <target name="server-process" depends="mcf-connector-build.server-process,has-RMI-check" if="hasRMI">
         <mkdir dir="dist/server-process/jar"/>
-        <mkdir dir="dist/server-process/script"/>
         <copy todir="dist/server-process/jar">
             <fileset dir="filenet-api" includes="*.jar"/>
         </copy>
-        <copy todir="dist/server-process/jar">
-            <fileset dir="build/jar">
-                <include name="mcf-filenet-server.jar"/>
-                <include name="mcf-filenet-interface.jar"/>
-                <include name="mcf-filenet-rmiskel.jar"/>
-                <include name="mcf-filenet-implementation.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="dist/server-process/script">
-            <fileset dir="server-scripts">
-                <include name="*.sh"/>
-                <include name="*.bat"/>
-            </fileset>
-        </copy>
-    </target>
-
-    <target name="registry-process" depends="jar-registry,precompile-check" if="canBuild">
-        <mkdir dir="dist/registry-process/jar"/>
-        <mkdir dir="dist/registry-process/script"/>
-        <copy todir="dist/registry-process/jar">
-            <fileset dir="build/jar">
-                <include name="mcf-filenet-registry.jar"/>
-                <include name="mcf-filenet-interface.jar"/>
-            </fileset>
-        </copy>
-        <copy todir="dist/registry-process/script">
-            <fileset dir="registry-scripts">
-                <include name="*.sh"/>
-                <include name="*.bat"/>
-            </fileset>
-        </copy>
     </target>
 
-    <target name="build" depends="lib,server-process,registry-process"/>
-    <target name="build-tests" depends="lib,server-process,registry-process,precompile-check" if="canBuild">
-      <mkdir dir="build/test-jar"/>
-    </target>
-    <target name="run-tests"/>
-    <target name="run-tests-derby"/>
-    <target name="run-tests-postgresql"/>
-    <target name="run-tests-mysql"/>
-    <target name="run-tests-HSQLDB"/>
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
-    
 </project>

Modified: incubator/lcf/trunk/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/filesystem/build.xml?rev=1231739&r1=1231738&r2=1231739&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/filesystem/build.xml (original)
+++ incubator/lcf/trunk/connectors/filesystem/build.xml Sun Jan 15 20:03:30 2012
@@ -15,72 +15,9 @@
  limitations under the License.
 -->
 
-<project default="all">
+<project name="filesystem-connector" default="all">
 
-    <target name="clean">
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-derby-output"/>
-        <delete dir="test-postgresql-output"/>
-        <delete dir="test-mysql-output"/>
-        <delete dir="test-HSQLDB-output"/>
-    </target>
-    
-    <target name="doc">
-        <mkdir dir="dist/doc"/>
-        <javadoc destdir="dist/doc" source="1.5">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-            <fileset dir="connector/src/main/java" includes="**/*.java"/>
-        </javadoc>
-    </target>
-
-    <target name="compile-connector">
-        <mkdir dir="build/connector/classes"/>
-        <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                <fileset dir="lib" includes="*.jar"/>
-            </classpath>
-        </javac>
-        <native2ascii encoding="UTF-8" src="connector/src/main/native2ascii" dest="build/connector/classes" includes="**/*.properties" />
-    </target>
-
-    <target name="jar-connector" depends="compile-connector">
-        <mkdir dir="build/jar"/>
-        <jar destfile="build/jar/mcf-filesystem-connector.jar">
-        	<fileset dir="build/connector/classes"/>
-          <!-- fileset dir="connector/src/main/resource"/ -->
-        </jar>
-    </target>
-
-    <target name="lib" depends="jar-connector">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib" file="build/jar/mcf-filesystem-connector.jar"/>
-    </target>
-
-    <target name="compile-connector-tests" depends="compile-connector">
-        <mkdir dir="build/connector-tests/classes"/>
-        <javac srcdir="connector/src/test/java" destdir="build/connector-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
-            <classpath>
-                 <fileset dir="lib"> 
-                    <include name="*.jar"/> 
-                </fileset>
-                <pathelement location="build/connector/classes"/>
-            </classpath>
-        </javac>
-    </target>
-    
-    <target name="compile-tests" depends="compile-connector-tests"/>
-    
-    <target name="jar-connector-tests" depends="compile-connector-tests">
-        <mkdir dir="build/test-jar"/>
-        <jar destfile="build/test-jar/mcf-filesystem-connector-tests.jar" basedir="build/connector-tests/classes"/>
-    </target>
-
-    <target name="jar-tests" depends="jar-connector-tests"/>
-
-    <target name="run-tests" depends="compile-tests"/>
+    <import file="../connector-build.xml"/>
 
     <target name="run-tests-derby" depends="compile-tests">
         <mkdir dir="test-derby-output"/>
@@ -144,8 +81,5 @@
         </junit>
     </target>
 
-    <target name="build" depends="lib"/>
-    <target name="build-tests" depends="jar-tests,lib"/>
-    <target name="all" depends="build,doc,build-tests,run-tests,run-tests-derby,run-tests-HSQLDB"/>
     
 </project>



Mime
View raw message