manifoldcf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kwri...@apache.org
Subject svn commit: r1299942 [1/2] - in /incubator/lcf/trunk: ./ connectors/ connectors/elasticsearch/ connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ connectors/elasticsearch/connector/src/main/native2ascii/...
Date Tue, 13 Mar 2012 01:19:32 GMT
Author: kwright
Date: Tue Mar 13 01:19:31 2012
New Revision: 1299942

URL: http://svn.apache.org/viewvc?rev=1299942&view=rev
Log:
Add ElasticSearch output connector.  CONNECTORS-288.

Added:
    incubator/lcf/trunk/connectors/elasticsearch/   (props changed)
      - copied from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js
      - copied, changed from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
      - copied, changed from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification.js
      - copied unchanged from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ElasticSearch.html
      - copied, changed from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
      - copied, changed from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification.html
      - copied, changed from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html
    incubator/lcf/trunk/tests/elasticsearch/   (props changed)
      - copied from r1299573, incubator/lcf/branches/CONNECTORS-288/tests/elasticsearch/
    incubator/lcf/trunk/tests/icmis-test-build.xml
      - copied unchanged from r1299573, incubator/lcf/branches/CONNECTORS-288/tests/icmis-test-build.xml
Removed:
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_ja_JP.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ja_JP.js
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/hiddenSpecification_ja_JP.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_ja_JP.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_ja_JP.html
Modified:
    incubator/lcf/trunk/   (props changed)
    incubator/lcf/trunk/CHANGES.txt
    incubator/lcf/trunk/build.xml
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
    incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
    incubator/lcf/trunk/connectors/elasticsearch/test-materials-proprietary/   (props changed)
    incubator/lcf/trunk/connectors/pom.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/index.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/writing-output-connectors.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/included-connectors_ja_JP.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/index.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/javadoc_ja_JP.xml
    incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/writing-output-connectors.xml
    incubator/lcf/trunk/tests/pom.xml

Propchange: incubator/lcf/trunk/
------------------------------------------------------------------------------
--- svn:mergeinfo (original)
+++ svn:mergeinfo Tue Mar 13 01:19:31 2012
@@ -11,6 +11,7 @@
 /incubator/lcf/branches/CONNECTORS-277:1185949-1187036
 /incubator/lcf/branches/CONNECTORS-284:1189305-1190398
 /incubator/lcf/branches/CONNECTORS-287:1200390-1210394
+/incubator/lcf/branches/CONNECTORS-288:1240833-1299573
 /incubator/lcf/branches/CONNECTORS-290:1204836-1205502
 /incubator/lcf/branches/CONNECTORS-313:1213173-1214848
 /incubator/lcf/branches/CONNECTORS-314:1221058,1221068

Modified: incubator/lcf/trunk/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/CHANGES.txt?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/CHANGES.txt (original)
+++ incubator/lcf/trunk/CHANGES.txt Tue Mar 13 01:19:31 2012
@@ -3,6 +3,9 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-288: Add Elastic Search connector.
+(Luca Stancapiano, Piergiorgio Lucidi, Karl Wright)
+
 CONNECTORS-422: Rearrange Velocity templates so that there's one
 template per tab.
 (Karl Wright)

Modified: incubator/lcf/trunk/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/build.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/build.xml (original)
+++ incubator/lcf/trunk/build.xml Tue Mar 13 01:19:31 2012
@@ -46,6 +46,7 @@
         <ant dir="connectors/memex" target="clean"/>
         <ant dir="connectors/meridio" target="clean"/>
         <ant dir="connectors/opensearchserver" target="clean"/>
+        <ant dir="connectors/elasticsearch" target="clean"/>
         <ant dir="connectors/nullauthority" target="clean"/>
         <ant dir="connectors/nulloutput" target="clean"/>
         <ant dir="connectors/rss" target="clean"/>
@@ -66,6 +67,7 @@
         <ant dir="tests/sharepoint" target="clean"/>
         <ant dir="tests/webcrawler" target="clean"/>
         <ant dir="tests/wiki" target="clean"/>
+        <ant dir="tests/elasticsearch" target="clean"/>
 
     </target>
 
@@ -93,6 +95,7 @@
         <ant dir="connectors/memex" target="clean"/>
         <ant dir="connectors/meridio" target="clean"/>
         <ant dir="connectors/opensearchserver" target="clean"/>
+        <ant dir="connectors/elasticsearch" target="clean"/>
         <ant dir="connectors/nullauthority" target="clean"/>
         <ant dir="connectors/nulloutput" target="clean"/>
         <ant dir="connectors/rss" target="clean"/>
@@ -113,6 +116,7 @@
         <ant dir="tests/sharepoint" target="clean"/>
         <ant dir="tests/webcrawler" target="clean"/>
         <ant dir="tests/wiki" target="clean"/>
+        <ant dir="tests/elasticsearch" target="clean"/>
 
     </target>
     
@@ -678,6 +682,44 @@
     <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-elasticsearch-connector" depends="build-framework"/>
+
+    <target name="setup-elasticsearch-connector-tests" depends="build-tests-framework"/>
+
+    <target name="build-elasticsearch-connector" depends="setup-elasticsearch-connector">
+      <ant dir="connectors/elasticsearch" target="build"/>
+    </target>
+
+    <target name="doc-elasticsearch-connector" depends="setup-elasticsearch-connector">
+        <ant dir="connectors/elasticsearch" target="doc"/>
+    </target>
+
+    <target name="build-tests-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="build-tests"/>
+    </target>
+
+    <target name="run-tests-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="run-tests"/>
+    </target>
+
+    <target name="run-tests-derby-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="run-tests-derby"/>
+    </target>
+
+    <target name="run-tests-postgresql-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="run-tests-postgresql"/>
+    </target>
+
+    <target name="run-tests-mysql-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="run-tests-mysql"/>
+    </target>
+
+    <target name="run-tests-HSQLDB-elasticsearch-connector" depends="setup-elasticsearch-connector,setup-elasticsearch-connector-tests">
+        <ant dir="connectors/elasticsearch" target="run-tests-HSQLDB"/>
+    </target>
 
     <target name="setup-nullauthority-connector" depends="build-framework"/>
     
@@ -1548,6 +1590,60 @@
             <param name="connector-name" value="opensearchserver"/>
         </antcall>
     </target>
+  
+
+    <target name="calculate-elasticsearch-condition" depends="build-elasticsearch-connector">
+      <available file="connectors/elasticsearch/dist/lib" type="dir" property="elasticsearch.exists"/>
+      <condition property="elasticsearch.include">
+          <isset property="elasticsearch.exists"/>
+      </condition>
+    </target>
+
+    <target name="calculate-elasticsearch-testmaterials-condition" depends="calculate-elasticsearch-condition">
+        <available file="connectors/elasticsearch/test-materials-proprietary/elasticsearch-0.18.7" type="dir" property="elasticsearch-testmaterials.exists"/>
+        <condition property="elasticsearch-testmaterials.include">
+          <and>
+              <isset property="elasticsearch-testmaterials.exists"/>
+              <isset property="elasticsearch.include"/>
+          </and>
+        </condition>
+    </target>
+
+    <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
+      <condition property="elasticsearch-tests.include">
+        <and>
+            <not>
+                <equals arg1="${ant.java.version}" arg2="1.5" />
+            </not>
+            <isset property="elasticsearch.include"/>
+            <isset property="elasticsearch-testmaterials.include"/>
+            <isset property="cmis.include"/>
+        </and>
+      </condition>
+    </target>
+
+    <target name="calculate-elasticsearch-doc-condition" depends="doc-elasticsearch-connector">
+        <available file="connectors/elasticsearch/dist/doc" type="dir" property="elasticsearch-doc.exists"/>
+        <condition property="elasticsearch-doc.include">
+            <isset property="elasticsearch-doc.exists"/>
+        </condition>
+    </target>
+
+   <target name="deliver-elasticsearch-connector" depends="calculate-elasticsearch-condition" if="elasticsearch.include">
+        <antcall target="general-connector-delivery">
+            <param name="connector-name" value="elasticsearch"/>
+        </antcall>
+        <antcall target="general-add-output-connector">
+            <param name="connector-name" value="ElasticSearch"/>
+            <param name="connector-class" value="org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector"/>
+        </antcall>
+    </target>
+
+    <target name="deliver-elasticsearch-connector-doc" depends="calculate-elasticsearch-doc-condition" if="elasticsearch-doc.include">
+        <antcall target="general-connector-doc-delivery">
+            <param name="connector-name" value="elasticsearch"/>
+        </antcall>
+    </target>
 
     <target name="calculate-nullauthority-condition" depends="build-nullauthority-connector">
         <available file="connectors/nullauthority/dist/lib" type="dir" property="nullauthority.exists"/>
