manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1727382 - in /manifoldcf/trunk: ./ connectors/ connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/ connectors/opennlp/ connectors/tika/connector/src/main/java/org/apache/manifo...
Date Thu, 28 Jan 2016 15:24:29 GMT
Author: kwright
Date: Thu Jan 28 15:24:29 2016
New Revision: 1727382

URL: http://svn.apache.org/viewvc?rev=1727382&view=rev
Log:
Fix for CONNECTORS-1270.  Add OpenNLP connector.

Added:
    manifoldcf/trunk/connectors/opennlp/
      - copied from r1727380, manifoldcf/branches/CONNECTORS-1270/connectors/opennlp/
    manifoldcf/trunk/framework/example-file-resources/
      - copied from r1727380, manifoldcf/branches/CONNECTORS-1270/framework/example-file-resources/
Modified:
    manifoldcf/trunk/   (props changed)
    manifoldcf/trunk/build.xml
    manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
    manifoldcf/trunk/connectors/pom.xml
    manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
    manifoldcf/trunk/dist-license/LICENSE.txt
    manifoldcf/trunk/framework/build.xml
    manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
    manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
    manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
    manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
    manifoldcf/trunk/framework/example-singleprocess/properties.xml
    manifoldcf/trunk/lib-license/LICENSE.txt
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
    manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml

Propchange: manifoldcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Thu Jan 28 15:24:29 2016
@@ -62,6 +62,7 @@
 /manifoldcf/branches/CONNECTORS-1236:1702132-1702240
 /manifoldcf/branches/CONNECTORS-1244:1705272-1705655
 /manifoldcf/branches/CONNECTORS-1263:1718116-1719239,1719355
+/manifoldcf/branches/CONNECTORS-1270:1726811-1727380
 /manifoldcf/branches/CONNECTORS-13:1525862-1527182,1539324-1541634
 /manifoldcf/branches/CONNECTORS-470:1349741-1360750,1360808
 /manifoldcf/branches/CONNECTORS-474:1349741-1353803

Modified: manifoldcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/build.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/build.xml (original)
+++ manifoldcf/trunk/build.xml Thu Jan 28 15:24:29 2016
@@ -150,6 +150,7 @@
     <property name="javaee-api.version" value="6.0"/>
     <property name="commons-vfs2.version" value="2.0"/>
     <property name="c3p0.version" value="0.9.5.1"/>
+    <property name="opennlp.version" value="1.6.0"/>
     
     <target name="downloaded-condition">
         <!-- Spot check a few of the dependent jars; no point including ALL of them here...
-->
@@ -291,6 +292,10 @@
         <copy todir="dist/lib-proprietary">
             <fileset dir="framework/dist/lib-proprietary"/>
         </copy>
+        <mkdir dir="dist/file-resources"/>
+        <copy todir="dist/file-resources">
+            <fileset dir="framework/dist/file-resources"/>
+        </copy>
         <mkdir dir="dist/multiprocess-file-example"/>
         <copy todir="dist/multiprocess-file-example">
             <fileset dir="framework/dist/multiprocess-file-example"/>
@@ -769,6 +774,17 @@ Use Apache Forrest version forrest-0.9-d
         </java>
     </target>
 
+    <target name="download-opennlp">
+        <mkdir dir="lib"/>
+        <antcall target="download-via-maven">
+            <param name="project-path" value="org/apache/opennlp"/>
+            <param name="artifact-version" value="${opennlp.version}"/>
+            <param name="target" value="lib"/>
+            <param name="artifact-name" value="opennlp-tools"/>
+            <param name="artifact-type" value="jar"/>
+        </antcall>
+    </target>
+    
     <target name="download-resteasy">
         <mkdir dir="lib"/>
         <antcall target="download-via-maven">
@@ -1779,7 +1795,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
         <antcall target="download-via-maven">
             <param name="target" value="lib"/>
-            <param name="project-path" value="com/fasterxml/jackson/core/"/>
+            <param name="project-path" value="com/fasterxml/jackson/core"/>
             <param name="artifact-version" value="${jackson-core.version}"/>
             <param name="artifact-name" value="jackson-core"/>
             <param name="artifact-type" value="jar"/>
@@ -2323,7 +2339,7 @@ Use Apache Forrest version forrest-0.9-d
         </antcall>
     </target>
   
