You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@manifoldcf.apache.org by kw...@apache.org on 2014/03/28 13:47:06 UTC

svn commit: r1582733 [2/6] - in /manifoldcf/trunk: ./ connectors/ connectors/activedirectory/ connectors/activedirectory/connector/src/test/java/org/ connectors/alfresco/ connectors/alfresco/connector/src/main/resources/org/apache/manifoldcf/crawler/co...

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1582733&r1=1582732&r2=1582733&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Fri Mar 28 12:47:03 2014
@@ -43,126 +43,6 @@
         <echo message="Overlay -lib package, or run 'make-core-deps' target first"/>
     </target>
 
-    <target name="clean">
-        <delete>
-          <fileset dir="." includes="apache-manifoldcf-*.zip"/>
-          <fileset dir="." includes="apache-manifoldcf-*.tar.gz"/>
-        </delete>
-        <delete dir="build"/>
-        <delete dir="dist"/>
-        <delete dir="test-output/"/>
-        <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"/>
-        <ant dir="site" target="clean"/>
-        <ant dir="framework" target="clean"/>
-        <ant dir="connectors/alfresco" target="clean"/>
-        <ant dir="connectors/cmis" target="clean"/>
-        <ant dir="connectors/dropbox" target="clean"/>
-        <ant dir="connectors/email" target="clean"/>
-        <ant dir="connectors/generic" target="clean"/>
-        <ant dir="connectors/googledrive" target="clean"/>
-        <ant dir="connectors/jira" target="clean"/>
-        <ant dir="connectors/activedirectory" target="clean"/>
-        <ant dir="connectors/ldap" target="clean"/>
-        <ant dir="connectors/documentum" target="clean"/>
-        <ant dir="connectors/filenet" target="clean"/>
-        <ant dir="connectors/filesystem" target="clean"/>
-        <ant dir="connectors/gts" target="clean"/>
-        <ant dir="connectors/hdfs" target="clean"/>
-        <ant dir="connectors/jcifs" target="clean"/>
-        <ant dir="connectors/jdbc" target="clean"/>
-        <ant dir="connectors/livelink" target="clean"/>
-        <ant dir="connectors/solr" target="clean"/>
-        <ant dir="connectors/memex" target="clean"/>
-        <ant dir="connectors/meridio" target="clean"/>
-        <ant dir="connectors/opensearchserver" target="clean"/>
-        <ant dir="connectors/elasticsearch" target="clean"/>
-        <ant dir="connectors/nullauthority" target="clean"/>
-        <ant dir="connectors/nulloutput" target="clean"/>
-        <ant dir="connectors/rss" target="clean"/>
-        <ant dir="connectors/regexpmapper" target="clean"/>
-        <ant dir="connectors/sharepoint" target="clean"/>
-        <ant dir="connectors/webcrawler" target="clean"/>
-        <ant dir="connectors/wiki" target="clean"/>
-        
-        <ant dir="tests/activedirectory" target="clean"/>
-        <ant dir="tests/alfresco" target="clean"/>
-        <ant dir="tests/cmis" target="clean"/>
-        <ant dir="tests/filesystem" target="clean"/>
-        <ant dir="tests/gts" target="clean"/>
-        <ant dir="tests/hdfs" target="clean"/>
-        <ant dir="tests/opensearchserver" target="clean"/>
-        <ant dir="tests/rss" target="clean"/>
-        <ant dir="tests/solr" target="clean"/>
-        <ant dir="tests/jcifs" target="clean"/>
-        <ant dir="tests/jdbc" target="clean"/>
-        <ant dir="tests/sharepoint" target="clean"/>
-        <ant dir="tests/webcrawler" target="clean"/>
-        <ant dir="tests/wiki" target="clean"/>
-        <ant dir="tests/elasticsearch" target="clean"/>
-
-    </target>
-
-    <target name="cleanup-afterbuild">
-        <delete dir="build"/>
-        <delete dir="test-output/"/>
-        <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"/>
-        <ant dir="site" target="clean"/>
-        <ant dir="framework" target="clean"/>
-        <ant dir="connectors/alfresco" target="clean"/>
-        <ant dir="connectors/cmis" target="clean"/>
-        <ant dir="connectors/dropbox" target="clean"/>
-        <ant dir="connectors/email" target="clean"/>
-        <ant dir="connectors/generic" target="clean"/>
-        <ant dir="connectors/googledrive" target="clean"/>
-        <ant dir="connectors/jira" target="clean"/>
-        <ant dir="connectors/activedirectory" target="clean"/>
-        <ant dir="connectors/ldap" target="clean"/>
-        <ant dir="connectors/documentum" target="clean"/>
-        <ant dir="connectors/filenet" target="clean"/>
-        <ant dir="connectors/filesystem" target="clean"/>
-        <ant dir="connectors/gts" target="clean"/>
-        <ant dir="connectors/hdfs" target="clean"/>
-        <ant dir="connectors/jcifs" target="clean"/>
-        <ant dir="connectors/jdbc" target="clean"/>
-        <ant dir="connectors/livelink" target="clean"/>
-        <ant dir="connectors/solr" target="clean"/>
-        <ant dir="connectors/memex" target="clean"/>
-        <ant dir="connectors/meridio" target="clean"/>
-        <ant dir="connectors/opensearchserver" target="clean"/>
-        <ant dir="connectors/elasticsearch" target="clean"/>
-        <ant dir="connectors/nullauthority" target="clean"/>
-        <ant dir="connectors/nulloutput" target="clean"/>
-        <ant dir="connectors/rss" target="clean"/>
-        <ant dir="connectors/regexpmapper" target="clean"/>
-        <ant dir="connectors/sharepoint" target="clean"/>
-        <ant dir="connectors/webcrawler" target="clean"/>
-        <ant dir="connectors/wiki" target="clean"/>
-
-        <ant dir="tests/activedirectory" target="clean"/>
-        <ant dir="tests/alfresco" target="clean"/>
-        <ant dir="tests/cmis" target="clean"/>
-        <ant dir="tests/filesystem" target="clean"/>
-        <ant dir="tests/gts" target="clean"/>
-        <ant dir="tests/hdfs" target="clean"/>
-        <ant dir="tests/opensearchserver" target="clean"/>
-        <ant dir="tests/rss" target="clean"/>
-        <ant dir="tests/solr" target="clean"/>
-        <ant dir="tests/jcifs" target="clean"/>
-        <ant dir="tests/jdbc" target="clean"/>
-        <ant dir="tests/sharepoint" target="clean"/>
-        <ant dir="tests/webcrawler" target="clean"/>
-        <ant dir="tests/wiki" target="clean"/>
-        <ant dir="tests/elasticsearch" target="clean"/>
-
-    </target>
     
     <target name="build-site" depends="downloaded-check" if="downloaded">
       <ant dir="site" target="all"/>