@@ -1938,7 +2034,15 @@
     <target name="run-cmis-loadtests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-nulloutput-connector,calculate-cmis-tests-condition" if="cmis-tests.include">
         <ant dir="tests/cmis" target="run-load-derby"/>
     </target>
-    
+	
+    <target name="run-elasticsearch-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-elasticsearch-connector,calculate-cmis-tests-condition,calculate-elasticsearch-tests-condition" if="elasticsearch-tests.include">
+        <ant dir="tests/elasticsearch" target="run-derby"/>
+    </target>
+
+    <target name="run-elasticsearch-UI-tests-derby" depends="build-tests-framework,build-tests-cmis-connector,build-tests-elasticsearch-connector,calculate-cmis-tests-condition,calculate-elasticsearch-tests-condition" if="elasticsearch-tests.include">
+        <ant dir="tests/elasticsearch" target="run-UI-derby"/>
+    </target>
+    	
     <target name="run-alfresco-loadtests-derby" depends="build-tests-framework,build-tests-alfresco-connector,build-tests-nulloutput-connector,calculate-alfresco-tests-condition" if="alfresco-tests.include">
         <ant dir="tests/alfresco" target="run-load-derby"/>
     </target>
@@ -2085,19 +2189,19 @@
     
     <target name="end-to-end-tests-derby" depends="run-filesystem-tests-derby,run-wiki-tests-derby,run-alfresco-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-alfresco-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-open-connectors" depends="run-tests-postgresql-activedirectory-connector,run-tests-postgresql-alfresco-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,run-tests-postgresql-elasticsearch-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-wiki-tests-postgresql,run-alfresco-tests-postgresql,run-cmis-tests-postgresql,run-sharepoint-tests-postgresql"/>
 
-    <target name="run-tests-mysql-open-connectors" depends="run-tests-mysql-activedirectory-connector,run-tests-mysql-alfresco-connector,run-tests-mysql-cmis-connector,run-tests-mysql-filesystem-connector,run-tests-mysql-nullauthority-connector,run-tests-mysql-nulloutput-connector,run-tests-mysql-rss-connector,run-tests-mysql-solr-connector,run-tests-mysql-webcrawler-connector,run-tests-mysql-wiki-connector,run-tests-mysql-jdbc-connector,run-tests-mysql-opensearchserver-connector"/>
+    <target name="run-tests-mysql-open-connectors" depends="run-tests-mysql-activedirectory-connector,run-tests-mysql-alfresco-connector,run-tests-mysql-cmis-connector,run-tests-mysql-filesystem-connector,run-tests-mysql-nullauthority-connector,run-tests-mysql-nulloutput-connector,run-tests-mysql-rss-connector,run-tests-mysql-solr-connector,run-tests-mysql-webcrawler-connector,run-tests-mysql-wiki-connector,run-tests-mysql-jdbc-connector,run-tests-mysql-opensearchserver-connector,run-tests-mysql-elasticsearch-connector"/>
     <target name="run-tests-mysql-lgpl-connectors" depends="run-tests-mysql-jcifs-connector"/>
     <target name="run-tests-mysql-proprietary-connectors" depends="run-tests-mysql-documentum-connector,run-tests-mysql-filenet-connector,run-tests-mysql-livelink-connector,run-tests-mysql-memex-connector,run-tests-mysql-meridio-connector,run-tests-mysql-sharepoint-connector"/>
     
     <target name="end-to-end-tests-mysql" depends="run-filesystem-tests-mysql,run-wiki-tests-mysql,run-alfresco-tests-mysql,run-cmis-tests-mysql,run-sharepoint-tests-mysql"/>
 
-    <target name="run-tests-HSQLDB-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-alfresco-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-open-connectors" depends="run-tests-HSQLDB-activedirectory-connector,run-tests-HSQLDB-alfresco-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,run-tests-HSQLDB-elasticsearch-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"/>
     
@@ -2115,8 +2219,8 @@
     <target name="deliver-open-connectors" depends="deliver-nullauthority-connector,deliver-activedirectory-connector,deliver-alfresco-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-alfresco-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"/>
+    <target name="deliver-output-connectors" depends="deliver-gts-connector,deliver-solr-connector,deliver-nulloutput-connector,deliver-opensearchserver-connector,deliver-elasticsearch-connector"/>
+    <target name="deliver-output-connectors-doc" depends="deliver-gts-connector-doc,deliver-solr-connector-doc,deliver-nulloutput-connector-doc,deliver-opensearchserver-connector-doc,deliver-elasticsearch-connector-doc"/>
     
     <target name="deliver-lgpl-connectors" depends="deliver-jcifs-connector"/>
     <target name="deliver-lgpl-connectors-doc" depends="deliver-jcifs-connector-doc"/>
@@ -2437,6 +2541,7 @@ Use Apache Forrest version forrest-0.9-d
         <ant dir="connectors/jcifs" target="download-dependencies"/>
         <ant dir="connectors/sharepoint" target="download-dependencies"/>
         <ant dir="connectors/alfresco" target="download-dependencies"/>
+        <ant dir="connectors/elasticsearch" target="download-dependencies"/>
         <ant dir="site" target="download-dependencies"/>
     </target>
 

Propchange: incubator/lcf/trunk/connectors/elasticsearch/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Mar 13 01:19:31 2012
@@ -0,0 +1,10 @@
+build
+dist
+doc
+target
+test-output
+test-derby-output
+test-postgresql-output
+test-HSQLDB-output
+test-HSQLDBext-output
+test-mysql-output

Modified: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java?rev=1299942&r1=1299573&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnector.java Tue Mar 13 01:19:31 2012
@@ -22,6 +22,7 @@ import java.io.IOException;
 import java.io.InputStream;
 import java.util.List;
 import java.util.Locale;
+import java.util.Map;
 
 import org.apache.commons.httpclient.HttpClient;
 import org.apache.commons.httpclient.MultiThreadedHttpConnectionManager;
@@ -61,33 +62,27 @@ public class ElasticSearchConnector exte
   { ELASTICSEARCH_INDEXATION_ACTIVITY, ELASTICSEARCH_DELETION_ACTIVITY,
       ELASTICSEARCH_OPTIMIZE_ACTIVITY };
 
-  private final static String ELASTICSEARCH_TAB_ELASTICSEARCH = "ElasticSearch";
+  private final static String ELASTICSEARCH_TAB_ELASTICSEARCH = "ElasticSearchConnector.ElasticSearch";
+  private final static String ELASTICSEARCH_TAB_PARAMETERS = "ElasticSearchConnector.Parameters";
 
