manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1182834 - in /incubator/lcf/trunk: ./ connectors/ connectors/rss/ connectors/webcrawler/ connectors/wiki/ connectors/wiki/connector/ connectors/wiki/connector/src/ connectors/wiki/connector/src/main/ connectors/wiki/connector/src/main/java...
Date Thu, 13 Oct 2011 13:19:02 GMT
Author: kwright
Date: Thu Oct 13 13:19:00 2011
New Revision: 1182834

URL: http://svn.apache.org/viewvc?rev=1182834&view=rev
Log:
Fix for CONNECTORS-256. Create a Wiki connector, and supporting infrastructure.  Also, fix missing maven dependency issues on the mcf version of xerces for rss and web connectors, discovered during wiki connector development.

Added:
    incubator/lcf/trunk/connectors/wiki/   (props changed)
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/
    incubator/lcf/trunk/connectors/wiki/build.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/build.xml
    incubator/lcf/trunk/connectors/wiki/connector/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/
    incubator/lcf/trunk/connectors/wiki/connector/src/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/BaseProcessingContext.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/BaseProcessingContext.java
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/PageBuffer.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/PageBuffer.java
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/SingleLevelContext.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/SingleLevelContext.java
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConfig.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConfig.java
    incubator/lcf/trunk/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/main/java/org/apache/manifoldcf/crawler/connectors/wiki/WikiConnector.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseDerby.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseHSQLDB.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BaseHSQLDB.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BasePostgresql.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/BasePostgresql.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityDerbyTest.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBTest.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityHSQLDBTest.java
    incubator/lcf/trunk/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityPostgresqlTest.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/connector/src/test/java/org/apache/manifoldcf/crawler/connectors/wiki/tests/SanityPostgresqlTest.java
    incubator/lcf/trunk/connectors/wiki/pom.xml
      - copied, changed from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/pom.xml
    incubator/lcf/trunk/loadtests/wiki/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/
    incubator/lcf/trunk/loadtests/wiki/src/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/
    incubator/lcf/trunk/loadtests/wiki/src/test/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/test/
    incubator/lcf/trunk/loadtests/wiki/src/test/java/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/loadtests/wiki/src/test/java/
    incubator/lcf/trunk/tests/wiki/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/
    incubator/lcf/trunk/tests/wiki/pom.xml
      - copied, changed from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/pom.xml
    incubator/lcf/trunk/tests/wiki/src/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/
    incubator/lcf/trunk/tests/wiki/src/test/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/
    incubator/lcf/trunk/tests/wiki/src/test/java/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/
    incubator/lcf/trunk/tests/wiki/src/test/java/org/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/manifoldcf/
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/BaseDerby.java
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/MockWikiService.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/MockWikiService.java
    incubator/lcf/trunk/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/java/org/apache/manifoldcf/wiki_tests/SanityDerbyTest.java
    incubator/lcf/trunk/tests/wiki/src/test/resources/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/
      - copied from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/14773725.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/14773725.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19219017.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19219017.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19319577.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19319577.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19839654.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/19839654.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/30955295.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/30955295.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/get_timestamps.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/get_timestamps.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/get_urls.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/get_urls.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_full.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_full.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_full_last.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_full_last.xml
    incubator/lcf/trunk/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_one.xml
      - copied unchanged from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/src/test/resources/org/apache/manifoldcf/wiki_tests/list_one.xml
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/pom.xml
    incubator/lcf/trunk/connectors/rss/pom.xml
    incubator/lcf/trunk/connectors/webcrawler/pom.xml
    incubator/lcf/trunk/tests/pom.xml

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Oct 13 13:19:00 2011
@@ -7,4 +7,5 @@
 /incubator/lcf/branches/CONNECTORS-224:1154884-1158633
 /incubator/lcf/branches/CONNECTORS-236:1153921-1154314
 /incubator/lcf/branches/CONNECTORS-240:1163953-1166425
+/incubator/lcf/branches/CONNECTORS-256:1172846-1182809
 /incubator/lcf/branches/CONNECTORS-32:1092556-1094216

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Thu Oct 13 13:19:00 2011
@@ -3,6 +3,10 @@ $Id$
 
 ======================= 0.4-dev =====================
 
