manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1580662 - in /manifoldcf/branches/CONNECTORS-912: ./ connectors/ connectors/memex/ connectors/regexpmapper/ connectors/rss/ connectors/sharepoint/ connectors/solr/ connectors/webcrawler/ connectors/wiki/ framework/buildfiles/
Date Sun, 23 Mar 2014 23:38:52 GMT
Author: kwright
Date: Sun Mar 23 23:38:51 2014
New Revision: 1580662

URL: http://svn.apache.org/r1580662
Log:
More work on CONNECTORS-912

Removed:
    manifoldcf/branches/CONNECTORS-912/connectors/connector-build.xml
Modified:
    manifoldcf/branches/CONNECTORS-912/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/memex/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/rss/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/solr/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/build.xml
    manifoldcf/branches/CONNECTORS-912/connectors/wiki/build.xml
    manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml

Modified: manifoldcf/branches/CONNECTORS-912/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/build.xml Sun Mar 23 23:38:51 2014
@@ -1286,162 +1286,79 @@
         </copy>
     </target>
 
-    <target name="general-connector-integration-check">
-        <available file="connectors/${connector-name}/dist/integration" type="dir" property="${connector-name}.has-integration"/>
-    </target>
-
-    <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>
-    </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>
-
-    <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>
-
-    <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>
-
-    <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>
-
-    <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>
-
-    <target name="general-connector-doc-check">
-        <available file="connectors/${connector-name}/dist/doc" type="dir" property="${connector-name}.has-doc"/>
-    </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>
-
-    <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>
-
-    <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 name="deliver-framework-test-jars" depends="deliver-framework" if="downloaded">
+        <!-- MHL -->
     </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>
-
-    <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>
-
-    <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>
-
-    <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>
-
-    <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>
-
-    <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>
-
-    <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>
+    <!-- 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-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>
-
-    <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;"/>
+    <!-- Generic connector targets -->
+    
+    <target name="download-connectors-dependencies">
+        <connectors-crawl target="download-dependencies"/>
     </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="cleanup-connectors-dependencies">
+        <connectors-crawl target="download-cleanup"/>
     </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="deliver-connectors" depends="deliver-framework" if="downloaded">
+        <connectors-crawl target="deliver-connector"/>
     </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="deliver-connectors-doc" depends="deliver-connectors,deliver-framework-doc"
if="downloaded">
+        <connectors-crawl target="deliver-connector-doc"/>
     </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="deliver-connectors-test-jars" depends="deliver-connectors,deliver-framework-test-jars"
if="downloaded">
+        <connectors-crawl target="deliver-connector-test-jars"/>
     </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-tests" depends="deliver-framework,deliver-framework-test-jars"
if="downloaded">
+        <connectors-crawl target="run-tests"/>
     </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-tests-derby" depends="deliver-framework,deliver-framework-test-jars"
if="downloaded">
+        <connectors-crawl target="run-tests-derby"/>
     </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-tests-HSQLDB" depends="deliver-framework,deliver-framework-test-jars"
if="downloaded">
+        <connectors-crawl target="run-tests-HSQLDB"/>
     </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-tests-HSQLDBext" depends="deliver-framework,deliver-framework-test-jars"
if="downloaded">
+        <connectors-crawl target="run-tests-HSQLDBext"/>
     </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;"/>
+    <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-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;"/>
+    <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-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="clean-connectors">
+        <connectors-crawl target="clean"/>
     </target>
     
+    <!-- Generic test targets -->
+    
+    <!-- MHL -->
+    
+    
+    
+
     <target name="calculate-activedirectory-condition" depends="build-activedirectory-connector">
         <available file="connectors/activedirectory/dist/lib" type="dir" property="activedirectory.exists"/>
         <condition property="activedirectory.include">

Modified: manifoldcf/branches/CONNECTORS-912/connectors/memex/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/memex/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/memex/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/memex/build.xml Sun Mar 23 23:38:51 2014
@@ -17,7 +17,17 @@
 
 <project name="memex" 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="mxie-java/JavaMXIELIB.jar" property="mxieStatus"/>
@@ -42,4 +52,15 @@
         </copy>
     </target>
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-authority-connector">
+            <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-label" value="Memex Patriarch"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.memex.MemexConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/regexpmapper/build.xml Sun Mar 23 23:38:51
2014
@@ -17,7 +17,23 @@
 
 <project name="regexpmapper" 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-mapping-connector">