-  /** Forward to the HTML template for rendering hidden fields when the Server
-   * tab is not selected */
-  private static final String HIDDEN_CONFIG_FORWARD = "hiddenConfiguration.html";
-
-  /** Forward to the HTML template for rendering hidden fields when the CMIS
-   * Query tab is not selected */
-  private static final String HIDDEN_SPEC_FORWARD = "hiddenSpecification.html";
+  /** Forward to the javascript to check the configuration parameters */
+  private static final String EDIT_CONFIG_HEADER_FORWARD = "editConfiguration.js";
 
   /** Forward to the HTML template to edit the configuration parameters */
-  private static final String EDIT_CONFIG_FORWARD = "editConfiguration.html";
+  private static final String EDIT_CONFIG_FORWARD_PARAMETERS = "editConfiguration_Parameters.html";
 
   /** Forward to the HTML template to view the configuration parameters */
   private static final String VIEW_CONFIG_FORWARD = "viewConfiguration.html";
 
-  /** Forward to the javascript to check the configuration parameters */
-  private static final String EDIT_CONFIG_HEADER_FORWARD = "editConfiguration.js";
+  /** Forward to the javascript to check the specification parameters for the job */
+  private static final String EDIT_SPEC_HEADER_FORWARD = "editSpecification.js";
+
+  /** Forward to the template to edit the configuration parameters for the job */
+  private static final String EDIT_SPEC_FORWARD_ELASTICSEARCH = "editSpecification_ElasticSearch.html";
 
   /** Forward to the template to view the specification parameters for the job */
   private static final String VIEW_SPEC_FORWARD = "viewSpecification.html";
 
-  /** Forward to the template to edit the configuration parameters for the job */
-  private static final String EDIT_SPEC_FORWARD = "editSpecification.html";
-
-  /** Forward to the javascript to check the specification parameters for the job */
-  private static final String EDIT_SPEC_HEADER_FORWARD = "editSpecification.js";
 
   private MultiThreadedHttpConnectionManager connectionManager = null;
   private HttpClient client = null;
@@ -139,10 +134,16 @@ public class ElasticSearchConnector exte
    * @param out
    * @throws ManifoldCFException */
   private static void outputResource(String resName, IHTTPOutput out,
-      Locale locale, ElasticSearchParam params) throws ManifoldCFException
+      Locale locale, ElasticSearchParam params, String tabName) throws ManifoldCFException
   {
-    Messages.outputResourceWithVelocity(out, locale, resName, (params == null) ? null
-        : params.buildMap(), false);
+    Map<String,String> paramMap = null;
+    if (params != null) {
+      paramMap = params.buildMap();
+      if (tabName != null) {
+        paramMap.put("TabName", tabName);
+      }
+    }
+    Messages.outputResourceWithVelocity(out, locale, resName, paramMap, true);
   }
 
   @Override
@@ -152,9 +153,8 @@ public class ElasticSearchConnector exte
   {
     super.outputConfigurationHeader(threadContext, out, locale, parameters,
         tabsArray);
-    tabsArray.add(Messages.getString(locale,
-        "ElasticSearchConnector.Parameters"));
-    outputResource(EDIT_CONFIG_HEADER_FORWARD, out, locale, null);
+    tabsArray.add(Messages.getString(locale, ELASTICSEARCH_TAB_PARAMETERS));
+    outputResource(EDIT_CONFIG_HEADER_FORWARD, out, locale, null, null);
   }
 
   @Override
@@ -165,14 +165,7 @@ public class ElasticSearchConnector exte
     super.outputConfigurationBody(threadContext, out, locale, parameters,
         tabName);
     ElasticSearchConfig config = this.getConfigParameters(parameters);
-    if (Messages.getString(locale, "ElasticSearchConnector.Parameters").equals(
-        tabName))
-    {
-      outputResource(EDIT_CONFIG_FORWARD, out, locale, config);
-    } else
-    {
-      outputResource(HIDDEN_CONFIG_FORWARD, out, locale, config);
-    }
+    outputResource(EDIT_CONFIG_FORWARD_PARAMETERS, out, locale, config, tabName);
   }
 
   @Override
@@ -181,8 +174,8 @@ public class ElasticSearchConnector exte
       throws ManifoldCFException, IOException
   {
     super.outputSpecificationHeader(out, locale, os, tabsArray);
-    tabsArray.add(ELASTICSEARCH_TAB_ELASTICSEARCH);
-    outputResource(EDIT_SPEC_HEADER_FORWARD, out, locale, null);
+    tabsArray.add(Messages.getString(locale, ELASTICSEARCH_TAB_ELASTICSEARCH));
+    outputResource(EDIT_SPEC_HEADER_FORWARD, out, locale, null, null);
   }
 
   final private SpecificationNode getSpecNode(OutputSpecification os)
@@ -206,13 +199,7 @@ public class ElasticSearchConnector exte
   {
     super.outputSpecificationBody(out, locale, os, tabName);
     ElasticSearchSpecs specs = getSpecParameters(os);
-    if (ELASTICSEARCH_TAB_ELASTICSEARCH.equals(tabName))
-    {
-      outputResource(EDIT_SPEC_FORWARD, out, locale, specs);
-    } else
-    {
-      outputResource(HIDDEN_SPEC_FORWARD, out, locale, specs);
-    }
+    outputResource(EDIT_SPEC_FORWARD_ELASTICSEARCH, out, locale, specs, tabName);
   }
 
   @Override