-    <target name="make-core-deps" depends="download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,download-axis,download-s
 aaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
+    <target name="make-core-deps" depends="download-opennlp,download-kafka-client,download-joda-time,download-aws-sdk,download-resteasy,download-jsoup,download-mockito,download-alfresco-webscript-plugin,download-alfresco-indexer-client,download-mongo-java-driver,download-jira-client,download-google-api-client,download-dropbox-client,download-solrj,download-zookeeper,download-httpcomponents,download-json,download-hsqldb,download-xerces,download-commons,download-elasticsearch-plugin,download-solr-plugins,download-sharepoint-plugins,download-jstl,download-xmlgraphics-commons,download-woodstox,download-xmlsec,download-xml-apis,download-wss4j,download-velocity,download-streambuffer,download-stax,download-servlet-api,download-xml-resolver,download-osgi,download-opensaml,download-mimepull,download-mail,download-log4j,download-junit,download-jaxws,download-glassfish,download-jaxb,download-tomcat,download-h2,download-h2-support,download-geronimo-specs,download-fop,download-postgresql,downloa
 d-axis,download-saaj,download-wsdl4j,download-castor,download-jetty,download-slf4j,download-xalan,download-activation,download-avalon-framework,download-poi,download-chemistry,download-ecj,download-hadoop,download-htrace,download-protobuf,download-tika,download-jackson">
         <copy todir="lib">
             <fileset dir="lib-license" includes="*.txt"/>
         </copy>

Modified: manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
(original)
+++ manifoldcf/trunk/connectors/forcedmetadata/connector/src/main/resources/org/apache/manifoldcf/agents/transformation/forcedmetadata/editSpecification_Expressions.html
Thu Jan 28 15:24:29 2016
@@ -39,7 +39,7 @@
         <tr class="oddformrow">
     #end
           <td class="formcolumncell">
-            <a name="s${SEQNUM}_forcedmetadata_${paramcounter}_tag"/>
+            <a name="s${SEQNUM}_expression_${paramcounter}_tag"/>
             <input type="button" value="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Delete'))"
alt="$Encoder.attributeEscape($ResourceBundle.getString('ForcedMetadata.Deleteexpressionnumber'))${paramcounter}"
onclick='javascript:s${SEQNUM}_DeleteExpression(${paramcounter});'/>
             <input type="hidden" name="s${SEQNUM}_expression_${paramcounter}_op" value="Continue"/>
             <input type="hidden" name="s${SEQNUM}_expression_${paramcounter}_name" value="$Encoder.attributeEscape($paramrecord.get('parameter'))"/>

Modified: manifoldcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/pom.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/pom.xml (original)
+++ manifoldcf/trunk/connectors/pom.xml Thu Jan 28 15:24:29 2016
@@ -68,6 +68,7 @@
     <module>confluence</module>
     <module>amazons3</module>
     <module>kafka</module>
+    <module>opennlp</module>
   </modules>
 
 </project>

Modified: manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
(original)
+++ manifoldcf/trunk/connectors/tika/connector/src/main/java/org/apache/manifoldcf/agents/transformation/tika/TikaExtractor.java
Thu Jan 28 15:24:29 2016
@@ -93,6 +93,7 @@ public class TikaExtractor extends org.a
   *@param checkActivity is an object including the activities that can be performed by this
method.
   *@return true if the mime type can be accepted by this connector.
   */