+            <param name="connector-label" value="Regular expression mapper"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.mappers.regexp.RegexpMapper"/>
+        </antcall>
+    </target>
     
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/rss/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/rss/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/rss/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/rss/build.xml Sun Mar 23 23:38:51 2014
@@ -17,6 +17,23 @@
 
 <project name="rss" 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="RSS"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.rss.RSSConnector"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/sharepoint/build.xml Sun Mar 23 23:38:51
2014
@@ -17,7 +17,17 @@
 
 <project name="sharepoint" 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/DspSts.wsdl" property="DspStsStatus"/>
@@ -92,4 +102,19 @@
         </delete>
     </target -->
 
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-repository-connector">
+            <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-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-label" value="SharePoint/Native"/>
+            <param name="connector-class" value="org.apache.manifoldcf.authorities.authorities.sharepoint.SharePointAuthority"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/solr/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/solr/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/solr/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/solr/build.xml Sun Mar 23 23:38:51 2014
@@ -17,7 +17,17 @@
 
 <project name="solr" 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"/>
@@ -53,5 +63,12 @@
           <fileset dir="../../lib/solr-4.x"/>
         </copy>
     </target>
-    
+
+    <target name="deliver-connector" depends="mcf-connector-build.deliver-connector">
+        <antcall target="general-add-output-connector">
+            <param name="connector-label" value="Solr"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>
+        </antcall>
+    </target>
+
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/webcrawler/build.xml Sun Mar 23 23:38:51
2014
@@ -17,6 +17,23 @@
 
 <project name="webcrawler" 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="Web"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>
+        </antcall>
+    </target>
 
 </project>

Modified: manifoldcf/branches/CONNECTORS-912/connectors/wiki/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/branches/CONNECTORS-912/connectors/wiki/build.xml?rev=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/connectors/wiki/build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/connectors/wiki/build.xml Sun Mar 23 23:38:51 2014
@@ -17,6 +17,23 @@
 
 <project name="wiki" 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="Wiki"/>
+            <param name="connector-class" value="org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector"/>
+        </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=1580662&r1=1580661&r2=1580662&view=diff
==============================================================================
--- manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml (original)
+++ manifoldcf/branches/CONNECTORS-912/framework/buildfiles/connector-build.xml Sun Mar 23
23:38:51 2014
@@ -596,21 +596,21 @@
     </target>
 
     <!-- Override this target to provide integration materials to the connector dist area
-->
-    <target name="integration"/>
+    <target name="integration" depends="precompile-check" if="canBuild"/>
 
     <!-- Delivery targets.  These targets conditionally deliver code and connectors.xml
lines
         into the main distribution area.
     -->
     
-    <target name="general-connector-integration-check" depends="integration">
+    <target name="general-connector-integration-check" depends="integration" if="canBuild">
         <available file="dist/integration" type="dir" property="has-integration"/>
     </target>
 
-    <target name="general-server-process-check" depends="server-process">
+    <target name="general-server-process-check" depends="server-process" if="canBuild">
         <available file="dist/server-process" type="dir" property="has-server-process"/>
     </target>
 
-    <target name="general-registry-process-check" depends="registry-process">
+    <target name="general-registry-process-check" depends="registry-process" if="canBuild">
         <available file="dist/registry-process" type="dir" property="has-registry-process"/>
     </target>
 
@@ -648,7 +648,11 @@
         </copy>
     </target>
 
-    <target name="general-connector-delivery" depends="general-connector-proprietary-only-delivery,general-connector-delivery-integration,general-connector-delivery-processes">
+    <target name="general-connector-delivery-check" depends="lib">
+        <available file="dist/lib" type="dir" property="has-lib"/>
+    </target>
+    
+    <target name="general-connector-delivery" depends="general-connector-delivery-check,general-connector-proprietary-only-delivery,general-connector-delivery-integration,general-connector-delivery-processes"
if="has-lib">
         <mkdir dir="${mcf-dist}/connector-lib"/>
         <copy todir="${mcf-dist}/connector-lib">
             <fileset dir="dist/lib"/>
@@ -775,9 +779,9 @@
     
     <target name="deliver-connector" depends="general-connector-delivery"/>
     
-    <target name="deliver-doc" depends="general-connector-doc-delivery"/>
+    <target name="deliver-connector-doc" depends="general-connector-doc-delivery"/>
     
-    <target name="deliver-test-jars" depends="general-connector-testjar-delivery"/>
+    <target name="deliver-connector-test-jars" depends="general-connector-testjar-delivery"/>
     
     <target name="build" depends="lib,lib-proprietary-instructions,lib-proprietary-README,server-process,registry-process,integration"/>
     



Mime
View raw message