@@ -255,16 +242,6 @@ public class ElasticSearchConnector exte
   {
     try
     {
-      /*
-      synchronized (this)
-      {
-        if (!outputDescription.equals(specsCacheOutpuDescription))
-          specsCache = null;
-        if (specsCache == null)
-          specsCache = new ElasticSearchSpecs(new JSONObject(outputDescription));
-        return specsCache;
-      }
-      */
       return new ElasticSearchSpecs(new JSONObject(outputDescription));
     } catch (JSONException e)
     {
@@ -314,14 +291,14 @@ public class ElasticSearchConnector exte
       IOException
   {
     outputResource(VIEW_CONFIG_FORWARD, out, locale,
-        getConfigParameters(parameters));
+        getConfigParameters(parameters), null);
   }
 
   @Override
   public void viewSpecification(IHTTPOutput out, Locale locale,
       OutputSpecification os) throws ManifoldCFException, IOException
   {
-    outputResource(VIEW_SPEC_FORWARD, out, locale, getSpecParameters(os));
+    outputResource(VIEW_SPEC_FORWARD, out, locale, getSpecParameters(os), null);
   }
 
   @Override

Modified: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java?rev=1299942&r1=1299573&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/Messages.java Tue Mar 13 01:19:31 2012
@@ -1,149 +1,141 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one or more
- * contributor license agreements. See the NOTICE file distributed with
- * this work for additional information regarding copyright ownership.
- * The ASF licenses this file to You under the Apache License, Version 2.0
- * (the "License"); you may not use this file except in compliance with
- * the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-package org.apache.manifoldcf.agents.output.elasticsearch;
-
-import java.util.Locale;
-import java.util.Map;
-import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
-import org.apache.manifoldcf.core.interfaces.IHTTPOutput;
-
-public class Messages extends org.apache.manifoldcf.ui.i18n.Messages
-{
-  public static final String DEFAULT_BUNDLE_NAME = "org.apache.manifoldcf.agents.output.elasticsearch.common";
-  public static final String DEFAULT_PATH_NAME = "org.apache.manifoldcf.crawler.connectors.elasticsearch";
-
-  /** Constructor - do no instantiate */
-  protected Messages()
-  {
-  }
-
-  public static String getString(Locale locale, String messageKey)
-  {
-    return getString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
-  }
-
-  public static String getAttributeString(Locale locale, String messageKey)
-  {
-    return getAttributeString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
-  }
-
-  public static String getBodyString(Locale locale, String messageKey)
-  {
-    return getBodyString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
-  }
-
-  public static String getAttributeJavascriptString(Locale locale,
-      String messageKey)
-  {
-    return getAttributeJavascriptString(DEFAULT_BUNDLE_NAME, locale,
-        messageKey, null);
-  }
-
-  public static String getBodyJavascriptString(Locale locale, String messageKey)
-  {
-    return getBodyJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey,
-        null);
-  }
-
-  public static String getString(Locale locale, String messageKey, Object[] args)
-  {
-    return getString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
-  }
-
-  public static String getAttributeString(Locale locale, String messageKey,
-      Object[] args)
-  {
-    return getAttributeString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
-  }
-
-  public static String getBodyString(Locale locale, String messageKey,
-      Object[] args)
-  {
-    return getBodyString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
-  }
-
-  public static String getAttributeJavascriptString(Locale locale,
-      String messageKey, Object[] args)
-  {
-    return getAttributeJavascriptString(DEFAULT_BUNDLE_NAME, locale,
-        messageKey, args);
-  }
-
-  public static String getBodyJavascriptString(Locale locale,
-      String messageKey, Object[] args)
-  {
-    return getBodyJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey,
-        args);
-  }
-
-  // More general methods which allow bundlenames and class loaders to be
-  // specified.
-
-  public static String getString(String bundleName, Locale locale,
-      String messageKey, Object[] args)
-  {
-    return getString(Messages.class.getClassLoader(), bundleName, locale,
-        messageKey, args);
-  }
-
-  public static String getAttributeString(String bundleName, Locale locale,
-      String messageKey, Object[] args)
-  {
-    return getAttributeString(Messages.class.getClassLoader(), bundleName,
-        locale, messageKey, args);
-  }
-
-  public static String getBodyString(String bundleName, Locale locale,
-      String messageKey, Object[] args)
-  {
-    return getBodyString(Messages.class.getClassLoader(), bundleName, locale,
-        messageKey, args);
-  }
-
-  public static String getAttributeJavascriptString(String bundleName,
-      Locale locale, String messageKey, Object[] args)
-  {
-    return getAttributeJavascriptString(Messages.class.getClassLoader(),
-        bundleName, locale, messageKey, args);
-  }
-
-  public static String getBodyJavascriptString(String bundleName,
-      Locale locale, String messageKey, Object[] args)
-  {
-    return getBodyJavascriptString(Messages.class.getClassLoader(), bundleName,
-        locale, messageKey, args);
-  }
-
-  // Resource output
-
-  public static void outputResource(IHTTPOutput output, Locale locale,
-      String resourceKey, Map<String, String> substitutionParameters,
-      boolean mapToUpperCase) throws ManifoldCFException
-  {
-    outputResource(output, Messages.class, DEFAULT_PATH_NAME, locale,
-        resourceKey, substitutionParameters, mapToUpperCase);
-  }
-  
-  public static void outputResourceWithVelocity(IHTTPOutput output, Locale locale, String resourceKey,
-      Map<String,String> substitutionParameters, boolean mapToUpperCase)
-      throws ManifoldCFException
-    {
-      outputResourceWithVelocity(output,createVelocityEngine(Messages.class),DEFAULT_PATH_NAME,locale,resourceKey,
-        substitutionParameters,mapToUpperCase);
-    }
-
-}
+/* $Id: Messages.java 1295926 2012-03-01 21:56:27Z kwright $ */
+
+/**
+* Licensed to the Apache Software Foundation (ASF) under one or more
+* contributor license agreements. See the NOTICE file distributed with
+* this work for additional information regarding copyright ownership.
+* The ASF licenses this file to You under the Apache License, Version 2.0
+* (the "License"); you may not use this file except in compliance with
+* the License. You may obtain a copy of the License at
+*
+* http://www.apache.org/licenses/LICENSE-2.0
+*
+* Unless required by applicable law or agreed to in writing, software
+* distributed under the License is distributed on an "AS IS" BASIS,
+* WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+* See the License for the specific language governing permissions and
+* limitations under the License.
+*/
+package org.apache.manifoldcf.agents.output.elasticsearch;
+
+import java.util.Locale;
+import java.util.Map;
+import org.apache.manifoldcf.core.interfaces.ManifoldCFException;
+import org.apache.manifoldcf.core.interfaces.IHTTPOutput;
+
+public class Messages extends org.apache.manifoldcf.ui.i18n.Messages
+{
+  public static final String DEFAULT_BUNDLE_NAME = "org.apache.manifoldcf.agents.output.elasticsearch.common";
+  public static final String DEFAULT_PATH_NAME = "org.apache.manifoldcf.crawler.connectors.elasticsearch";
+  
+  /** Constructor - do no instantiate
+  */
+  protected Messages()
+  {
+  }
+  
+  public static String getString(Locale locale, String messageKey)
+  {
+    return getString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
+  }
+
+  public static String getAttributeString(Locale locale, String messageKey)
+  {
+    return getAttributeString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
+  }
+
+  public static String getBodyString(Locale locale, String messageKey)
+  {
+    return getBodyString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
+  }
+
+  public static String getAttributeJavascriptString(Locale locale, String messageKey)
+  {
+    return getAttributeJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
+  }
+
+  public static String getBodyJavascriptString(Locale locale, String messageKey)
+  {
+    return getBodyJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey, null);
+  }
+
+  public static String getString(Locale locale, String messageKey, Object[] args)
+  {
+    return getString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
+  }
+
+  public static String getAttributeString(Locale locale, String messageKey, Object[] args)
+  {
+    return getAttributeString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
+  }
+  
+  public static String getBodyString(Locale locale, String messageKey, Object[] args)
+  {
+    return getBodyString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
+  }
+
+  public static String getAttributeJavascriptString(Locale locale, String messageKey, Object[] args)
+  {
+    return getAttributeJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
+  }
+
+  public static String getBodyJavascriptString(Locale locale, String messageKey, Object[] args)
+  {
+    return getBodyJavascriptString(DEFAULT_BUNDLE_NAME, locale, messageKey, args);
+  }
+
+  // More general methods which allow bundlenames and class loaders to be specified.
+  
+  public static String getString(String bundleName, Locale locale, String messageKey, Object[] args)
+  {
+    return getString(Messages.class, bundleName, locale, messageKey, args);
+  }
+
+  public static String getAttributeString(String bundleName, Locale locale, String messageKey, Object[] args)
+  {
+    return getAttributeString(Messages.class, bundleName, locale, messageKey, args);
+  }
+
+  public static String getBodyString(String bundleName, Locale locale, String messageKey, Object[] args)
+  {
+    return getBodyString(Messages.class, bundleName, locale, messageKey, args);
+  }
+  
+  public static String getAttributeJavascriptString(String bundleName, Locale locale, String messageKey, Object[] args)
+  {
+    return getAttributeJavascriptString(Messages.class, bundleName, locale, messageKey, args);
+  }
+
+  public static String getBodyJavascriptString(String bundleName, Locale locale, String messageKey, Object[] args)
+  {
+    return getBodyJavascriptString(Messages.class, bundleName, locale, messageKey, args);
+  }
+
+  // Resource output
+  
+  public static void outputResource(IHTTPOutput output, Locale locale, String resourceKey,
+    Map<String,String> substitutionParameters, boolean mapToUpperCase)
+    throws ManifoldCFException
+  {
+    outputResource(output,Messages.class,DEFAULT_PATH_NAME,locale,resourceKey,
+      substitutionParameters,mapToUpperCase);
+  }
+  
+  public static void outputResourceWithVelocity(IHTTPOutput output, Locale locale, String resourceKey,
+    Map<String,String> substitutionParameters, boolean mapToUpperCase)
+    throws ManifoldCFException
+  {
+    outputResourceWithVelocity(output,Messages.class,DEFAULT_BUNDLE_NAME,DEFAULT_PATH_NAME,locale,resourceKey,
+      substitutionParameters,mapToUpperCase);
+  }
+
+  public static void outputResourceWithVelocity(IHTTPOutput output, Locale locale, String resourceKey,
+    Map<String,Object> contextObjects)
+    throws ManifoldCFException
+  {
+    outputResourceWithVelocity(output,Messages.class,DEFAULT_BUNDLE_NAME,DEFAULT_PATH_NAME,locale,resourceKey,
+      contextObjects);
+  }
+  
+}
+