+CONNECTORS-256: Add a Wiki connector, including basic sanity tests
+and build logic.
+(Karl Wright, Tobias Wunderlich)
+
 CONNECTORS-270: The OpenSearchServer connector pom.xml was incorrect,
 and skipped the resources needed to run the connector properly.
 (Karl Wright)

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Thu Oct 13 13:19:00 2011
@@ -66,6 +66,8 @@
         <delete dir="connectors/sharepoint/lib"/>
         <ant dir="connectors/webcrawler" target="clean"/>
         <delete dir="connectors/webcrawler/lib"/>
+        <ant dir="connectors/wiki" target="clean"/>
+        <delete dir="connectors/wiki/lib"/>
     </target>
 
     <target name="cleanup-afterbuild">
@@ -98,8 +100,8 @@
         <delete dir="connectors/memex/lib"/>
         <ant dir="connectors/meridio" target="clean"/>
         <delete dir="connectors/meridio/lib"/>
-    	<ant dir="connectors/opensearchserver" target="clean"/>
-    	<delete dir="connectors/opensearchserver/lib"/>
+        <ant dir="connectors/opensearchserver" target="clean"/>
+        <delete dir="connectors/opensearchserver/lib"/>
         <ant dir="connectors/nullauthority" target="clean"/>
         <delete dir="connectors/nullauthority/lib"/>
         <ant dir="connectors/nulloutput" target="clean"/>
@@ -110,6 +112,8 @@
         <delete dir="connectors/sharepoint/lib"/>
         <ant dir="connectors/webcrawler" target="clean"/>
         <delete dir="connectors/webcrawler/lib"/>
+        <ant dir="connectors/wiki" target="clean"/>
+        <delete dir="connectors/wiki/lib"/>
     </target>
     
     <target name="build-site">
@@ -1044,6 +1048,52 @@
         <ant dir="connectors/webcrawler" target="run-tests-HSQLDB"/>
     </target>
 
+    <target name="setup-wiki-connector" depends="build-framework">
+        <mkdir dir="connectors/wiki/lib"/>
+        <copy todir="connectors/wiki/lib">
+            <fileset dir="framework/lib"/>
+        </copy>
+        <copy todir="connectors/wiki/lib">
+            <fileset dir="framework/build/jar"/>
+        </copy>
+    </target>
+    
+    <target name="setup-wiki-connector-tests" depends="build-tests-framework">
+        <mkdir dir="connectors/wiki/lib"/>
+        <copy todir="connectors/wiki/lib">
+            <fileset dir="framework/build/test-jar"/>
+        </copy>
+    </target>
+
+    <target name="build-wiki-connector" depends="setup-wiki-connector">
+        <ant dir="connectors/wiki" target="build"/>
+    </target>
+
+    <target name="doc-wiki-connector" depends="setup-wiki-connector">
+        <ant dir="connectors/wiki" target="doc"/>
+    </target>
+
+    <target name="build-tests-wiki-connector" depends="setup-wiki-connector,setup-wiki-connector-tests">
+        <ant dir="connectors/wiki" target="build-tests"/>
+    </target>
+
+    <target name="run-tests-wiki-connector" depends="setup-wiki-connector,setup-wiki-connector-tests">
+        <ant dir="connectors/wiki" target="run-tests"/>
+    </target>
+
+    <target name="run-tests-derby-wiki-connector" depends="setup-wiki-connector,setup-wiki-connector-tests">
+        <ant dir="connectors/wiki" target="run-tests-derby"/>
+    </target>
+
+    <target name="run-tests-postgresql-wiki-connector" depends="setup-wiki-connector,setup-wiki-connector-tests">
+        <ant dir="connectors/wiki" target="run-tests-postgresql"/>
+    </target>
+
+    <target name="run-tests-HSQLDB-wiki-connector" depends="setup-wiki-connector,setup-wiki-connector-tests">
+        <ant dir="connectors/wiki" target="run-tests-HSQLDB"/>
+    </target>
+
+
     <target name="deliver-site-doc" depends="build-site">
           <mkdir dir="dist/doc"/>
           <copy todir="dist/doc">
