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/21 19:47:31 UTC

svn commit: r1580012 - in /manifoldcf/branches/CONNECTORS-912: connectors/activedirectory/ connectors/alfresco/ connectors/cmis/ connectors/documentum/ connectors/dropbox/ connectors/elasticsearch/ connectors/email/ connectors/filenet/ connectors/files...

Author: kwright
Date: Fri Mar 21 18:47:30 2014
New Revision: 1580012

URL: http://svn.apache.org/r1580012
Log:
More connector builds done

Modified:
    manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/cmis/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/documentum/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/dropbox/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/filenet/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/filesystem/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/generic/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/googledrive/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/gts/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/hdfs/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/jcifs/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/jdbc/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/jira/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/ldap/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/livelink/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/meridio/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/build.xml
    manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml

Modified: manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/activedirectory/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,23 @@
 
 <project name="activedirectory" default="all">
 
-    <import file="../connector-build.xml"/>
-    
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
     
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <param name="connector-label" value="Active Directory"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/alfresco/build.xml Fri Mar 21 18:47:30 2014
@@ -17,8 +17,17 @@
 
 <project name="alfresco" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
 
+    <import file="${mcf-dist}/connector-build.xml"/>
   
     <target name="calculate-condition">
         <available file="lib-proprietary/alfresco-web-service-client-4.2.c.jar" property="alfrescoStatus"/>
@@ -109,4 +118,11 @@
         </delete>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="Alfresco"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.alfresco.AlfrescoRepositoryConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/cmis/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/cmis/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/cmis/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/cmis/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="cmis" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
     
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -56,4 +66,15 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="CMIS"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.cmis.CmisAuthorityConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/documentum/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/documentum/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/documentum/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/documentum/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="documentum" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <target name="has-proprietary-materials-check">
         <available file="lib-proprietary/dfc.jar" property="dfcStatus"/>
@@ -64,4 +74,15 @@
         <copy todir="dist/server-process/lib-proprietary" file="server/README.txt"/>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <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-label" value="Documentum"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.DCTM.DCTM"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/dropbox/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/dropbox/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/dropbox/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/dropbox/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="dropbox" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -37,4 +47,11 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="DropBox"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.dropbox.DropboxRepositoryConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/elasticsearch/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="elasticsearch" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <target name="download-dependencies">
         
@@ -57,4 +67,11 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-output-connector">
+            <param name="connector-label" value="ElasticSearch"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/email/build.xml Fri Mar 21 18:47:30 2014
@@ -18,7 +18,7 @@ limitations under the License.
 <project name="email" default="all">
 
     <property environment="env"/>
-    <condition property="mcf-dst" value="${env.MCFDISTPATH}">
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
         <isset property="env.MCFDISTPATH"/>
     </condition>
     <condition property="mcf-dist" value="../../dist">
@@ -29,4 +29,11 @@ limitations under the License.
 
     <import file="${mcf-dist}/connector-build.xml"/>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="EMail"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.email.EmailConnector"/>
+        </antcall>
+    </target>
+
 </project>
\ No newline at end of file

Modified: manifoldcf/branches/CONNECTORS-912/connectors/filenet/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/filenet/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/filenet/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/filenet/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="filenet" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <target name="has-proprietary-materials-check">
         <available file="lib-proprietary/Jace.jar" property="JaceStatus"/>
@@ -51,4 +61,11 @@
         <copy todir="dist/server-process/lib-proprietary" file="server/README.txt"/>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="FileNet"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.filenet.FilenetConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/filesystem/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/filesystem/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/filesystem/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/filesystem/build.xml Fri Mar 21 18:47:30 2014
@@ -17,6 +17,27 @@
 
 <project name="filesystem" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="File system"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.filesystem.FileOutputConnector"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/generic/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/generic/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/generic/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/generic/build.xml Fri Mar 21 18:47:30 2014
@@ -17,11 +17,21 @@
 
 <project name="generic" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="../../lib">
+        <fileset dir="${mcf-dist}/lib">
             <include name="jaxb-impl*.jar"/>
         </fileset>
     </path>
@@ -29,10 +39,21 @@
     <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
         <mkdir dir="dist/lib"/>
         <copy todir="dist/lib">
-            <fileset dir="../../lib">
+            <fileset dir="${mcf-dist}/lib">
                 <include name="jaxb-impl*.jar"/>
             </fileset>
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="Generic"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.generic.GenericAuthority"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/googledrive/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/googledrive/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/googledrive/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/googledrive/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="googledrive" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -37,4 +47,11 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="GoogleDrive"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.googledrive.GoogleDriveRepositoryConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/gts/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/gts/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/gts/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/gts/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="gts" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -35,4 +45,11 @@
         </copy>
     </target>
     
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-output-connector">
+            <param name="connector-label" value="MetaCarta GTS"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.gts.GTSConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/hdfs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/hdfs/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/hdfs/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/hdfs/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="hdfs" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -48,4 +58,16 @@
             </fileset>
         </copy>
     </target>