@@ -1202,6 +1082,12 @@
     </target>
     
     <target name="deliver-framework" depends="preclean-for-delivery,build-framework" if="downloaded">
+        <mkdir dir="dist"/>
+        <copy todir="dist">
+            <fileset dir="framework/dist">
+                <include name="connector-build.xml"/>
+            </fileset>
+        </copy>
         <mkdir dir="dist/web"/>
         <copy todir="dist/web">
             <fileset dir="framework/dist/web"/>
@@ -1214,6 +1100,10 @@
         <copy todir="dist/lib">
             <fileset dir="framework/dist/lib"/>
         </copy>
+        <mkdir dir="dist/test-lib"/>
+        <copy todir="dist/test-lib">
+            <fileset dir="framework/dist/test-lib"/>
+        </copy>
         <mkdir dir="dist/lib-proprietary"/>
         <copy todir="dist/lib-proprietary">
             <fileset dir="framework/dist/lib-proprietary"/>
@@ -1280,1975 +1170,299 @@
         </copy>
     </target>
 
-    <target name="general-connector-integration-check">
-        <available file="connectors/${connector-name}/dist/integration" type="dir" property="${connector-name}.has-integration"/>
+    <target name="deliver-framework-test-jars" depends="deliver-framework" if="downloaded">
+        <!-- MHL -->
     </target>
+    
+    <!-- Connector crawler.  This iterates over all connector makefiles, invoking the specified target of each. -->
+    <macrodef name="connectors-crawl">
+        <attribute name="target" default=""/>
+        <attribute name="failonerror" default="true"/>
+        <sequential>
+            <subant target="@{target}" failonerror="@{failonerror}" inheritall="false">
+                <!-- propertyset refid="uptodate.and.compiled.properties"/ -->
+                <fileset dir="connectors" includes="*/build.xml" excludes="build/**,build-stubs/**,connector/**,dist/**,test-output*/**"/>
+            </subant>
+        </sequential>
+    </macrodef>
 
-    <target name="general-connector-processes-check">
-        <available file="connectors/${connector-name}/dist/server-process" type="dir" property="${connector-name}.has-server-process"/>
-        <available file="connectors/${connector-name}/dist/registry-process" type="dir" property="${connector-name}.has-registry-process"/>
-        <condition property="${connector-name}.has-processes">
-          <and>
-              <isset property="${connector-name}.has-server-process"/>
-              <isset property="${connector-name}.has-registry-process"/>
-          </and>
-        </condition>
+    <!-- Generic connector targets -->
+    
+    <target name="download-connectors-dependencies" depends="deliver-framework" if="downloaded">
+        <connectors-crawl target="download-dependencies"/>
     </target>
 
-    <target name="general-connector-delivery-integration" depends="general-connector-integration-check" if="${connector-name}.has-integration">
-        <mkdir dir="dist/${connector-name}-integration"/>
-        <copy todir="dist/${connector-name}-integration">
-            <fileset dir="connectors/${connector-name}/dist/integration"/>
-        </copy>
+    <target name="cleanup-connectors-dependencies" depends="deliver-framework" if="downloaded">
+        <connectors-crawl target="download-cleanup"/>
     </target>
 
-    <target name="general-connector-delivery-processes" depends="general-connector-processes-check" if="${connector-name}.has-processes">
-        <mkdir dir="dist/${connector-name}-server-process"/>
-        <copy todir="dist/${connector-name}-server-process">
-            <fileset dir="connectors/${connector-name}/dist/server-process"/>
-        </copy>
-        <mkdir dir="dist/${connector-name}-registry-process"/>
-        <copy todir="dist/${connector-name}-registry-process">
-            <fileset dir="connectors/${connector-name}/dist/registry-process"/>
-        </copy>
+    <target name="deliver-connectors" depends="deliver-framework" if="downloaded">
+        <connectors-crawl target="deliver-connector"/>
     </target>
-
-    <target name="general-connector-proprietary-only-check">
-        <available file="connectors/${connector-name}/dist/lib-proprietary-only" type="dir" property="${connector-name}.has-proprietary-only"/>
+    
+    <target name="deliver-connectors-doc" depends="deliver-connectors,deliver-framework-doc" if="downloaded">
+        <connectors-crawl target="deliver-connector-doc"/>
     </target>
 
-    <target name="general-connector-proprietary-only-delivery" depends="general-connector-proprietary-only-check" if="${connector-name}.has-proprietary-only">
-        <mkdir dir="dist/connector-lib-proprietary"/>
-        <copy todir="dist/connector-lib-proprietary">
-            <fileset dir="connectors/${connector-name}/dist/lib-proprietary-only"/>
-        </copy>
+    <target name="deliver-connectors-test-jars" depends="deliver-connectors,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="deliver-connector-test-jars"/>
     </target>
-
-    <target name="general-connector-delivery" depends="general-connector-proprietary-only-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
-        <mkdir dir="dist/connector-lib"/>
-        <copy todir="dist/connector-lib">
-            <fileset dir="connectors/${connector-name}/dist/lib"/>
-        </copy>
+    
+    <target name="run-connectors-tests" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests"/>
     </target>
 
-    <target name="general-connector-doc-check">
-        <available file="connectors/${connector-name}/dist/doc" type="dir" property="${connector-name}.has-doc"/>
+    <target name="run-connectors-tests-derby" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests-derby"/>
     </target>
 
-    <target name="general-connector-doc-delivery" depends="general-connector-doc-check" if="${connector-name}.has-doc">
-        <mkdir dir="dist/doc/api/${connector-name}"/>
-        <copy todir="dist/doc/api/${connector-name}">
-            <fileset dir="connectors/${connector-name}/dist/doc"/>
-        </copy>
+    <target name="run-connectors-tests-HSQLDB" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests-HSQLDB"/>
     </target>
 
-    <target name="general-connector-proprietary-runnable-check">
-        <available file="connectors/${connector-name}/dist/lib-proprietary-only/${connector-name}-PLACEHOLDER.txt" property="${connector-name}.has-placeholder"/>
-        <condition property="${connector-name}.is-proprietary-runnable">
-            <not>
-                <isset property="${connector-name}.has-placeholder"/>
-            </not>
-        </condition>
+    <target name="run-connectors-tests-HSQLDBext" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests-HSQLDBext"/>
     </target>
 
-    <target name="general-connector-runnable-check" depends="general-connector-proprietary-runnable-check">
-        <available file="connectors/${connector-name}/lib-proprietary" type="dir" property="${connector-name}.has-lib-proprietary"/>
-        <condition property="${connector-name}.is-runnable">
-            <not>
-                <isset property="${connector-name}.has-lib-proprietary"/>
-            </not>
-        </condition>
-    </target>
-    
-    <target name="general-add-mapping-connector-commented" depends="general-connector-runnable-check" unless="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your mapping connectors here --&gt;" value="&lt;!-- Add your mapping connectors here --&gt;&#0010;  &lt;!--mappingconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-tests-postgresql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests-postgresql"/>
     </target>
 