@@ -1611,6 +1661,35 @@
         </copy>
     </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">
+            <isset property="wiki.exists"/>
+        </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">
+            <isset property="wiki-doc.exists"/>
+        </condition>
+    </target>
+
+    <target name="deliver-wiki-connector" depends="calculate-wiki-condition" if="wiki.include">
+        <mkdir dir="dist/lib"/>
+        <copy todir="dist/lib">
+            <fileset dir="connectors/wiki/dist/lib"/>
+        </copy>
+    </target>
+    
+    <target name="deliver-wiki-connector-doc" depends="calculate-wiki-doc-condition" if="wiki-doc.include">
+        <mkdir dir="dist/doc/api/wiki"/>
+        <copy todir="dist/doc/api/wiki">
+	  <fileset dir="connectors/wiki/dist/doc"/>
+        </copy>
+    </target>
+
+
     <target name="cleanup-example">
         <delete file="dist/example/connectors.xml"/>
         <delete file="dist/example/properties.xml"/>
@@ -1798,7 +1877,15 @@
         <replace file="dist/example/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;Web&quot; class=&quot;org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector&quot;/&gt;"/>
     </target>
 
-    <target name="deliver-example" depends="deliver-framework-example,deliver-activedirectory-example,deliver-cmis-example,deliver-documentum-example,deliver-filesystem-example,deliver-filenet-example,deliver-gts-example,deliver-jcifs-example,deliver-jdbc-example,deliver-livelink-example,deliver-memex-example,deliver-meridio-example,deliver-nullauthority-example,deliver-nulloutput-example,deliver-opensearchserver-example,deliver-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example">
+    <target name="deliver-wiki-example" depends="deliver-framework-example,calculate-wiki-condition" if="wiki.include">
+        <mkdir dir="dist/example/connector-lib"/>
+        <copy todir="dist/example/connector-lib">
+            <fileset dir="connectors/wiki/dist/lib"/>
+        </copy>
+        <replace file="dist/example/connectors.xml" token="&lt;!-- Add your repository connectors here --&gt;" value="&lt;!-- Add your repository connectors here --&gt;&#0010;  &lt;repositoryconnector name=&quot;Wiki&quot; class=&quot;org.apache.manifoldcf.crawler.connectors.wiki.WikiConnector&quot;/&gt;"/>
+    </target>
+
+    <target name="deliver-example" depends="deliver-framework-example,deliver-activedirectory-example,deliver-cmis-example,deliver-documentum-example,deliver-filesystem-example,deliver-filenet-example,deliver-gts-example,deliver-jcifs-example,deliver-jdbc-example,deliver-livelink-example,deliver-memex-example,deliver-meridio-example,deliver-nullauthority-example,deliver-nulloutput-example,deliver-opensearchserver-example,deliver-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example,deliver-wiki-example">
         <!-- Build a manifest file.  There doesn't seem to be any good way to do this automatically in ant without developing my own
         custom task, so I've hard coded all the class path libs. -->
         <mkdir dir="build/example"/>
@@ -1836,6 +1923,15 @@
       </condition>
     </target>
 
+    <target name="calculate-wiki-tests-condition" depends="calculate-wiki-condition,calculate-nulloutput-condition">
+      <condition property="wiki-tests.include">
+        <and>
+            <isset property="wiki.include"/>
+            <isset property="nulloutput.include"/>
+        </and>
+      </condition>
+    </target>
+
     <target name="compile-filesystem-tests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-filesystem-tests-condition,build-tests-filesystem-connector,build-tests-nulloutput-connector" if="filesystem-tests.include">
         <mkdir dir="build/filesystem-tests/classes"/>
         <javac srcdir="tests/filesystem/src/test/java" destdir="build/filesystem-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -1900,6 +1996,70 @@
         </javac>
     </target>
 