Modified: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties?rev=1299942&r1=1299573&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties Tue Mar 13 01:19:31 2012
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ElasticSearchConnector.configurationJs=configuration.js
-ElasticSearchConnector.configurationHtml=configuration.html
-ElasticSearchConnector.specificationsHtml=specifications.html
-ElasticSearchConnector.viewHtml=view.html
-ElasticSearchConnector.viewSpecHtml=viewSpec.html
 ElasticSearchConnector.Parameters=Parameters
-ElasticSearchConnector.Optimize=Optimize
-ElasticSearchConnector.Deletion=Deletion
-ElasticSearchConnector.Indexation=Indexation
 
+ElasticSearchConnector.ServerLocation=Server Location
+ElasticSearchConnector.URLColon=(URL):
+ElasticSearchConnector.IndexNameColon=Index name:
+ElasticSearchConnector.IndexTypeColon=Index type:
+ElasticSearchConnector.UserNameColon=User name:
+ElasticSearchConnector.APIKeyColon=API Key:
+
+ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=Please supply a valid ElasticSearch server location
+ElasticSearchConnector.PleaseSupplyValidIndexName=Please supply a valid index name
+ElasticSearchConnector.PleaseSupplyValidIndexType=Please supply a valid index type
+
+ElasticSearchConnector.ElasticSearch=ElasticSearch
+
+ElasticSearchConnector.MaxFileSizeBytesColon=Max file size (bytes):
+ElasticSearchConnector.AllowedMIMETypesColon=Allowed MIME Types:
+ElasticSearchConnector.AllowedFileExtensionsColon=Allowed file extensions:
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties?rev=1299942&r1=1299573&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties Tue Mar 13 01:19:31 2012
@@ -13,13 +13,21 @@
 # See the License for the specific language governing permissions and
 # limitations under the License.
 
-ElasticSearchConnector.configurationJs=configuration_ja.js
-ElasticSearchConnector.configurationHtml=configuration_ja.html
-ElasticSearchConnector.specificationsHtml=specifications_ja.html
-ElasticSearchConnector.viewHtml=view_ja.html
-ElasticSearchConnector.viewSpecHtml=viewSpec_ja.html
 ElasticSearchConnector.Parameters=引数
-ElasticSearchConnector.Optimize=Optimize
-ElasticSearchConnector.Deletion=Deletion
-ElasticSearchConnector.Indexation=Indexation
 
+ElasticSearchConnector.ServerLocation=サーバ
+ElasticSearchConnector.URLColon=(URL):
+ElasticSearchConnector.IndexNameColon=索引名:
+ElasticSearchConnector.IndexTypeColon=索引名:
+ElasticSearchConnector.UserNameColon=ユーザ名:
+ElasticSearchConnector.APIKeyColon=APIキー:
+
+ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=正しいElasticSearchサーバURLを入力してください
+ElasticSearchConnector.PleaseSupplyValidIndexName=正しい索引名を入力してください
+ElasticSearchConnector.PleaseSupplyValidIndexType=正しい索引名を入力してください
+
+ElasticSearchConnector.ElasticSearch=ElasticSearch
+
+ElasticSearchConnector.MaxFileSizeBytesColon=最大ファイルサイズ (bytes):
+ElasticSearchConnector.AllowedMIMETypesColon=利用可能なMIMEタイプ:
+ElasticSearchConnector.AllowedFileExtensionsColon=利用可能なファイル拡張子:

