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 2011/08/17 14:33:28 UTC
svn commit: r1158655 - in /incubator/lcf/trunk: ./ connectors/
connectors/opensearchserver/ connectors/opensearchserver/connector/
connectors/opensearchserver/connector/src/
connectors/opensearchserver/connector/src/main/
connectors/opensearchserver/co...
Author: kwright
Date: Wed Aug 17 12:33:26 2011
New Revision: 1158655
URL: http://svn.apache.org/viewvc?rev=1158655&view=rev
Log:
Commit OpenSearchServer output connector. This is part of ticket CONNECTORS-224.
Added:
incubator/lcf/trunk/connectors/opensearchserver/ (props changed)
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/
incubator/lcf/trunk/connectors/opensearchserver/build.xml
- copied, changed from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/build.xml
incubator/lcf/trunk/connectors/opensearchserver/connector/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerAction.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConfig.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnection.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerConnector.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerDelete.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerIndex.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerParam.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSchema.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/java/org/apache/manifoldcf/agents/output/opensearchserver/OpenSearchServerSpecs.java
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/
- copied from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.html
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.html
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.js
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/configuration.js
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications.html
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/specifications.html
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view.html
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/view.html
incubator/lcf/trunk/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec.html
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/connector/src/main/resource/org/apache/manifoldcf/agents/output/opensearchserver/viewSpec.html
incubator/lcf/trunk/connectors/opensearchserver/pom.xml
- copied unchanged from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/pom.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/site/src/documentation/content/xdocs/javadoc.xml
Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Wed Aug 17 12:33:26 2011
@@ -4,5 +4,6 @@
/incubator/lcf/branches/CONNECTORS-203:1128152-1130460
/incubator/lcf/branches/CONNECTORS-221:1143785-1151084
/incubator/lcf/branches/CONNECTORS-223:1146689-1146810
+/incubator/lcf/branches/CONNECTORS-224:1154884-1158633
/incubator/lcf/branches/CONNECTORS-236:1153921-1154314
/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=1158655&r1=1158654&r2=1158655&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Wed Aug 17 12:33:26 2011
@@ -3,6 +3,9 @@ $Id$
======================= 0.3-dev =========================
+CONNECTORS-224: Add OpenSearchServer output connector.
+(Emmanuel Keller, Karl Wright)
+
CONNECTORS-157: Fixed a second kind of case where the java.net.URI
class is broken. Relative queries starting with "?" now replace the query
part of the url.
Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1158655&r1=1158654&r2=1158655&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Wed Aug 17 12:33:26 2011
@@ -54,6 +54,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/nullauthority" target="clean"/>
<delete dir="connectors/nullauthority/lib"/>
<ant dir="connectors/nulloutput" target="clean"/>
@@ -667,6 +669,47 @@
<ant dir="connectors/meridio" target="run-tests-HSQLDB"/>
</target>
+ <target name="setup-opensearchserver-connector" depends="build-framework">
+ <mkdir dir="connectors/opensearchserver/lib"/>
+ <copy todir="connectors/opensearchserver/lib">
+ <fileset dir="framework/lib"/>
+ </copy>
+ <copy todir="connectors/opensearchserver/lib">
+ <fileset dir="framework/build/jar"/>
+ </copy>
+ </target>
+
+ <target name="setup-opensearchserver-connector-tests" depends="build-tests-framework">
+ <mkdir dir="connectors/opensearchserver/lib"/>
+ <copy todir="connectors/opensearchserver/lib">
+ <fileset dir="framework/build/test-jar"/>
+ </copy>
+ </target>
+
+ <target name="build-opensearchserver-connector" depends="setup-opensearchserver-connector">
+ <ant dir="connectors/opensearchserver" target="build"/>
+ </target>
+
+ <target name="doc-opensearchserver-connector" depends="setup-opensearchserver-connector">
+ <ant dir="connectors/opensearchserver" target="doc"/>
+ </target>
+
+ <target name="build-tests-opensearchserver-connector" depends="setup-opensearchserver-connector,setup-opensearchserver-connector-tests">
+ <ant dir="connectors/opensearchserver" target="build-tests"/>
+ </target>
+
+ <target name="run-tests-opensearchserver-connector" depends="setup-opensearchserver-connector,setup-opensearchserver-connector-tests">
+ <ant dir="connectors/opensearchserver" target="run-tests"/>
+ </target>
+
+ <target name="run-tests-postgresql-opensearchserver-connector" depends="setup-opensearchserver-connector,setup-opensearchserver-connector-tests">
+ <ant dir="connectors/opensearchserver" target="run-tests-postgresql"/>
+ </target>
+
+ <target name="run-tests-HSQLDB-opensearchserver-connector" depends="setup-opensearchserver-connector,setup-opensearchserver-connector-tests">
+ <ant dir="connectors/opensearchserver" target="run-tests-HSQLDB"/>
+ </target>
+
<target name="setup-nullauthority-connector" depends="build-framework">
<mkdir dir="connectors/nullauthority/lib"/>
<copy todir="connectors/nulloutput/lib">
@@ -1264,6 +1307,34 @@
</copy>
</target>
+ <target name="calculate-opensearchserver-condition" depends="build-opensearchserver-connector">
+ <available file="connectors/opensearchserver/dist/lib" type="dir" property="opensearchserver.exists"/>
+ <condition property="opensearchserver.include">
+ <isset property="opensearchserver.exists"/>
+ </condition>
+ </target>
+
+ <target name="calculate-opensearchserver-doc-condition" depends="doc-opensearchserver-connector">
+ <available file="connectors/opensearchserver/dist/doc" type="dir" property="opensearchserver-doc.exists"/>
+ <condition property="opensearchserver-doc.include">
+ <isset property="opensearchserver-doc.exists"/>
+ </condition>
+ </target>
+
+ <target name="deliver-opensearchserver-connector" depends="calculate-opensearchserver-condition" if="opensearchserver.include">
+ <mkdir dir="dist/lib"/>
+ <copy todir="dist/lib">
+ <fileset dir="connectors/opensearchserver/dist/lib"/>
+ </copy>
+ </target>
+
+ <target name="deliver-opensearchserver-connector-doc" depends="calculate-opensearchserver-doc-condition" if="opensearchserver-doc.include">
+ <mkdir dir="dist/doc/api/opensearchserver"/>
+ <copy todir="dist/doc/api/opensearchserver">
+ <fileset dir="connectors/opensearchserver/dist/doc"/>
+ </copy>
+ </target>
+
<target name="calculate-nullauthority-condition" depends="build-nullauthority-connector">
<available file="connectors/nullauthority/dist/lib" type="dir" property="nullauthority.exists"/>
<condition property="nullauthority.include">
@@ -1579,6 +1650,14 @@
<replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="Solr" class="org.apache.manifoldcf.agents.output.solr.SolrConnector"/>"/>
</target>
+ <target name="deliver-opensearchserver-example" depends="deliver-framework-example,calculate-opensearchserver-condition" if="opensearchserver.include">
+ <mkdir dir="dist/example/connector-lib"/>
+ <copy todir="dist/example/connector-lib">
+ <fileset dir="connectors/opensearchserver/dist/lib"/>
+ </copy>
+ <replace file="dist/example/connectors.xml" token="<!-- Add your output connectors here -->" value="<!-- Add your output connectors here -->
 <outputconnector name="OpenSearchServer" class="org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector"/>"/>