+    <target name="compile-wiki-tests" depends="build-framework,build-wiki-connector,build-nulloutput-connector,calculate-wiki-tests-condition,build-tests-wiki-connector,build-tests-nulloutput-connector" if="wiki-tests.include">
+        <mkdir dir="build/wiki-tests/classes"/>
+        <javac srcdir="tests/wiki/src/test/java" destdir="build/wiki-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                 <fileset dir="framework/lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+            </classpath>
+        </javac>
+    </target>
+
+    <target name="compile-wiki-loadtests" depends="build-framework,build-filesystem-connector,build-nulloutput-connector,calculate-wiki-tests-condition,build-tests-wiki-connector,build-tests-nulloutput-connector" if="wiki-tests.include">
+        <mkdir dir="build/wiki-loadtests/classes"/>
+        <javac srcdir="loadtests/wiki/src/test/java" destdir="build/wiki-loadtests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+            <classpath>
+                 <fileset dir="framework/lib"> 
+                    <include name="*.jar"/> 
+                </fileset>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+            </classpath>
+        </javac>
+    </target>
+
     <target name="compile-sharepoint-tests" depends="build-framework,build-sharepoint-connector,build-nulloutput-connector,calculate-sharepoint-tests-condition,build-tests-sharepoint-connector,build-tests-nulloutput-connector" if="sharepoint-tests.include">
         <mkdir dir="build/sharepoint-tests/classes"/>
         <javac srcdir="tests/sharepoint/src/test/java" destdir="build/sharepoint-tests/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
@@ -2098,6 +2258,76 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-derby" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+                <pathelement location="tests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <test name="org.apache.manifoldcf.wiki_tests.SanityDerbyTest" todir="test-output/wiki"/>
+            <!-- MHL -->
+
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-derby" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="loadtests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
     <target name="run-cmis-tests-derby" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-output/cmis"/>
         <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -2309,6 +2539,75 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-postgresql" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-postgresql-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+                <pathelement location="tests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-postgresql" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-postgresql-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-postgresql-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="loadtests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+            
+        </junit>
+    </target>
+
     <target name="run-cmis-tests-postgresql" depends="compile-cmis-tests,calculate-cmis-tests-condition" if="cmis-tests.include">
         <mkdir dir="test-output/cmis"/>
         <junit fork="true" maxmemory="128m" dir="test-output/cmis" outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -2451,6 +2750,74 @@
         </junit>
     </target>
 
+    <target name="run-wiki-tests-HSQLDB" depends="compile-wiki-tests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-HSQLDB-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-tests/classes"/>
+                <pathelement location="tests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
+    <target name="run-wiki-loadtests-HSQLDB" depends="compile-wiki-loadtests,calculate-wiki-tests-condition" if="wiki-tests.include">
+        <mkdir dir="test-HSQLDB-output/wiki"/>
+        <junit fork="true" maxmemory="128m" dir="test-HSQLDB-output/wiki" outputtoformatters="true" showoutput="true" haltonfailure="true">
+            <classpath>
+                <fileset dir="framework/lib">
+                    <include name="*.jar"/>
+                </fileset>
+	      <fileset dir="framework/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="framework/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/wiki/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/jar">
+		<include name="*.jar"/>
+	      </fileset>
+	      <fileset dir="connectors/nulloutput/build/test-jar">
+		<include name="*.jar"/>
+	      </fileset>
+                <pathelement location="build/wiki-loadtests/classes"/>
+                <pathelement location="loadtests/wiki/src/test/resources"/>
+            </classpath>
+            <formatter type="brief" usefile="false"/>
+
+            <!-- MHL -->
+        </junit>
+    </target>
+
     <target name="run-sharepoint-tests-postgresql" depends="compile-sharepoint-tests,calculate-sharepoint-tests-condition" if="sharepoint-tests.include">
         <mkdir dir="test-postgresql-output/sharepoint"/>
         <junit fork="true" maxmemory="128m" dir="test-postgresql-output/sharepoint" outputtoformatters="true" showoutput="true" haltonfailure="true">
@@ -2655,37 +3022,37 @@
         </junit>
     </target>
 