Copied: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js (from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.js)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js?p2=incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js&p1=incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.js&r1=1299573&r2=1299942&rev=1299942&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.js (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration.js Tue Mar 13 01:19:31 2012
@@ -18,32 +18,56 @@
 <script type="text/javascript">
 <!--
 function checkConfig() {
-	if (editconnection.serverlocation) {
-		if (editconnection.serverlocation.value == "") {
-			alert("Please supply a valid ElasticSearch server location");
-			editconnection.serverlocation.focus();
-			return false;
-		}
-	}
-	if (editconnection.indexname) {
-		if (editconnection.indexname.value == "") {
-			alert("Please supply a valid index name");
-			editconnection.indexname.focus();
-			return false;
-		}
-	}
-	if (editconnection.indextype) {
-		if (editconnection.indextype.value == "") {
-			alert("Please supply a valid index type");
-			editconnection.indextype.focus();
-			return false;
-		}
-	}
-	return true;
+  if (editconnection.serverlocation) {
+    if (editconnection.serverlocation.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation'))");
+      editconnection.serverlocation.focus();
+      return false;
+    }
+  }
+  if (editconnection.indexname) {
+    if (editconnection.indexname.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidIndexName'))");
+      editconnection.indexname.focus();
+      return false;
+    }
+  }
+  if (editconnection.indextype) {
+    if (editconnection.indextype.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidIndexType'))");
+      editconnection.indextype.focus();
+      return false;
+    }
+  }
+  return true;
 }
 
 function checkConfigForSave() {
-	return checkConfig();
+  if (editconnection.serverlocation) {
+    if (editconnection.serverlocation.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation'))");
+      SelectTab("$Encoder.javascriptBodyEscape($ResourceBundle.getString('ElasticSearchConnector.Parameters'))");
+      editconnection.serverlocation.focus();
+      return false;
+    }
+  }
+  if (editconnection.indexname) {
+    if (editconnection.indexname.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidIndexName'))");
+      SelectTab("$Encoder.javascriptBodyEscape($ResourceBundle.getString('ElasticSearchConnector.Parameters'))");
+      editconnection.indexname.focus();
+      return false;
+    }
+  }
+  if (editconnection.indextype) {
+    if (editconnection.indextype.value == "") {
+      alert("$Encoder.bodyJavascriptEscape($ResourceBundle.getString('ElasticSearchConnector.PleaseSupplyValidIndexType'))");
+      SelectTab("$Encoder.javascriptBodyEscape($ResourceBundle.getString('ElasticSearchConnector.Parameters'))");
+      editconnection.indextype.focus();
+      return false;
+    }
+  }
+  return true;
 }
 //-->
 </script>

Copied: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html (from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html?p2=incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html&p1=incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html&r1=1299573&r2=1299942&rev=1299942&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_en_US.html (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html Tue Mar 13 01:19:31 2012
@@ -15,31 +15,46 @@
  limitations under the License.
 -->
 
+#if($TABNAME == $ResourceBundle.getString('ElasticSearchConnector.Parameters'))
+
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Server Location</nobr> (URL):</td>
-		<td class="value"><input name="serverlocation" type="text"
-			value="$SERVERLOCATION_A" size="48" />
-		</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Index name:</nobr></td>
-		<td class="value"><input name="indexname" type="text" value="$INDEXNAME_A"
-			size="24" /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Index type:</nobr></td>
-		<td class="value"><input name="indextype" type="text" value="$INDEXTYPE_A"
-			size="24" /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>User name:</nobr></td>
-		<td class="value"><input name="username" type="text" value="$USERNAME_A"
-			size="24" /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>API Key:</nobr></td>
-		<td class="value"><input name="apikey" type="text" value="$APIKEY_A"
-			size="40" /></td>
-	</tr>
-</table>
\ No newline at end of file
+  <tr>
+    <td class="description">
+      <nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ServerLocation'))</nobr>
+        $Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.URLColon'))
+    </td>
+    <td class="value"><input name="serverlocation" type="text"
+      value="$Encoder.attributeEscape($SERVERLOCATION)" size="48" />
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexNameColon'))</nobr></td>
+    <td class="value"><input name="indexname" type="text" value="$Encoder.attributeEscape($INDEXNAME)"
+      size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexTypeColon'))</nobr></td>
+    <td class="value"><input name="indextype" type="text" value="$Encoder.attributeEscape($INDEXTYPE)"
+      size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.UserNameColon'))</nobr></td>
+    <td class="value"><input name="username" type="text" value="$Encoder.attributeEscape($USERNAME)"
+      size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.APIKeyColon'))</nobr></td>
+    <td class="value"><input name="apikey" type="text" value="$Encoder.attributeEscape($APIKEY)"
+      size="40" /></td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="serverlocation" value="$Encoder.attributeEscape($SERVERLOCATION)" />
+<input type="hidden" name="indexname" value="$Encoder.attributeEscape($INDEXNAME)" />
+<input type="hidden" name="indextype" value="$Encoder.attributeEscape($INDEXTYPE)" />
+<input type="hidden" name="username" value="$Encoder.attributeEscape($USERNAME)" />
+<input type="hidden" name="apikey" value="$Encoder.attributeEscape($APIKEY)" />
+
+#end

Copied: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ElasticSearch.html (from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ElasticSearch.html?p2=incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ElasticSearch.html&p1=incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html&r1=1299573&r2=1299942&rev=1299942&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_en_US.html (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editSpecification_ElasticSearch.html Tue Mar 13 01:19:31 2012
@@ -15,21 +15,31 @@
  limitations under the License.
 -->
 
+#if($TABNAME == $ResourceBundle.getString('ElasticSearchConnector.ElasticSearch'))
+
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
-		<td class="value"><input name="maxfilesize" type="text"
-			value="$MAXFILESIZE_A" size="24" /></td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed MIME Types :</nobr>
-		</td>
-		<td class="value"><textarea rows="10" cols="64" name="mimetypes">$MIMETYPES_B</textarea>
-		</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed file</nobr> extensions:</td>
-		<td class="value"><textarea rows="10" cols="12" name="extensions">$EXTENSIONS_B</textarea>
-		</td>
-	</tr>
-</table>
\ No newline at end of file
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.MaxFileSizeBytesColon'))</nobr></td>
+    <td class="value"><input name="maxfilesize" type="text"
+      value="$Encoder.attributeEscape($MAXFILESIZE)" size="24" /></td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.AllowedMIMETypesColon'))</nobr>
+    </td>
+    <td class="value"><textarea rows="10" cols="64" name="mimetypes">$Encoder.bodyEscape($MIMETYPES)</textarea>
+    </td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.AllowedFileExtensionsColon'))</nobr></td>
+    <td class="value"><textarea rows="10" cols="12" name="extensions">$Encoder.bodyEscape($EXTENSIONS)</textarea>
+    </td>
+  </tr>
+</table>
+
+#else
+
+<input type="hidden" name="maxfilesize" value="$Encoder.attributeEscape($MAXFILESIZE)" />
+<input type="hidden" name="mimetypes" value="$Encoder.attributeEscape($MIMETYPES)" />
+<input type="hidden" name="extensions" value="$Encoder.attributeEscape($EXTENSIONS)" />
+
+#end

Copied: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html (from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html?p2=incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html&p1=incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html&r1=1299573&r2=1299942&rev=1299942&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration_en_US.html (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html Tue Mar 13 01:19:31 2012
@@ -16,16 +16,25 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Server Location</nobr> (URL):</td>
-		<td class="value">$SERVERLOCATION_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>User name:</nobr></td>
-		<td class="value">$USERNAME_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>API Key:</nobr></td>
-		<td class="value">$APIKEY_B</td>
-	</tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.ServerLocation'))</nobr>
+    $Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.URLColon'))</td>
+    <td class="value">$Encoder.bodyEscape($SERVERLOCATION)</td>
+  </tr>
+    <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexNameColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($INDEXNAME)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.IndexTypeColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($INDEXTYPE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.UserNameColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($USERNAME)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.APIKeyColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($APIKEY)</td>
+  </tr>
 </table>
\ No newline at end of file

Copied: incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification.html (from r1299573, incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html)
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification.html?p2=incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification.html&p1=incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html&r1=1299573&r2=1299942&rev=1299942&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-288/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification_en_US.html (original)
+++ incubator/lcf/trunk/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewSpecification.html Tue Mar 13 01:19:31 2012
@@ -16,16 +16,16 @@
 -->
 
 <table class="displaytable">
-	<tr>
-		<td class="description"><nobr>Max file size</nobr> (bytes):</td>
-		<td class="value">$MAXFILESIZE_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed MIME types:</nobr></td>
-		<td class="value">$MIMETYPES_B</td>
-	</tr>
-	<tr>
-		<td class="description"><nobr>Allowed file</nobr> extensions:</td>
-		<td class="value">$EXTENSIONS_B</td>
-	</tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.MaxFileSizeBytesColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($MAXFILESIZE)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.AllowedMIMETypesColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($MIMETYPES)</td>
+  </tr>
+  <tr>
+    <td class="description"><nobr>$Encoder.bodyEscape($ResourceBundle.getString('ElasticSearchConnector.AllowedFileExtensionsColon'))</nobr></td>
+    <td class="value">$Encoder.bodyEscape($EXTENSIONS)</td>
+  </tr>
 </table>
\ No newline at end of file

Modified: incubator/lcf/trunk/connectors/pom.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/connectors/pom.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/connectors/pom.xml (original)
+++ incubator/lcf/trunk/connectors/pom.xml Tue Mar 13 01:19:31 2012
@@ -48,6 +48,7 @@
     <module>opensearchserver</module>
     <module>wiki</module>
     <module>alfresco</module>
+    <module>elasticsearch</module>
   </modules>
 
 </project>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml Tue Mar 13 01:19:31 2012
@@ -504,6 +504,35 @@
              	<p>You may also refer to the <a href="http://www.open-search-server.com/documentation">OpenSearchServer's user documentation</a>.</p>
             </section>
             
+            <section id="esssoutputconnector">
+            	<title>ElasticSearch Output Connection</title>
+            	<p>The ElasticSearch Output Connection allow ManifoldCF to submit documents to an ElasticSearch instance, via the XML over HTTP API. The connector has been designed
+            	to be as easy to use as possible.</p>
+            	<p>After creating an ElasticSearch ouput connection, you have to populate the parameters tab. Fill in the fields according your ElasticSearch configuration. Each
+            	ElasticSearch output connector instance works with one index. To work with muliple indexes, just create one output connector for each index.</p>
+            	<figure src="images/en_US/elasticsearch-connection-parameters.PNG" alt="ElasticSearch, parameters tab" width="80%"/>
+            	<p>The parameters are:</p><br/>
+            	<ul>
+            		<li>Server location: An URL that references your ElasticSearch instance. The default value (http://localhost:8080) is valid if your ElasticSearch instance runs
+            		on the same server than the ManifoldCF instance.</li>
+            		<li>Index name: The connector will populate the index defined here.</li>
+            		<li>User name and API Key: The credentials required to connect to the ElasticSearch instance. It can be left empty if no user has been created. The next figure shows
+            		where to find the user's informations in the ElasticSearch user interface.</li>
+            	</ul>
+            	<figure src="images/en_US/elasticsearch-user.PNG" alt="ElasticSearch, user configuration" width="80%"/>
+            	<p>Once you created a new job, having selected the ElasticSearch output connector, you will have the ElasticSearch tab. This tab let you:</p><br/>
+            	<ul>
+            		<li>Fix the maximum size of a document before deciding to index it. The value is in bytes. The default value is 16MB.</li>
+            		<li>The allowed mime types. Warning it does not work with all repository connectors.</li>
+            		<li>The allowed file extensions. Warning it does not work with all repository connectors.</li>
+            	</ul>
+            	<figure src="images/en_US/elasticsearch-job-parameters.PNG" alt="ElasticSearch, job parameters" width="80%"/>
+            	<p>In the history report you will be able to monitor all the activites. The connector supports three activites: Document ingestion (Indexation), document deletion and
+            	   index optimization. The targeted index is automatically optimized when the job is ending.</p>
+            	<figure src="images/en_US/elasticsearch-history-report.PNG" alt="ElasticSearch, history report" width="80%"/>
+             	<p>You may also refer to the <a href="http://www.elasticsearch.org/guide">ElasticSearch's user documentation</a>.</p>
+            </section>
+            
             <section id="gtsoutputconnector">
                 <title>MetaCarta GTS Output Connection</title>
                 <p>The MetaCarta GTS output connection type is designed to allow ManifoldCF to submit documents to an appropriate MetaCarta GTS search

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/how-to-build-and-deploy.xml Tue Mar 13 01:19:31 2012
@@ -69,6 +69,7 @@
           <li>MetaCarta GTS output connector</li>
           <li>Apache Solr output connector</li>
           <li>OpenSearchServer output connector</li>
+          <li>ElasticSearch output connector</li>
           <li>Null output connector</li>
         </ul>
         <p></p>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/included-connectors.xml Tue Mar 13 01:19:31 2012
@@ -44,6 +44,7 @@
         <tr><td>Wiki</td><td> Pure Java </td><td>N/A</td><td> N/A </td><td>Wiki version 1.8 and above </td></tr>
         <tr><td>LiveLink (OpenText)</td><td> Pure Java </td><td> Win </td><td> LAPI 9.7.1 </td><td> Tested with 9.2.0 - 9.7.1 </td></tr>
         <tr><td>OpenSearchServer</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with OpenSearchServer 1.2.1, 1.2.2, 1.2.3 </td></tr>
+        <tr><td>ElasticSearch</td><td> Pure Java </td><td> N/A </td><td> N/A</td><td> Tested with ElasticSearch 0.18.3, 0.18.4, 0.18.5, 0.18.6, 0.18.7 </td></tr>
         <tr><td>Documentum (EMC)</td><td> Win, RedHat </td><td> Win, RedHat </td><td> Tested with DFC 5.3 SP5 </td><td> Tested against 5.3, 6.0, and 6.5 servers </td></tr>
         <tr><td>SharePoint (MSFT)</td><td>Pure Java </td><td>Win</td><td> N/A </td><td> Tested with SharePoint 2003 (2.0), 2007 (3.0) </td></tr>
         <tr><td>Meridio (Autonomy)</td><td> Pure Java </td><td> Win </td><td> N/A </td><td> Tested with Meridio 4.1, 5.0 </td></tr>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/index.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/index.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/index.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/index.xml Tue Mar 13 01:19:31 2012
@@ -29,9 +29,9 @@
   <body> 
     <section>
 	<title>What Is ManifoldCF?</title>
-	<p>ManifoldCF is an effort to provide an open source framework for connecting source content repositories like Microsoft Sharepoint and EMC Documentum, to target repositories or indexes, such as Apache Solr or OpenSearchServer.  ManifoldCF also defines a security model for target repositories that permits them to enforce source-repository security policies.</p>
+	<p>ManifoldCF is an effort to provide an open source framework for connecting source content repositories like Microsoft Sharepoint and EMC Documentum, to target repositories or indexes, such as Apache Solr , OpenSearchServer or ElasticSearch.  ManifoldCF also defines a security model for target repositories that permits them to enforce source-repository security policies.</p>
 	<p>Currently included connectors support FileNet P8 (IBM), Documentum (EMC), LiveLink (OpenText), Meridio (Autonomy), Windows shares (Microsoft), and SharePoint (Microsoft).  Also included are a general CMIS connector, a generic file system connector, a general JDBC connector, an RSS feed connector, a Wiki connector, and a general web connector.
-            Currently supported targets include Apache Solr, QBase (formerly MetaCarta) GTS and OpenSearchServer.  The complete repository compatibility list can be found <a href="included-connectors.html">here</a>.</p>
+            Currently supported targets include Apache Solr, QBase (formerly MetaCarta) GTS , OpenSearchServer and ElasticSearch.  The complete repository compatibility list can be found <a href="included-connectors.html">here</a>.</p>
 	<p>The original ManifoldCF code base was granted by MetaCarta, Inc., to the Apache Software Foundation in December 2009.  The MetaCarta effort represented more than five years of successful development and testing in multiple, challenging enterprise environments.</p>
     </section>
 

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/javadoc.xml Tue Mar 13 01:19:31 2012
@@ -44,6 +44,7 @@
       <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/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/rss/index.html">RSS connector</a></p>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/writing-output-connectors.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/writing-output-connectors.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/writing-output-connectors.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/en_US/writing-output-connectors.xml Tue Mar 13 01:19:31 2012
@@ -63,7 +63,7 @@
         <p></p>
         <p>A very good place to start is to read the javadoc for the output connector interface.  You will note that the javadoc describes the usage and pooling model for a connector class pretty thoroughly.  It is very important to understand the model thoroughly in order to write reliable connectors!  Use of static variables, for one thing, must be done in a very careful way, to avoid issues that would be hard to detect with a cursory test.</p>
         <p></p>
-        <p>The second thing to do is to examine some of the provided output connector implementations.  The GTS connector, the SOLR connector, the OpenSearchServer connector, and the Null Output connector all are output connectors which demonstrate (to some degree) the sorts of techniques you will need for an effective implementation.  You will also note that all of these connectors extend a framework-provided output connector base class, found at <em>org.apache.manifoldcf.agents.output.BaseOutputConnector</em>.  This base class furnishes some basic bookkeeping logic for managing the connector pool, as well as default implementations of some of the less typical functionality a connector may have.  For example, connectors are allowed to have database tables of their own, which are instantiated when the connector is registered, and are torn down when the connector is removed.  This is, however, not very typical, and the base implementation reflects that.</p>
+        <p>The second thing to do is to examine some of the provided output connector implementations.  The GTS connector, the SOLR connector, the OpenSearchServer connector, the ElasticSearch connector, and the Null Output connector all are output connectors which demonstrate (to some degree) the sorts of techniques you will need for an effective implementation.  You will also note that all of these connectors extend a framework-provided output connector base class, found at <em>org.apache.manifoldcf.agents.output.BaseOutputConnector</em>.  This base class furnishes some basic bookkeeping logic for managing the connector pool, as well as default implementations of some of the less typical functionality a connector may have.  For example, connectors are allowed to have database tables of their own, which are instantiated when the connector is registered, and are torn down when the connector is removed.  This is, however, not very typical, and the base implementation reflects
  that.</p>
         <p></p>
         <section>
           <title>Principle methods</title>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/end-user-documentation.xml Tue Mar 13 01:19:31 2012
@@ -374,6 +374,30 @@
              	<p>OpenSearchServerの詳細に付いては<a href="http://www.open-search-server.com/documentation">OpenSearchServerユーザマニュアル</a>を参照してください。</p>
             </section>
             
+            <section id="esssoutputconnector">
+            	<title>ElasticSearch出力コネクション</title>
+            	<p>ElasticSearch出力コネクションは、XML文書をHTTP APIを介してElasticSearchに送ります。このコネクタは、できるだけ簡単に利用できるように設計されています。</p>
+            	<p>ElasticSearch出力コネクションタイプを選択した後には、「引数」タブの項目をElasticSearchの設定に従って入力してください。各ElasticSearch出力コネクションは1つの索引と対応しています。一つ以上の索引を利用する場合は、索引毎に出力コネクションを作成してください。</p>
+            	<figure src="images/ja_JP/elasticsearch-connection-parameters_ja_JP.PNG" alt="ElasticSearch, parameters tab" width="80%"/>
+            	<p>引数:</p><br/>
+            	<ul>
+            		<li>サーバアドレス:ElasticSearchインスタンスのURL。デフォルトURL(http://localhost:8080)はElasticSearchがManifoldCFと同じサーバで起動している場合のアドレスです。</li>
+            		<li>索引名:コネクタは指定された索引にデータを作成します。</li>
+            		<li>ユーザ名とAPIキー:ElasticSearchインスタンスに接続するためのユーザ認証情報。ユーザが作成されていない場合は、空白にしてください。次の画像はElasticSearchで、認証情報が記載されている画面です。</li>
+            	</ul>
+            	<figure src="images/ja_JP/elasticsearch-user_ja_JP.PNG" alt="ElasticSearch, user configuration" width="80%"/>
+            	<p>ジョブでElasticSearch出力コネクションを選択した場合は、「ElasticSearch」タブが表示されます。このタブから以下の設定を指定する事ができます:</p><br/>
+            	<ul>
+            		<li>対象とするコンテンツの最大サイズ(バイト)。デフォルトでは16MBです。</li>
+            		<li>対象とするMIMEタイプ。リポジトリコネクションによっては正しく処されません。</li>
+            		<li>対象とするファイル拡張子。リポジトリコネクションによっては正しく処されません。</li>
+            	</ul>
+            	<figure src="images/ja_JP/elasticsearch-job-parameters_ja_JP.PNG" alt="ElasticSearch, job parameters" width="80%"/>
+            	<p>すべてのアクティビティは履歴レポートから参照することができます。コネクタは3つのアクティビティに対応しています:コンテンツの読込み(索引の作成)、コンテンツの削除、索引の最適化。ジョブが終了すると索引は最適化されます。</p>
+            	<figure src="images/ja_JP/elasticsearch-history-report_ja_JP.PNG" alt="ElasticSearch, history report" width="80%"/>
+             	<p>ElasticSearchの詳細に付いては<a href="http://www.open-search-server.com/documentation">ElasticSearchユーザマニュアル</a>を参照してください。</p>
+            </section>
+            
             <section id="gtsoutputconnector">
                 <title>MetaCarta GTS出力コネクション</title>
                 <p>MetaCarta GTS出力コネクションタイプはHTTP APIを介してMetaCarta GTS検索エンジンにコンテンツを送ります。</p>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/how-to-build-and-deploy.xml Tue Mar 13 01:19:31 2012
@@ -69,6 +69,7 @@
           <li>MetaCarta GTS output connector</li>
           <li>Apache Solr output connector</li>
           <li>OpenSearchServer output connector</li>
+          <li>ElasticSearch output connector</li>
           <li>Null output connector</li>
         </ul>
         <p></p>
@@ -594,6 +595,7 @@ log4j.appender.MAIN.layout.ConversionPat
             <tr><td>org.apache.manifoldcf.agents.RegisterOutput</td><td>org.apache.manifoldcf.agents.output.gts.GTSConnector "GTS Connector"</td></tr>
             <tr><td>org.apache.manifoldcf.agents.RegisterOutput</td><td>org.apache.manifoldcf.agents.output.solr.SolrConnector "SOLR Connector"</td></tr>
             <tr><td>org.apache.manifoldcf.agents.RegisterOutput</td><td>org.apache.manifoldcf.agents.output.opensearchserver.OpenSearchServerConnector "OpenSearchServer Connector"</td></tr>
+            <tr><td>org.apache.manifoldcf.agents.RegisterOutput</td><td>org.apache.manifoldcf.agents.output.elasticsearch.ElasticSearchConnector "ElasticSearch Connector"</td></tr>
             <tr><td>org.apache.manifoldcf.agents.RegisterOutput</td><td>org.apache.manifoldcf.agents.output.nullconnector.NullConnector "Null Connector"</td></tr>
             <tr><td>org.apache.manifoldcf.authorities.RegisterAuthority</td><td>org.apache.manifoldcf.authorities.authorities.activedirectory.ActiveDirectoryAuthority "Active Directory Authority"</td></tr>
             <tr><td>org.apache.manifoldcf.crawler.Register</td><td>org.apache.manifoldcf.crawler.connectors.cmis.CmisRepositoryConnector "CMIS"</td></tr>

Modified: incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/included-connectors_ja_JP.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/included-connectors_ja_JP.xml?rev=1299942&r1=1299941&r2=1299942&view=diff
==============================================================================
--- incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/included-connectors_ja_JP.xml (original)
+++ incubator/lcf/trunk/site/src/documentation/content/xdocs/ja_JP/included-connectors_ja_JP.xml Tue Mar 13 01:19:31 2012
@@ -43,6 +43,7 @@
         <tr><td>Wiki</td><td>Java </td><td>N/A</td><td> N/A </td><td>Wiki 1.8以降</td></tr>
         <tr><td>LiveLink (OpenText)</td><td>Java </td><td> Win </td><td> LAPI 9.7.1 </td><td>9.2.0 - 9.7.1で検証済み</td></tr>
         <tr><td>OpenSearchServer</td><td>Java </td><td> N/A </td><td> N/A</td><td>OpenSearchServer 1.2.1, 1.2.2, 1.2.3で検証済み</td></tr>
+        <tr><td>ElasticSearch</td><td>Java </td><td> N/A </td><td> N/A</td><td>ElasticSearch 0.18.3, 0.18.4, 0.18.5, 0.18.6, 0.18.7で検証済み</td></tr>
         <tr><td>Documentum (EMC)</td><td>Win, RedHat</td><td> Win, RedHat </td><td>DFC 5.3 SP5で検証済み</td><td>5.3, 6.0, and 6.5サーバで検証済み</td></tr>
         <tr><td>SharePoint (MSFT)</td><td>Java </td><td>Win</td><td> N/A </td><td>SharePoint 2003 (2.0), 2007 (3.0)で検証済み</td></tr>
         <tr><td>Meridio (Autonomy)</td><td>Java </td><td> Win </td><td> N/A </td><td>Meridio 4.1, 5.0で検証済み</td></tr>



Mime
View raw message