+ </target>
+
<target name="deliver-webcrawler-example" depends="deliver-framework-example,calculate-webcrawler-condition" if="webcrawler.include">
<mkdir dir="dist/example/connector-lib"/>
<copy todir="dist/example/connector-lib">
@@ -1587,7 +1666,7 @@
<replace file="dist/example/connectors.xml" token="<!-- Add your repository connectors here -->" value="<!-- Add your repository connectors here -->
 <repositoryconnector name="Web" class="org.apache.manifoldcf.crawler.connectors.webcrawler.WebcrawlerConnector"/>"/>
</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-rss-example,deliver-sharepoint-example,deliver-solr-example,deliver-webcrawler-example">
+ <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">
<!-- 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"/>
@@ -1960,13 +2039,13 @@
<target name="end-to-end-tests" depends="run-filesystem-tests,run-cmis-tests,run-sharepoint-tests"/>
- <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"/>
+ <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-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-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"/>
+ <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-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"/>
@@ -1975,15 +2054,14 @@
<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-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector"/>
- <target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-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"/>
<target name="deliver-lgpl-connectors" depends="deliver-jcifs-connector"/>
<target name="deliver-lgpl-connectors-doc" depends="deliver-jcifs-connector-doc"/>
<target name="deliver-proprietary-connectors" depends="deliver-documentum-connector,deliver-filenet-connector,deliver-livelink-connector,deliver-memex-connector,deliver-meridio-connector,deliver-sharepoint-connector"/>
<target name="deliver-proprietary-connectors-doc" depends="deliver-documentum-connector-doc,deliver-filenet-connector-doc,deliver-livelink-connector-doc,deliver-memex-connector-doc,deliver-meridio-connector-doc,deliver-sharepoint-connector-doc"/>
-
<target name="build" depends="deliver-framework,deliver-open-connectors,deliver-output-connectors,deliver-lgpl-connectors,deliver-proprietary-connectors,deliver-example"/>
<target name="javadoc" depends="deliver-framework-doc,deliver-open-connectors-doc,deliver-output-connectors-doc,deliver-lgpl-connectors-doc,deliver-proprietary-connectors-doc"/>
Propchange: incubator/lcf/trunk/connectors/opensearchserver/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Wed Aug 17 12:33:26 2011
@@ -0,0 +1,4 @@
+build
+lib
+dist
+
Copied: incubator/lcf/trunk/connectors/opensearchserver/build.xml (from r1158633, incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/build.xml)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/opensearchserver/build.xml?p2=incubator/lcf/trunk/connectors/opensearchserver/build.xml&p1=incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/build.xml&r1=1158633&r2=1158655&rev=1158655&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-224/connectors/opensearchserver/build.xml (original)
+++ incubator/lcf/trunk/connectors/opensearchserver/build.xml Wed Aug 17 12:33:26 2011
@@ -1,38 +1,50 @@
<project default="all">
- <target name="clean">
- <delete dir="build" />
- <delete dir="dist" />
- </target>
-
- <target name="compile-connector">
- <mkdir dir="build/connector/classes" />
- <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
- <classpath>
- <fileset dir="lib" includes="*.jar" />
- </classpath>
- </javac>
- </target>
-
- <target name="jar-connector" depends="compile-connector">
- <mkdir dir="build/jar" />
- <jar destfile="build/jar/mcf-opensearchserver-connector.jar">
- <fileset dir="build/connector/classes" />
- <fileset dir="connector/src/main/resource" />
- </jar>
- </target>
-
- <target name="lib" depends="jar-connector">
- <mkdir dir="dist/lib" />
- <copy todir="dist/lib" file="build/jar/mcf-opensearchserver-connector.jar" />
- </target>
-
- <target name="build" depends="lib" />
- <target name="build-tests">
- <mkdir dir="build/test-jar" />
- </target>
- <target name="run-tests" />
+ <target name="clean">
+ <delete dir="build" />
+ <delete dir="dist" />
+ </target>
+
+ <target name="doc">
+ <mkdir dir="dist/doc"/>
+ <javadoc destdir="dist/doc" source="1.5">
+ <classpath>
+ <fileset dir="lib" includes="*.jar"/>
+ </classpath>
+ <fileset dir="connector/src/main/java" includes="**/*.java"/>
+ </javadoc>
+ </target>
+
+ <target name="compile-connector">
+ <mkdir dir="build/connector/classes" />
+ <javac srcdir="connector/src/main/java" destdir="build/connector/classes" target="1.5" source="1.5" debug="true" debuglevel="lines,vars,source">
+ <classpath>
+ <fileset dir="lib" includes="*.jar" />
+ </classpath>
+ </javac>
+ </target>
+
+ <target name="jar-connector" depends="compile-connector">
+ <mkdir dir="build/jar" />
+ <jar destfile="build/jar/mcf-opensearchserver-connector.jar">
+ <fileset dir="build/connector/classes" />
+ <fileset dir="connector/src/main/resource" />
+ </jar>
+ </target>
+
+ <target name="lib" depends="jar-connector">
+ <mkdir dir="dist/lib" />
+ <copy todir="dist/lib" file="build/jar/mcf-opensearchserver-connector.jar" />
+ </target>
+
+ <target name="build" depends="lib" />
+ <target name="build-tests">
+ <mkdir dir="build/test-jar" />
+ </target>
+ <target name="run-tests" />
+ <target name="run-tests-postgresql"/>
+ <target name="run-tests-HSQLDB"/>
- <target name="all" depends="build,build-tests,run-tests" />
+ <target name="all" depends="build,doc,build-tests,run-tests,run-tests-postgresql,run-tests-HSQLDB" />
</project>
Modified: incubator/lcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/pom.xml?rev=1158655&r1=1158654&r2=1158655&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/pom.xml (original)
+++ incubator/lcf/trunk/connectors/pom.xml Wed Aug 17 12:33:26 2011
@@ -45,6 +45,7 @@
<module>solr</module>
<module>webcrawler</module>
<module>cmis</module>
+ <module>opensearchserver</module>
</modules>
</project>
Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/javadoc.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/javadoc.xml?rev=1158655&r1=1158654&r2=1158655&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/javadoc.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/javadoc.xml Wed Aug 17 12:33:26 2011
@@ -42,6 +42,7 @@
<p><a href="api/jdbc/index.html">JDBC connector</a></p>
<p><a href="api/livelink/index.html">LiveLink authority and connector</a></p>
<p><a href="api/meridio/index.html">Meridio authority and connector</a></p>
+ <p><a href="api/opensearchserver/index.html">OpenSearchServer output connector</a></p>
<p><a href="api/nullauthority/index.html">Null authority</a></p>
<p><a href="api/nulloutput/index.html">Null output connector</a></p>
<p><a href="api/rss/index.html">RSS connector</a></p>