-    <target name="run-tests-open-connectors" depends="run-tests-activedirectory-connector,run-tests-cmis-connector,run-tests-filesystem-connector,run-tests-nullauthority-connector,run-tests-nulloutput-connector,run-tests-rss-connector,run-tests-solr-connector,run-tests-webcrawler-connector,run-tests-jdbc-connector"/>
+    <target name="run-tests-open-connectors" depends="run-tests-activedirectory-connector,run-tests-cmis-connector,run-tests-filesystem-connector,run-tests-nullauthority-connector,run-tests-nulloutput-connector,run-tests-rss-connector,run-tests-solr-connector,run-tests-webcrawler-connector,run-tests-wiki-connector,run-tests-jdbc-connector"/>
     <target name="run-tests-lgpl-connectors" depends="run-tests-jcifs-connector"/>
     <target name="run-tests-proprietary-connectors" depends="run-tests-documentum-connector,run-tests-filenet-connector,run-tests-livelink-connector,run-tests-memex-connector,run-tests-meridio-connector,run-tests-sharepoint-connector"/>
 
-    <target name="run-tests-derby-open-connectors" depends="run-tests-derby-activedirectory-connector,run-tests-derby-cmis-connector,run-tests-derby-filesystem-connector,run-tests-derby-nullauthority-connector,run-tests-derby-nulloutput-connector,run-tests-derby-rss-connector,run-tests-derby-solr-connector,run-tests-derby-webcrawler-connector,run-tests-derby-jdbc-connector"/>
+    <target name="run-tests-derby-open-connectors" depends="run-tests-derby-activedirectory-connector,run-tests-derby-cmis-connector,run-tests-derby-filesystem-connector,run-tests-derby-nullauthority-connector,run-tests-derby-nulloutput-connector,run-tests-derby-rss-connector,run-tests-derby-solr-connector,run-tests-derby-webcrawler-connector,run-tests-derby-wiki-connector,run-tests-derby-jdbc-connector"/>
     <target name="run-tests-derby-lgpl-connectors" depends="run-tests-derby-jcifs-connector"/>
     <target name="run-tests-derby-proprietary-connectors" depends="run-tests-derby-documentum-connector,run-tests-derby-filenet-connector,run-tests-derby-livelink-connector,run-tests-derby-memex-connector,run-tests-derby-meridio-connector,run-tests-derby-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-derby" depends="run-filesystem-tests-derby,run-cmis-tests-derby,run-sharepoint-tests-derby"/>
+    <target name="end-to-end-tests-derby" depends="run-filesystem-tests-derby,run-wiki-tests-derby,run-cmis-tests-derby,run-sharepoint-tests-derby"/>
 
-    <target name="run-tests-postgresql-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-cmis-connector,run-tests-postgresql-filesystem-connector,run-tests-postgresql-nullauthority-connector,run-tests-postgresql-nulloutput-connector,run-tests-postgresql-rss-connector,run-tests-postgresql-solr-connector,run-tests-postgresql-webcrawler-connector,run-tests-postgresql-jdbc-connector,run-tests-postgresql-opensearchserver-connector"/>
+    <target name="run-tests-postgresql-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-cmis-connector,run-tests-postgresql-filesystem-connector,run-tests-postgresql-nullauthority-connector,run-tests-postgresql-nulloutput-connector,run-tests-postgresql-rss-connector,run-tests-postgresql-solr-connector,run-tests-postgresql-webcrawler-connector,run-tests-postgresql-wiki-connector,run-tests-postgresql-jdbc-connector,run-tests-postgresql-opensearchserver-connector"/>
     <target name="run-tests-postgresql-lgpl-connectors" depends="run-tests-postgresql-jcifs-connector"/>
     <target name="run-tests-postgresql-proprietary-connectors" depends="run-tests-postgresql-documentum-connector,run-tests-postgresql-filenet-connector,run-tests-postgresql-livelink-connector,run-tests-postgresql-memex-connector,run-tests-postgresql-meridio-connector,run-tests-postgresql-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-postgresql" depends="run-filesystem-tests-postgresql,run-cmis-tests-postgresql,run-sharepoint-tests-postgresql"/>
+    <target name="end-to-end-tests-postgresql" depends="run-filesystem-tests-postgresql,run-wiki-tests-postgresql,run-cmis-tests-postgresql,run-sharepoint-tests-postgresql"/>
 