+    
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="HDFS"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.hdfs.HDFSOutputConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/jcifs/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jcifs/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jcifs/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jcifs/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="jcifs" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <target name="calculate-condition">
         <available file="lib-proprietary/jcifs.jar" property="jcifsStatus"/>
@@ -64,4 +74,11 @@
         </delete>
     </target>
     
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <param name="connector-label" value="Windows shares"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.sharedrive.SharedDriveConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/jdbc/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jdbc/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jdbc/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jdbc/build.xml Fri Mar 21 18:47:30 2014
@@ -17,6 +17,27 @@
 
 <project name="jdbc" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="JDBC"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.jdbc.JDBCAuthority"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/jira/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/jira/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/jira/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/jira/build.xml Fri Mar 21 18:47:30 2014
@@ -17,24 +17,27 @@
 
 <project name="jira" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
 
-    <path id="connector-classpath">
-        <path refid="mcf-connector-build.connector-classpath"/>
-        <fileset dir="../../lib">
-            <include name="google-*.jar"/>
-	    <include name="jackson-core.jar"/>
-        </fileset>
-    </path>
+    <import file="${mcf-dist}/connector-build.xml"/>
 
-    <target name="lib" depends="mcf-connector-build.lib,precompile-check" if="canBuild">
-        <mkdir dir="dist/lib"/>
-        <copy todir="dist/lib">
-            <fileset dir="../../lib">
-                <include name="google-*.jar"/>
-		<include name="jackson-core.jar"/>
-            </fileset>
-        </copy>
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-label" value="Jira"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.jira.JiraAuthorityConnector"/>
+        </antcall>
     </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/ldap/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/ldap/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/ldap/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/ldap/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,23 @@
 
 <project name="ldap" default="all">
 
-    <import file="../connector-build.xml"/>
-    
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
     
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <param name="connector-label" value="LDAP"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.ldap.LDAPAuthority"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/livelink/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/livelink/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/livelink/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/livelink/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="livelink" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <path id="connector-classpath">
         <path refid="mcf-connector-build.connector-classpath"/>
@@ -51,4 +61,15 @@
     <target name="lib" depends="mcf-connector-build.lib,copy-proprietary-libs,precompile-check" if="canBuild">
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <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-label" value="LiveLink"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.livelink.LivelinkConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/meridio/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/meridio/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/meridio/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/meridio/build.xml Fri Mar 21 18:47:30 2014
@@ -17,7 +17,17 @@
 
 <project name="meridio" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
 
     <!-- target name="calculate-condition">
         <available file="lib-proprietary/MeridioDMWS_axis.wsdl" property="meridioDMWS_axisStatus"/>
@@ -90,4 +100,15 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <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-label" value="Meridio"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.meridio.MeridioConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/nullauthority/build.xml Fri Mar 21 18:47:30 2014
@@ -17,6 +17,23 @@
 
 <project name="nullauthority" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <param name="connector-label" value="Null"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.nullauthority.NullAuthority"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/nulloutput/build.xml Fri Mar 21 18:47:30 2014
@@ -17,6 +17,23 @@
 
 <project name="nulloutput" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-output-connector">
+            <param name="connector-label" value="Null"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.nullconnector.NullConnector"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/opensearchserver/build.xml Fri Mar 21 18:47:30 2014
@@ -17,6 +17,23 @@
 
 <project name="opensearchserver" default="all">
 
-    <import file="../connector-build.xml"/>
+    <property environment="env"/>
+    <condition property="mcf-dist" value="${env.MCFDISTPATH}">
+        <isset property="env.MCFDISTPATH"/>
+    </condition>
+    <condition property="mcf-dist" value="../../dist">
+        <not>
+            <isset property="env.MCFDISTPATH"/>
+        </not>
+    </condition>
+
+    <import file="${mcf-dist}/connector-build.xml"/>
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-output-connector">
+            <param name="connector-label" value="OpenSearchServer"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml?rev=1580012&r1=1580011&r2=1580012&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml Fri Mar 21 18:47:30 2014
@@ -29,7 +29,6 @@
         <delete dir="test-HSQLDBext-output"/>
     </target>
 
-
     <path id="mcf-connector-build.connector-classpath">
         <fileset dir="${mcf-dist}/lib">
             <include name="mcf-core.jar"/>