-    <target name="general-add-mapping-connector-non-commented" depends="general-connector-runnable-check" if="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your mapping connectors here --&gt;" value="&lt;!-- Add your mapping connectors here --&gt;&#0010;  &lt;mappingconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-tests-mysql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-tests-mysql"/>
     </target>
 
-    <target name="general-add-mapping-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your mapping connectors here --&gt;" value="&lt;!-- Add your mapping connectors here --&gt;&#0010;  &lt;!--mappingconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-IT-derby" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-IT-derby"/>
     </target>
 
-    <target name="general-add-mapping-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your mapping connectors here --&gt;" value="&lt;!-- Add your mapping connectors here --&gt;&#0010;  &lt;mappingconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-IT-HSQLDB" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-IT-HSQLDB"/>
     </target>
 
-    <target name="general-add-mapping-connector" depends="general-add-mapping-connector-commented,general-add-mapping-connector-non-commented,general-add-mapping-connector-proprietary-commented,general-add-mapping-connector-proprietary-non-commented">
+    <target name="run-connectors-IT-HSQLDBext" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-IT-HSQLDBext"/>
     </target>
 
-    <target name="general-add-authority-connector-commented" depends="general-connector-runnable-check" unless="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;!--authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-IT-postgresql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-IT-postgresql"/>
     </target>
 
-    <target name="general-add-authority-connector-non-commented" depends="general-connector-runnable-check" if="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-IT-mysql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-IT-mysql"/>
     </target>
 
-    <target name="general-add-authority-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;!--authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-UI-derby" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-UI-derby"/>
     </target>
 
-    <target name="general-add-authority-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your authority connectors here --&gt;" value="&lt;!-- Add your authority connectors here --&gt;&#0010;  &lt;authorityconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-UI-HSQLDB" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-UI-HSQLDB"/>
     </target>
 
-    <target name="general-add-authority-connector" depends="general-add-authority-connector-commented,general-add-authority-connector-non-commented,general-add-authority-connector-proprietary-commented,general-add-authority-connector-proprietary-non-commented">
+    <target name="run-connectors-UI-HSQLDBext" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-UI-HSQLDBext"/>
     </target>
 
-    <target name="general-add-output-connector-commented" depends="general-connector-runnable-check" unless="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;!--outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-UI-postgresql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-UI-postgresql"/>
     </target>
 
-    <target name="general-add-output-connector-non-commented" depends="general-connector-runnable-check" if="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-UI-mysql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-UI-mysql"/>
     </target>
 
-    <target name="general-add-output-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;!--outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-LT-derby" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-LT-derby"/>
     </target>
 
-    <target name="general-add-output-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your output connectors here --&gt;" value="&lt;!-- Add your output connectors here --&gt;&#0010;  &lt;outputconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-LT-HSQLDB" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-LT-HSQLDB"/>
     </target>
 
-    <target name="general-add-output-connector" depends="general-add-output-connector-commented,general-add-output-connector-non-commented,general-add-output-connector-proprietary-commented,general-add-output-connector-proprietary-non-commented">
+    <target name="run-connectors-LT-HSQLDBext" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-LT-HSQLDBext"/>
     </target>
 
-    <target name="general-add-repository-connector-commented" depends="general-connector-runnable-check" unless="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;!--repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <target name="run-connectors-LT-postgresql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-LT-postgresql"/>
     </target>
 
-    <target name="general-add-repository-connector-non-commented" depends="general-connector-runnable-check" if="${connector-name}.is-runnable">
-        <replace file="dist/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    <target name="run-connectors-LT-mysql" depends="deliver-framework,deliver-framework-test-jars" if="downloaded">
+        <connectors-crawl target="run-LT-mysql"/>
     </target>
 
-    <target name="general-add-repository-connector-proprietary-commented" depends="general-connector-proprietary-runnable-check" unless="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;!--repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/--&gt;"/>
+    <!-- General connectors utility targets -->
+    
+    <target name="clean-connectors" depends="deliver-framework" if="downloaded">
+        <connectors-crawl target="clean"/>
     </target>
-
-    <target name="general-add-repository-connector-proprietary-non-commented" depends="general-connector-proprietary-runnable-check" if="${connector-name}.is-proprietary-runnable">
-        <replace file="dist/connectors-proprietary.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;${connector-label}&quot; class=&quot;${connector-class}&quot;/&gt;"/>
+    
+    <!-- General targets -->
+    <target name="clean" depends="clean-connectors">
+        <delete>
+          <fileset dir="." includes="apache-manifoldcf-*.zip"/>
+          <fileset dir="." includes="apache-manifoldcf-*.tar.gz"/>
+        </delete>
+        <delete dir="build"/>
+        <delete dir="dist"/>
+        <ant dir="site" target="clean"/>
+        <ant dir="framework" target="clean"/>
     </target>
 
-    <target name="general-add-repository-connector" depends="general-add-repository-connector-commented,general-add-repository-connector-non-commented,general-add-repository-connector-proprietary-commented,general-add-repository-connector-proprietary-non-commented">
+    <target name="cleanup-afterbuild" depends="clean-connectors">
+        <delete dir="build"/>
+        <ant dir="site" target="clean"/>
+        <ant dir="framework" target="clean"/>
     </target>
+
+    <target name="build" depends="deliver-connectors"/>
+    <target name="tmpclean" depends="cleanup-afterbuild"/>
+    <target name="buildcln" depends="build,tmpclean"/>
+    <target name="javadoc" depends="deliver-connectors-doc"/>
+    <target name="doc" depends="deliver-site-doc"/>
     
-    <target name="calculate-activedirectory-condition" depends="build-activedirectory-connector">
-        <available file="connectors/activedirectory/dist/lib" type="dir" property="activedirectory.exists"/>
-        <condition property="activedirectory.include">
-            <and>
-                <isset property="activedirectory.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
+    <target name="set-version">
+      <property name="release-version" value="1.6-dev"/>
     </target>
-
-    <target name="calculate-activedirectory-doc-condition" depends="doc-activedirectory-connector">
-        <available file="connectors/activedirectory/dist/doc" type="dir" property="activedirectory-doc.exists"/>
-        <condition property="activedirectory-doc.include">
-            <and>
-                <isset property="activedirectory-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
+    
+    <target name="create-source-zip" depends="set-version">
+      <zip destfile="apache-manifoldcf-${release-version}-src.zip" update="false">
+        <zipfileset dir="." prefix="apache-manifoldcf-${release-version}">
+          <exclude name="/lib/"/>
+          <exclude name="/connectors/*/lib/"/>
+          <exclude name="/framework/lib/"/>
+          <exclude name="**/build/"/>
+          <exclude name="**/tmp/"/>
+          <exclude name="/site/fonts/"/>
+          <exclude name="/dist/"/>
+          <exclude name="/connectors/*/dist/"/>
+          <exclude name="/framework/dist/"/>
+          <exclude name="**/target/"/>
+          <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
+          <exclude name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
+          <exclude name="/legacy-*/"/>
+          <exclude name="apache-manifoldcf-*"/>
+        </zipfileset>
+      </zip>
     </target>
 