-    <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-cmis-connector,run-tests-HSQLDB-filesystem-connector,run-tests-HSQLDB-nullauthority-connector,run-tests-HSQLDB-nulloutput-connector,run-tests-HSQLDB-rss-connector,run-tests-HSQLDB-solr-connector,run-tests-HSQLDB-webcrawler-connector,run-tests-HSQLDB-jdbc-connector,run-tests-HSQLDB-opensearchserver-connector"/>
+    <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-cmis-connector,run-tests-HSQLDB-filesystem-connector,run-tests-HSQLDB-nullauthority-connector,run-tests-HSQLDB-nulloutput-connector,run-tests-HSQLDB-rss-connector,run-tests-HSQLDB-solr-connector,run-tests-HSQLDB-webcrawler-connector,run-tests-HSQLDB-wiki-connector,run-tests-HSQLDB-jdbc-connector,run-tests-HSQLDB-opensearchserver-connector"/>
     <target name="run-tests-HSQLDB-lgpl-connectors" depends="run-tests-HSQLDB-jcifs-connector"/>
     <target name="run-tests-HSQLDB-proprietary-connectors" depends="run-tests-HSQLDB-documentum-connector,run-tests-HSQLDB-filenet-connector,run-tests-HSQLDB-livelink-connector,run-tests-HSQLDB-memex-connector,run-tests-HSQLDB-meridio-connector,run-tests-HSQLDB-sharepoint-connector"/>
     
-    <target name="end-to-end-tests-HSQLDB" depends="run-filesystem-tests-HSQLDB,run-cmis-tests-HSQLDB,run-sharepoint-tests-HSQLDB"/>
+    <target name="end-to-end-tests-HSQLDB" depends="run-filesystem-tests-HSQLDB,run-wiki-tests-HSQLDB,run-cmis-tests-HSQLDB,run-sharepoint-tests-HSQLDB"/>
 
-    <target name="end-to-end-loadtests-derby" depends="run-filesystem-loadtests-derby,run-cmis-loadtests-derby,run-sharepoint-loadtests-derby"/>
+    <target name="end-to-end-loadtests-derby" depends="run-filesystem-loadtests-derby,run-wiki-loadtests-derby,run-cmis-loadtests-derby,run-sharepoint-loadtests-derby"/>
 
-    <target name="end-to-end-loadtests-postgresql" depends="run-filesystem-loadtests-postgresql,run-cmis-loadtests-postgresql,run-sharepoint-loadtests-postgresql"/>
+    <target name="end-to-end-loadtests-postgresql" depends="run-filesystem-loadtests-postgresql,run-wiki-loadtests-postgresql,run-cmis-loadtests-postgresql,run-sharepoint-loadtests-postgresql"/>
 
-    <target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
+    <target name="end-to-end-loadtests-HSQLDB" depends="run-filesystem-loadtests-HSQLDB,run-wiki-loadtests-HSQLDB,run-cmis-loadtests-HSQLDB,run-sharepoint-loadtests-HSQLDB"/>
 
 
-    <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-jdbc-connector"/>
-    <target name="deliver-open-connectors-doc" depends="deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-jdbc-connector-doc"/>
+    <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-cmis-connector,deliver-filesystem-connector,deliver-rss-connector,deliver-webcrawler-connector,deliver-wiki-connector,deliver-jdbc-connector"/>
+    <target name="deliver-open-connectors-doc" depends="deliver-nullauthority-connector-doc,deliver-activedirectory-connector-doc,deliver-cmis-connector-doc,deliver-filesystem-connector-doc,deliver-rss-connector-doc,deliver-webcrawler-connector-doc,deliver-wiki-connector-doc,deliver-jdbc-connector-doc"/>
     
     <target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector,deliver-opensearchserver-connector"/>
     <target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-connector-doc,deliver-opensearchserver-connector-doc"/>

Modified: incubator/lcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/pom.xml?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/pom.xml (original)
+++ incubator/lcf/trunk/connectors/pom.xml Thu Oct 13 13:19:00 2011
@@ -46,6 +46,7 @@
     <module>webcrawler</module>
     <module>cmis</module>
     <module>opensearchserver</module>