+  @Override
   public boolean checkMimeTypeIndexable(VersionContext pipelineDescription, String mimeType,
IOutputCheckActivity checkActivity)
     throws ManifoldCFException, ServiceInterruption
   {

Modified: manifoldcf/trunk/dist-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/dist-license/LICENSE.txt?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/dist-license/LICENSE.txt (original)
+++ manifoldcf/trunk/dist-license/LICENSE.txt Thu Jan 28 15:24:29 2016
@@ -188,6 +188,7 @@ including, but not limited to:
   - Apache Axis
   - Apache Xerces2
   - Apache Chemistry
+  - Apache OpenNLP
   - Apache Velocity
   - Apache Avalon
   - Apache FOP

Modified: manifoldcf/trunk/framework/build.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/build.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/build.xml (original)
+++ manifoldcf/trunk/framework/build.xml Thu Jan 28 15:24:29 2016
@@ -153,6 +153,15 @@
             <include name="activation*.jar"/>
         </fileset>
     </path>
+
+    <target name="file-resources">
+        <mkdir dir="dist/file-resources"/>
+        <copy todir="dist/file-resources">
+            <fileset dir="example-file-resources">
+                <include name="README.txt"/>
+            </fileset>
+        </copy>
+    </target>
     
     <target name="doc">
         <mkdir dir="dist/doc"/>
@@ -1998,7 +2007,7 @@
         </java>
     </target>
     
-    <target name="build" depends="multi-process-zk-example,multi-process-zk-example-proprietary,multi-process-file-example,multi-process-file-example-proprietary,single-process-example,single-process-example-proprietary,example-common,script-engine,obfuscation-utility,buildfiles,test-lib"/>
+    <target name="build" depends="multi-process-zk-example,multi-process-zk-example-proprietary,multi-process-file-example,multi-process-file-example-proprietary,single-process-example,single-process-example-proprietary,example-common,script-engine,obfuscation-utility,file-resources,buildfiles,test-lib"/>
     
     <target name="all" depends="build,doc,build-tests,run-tests,run-tests-HSQLDB,run-tests-HSQLDBext"/>
     

Modified: manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
(original)
+++ manifoldcf/trunk/framework/core/src/main/java/org/apache/manifoldcf/core/system/ManifoldCF.java
Thu Jan 28 15:24:29 2016
@@ -106,10 +106,6 @@ public class ManifoldCF
   protected static Integer initializeFlagLock = new Integer(0);
 
   // Local member variables
-  protected static String loginUserName = null;
-  protected static String loginPassword = null;
-  protected static String apiLoginUserName = null;
-  protected static String apiLoginPassword = null;
   protected static String masterDatabaseName = null;
   protected static String masterDatabaseUsername = null;
   protected static String masterDatabasePassword = null;
@@ -152,6 +148,10 @@ public class ManifoldCF
   /** Location of log configuration file */
   public static final String logConfigFileProperty = "org.apache.manifoldcf.logconfigfile";
   
+  // File resources property
+  /** Location of file resources */
+  public static final String fileResourcesProperty = "org.apache.manifoldcf.fileresources";
+  
   // Implementation class properties
   /** Lock manager implementation class */
   public static final String lockManagerImplementation = "org.apache.manifoldcf.lockmanagerclass";

Modified: manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file-proprietary/properties.xml Thu Jan
28 15:24:29 2016
@@ -38,6 +38,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/framework/example-multiprocess-file/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-file/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-file/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-file/properties.xml Thu Jan 28 15:24:29
2016
@@ -38,6 +38,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk-proprietary/properties.xml Thu Jan
28 15:24:29 2016
@@ -33,6 +33,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml (original)
+++ manifoldcf/trunk/framework/example-multiprocess-zk/properties.xml Thu Jan 28 15:24:29
2016
@@ -33,6 +33,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess-proprietary/properties.xml Thu Jan 28
15:24:29 2016
@@ -35,6 +35,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors-proprietary.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/framework/example-singleprocess/properties.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/framework/example-singleprocess/properties.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/framework/example-singleprocess/properties.xml (original)
+++ manifoldcf/trunk/framework/example-singleprocess/properties.xml Thu Jan 28 15:24:29 2016
@@ -35,6 +35,8 @@
   <property name="org.apache.manifoldcf.logconfigfile" value="./logging.ini"/>
   <!-- Specify the connectors to be loaded -->
   <property name="org.apache.manifoldcf.connectorsconfigurationfile" value="../connectors.xml"/>
+  <!-- Specify the path to the file resources directory -->
+  <property name="org.apache.manifoldcf.fileresources" value="../file-resources"/>
   <!-- Tell MCF where to find the connector jars -->
   <libdir path="../connector-lib"/>
   <libdir path="../connector-common-lib"/>

Modified: manifoldcf/trunk/lib-license/LICENSE.txt
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/lib-license/LICENSE.txt?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/lib-license/LICENSE.txt (original)
+++ manifoldcf/trunk/lib-license/LICENSE.txt Thu Jan 28 15:24:29 2016
@@ -188,6 +188,7 @@ including, but not limited to:
   - Apache Axis
   - Apache Xerces2
   - Apache Chemistry
+  - Apache OpenNLP
   - Apache Velocity
   - Apache Avalon
   - Apache FOP

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
(original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
Thu Jan 28 15:24:29 2016
@@ -79,7 +79,9 @@
         <p></p>
         <ul>
           <li>Alfresco Webscript connector</li>
+          <li>Amazon S3 connector</li>
           <li>CMIS connector</li>
+          <li>Atlassian Confluence connector</li>
           <li>EMC Documentum connector, built against a Documentum API stub</li>
           <li>DropBox connector</li>
           <li>Email connector</li>
@@ -104,7 +106,9 @@
         <ul>
           <li>Active Directory authority</li>
           <li>Alfresco Webscript authority</li>
+          <li>Amazon S3 authority</li>
           <li>CMIS authority</li>
+          <li>Atlassian Confluence authority</li>
           <li>EMC Documentum authority</li>
           <li>Atlassian Jira authority</li>
           <li>LDAP authority</li>
@@ -118,6 +122,7 @@
         <p>The following output connectors will be built:</p>
         <p></p>
         <ul>
+          <li>Amazon Cloud Search output connector</li>
           <li>WGET-compatible filesystem output connector</li>
           <li>MetaCarta GTS output connector</li>
           <li>Apache Solr output connector</li>
@@ -125,7 +130,9 @@
           <li>ElasticSearch output connector</li>
           <li>WGET-compatible filesystem output connector</li>
           <li>HDFS output connector</li>
+          <li>Kafka output connector</li>
           <li>Null output connector</li>
+          <li>Searchblox output connector</li>
         </ul>
         <p></p>
         <p>The following transformation connectors will be built:</p>
@@ -133,6 +140,7 @@
         <ul>
           <li>Field mapping transformation connector</li>
           <li>Document filter transformation connector</li>
+          <li>OpenNLP transformation connector</li>
           <li>Null transformation connector</li>
           <li>Tika extractor transformation connector</li>
         </ul>
@@ -143,6 +151,12 @@
           <li>Regular-expression mapping connector</li>
         </ul>
         <p></p>
+        <p>The following notification connectors will be built:</p>
+        <p></p>
+        <ul>
+          <li>Email notification connector</li>
+        </ul>
+        <p></p>
         <p>The dependencies and build limitations of each individual LGPL and proprietary
connector is described in separate sections below.</p>
         <p></p>
             
@@ -269,7 +283,19 @@
             corresponding directory.</p>
           <p></p>
         </section>
-        
+
+        <section>
+          <title>Running the Apache OpenNLP transformation connector</title>
+          <p></p>
+          <p>The Apache OpenNLP transformation connector requires OpenNLP models in
order to be useful.  These models should be downloaded or created by you, and
+            must be placed in the <em>file-resources</em> folder.  This will
allow the connector to find them and allow you to use them.</p>
+          <p>The models available publicly for OpenNLP can be downloaded from this
URL: <a href="http://opennlp.sourceforge.net/models-1.5/">http://opennlp.sourceforge.net/models-1.5/</a>.
 To use the
+            connector, you <strong>must</strong> specify a sentence model and
a tokenization model.  You can specify as few or as many content extraction models as you
+            wish.</p>
+          <p></p>
+          <p><strong>If you do not download or otherwise provide models for the
OpenNLP connector's use, it will not be possible to define a job which uses the connector.</strong></p>
+        </section>
+
         <section>
           <title>Running the Apache Solr output connector</title>
           <p></p>
@@ -477,6 +503,7 @@ mvn clean package
           <tr><td><em>web-proprietary</em></td><td>app-server
deployable web applications (wars), including proprietary libraries; not included in binary
release</td></tr>
           <tr><td><em>doc</em></td><td>javadocs for framework
and all included connectors</td></tr>
           <tr><td><em>plugins</em></td><td>pre-built
integration components to deploy on target systems, e.g. for Solr</td></tr>
+          <tr><td><em>file-resources</em></td><td>a directory
meant to contain file resources that are identically present on all cluster members, e.g.
models for OpenNLP</td></tr>
         </table>
         <p></p>
         <p>If you downloaded the binary distribution, you may notice that the <em>connector-lib-proprietary</em>
directory contains only a number of 
@@ -504,6 +531,11 @@ mvn clean package
         <p>The <em>plugins</em> directory contains components you may need
to deploy on the target system to make the associated connector function correctly.  For example,
the Solr
             connector includes plug-in classes for enforcing ManifoldCF security on Solr
3.x and 4.x.  See the README file in each directory for detailed instructions on how to deploy
the components.</p>
         <p></p>
+        <p>The <em>file-resources</em> directory contains a README.txt
file plus any files your connectors specifically need access to across all cluster members.
+            You should have an exact copy of this directory present on every machine that
a related ManifoldCF process runs on, and the properties.xml file parameter
+            <em>org.apache.manifoldcf.fileresources</em> should point to it.
 Any third-party or custom files needed by your connector configuration (e.g. OpenNLP models)
+            should be created or downloaded and placed here.</p>
+        <p></p>
         <p>Inside the <em>example</em> directory, you will find everything
you need to fire up ManifoldCF in a single-process model under Jetty.  Everything is included
so that all you need to do is change
             to that directory, and start it using the command <em>&lt;java&gt;
-jar start.jar</em>.  This is described in more detail later, and is the recommended
way for beginners to try out ManifoldCF.
             The directory <em>example-proprietary</em> contains an equivalent
example that includes proprietary connectors and jars.  This is the standard place to start
if you build ManifoldCF yourself.</p>

Modified: manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml
URL: http://svn.apache.org/viewvc/manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml?rev=1727382&r1=1727381&r2=1727382&view=diff
==============================================================================
--- manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml (original)
+++ manifoldcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml Thu Jan 28 15:24:29
2016
@@ -33,13 +33,20 @@
       <p>The javadoc for the last released version of ManifoldCF and its connectors
can be found by following the links below.</p>
       <p><a href="../api/framework/index.html">ManifoldCF Framework</a></p>
       <p><a href="../api/activedirectory/index.html">Active Directory authority</a></p>
+      <p><a href="../api/alfresco-webscript/index.html">Alfresco webscript authority
and connector</a></p>
       <p><a href="../api/alfresco/index.html">Alfresco connector</a></p>
+      <p><a href="../api/amazoncloudsearch/index.html">AmazonCloudSearch output
connector</a></p>
+      <p><a href="../api/amazons3/index.html">Amazon S3 authority and connector</a></p>
       <p><a href="../api/cmis/index.html">CMIS authority and connector</a></p>
+      <p><a href="../api/confluence/index.html">Confluence authority and connector</a></p>
       <p><a href="../api/documentum/index.html">Documentum authority, connector,
and support processes</a></p>
       <p><a href="../api/dropbox/index.html">Dropbox connector</a></p>
-      <p><a href="../api/email/index.html">Email connector</a></p>
+      <p><a href="../api/email/index.html">Email connector and notification connector</a></p>
+      <p><a href="../api/elasticsearch/index.html">ElasticSearch output connector</a></p>
       <p><a href="../api/filenet/index.html">FileNet connector and support processes</a></p>
       <p><a href="../api/filesystem/index.html">File system repository and output
connector</a></p>
+      <p><a href="../api/forcedmetadata/index.html">Metadata transformation connector</a></p>
+      <p><a href="../api/generic/index.html">Generic connector</a></p>
       <p><a href="../api/googledrive/index.html">GoogleDrive connector</a></p>
       <p><a href="../api/gridfs/index.html">GridFS connector</a></p>
       <p><a href="../api/gts/index.html">qBase GTS output connector</a></p>
@@ -47,16 +54,20 @@
       <p><a href="../api/jcifs/index.html">CIFS connector</a></p>
       <p><a href="../api/jira/index.html">JIRA connector and authority</a></p>
       <p><a href="../api/jdbc/index.html">JDBC connector</a></p>
+      <p><a href="../api/kafka/index.html">Kafka output 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/opennlp/index.html">OpenNLP transformation connector</a></p>
       <p><a href="../api/elasticsearch/index.html">ElasticSearch 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/regexpmapper/index.html">Regular expression mapping
connector</a></p>
       <p><a href="../api/rss/index.html">RSS connector</a></p>
+      <p><a href="../api/searchblox/index.html">Searchblox output connector</a></p>
       <p><a href="../api/sharepoint/index.html">SharePoint connector</a></p>
       <p><a href="../api/solr/index.html">Solr output connector</a></p>
+      <p><a href="../api/tika/index.html">Tika transformation connector</a></p>
       <p><a href="../api/webcrawler/index.html">Web connector</a></p>
       <p><a href="../api/wiki/index.html">Wiki connector</a></p>
     </section>



Mime
View raw message