-    <target name="deliver-activedirectory-connector" depends="calculate-activedirectory-condition" if="activedirectory.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="activedirectory"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="activedirectory"/>
-            <param name="connector-label" value="Active Directory"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority"/>
-        </antcall>
+    <target name="create-lib-zip" depends="set-version">
+      <zip destfile="apache-manifoldcf-${release-version}-lib.zip" update="false">
+        <zipfileset dir="lib" prefix="apache-manifoldcf-${release-version}"/>
+      </zip>
     </target>
 
-    <target name="deliver-activedirectory-connector-doc" depends="calculate-activedirectory-doc-condition" if="activedirectory-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="activedirectory"/>
-        </antcall>
+    <target name="create-source-tar" depends="set-version">
+      <tar destfile="apache-manifoldcf-${release-version}-src.tar.gz" compression="gzip" longfile="gnu">
+        <tarfileset dir="." prefix="apache-manifoldcf-${release-version}">
+          <exclude name="/lib/"/>
+          <exclude name="/connectors/*/lib/"/>
+          <exclude name="/framework/lib/"/>
+          <exclude name="**/build/"/>
+          <exclude name="**/tmp/"/>
+          <exclude name="/site/fonts/"/>
+          <exclude name="/dist/"/>
+          <exclude name="/connectors/*/dist/"/>
+          <exclude name="/framework/dist/"/>
+          <exclude name="**/target/"/>
+          <exclude name="**/test-output/"/>
+          <exclude name="**/test-derby-output/"/>
+          <exclude name="**/test-postgresql-output/"/>
+          <exclude name="**/test-HSQLDB-output/"/>
+          <exclude name="**/test-HSQLDBext-output/"/>
+          <exclude name="**/test-mysql-output/"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="**/test-materials-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.war"/>
+          <exclude name="**/test-materials-proprietary/*.war"/>
+          <exclude name="**/lib-proprietary/*.wsdl"/>
+          <exclude name="**/test-materials-proprietary/*.wsdl"/>
+          <exclude name="**/lib-proprietary/*.xsd"/>
+          <exclude name="**/test-materials-proprietary/*.xsd"/>
+          <exclude name="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1/"/>
+          <exclude name="/legacy-*/"/>
+          <exclude name="apache-manifoldcf-*"/>
+        </tarfileset>
+      </tar>
     </target>
 
-    <target name="calculate-ldap-condition" depends="build-ldap-connector">
-        <available file="connectors/ldap/dist/lib" type="dir" property="ldap.exists"/>
-        <condition property="ldap.include">
-            <and>
-                <isset property="ldap.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
+    <target name="create-lib-tar" depends="set-version">
+      <tar destfile="apache-manifoldcf-${release-version}-lib.tar.gz" compression="gzip" longfile="gnu">
+        <tarfileset dir="lib" prefix="apache-manifoldcf-${release-version}"/>
+      </tar>
     </target>
 