+    <module>wiki</module>
   </modules>
 
 </project>

Modified: incubator/lcf/trunk/connectors/rss/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/rss/pom.xml?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/rss/pom.xml (original)
+++ incubator/lcf/trunk/connectors/rss/pom.xml Thu Oct 13 13:19:00 2011
@@ -83,6 +83,11 @@
       <version>1.5</version>
     </dependency>
     <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl-mcf</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>

Modified: incubator/lcf/trunk/connectors/webcrawler/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/webcrawler/pom.xml?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/webcrawler/pom.xml (original)
+++ incubator/lcf/trunk/connectors/webcrawler/pom.xml Thu Oct 13 13:19:00 2011
@@ -83,6 +83,11 @@
       <version>1.5</version>
     </dependency>
     <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl-mcf</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>

Propchange: incubator/lcf/trunk/connectors/wiki/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Thu Oct 13 13:19:00 2011
@@ -0,0 +1,4 @@
+build
+dist
+lib
+test-output

Copied: incubator/lcf/trunk/connectors/wiki/pom.xml (from r1182809, incubator/lcf/branches/CONNECTORS-256/connectors/wiki/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/wiki/pom.xml?p2=incubator/lcf/trunk/connectors/wiki/pom.xml&p1=incubator/lcf/branches/CONNECTORS-256/connectors/wiki/pom.xml&r1=1182809&r2=1182834&rev=1182834&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-256/connectors/wiki/pom.xml (original)
+++ incubator/lcf/trunk/connectors/wiki/pom.xml Thu Oct 13 13:19:00 2011
@@ -70,11 +70,55 @@
       <version>1.5</version>
     </dependency>
     <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl-mcf</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
       <groupId>junit</groupId>
       <artifactId>junit</artifactId>
       <version>${junit.version}</version>
       <scope>test</scope>
     </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-core</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-agents</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>${project.groupId}</groupId>
+      <artifactId>mcf-pull-agent</artifactId>
+      <version>${project.version}</version>
+      <type>test-jar</type>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>postgresql</groupId>
+      <artifactId>postgresql</artifactId>
+      <version>${postgresql.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.hsqldb</groupId>
+      <artifactId>hsqldb</artifactId>
+      <version>${hsqldb.version}</version>
+      <scope>test</scope>
+    </dependency>
+    <dependency>
+      <groupId>org.apache.derby</groupId>
+      <artifactId>derby</artifactId>
+      <version>${derby.version}</version>
+      <scope>test</scope>
+    </dependency>
 
   </dependencies>
 </project>

Modified: incubator/lcf/trunk/tests/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/pom.xml?rev=1182834&r1=1182833&r2=1182834&view=diff
==============================================================================
--- incubator/lcf/trunk/tests/pom.xml (original)
+++ incubator/lcf/trunk/tests/pom.xml Thu Oct 13 13:19:00 2011
@@ -33,6 +33,7 @@
   <packaging>pom</packaging>
 
   <modules>
+    <module>wiki</module>
     <module>cmis</module>
     <module>filesystem</module>
     <module>sharepoint</module>

Copied: incubator/lcf/trunk/tests/wiki/pom.xml (from r1182809, incubator/lcf/branches/CONNECTORS-256/tests/wiki/pom.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/tests/wiki/pom.xml?p2=incubator/lcf/trunk/tests/wiki/pom.xml&p1=incubator/lcf/branches/CONNECTORS-256/tests/wiki/pom.xml&r1=1182809&r2=1182834&rev=1182834&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-256/tests/wiki/pom.xml (original)
+++ incubator/lcf/trunk/tests/wiki/pom.xml Thu Oct 13 13:19:00 2011
@@ -159,6 +159,11 @@
       <version>2.1.v20091210</version>
     </dependency>
     <dependency>
+      <groupId>xerces</groupId>
+      <artifactId>xercesImpl-mcf</artifactId>
+      <version>2.9.1</version>
+    </dependency>
+    <dependency>
       <groupId>${project.groupId}</groupId>
       <artifactId>mcf-core</artifactId>
       <version>${project.version}</version>



Mime
View raw message