-    <target name="calculate-ldap-doc-condition" depends="doc-ldap-connector">
-        <available file="connectors/ldap/dist/doc" type="dir" property="ldap-doc.exists"/>
-        <condition property="ldap-doc.include">
-            <and>
-                <isset property="ldap-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
+    <target name="create-bin-zip" depends="build,doc,javadoc,set-version">
+      <zip destfile="apache-manifoldcf-${release-version}-bin.zip" update="false">
+        <zipfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
+          <exclude name="connector-lib-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="lib-proprietary/*.jar"/>
+          <exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
+          <exclude name="connectors-proprietary.xml"/>
+          <exclude name="/example-proprietary/"/>
+          <exclude name="/multiprocess-file-example-proprietary/"/>
+          <exclude name="/multiprocess-zk-example-proprietary/"/>
+          <exclude name="/web-proprietary/"/>
+        </zipfileset>
+      </zip>
     </target>
-
-    <target name="deliver-ldap-connector" depends="calculate-ldap-condition" if="ldap.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="ldap"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="ldap"/>
-            <param name="connector-label" value="LDAP"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.ldap.LDAPAuthority"/>
-        </antcall>
+    
+    <target name="create-bin-tar" depends="build,doc,javadoc,set-version">
+      <tar destfile="apache-manifoldcf-${release-version}-bin.tar.gz" compression="gzip" longfile="gnu">
+        <tarfileset dir="dist" prefix="apache-manifoldcf-${release-version}">
+          <exclude name="connector-lib-proprietary/*.jar"/>
+          <exclude name="**/lib-proprietary/*.jar"/>
+          <exclude name="lib-proprietary/*.jar"/>
+          <exclude name="connector-lib-proprietary/*-PLACEHOLDER.txt"/>
+          <exclude name="connectors-proprietary.xml"/>
+          <exclude name="/example-proprietary/"/>
+          <exclude name="/multiprocess-file-example-proprietary/"/>
+          <exclude name="/multiprocess-zk-example-proprietary/"/>
+          <exclude name="/web-proprietary/"/>
+        </tarfileset>
+      </tar>
     </target>
 
-    <target name="deliver-ldap-connector-doc" depends="calculate-ldap-doc-condition" if="ldap-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="ldap"/>
-        </antcall>
-    </target>
+    <target name="image" depends="create-source-zip,create-source-tar,create-lib-zip,create-lib-tar,create-bin-zip,create-bin-tar"/>
+    
+    <target name="test-dr" depends="run-tests-derby-framework,run-connectors-tests-derby,run-connectors-IT-derby"/>
 
-    <target name="calculate-alfresco-condition" depends="build-alfresco-connector">
-        <available file="connectors/alfresco/dist/lib" type="dir" property="alfresco.exists"/>
-        <condition property="alfresco.include">
-            <and>
-                <isset property="alfresco.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="test-pg" depends="run-tests-postgresql-framework,run-connectors-tests-postgresql,run-connectors-IT-postgresql"/>
 
-    <target name="calculate-alfresco-testmaterials-condition" depends="calculate-alfresco-condition,build-alfresco-connector-testmaterials">
-        <available file="connectors/alfresco/build/alfresco-4-war" type="dir" property="alfresco-testmaterials.exists"/>
-        <condition property="alfresco-testmaterials.include">
-          <and>
-              <isset property="alfresco-testmaterials.exists"/>
-              <isset property="alfresco.include"/>
-              <isset property="downloaded"/>
-          </and>
-        </condition>
-    </target>
+    <target name="test-my" depends="run-tests-mysql-framework,run-connectors-tests-mysql,run-connectors-IT-mysql"/>
 
-    <target name="calculate-alfresco-doc-condition" depends="doc-alfresco-connector">
-        <available file="connectors/alfresco/dist/doc" type="dir" property="alfresco-doc.exists"/>
-        <condition property="alfresco-doc.include">
-            <and>
-                <isset property="alfresco-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="test-hs" depends="run-tests-HSQLDB-framework,run-tests-HSQLDBext-framework,run-connectors-tests-HSQLDB,run-connectors-tests-HSQLDBext,run-connectors-IT-HSQLDB,run-connectors-IT-HSQLDBext"/>
 
-    <target name="deliver-alfresco-connector" depends="calculate-alfresco-condition" if="alfresco.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="alfresco"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="alfresco"/>
-            <param name="connector-label" value="Alfresco"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.alfresco.AlfrescoRepositoryConnector"/>
-        </antcall>
-    </target>
+    <target name="load-dr" depends="run-connectors-LT-derby"/>
 
-    <target name="deliver-alfresco-connector-doc" depends="calculate-alfresco-doc-condition" if="alfresco-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="alfresco"/>
-        </antcall>
-    </target>
-    
-    <target name="calculate-cmis-condition" depends="build-cmis-connector">
-        <available file="connectors/cmis/dist/lib" type="dir" property="cmis.exists"/>
-        <condition property="cmis.include">
-            <and>
-                <isset property="cmis.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-    
-    
-    <target name="calculate-dropbox-condition" depends="build-dropbox-connector">
-        <available file="connectors/dropbox/dist/lib" type="dir" property="dropbox.exists"/>
-        <condition property="dropbox.include">
-            <and>
-                <isset property="dropbox.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="load-pg" depends="run-connectors-LT-postgresql"/>
 
-    <target name="calculate-dropbox-doc-condition" depends="doc-dropbox-connector">
-        <available file="connectors/dropbox/dist/doc" type="dir" property="dropbox-doc.exists"/>
-        <condition property="dropbox-doc.include">
-            <and>
-                <isset property="dropbox-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="load-my" depends="run-connectors-LT-mysql"/>
 
-    <target name="calculate-generic-condition" depends="build-generic-connector">
-        <available file="connectors/generic/dist/lib" type="dir" property="generic.exists"/>
-        <condition property="generic.include">
-            <and>
-                <isset property="generic.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="load-hs" depends="run-connectors-LT-HSQLDB,run-connectors-LT-HSQLDBext"/>
 
-    <target name="calculate-generic-doc-condition" depends="doc-generic-connector">
-        <available file="connectors/generic/dist/doc" type="dir" property="generic-doc.exists"/>
-        <condition property="generic-doc.include">
-            <and>
-                <isset property="generic-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-	
-    <target name="calculate-googledrive-condition" depends="build-googledrive-connector">
-        <available file="connectors/googledrive/dist/lib" type="dir" property="googledrive.exists"/>
-        <condition property="googledrive.include">
-            <and>
-                <isset property="googledrive.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="test" depends="run-tests-framework,run-connectors-tests,test-dr,test-hs"/>
 
-    <target name="calculate-googledrive-doc-condition" depends="doc-googledrive-connector">
-        <available file="connectors/googledrive/dist/doc" type="dir" property="googledrive-doc.exists"/>
-        <condition property="googledrive-doc.include">
-            <and>
-                <isset property="googledrive-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
+    <target name="ldtest" depends="run-connectors-LT-derby,run-connectors-LT-HSQLDB"/>
 
-    <target name="calculate-jira-condition" depends="build-jira-connector">
-        <available file="connectors/jira/dist/lib" type="dir" property="jira.exists"/>
-        <condition property="jira.include">
-            <and>
-                <isset property="jira.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-jira-doc-condition" depends="doc-jira-connector">
-        <available file="connectors/jira/dist/doc" type="dir" property="jira-doc.exists"/>
-        <condition property="jira-doc.include">
-            <and>
-                <isset property="jira-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-
-
-    <target name="calculate-cmis-doc-condition" depends="doc-cmis-connector">
-        <available file="connectors/cmis/dist/doc" type="dir" property="cmis-doc.exists"/>
-        <condition property="cmis-doc.include">
-            <and>
-                <isset property="cmis-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-cmis-connector" depends="calculate-cmis-condition" if="cmis.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="cmis"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="cmis"/>
-            <param name="connector-label" value="CMIS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="cmis"/>
-            <param name="connector-label" value="CMIS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.cmis.CmisAuthorityConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-dropbox-connector" depends="calculate-dropbox-condition" if="dropbox.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="dropbox"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="dropbox"/>
-            <param name="connector-label" value="DropBox"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.dropbox.DropboxRepositoryConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-dropbox-connector-doc" depends="calculate-dropbox-doc-condition" if="dropbox-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="dropbox"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-generic-connector" depends="calculate-generic-condition" if="generic.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="generic"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="generic"/>
-            <param name="connector-label" value="Generic"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.generic.GenericConnector"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="generic"/>
-            <param name="connector-label" value="Generic"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.generic.GenericAuthority"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-generic-connector-doc" depends="calculate-generic-doc-condition" if="generic-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="generic"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-googledrive-connector" depends="calculate-googledrive-condition" if="googledrive.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="googledrive"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="googledrive"/>
-            <param name="connector-label" value="GoogleDrive"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.googledrive.GoogleDriveRepositoryConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-googledrive-connector-doc" depends="calculate-googledrive-doc-condition" if="googledrive-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="googledrive"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-jira-connector" depends="calculate-jira-condition" if="jira.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="jira"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="jira"/>
-            <param name="connector-label" value="Jira"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.jira.JiraRepositoryConnector"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="jira"/>
-            <param name="connector-label" value="Jira"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.jira.JiraAuthorityConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-jira-connector-doc" depends="calculate-jira-doc-condition" if="jira-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="jira"/>
-        </antcall>
-    </target>
-
-	
-    <target name="deliver-cmis-connector-doc" depends="calculate-cmis-doc-condition" if="cmis-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="cmis"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-documentum-condition" depends="build-documentum-connector">
-        <available file="connectors/documentum/dist/lib" type="dir" property="documentum.exists"/>
-        <condition property="documentum.include">
-            <and>
-                <isset property="documentum.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-documentum-doc-condition" depends="doc-documentum-connector">
-        <available file="connectors/documentum/dist/doc" type="dir" property="documentum-doc.exists"/>
-        <condition property="documentum-doc.include">
-            <and>
-                <isset property="documentum-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-documentum-connector" depends="calculate-documentum-condition" if="documentum.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="documentum"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="documentum"/>
-            <param name="connector-label" value="Documentum"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.authorities.DCTM.AuthorityConnector"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="documentum"/>
-            <param name="connector-label" value="Documentum"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.DCTM.DCTM"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-documentum-connector-doc" depends="calculate-documentum-doc-condition" if="documentum-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="documentum"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-filenet-condition" depends="build-filenet-connector">
-        <available file="connectors/filenet/dist/lib" type="dir" property="filenet.exists"/>
-        <condition property="filenet.include">
-            <and>
-                <isset property="filenet.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-filenet-doc-condition" depends="doc-filenet-connector">
-        <available file="connectors/filenet/dist/doc" type="dir" property="filenet-doc.exists"/>
-        <condition property="filenet-doc.include">
-            <and>
-                <isset property="filenet-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-filenet-connector" depends="calculate-filenet-condition" if="filenet.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="filenet"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="filenet"/>
-            <param name="connector-label" value="FileNet"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-filenet-connector-doc" depends="calculate-filenet-doc-condition" if="filenet-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="filenet"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-filesystem-condition" depends="build-filesystem-connector">
-        <available file="connectors/filesystem/dist/lib" type="dir" property="filesystem.exists"/>
-        <condition property="filesystem.include">
-            <and>
-                <isset property="filesystem.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-filesystem-doc-condition" depends="doc-filesystem-connector">
-        <available file="connectors/filesystem/dist/doc" type="dir" property="filesystem-doc.exists"/>
-        <condition property="filesystem-doc.include">
-            <and>
-                <isset property="filesystem-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-filesystem-connector" depends="calculate-filesystem-condition" if="filesystem.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="filesystem"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="filesystem"/>
-            <param name="connector-label" value="File system"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.filesystem.FileConnector"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="filesystem"/>
-            <param name="connector-label" value="File system"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.filesystem.FileOutputConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-filesystem-connector-doc" depends="calculate-filesystem-doc-condition" if="filesystem-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="filesystem"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-gts-condition" depends="build-gts-connector">
-        <available file="connectors/gts/dist/lib" type="dir" property="gts.exists"/>
-        <condition property="gts.include">
-            <and>
-                <isset property="gts.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-gts-doc-condition" depends="doc-gts-connector">
-        <available file="connectors/gts/dist/doc" type="dir" property="gts-doc.exists"/>
-        <condition property="gts-doc.include">
-            <and>
-                <isset property="gts-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-gts-connector" depends="calculate-gts-condition" if="gts.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="gts"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="gts"/>
-            <param name="connector-label" value="MetaCarta GTS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.gts.GTSConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-gts-connector-doc" depends="calculate-gts-doc-condition" if="gts-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="gts"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-jdbc-condition" depends="build-jdbc-connector">
-        <available file="connectors/jdbc/dist/lib" type="dir" property="jdbc.exists"/>
-        <condition property="jdbc.include">
-            <and>
-                <isset property="jdbc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-hdfs-condition" depends="build-hdfs-connector">
-        <available file="connectors/hdfs/dist/lib" type="dir" property="hdfs.exists"/>
-        <condition property="hdfs.include">
-            <and>
-                <isset property="hdfs.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-hdfs-doc-condition" depends="doc-hdfs-connector">
-        <available file="connectors/hdfs/dist/doc" type="dir" property="hdfs-doc.exists"/>
-        <condition property="hdfs-doc.include">
-            <and>
-                <isset property="hdfs-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-hdfs-connector" depends="calculate-hdfs-condition" if="hdfs.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="hdfs"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="hdfs"/>
-            <param name="connector-label" value="HDFS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.hdfs.HDFSRepositoryConnector"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="hdfs"/>
-            <param name="connector-label" value="HDFS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.hdfs.HDFSOutputConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-hdfs-connector-doc" depends="calculate-hdfs-doc-condition" if="hdfs-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="hdfs"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-jdbc-doc-condition" depends="doc-jdbc-connector">
-        <available file="connectors/jdbc/dist/doc" type="dir" property="jdbc-doc.exists"/>
-        <condition property="jdbc-doc.include">
-            <and>
-                <isset property="jdbc-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-jdbc-connector" depends="calculate-jdbc-condition" if="jdbc.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="jdbc"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="jdbc"/>
-            <param name="connector-label" value="JDBC"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.jdbc.JDBCConnector"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="jdbc"/>
-            <param name="connector-label" value="JDBC"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.jdbc.JDBCAuthority"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-jdbc-connector-doc" depends="calculate-jdbc-doc-condition" if="jdbc-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="jdbc"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-jcifs-condition" depends="build-jcifs-connector">
-        <available file="connectors/jcifs/dist/lib" type="dir" property="jcifs.exists"/>
-        <condition property="jcifs.include">
-            <and>
-                <isset property="jcifs.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-jcifs-doc-condition" depends="doc-jcifs-connector">
-        <available file="connectors/jcifs/dist/doc" type="dir" property="jcifs-doc.exists"/>
-        <condition property="jcifs-doc.include">
-            <and>
-                <isset property="jcifs-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-jcifs-connector" depends="calculate-jcifs-condition" if="jcifs.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="jcifs"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="jcifs"/>
-            <param name="connector-label" value="Windows shares"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-jcifs-connector-doc" depends="calculate-jcifs-doc-condition" if="jcifs-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="jcifs"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-livelink-condition" depends="build-livelink-connector">
-        <available file="connectors/livelink/dist/lib" type="dir" property="livelink.exists"/>
-        <condition property="livelink.include">
-            <and>
-                <isset property="livelink.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-livelink-doc-condition" depends="doc-livelink-connector">
-        <available file="connectors/livelink/dist/doc" type="dir" property="livelink-doc.exists"/>
-        <condition property="livelink-doc.include">
-            <and>
-                <isset property="livelink-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-livelink-connector" depends="calculate-livelink-condition" if="livelink.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="livelink"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="livelink"/>
-            <param name="connector-label" value="LiveLink"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkAuthority"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="livelink"/>
-            <param name="connector-label" value="LiveLink"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-livelink-connector-doc" depends="calculate-livelink-doc-condition" if="livelink-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="livelink"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-solr-condition" depends="build-solr-connector">
-        <available file="connectors/solr/dist/lib" type="dir" property="solr.exists"/>
-        <condition property="solr.include">
-            <and>
-                <isset property="solr.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-solr-doc-condition" depends="doc-solr-connector">
-        <available file="connectors/solr/dist/doc" type="dir" property="solr-doc.exists"/>
-        <condition property="solr-doc.include">
-            <and>
-                <isset property="solr-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-solr-connector" depends="calculate-solr-condition" if="solr.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="solr"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="solr"/>
-            <param name="connector-label" value="Solr"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-solr-connector-doc" depends="calculate-solr-doc-condition" if="solr-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="solr"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-memex-condition" depends="build-memex-connector">
-        <available file="connectors/memex/dist/lib" type="dir" property="memex.exists"/>
-        <condition property="memex.include">
-            <and>
-                <isset property="memex.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-memex-doc-condition" depends="doc-memex-connector">
-        <available file="connectors/memex/dist/doc" type="dir" property="memex-doc.exists"/>
-        <condition property="memex-doc.include">
-            <and>
-                <isset property="memex-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-memex-connector" depends="calculate-memex-condition" if="memex.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="memex"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="memex"/>
-            <param name="connector-label" value="Memex Patriarch"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.memex.MemexAuthority"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="memex"/>
-            <param name="connector-label" value="Memex Patriarch"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.memex.MemexConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-memex-connector-doc" depends="calculate-memex-doc-condition" if="memex-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="memex"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-meridio-condition" depends="build-meridio-connector">
-        <available file="connectors/meridio/dist/lib" type="dir" property="meridio.exists"/>
-        <condition property="meridio.include">
-            <and>
-                <isset property="meridio.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-meridio-doc-condition" depends="doc-meridio-connector">
-        <available file="connectors/meridio/dist/doc" type="dir" property="meridio-doc.exists"/>
-        <condition property="meridio-doc.include">
-            <and>
-                <isset property="meridio-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-meridio-connector" depends="calculate-meridio-condition" if="meridio.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="meridio"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="meridio"/>
-            <param name="connector-label" value="Meridio"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioAuthority"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="meridio"/>
-            <param name="connector-label" value="Meridio"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-meridio-connector-doc" depends="calculate-meridio-doc-condition" if="meridio-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="meridio"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-opensearchserver-condition" depends="build-opensearchserver-connector">
-        <available file="connectors/opensearchserver/dist/lib" type="dir" property="opensearchserver.exists"/>
-        <condition property="opensearchserver.include">
-            <and>
-                <isset property="opensearchserver.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-opensearchserver-doc-condition" depends="doc-opensearchserver-connector">
-        <available file="connectors/opensearchserver/dist/doc" type="dir" property="opensearchserver-doc.exists"/>
-        <condition property="opensearchserver-doc.include">
-            <isset property="opensearchserver-doc.exists"/>
-        </condition>
-    </target>
-
-   <target name="deliver-opensearchserver-connector" depends="calculate-opensearchserver-condition" if="opensearchserver.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="opensearchserver"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="opensearchserver"/>
-            <param name="connector-label" value="OpenSearchServer"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-opensearchserver-connector-doc" depends="calculate-opensearchserver-doc-condition" if="opensearchserver-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="opensearchserver"/>
-        </antcall>
-    </target>
-  
-
-    <target name="calculate-elasticsearch-condition" depends="build-elasticsearch-connector">
-        <available file="connectors/elasticsearch/dist/lib" type="dir" property="elasticsearch.exists"/>
-        <condition property="elasticsearch.include">
-            <and>
-                <isset property="elasticsearch.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-elasticsearch-testmaterials-condition" depends="calculate-elasticsearch-condition">
-        <available file="connectors/elasticsearch/test-materials-proprietary/elasticsearch-1.0.1" type="dir" property="elasticsearch-testmaterials.exists"/>
-        <condition property="elasticsearch-testmaterials.include">
-          <and>
-              <isset property="elasticsearch-testmaterials.exists"/>
-              <isset property="elasticsearch.include"/>
-          </and>
-        </condition>
-    </target>
-
-    <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
-      <condition property="elasticsearch-tests.include">
-        <and>
-            <isset property="elasticsearch.include"/>
-            <isset property="elasticsearch-testmaterials.include"/>
-            <isset property="cmis.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-elasticsearch-doc-condition" depends="doc-elasticsearch-connector">
-        <available file="connectors/elasticsearch/dist/doc" type="dir" property="elasticsearch-doc.exists"/>
-        <condition property="elasticsearch-doc.include">
-            <and>
-                <isset property="elasticsearch-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-   <target name="deliver-elasticsearch-connector" depends="calculate-elasticsearch-condition" if="elasticsearch.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="elasticsearch"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="elasticsearch"/>
-            <param name="connector-label" value="ElasticSearch"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"/>
-        </antcall>
-    </target>
-
-    <target name="deliver-elasticsearch-connector-doc" depends="calculate-elasticsearch-doc-condition" if="elasticsearch-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="elasticsearch"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-nullauthority-condition" depends="build-nullauthority-connector">
-        <available file="connectors/nullauthority/dist/lib" type="dir" property="nullauthority.exists"/>
-        <condition property="nullauthority.include">
-            <and>
-                <isset property="nullauthority.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-nullauthority-doc-condition" depends="doc-nullauthority-connector">
-        <available file="connectors/nullauthority/dist/doc" type="dir" property="nullauthority-doc.exists"/>
-        <condition property="nullauthority-doc.include">
-            <and>
-                <isset property="nullauthority-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-nullauthority-connector" depends="calculate-nullauthority-condition" if="nullauthority.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="nullauthority"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="nullauthority"/>
-            <param name="connector-label" value="Null"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-nullauthority-connector-doc" depends="calculate-nullauthority-doc-condition" if="nullauthority-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="nullauthority"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-nulloutput-condition" depends="build-nulloutput-connector">
-        <available file="connectors/nulloutput/dist/lib" type="dir" property="nulloutput.exists"/>
-        <condition property="nulloutput.include">
-            <and>
-                <isset property="nulloutput.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-nulloutput-doc-condition" depends="doc-nulloutput-connector">
-        <available file="connectors/nulloutput/dist/doc" type="dir" property="nulloutput-doc.exists"/>
-        <condition property="nulloutput-doc.include">
-            <and>
-                <isset property="nulloutput-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-nulloutput-connector" depends="calculate-nulloutput-condition" if="nulloutput.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="nulloutput"/>
-        </antcall>
-        <antcall target="general-add-output-connector">
-            <param name="connector-name" value="nulloutput"/>
-            <param name="connector-label" value="Null"/>
-            <param name="connector-class" value="org.apache.manifoldcf.agents.output.nullconnector.NullConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-nulloutput-connector-doc" depends="calculate-nulloutput-doc-condition" if="nulloutput-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="nulloutput"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-rss-condition" depends="build-rss-connector">
-        <available file="connectors/rss/dist/lib" type="dir" property="rss.exists"/>
-        <condition property="rss.include">
-            <and>
-                <isset property="rss.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-rss-doc-condition" depends="doc-rss-connector">
-        <available file="connectors/rss/dist/doc" type="dir" property="rss-doc.exists"/>
-        <condition property="rss-doc.include">
-            <and>
-                <isset property="rss-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-rss-connector" depends="calculate-rss-condition" if="rss.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="rss"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="rss"/>
-            <param name="connector-label" value="RSS"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-rss-connector-doc" depends="calculate-rss-doc-condition" if="rss-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="rss"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-regexpmapper-condition" depends="build-regexp-mapper">
-        <available file="connectors/regexpmapper/dist/lib" type="dir" property="regexpmapper.exists"/>
-        <condition property="regexpmapper.include">
-            <and>
-                <isset property="regexpmapper.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-regexpmapper-doc-condition" depends="doc-regexp-mapper">
-        <available file="connectors/regexpmapper/dist/doc" type="dir" property="regexpmapper-doc.exists"/>
-        <condition property="regexpmapper-doc.include">
-            <and>
-                <isset property="regexpmapper-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-regexp-mapper" depends="calculate-regexpmapper-condition" if="regexpmapper.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="regexpmapper"/>
-        </antcall>
-        <antcall target="general-add-mapping-connector">
-            <param name="connector-name" value="regexpmapper"/>
-            <param name="connector-label" value="Regular expression mapper"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.mappers.regexp.RegexpMapper"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-regexp-mapper-doc" depends="calculate-regexpmapper-doc-condition" if="regexpmapper-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="regexpmapper"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-sharepoint-condition" depends="build-sharepoint-connector">
-        <available file="connectors/sharepoint/dist/lib" type="dir" property="sharepoint.exists"/>
-        <condition property="sharepoint.include">
-            <and>
-                <isset property="sharepoint.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-sharepoint-doc-condition" depends="doc-sharepoint-connector">
-        <available file="connectors/sharepoint/dist/doc" type="dir" property="sharepoint-doc.exists"/>
-        <condition property="sharepoint-doc.include">
-            <and>
-                <isset property="sharepoint-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-sharepoint-connector" depends="calculate-sharepoint-condition" if="sharepoint.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="sharepoint"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="sharepoint"/>
-            <param name="connector-label" value="SharePoint"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.sharepoint.SharePointRepository"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="sharepoint"/>
-            <param name="connector-label" value="SharePoint/ActiveDirectory"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.sharepoint.SharePointADAuthority"/>
-        </antcall>
-        <antcall target="general-add-authority-connector">
-            <param name="connector-name" value="sharepoint"/>
-            <param name="connector-label" value="SharePoint/Native"/>
-            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.sharepoint.SharePointAuthority"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-sharepoint-connector-doc" depends="calculate-sharepoint-doc-condition" if="sharepoint-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="sharepoint"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-webcrawler-condition" depends="build-webcrawler-connector">
-        <available file="connectors/webcrawler/dist/lib" type="dir" property="webcrawler.exists"/>
-        <condition property="webcrawler.include">
-            <and>
-                <isset property="webcrawler.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-webcrawler-doc-condition" depends="doc-webcrawler-connector">
-        <available file="connectors/webcrawler/dist/doc" type="dir" property="webcrawler-doc.exists"/>
-        <condition property="webcrawler-doc.include">
-            <and>
-                <isset property="webcrawler-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-webcrawler-connector" depends="calculate-webcrawler-condition" if="webcrawler.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="webcrawler"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="webcrawler"/>
-            <param name="connector-label" value="Web"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-webcrawler-connector-doc" depends="calculate-webcrawler-doc-condition" if="webcrawler-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="webcrawler"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-wiki-condition" depends="build-wiki-connector">
-        <available file="connectors/wiki/dist/lib" type="dir" property="wiki.exists"/>
-        <condition property="wiki.include">
-            <and>
-                <isset property="wiki.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-wiki-doc-condition" depends="doc-wiki-connector">
-        <available file="connectors/wiki/dist/doc" type="dir" property="wiki-doc.exists"/>
-        <condition property="wiki-doc.include">
-            <and>
-                <isset property="wiki-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-wiki-connector" depends="calculate-wiki-condition" if="wiki.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="wiki"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="wiki"/>
-            <param name="connector-label" value="Wiki"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-wiki-connector-doc" depends="calculate-wiki-doc-condition" if="wiki-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="wiki"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-email-condition" depends="build-email-connector">
-        <available file="connectors/email/dist/lib" type="dir" property="email.exists"/>
-        <condition property="email.include">
-            <and>
-                <isset property="email.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="calculate-email-doc-condition" depends="doc-email-connector">
-        <available file="connectors/email/dist/doc" type="dir" property="email-doc.exists"/>
-        <condition property="email-doc.include">
-            <and>
-                <isset property="email-doc.exists"/>
-                <isset property="downloaded"/>
-            </and>
-        </condition>
-    </target>
-
-    <target name="deliver-email-connector" depends="calculate-email-condition" if="email.include">
-        <antcall target="general-connector-delivery">
-            <param name="connector-name" value="email"/>
-        </antcall>
-        <antcall target="general-add-repository-connector">
-            <param name="connector-name" value="email"/>
-            <param name="connector-label" value="EMail"/>
-            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.email.EmailConnector"/>
-        </antcall>
-    </target>
-    
-    <target name="deliver-email-connector-doc" depends="calculate-email-doc-condition" if="email-doc.include">
-        <antcall target="general-connector-doc-delivery">
-            <param name="connector-name" value="email"/>
-        </antcall>
-    </target>
-
-    <target name="calculate-filesystem-tests-condition" depends="calculate-filesystem-condition,calculate-nulloutput-condition">
-      <condition property="filesystem-tests.include">
-        <and>
-            <isset property="filesystem.include"/>
-            <isset property="nulloutput.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-hdfs-tests-condition" depends="calculate-hdfs-condition,calculate-nulloutput-condition">
-      <condition property="hdfs-tests.include">
-        <and>
-            <isset property="hdfs.include"/>
-            <isset property="nulloutput.include"/>
-        </and>
-      </condition>
-    </target>
-
-	<target name="calculate-jcifs-tests-condition" depends="calculate-jcifs-condition,calculate-nulloutput-condition">
-      <condition property="jcifs-tests.include">
-        <and>
-            <isset property="jcifs.include"/>
-            <isset property="nulloutput.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-jdbc-tests-condition" depends="calculate-jdbc-condition,calculate-nulloutput-condition">
-      <condition property="jdbc-tests.include">
-        <and>
-            <isset property="jdbc.include"/>
-            <isset property="nulloutput.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-activedirectory-tests-condition" depends="calculate-activedirectory-condition">
-      <condition property="activedirectory-tests.include">
-        <and>
-            <isset property="activedirectory.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-ldap-tests-condition" depends="calculate-ldap-condition">
-      <condition property="ldap-tests.include">
-        <and>
-            <isset property="ldap.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-solr-tests-condition" depends="calculate-filesystem-condition,calculate-solr-condition">
-      <condition property="solr-tests.include">
-        <and>
-            <isset property="filesystem.include"/>
-            <isset property="solr.include"/>
-        </and>
-      </condition>
-    </target>
-
-    <target name="calculate-gts-tests-condition" depends="calculate-filesystem-condition,calculate-gts-condition">
-      <condition property="gts-tests.include">
-        <and>

[... 699 lines stripped ...]