incubator-connectors-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From piergior...@apache.org
Subject svn commit: r1302515 - in /incubator/lcf/branches/CONNECTORS-423: ./ connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agen...
Date Mon, 19 Mar 2012 15:45:14 GMT
Author: piergiorgio
Date: Mon Mar 19 15:45:14 2012
New Revision: 1302515

URL: http://svn.apache.org/viewvc?rev=1302515&view=rev
Log:
Patch for ElasticSearch connector to solve CONNECTORS-423 and CONNECTORS-425:
- fix for the Ant script to execute integration tests
- added missing images to the documentation
- removed unused parameters from the connector: API Key and Username that were taken from
OpenSearchServer implementation

Added:
    incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-connection-parameters.png
  (with props)
    incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-history-report.png
  (with props)
    incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-job-parameters.png
  (with props)
Modified:
    incubator/lcf/branches/CONNECTORS-423/CHANGES.txt
    incubator/lcf/branches/CONNECTORS-423/build.xml
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
    incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
    incubator/lcf/branches/CONNECTORS-423/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
    incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/build.xml
    incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/APISanityDerbyIT.java
    incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java

Modified: incubator/lcf/branches/CONNECTORS-423/CHANGES.txt
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/CHANGES.txt?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/CHANGES.txt (original)
+++ incubator/lcf/branches/CONNECTORS-423/CHANGES.txt Mon Mar 19 15:45:14 2012
@@ -3,6 +3,12 @@ $Id$
 
 ======================= 0.5-dev =====================
 
+CONNECTORS-425: Elastic Search documentation missing images
+(Piergiorgio Lucidi)
+
+CONNECTORS-423: Elastic Search connector should handle document metadata
+(Luca Stancapiano, Piergiorgio Lucidi, Karl Wright)
+
 CONNECTORS-288: Add Elastic Search connector.
 (Luca Stancapiano, Piergiorgio Lucidi, Karl Wright)
 

Modified: incubator/lcf/branches/CONNECTORS-423/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/build.xml?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-423/build.xml Mon Mar 19 15:45:14 2012
@@ -1600,7 +1600,7 @@
     </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"/>
+        <available file="connectors/elasticsearch/test-materials-proprietary/elasticsearch-0.19.0"
type="dir" property="elasticsearch-testmaterials.exists"/>
         <condition property="elasticsearch-testmaterials.include">
           <and>
               <isset property="elasticsearch-testmaterials.exists"/>
@@ -1612,7 +1612,7 @@
     <target name="calculate-elasticsearch-tests-condition" depends="calculate-elasticsearch-testmaterials-condition,calculate-elasticsearch-condition,calculate-cmis-condition">
       <condition property="elasticsearch-tests.include">
         <and>
-            <not>
+        	  <not>
                 <equals arg1="${ant.java.version}" arg2="1.5" />
             </not>
             <isset property="elasticsearch.include"/>

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConfig.java
Mon Mar 19 15:45:14 2012
@@ -33,7 +33,7 @@ public class ElasticSearchConfig extends
   /** Parameters used for the configuration */
   final private static ParameterEnum[] CONFIGURATIONLIST =
   { ParameterEnum.SERVERLOCATION, ParameterEnum.INDEXNAME,
-      ParameterEnum.INDEXTYPE, ParameterEnum.USERNAME, ParameterEnum.APIKEY };
+      ParameterEnum.INDEXTYPE};
 
   /** Build a set of ElasticSearchParameters by reading ConfigParams. If the
    * value returned by ConfigParams.getParameter is null, the default value is
@@ -90,13 +90,4 @@ public class ElasticSearchConfig extends
     return get(ParameterEnum.INDEXTYPE);
   }
 
-  final public String getUserName()
-  {
-    return get(ParameterEnum.USERNAME);
-  }
-
-  final public String getApiKey()
-  {
-    return get(ParameterEnum.APIKEY);
-  }
 }

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchConnection.java
Mon Mar 19 15:45:14 2012
@@ -37,10 +37,6 @@ public class ElasticSearchConnection
 
   private String indexName;
 
-  private String userName;
-
-  private String apiKey;
-
   private String resultDescription;
 
   private String callUrlSnippet;
@@ -66,8 +62,6 @@ public class ElasticSearchConnection
     callUrlSnippet = null;
     serverLocation = config.getServerLocation();
     indexName = config.getIndexName();
-    userName = config.getUserName();
-    apiKey = config.getApiKey();
   }
 
   protected final String urlEncode(String t) throws ManifoldCFException
@@ -90,14 +84,6 @@ public class ElasticSearchConnection
       url.append(urlEncode(indexName)+"/");
     url.append(command);
     callUrlSnippet = url.toString();
-    if (userName != null && apiKey != null && userName.length() > 0
-        && apiKey.length() > 0)
-    {
-      url.append("&login=");
-      url.append(urlEncode(userName));
-      url.append("&key=");
-      url.append(apiKey);
-    }
     return url;
   }
 

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/java/org/apache/manifoldcf/agents/output/elasticsearch/ElasticSearchParam.java
Mon Mar 19 15:45:14 2012
@@ -39,10 +39,6 @@ public class ElasticSearchParam extends 
 
 		INDEXTYPE("generictype"),
 
-		USERNAME(""),
-
-		APIKEY(""),
-
 		FIELDLIST(""),
 
 		MAXFILESIZE("16777216"),

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_en_US.properties
Mon Mar 19 15:45:14 2012
@@ -19,8 +19,6 @@ ElasticSearchConnector.ServerLocation=Se
 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
@@ -30,4 +28,4 @@ ElasticSearchConnector.ElasticSearch=Ela
 
 ElasticSearchConnector.MaxFileSizeBytesColon=Max file size (bytes):
 ElasticSearchConnector.AllowedMIMETypesColon=Allowed MIME Types:
-ElasticSearchConnector.AllowedFileExtensionsColon=Allowed file extensions:
\ No newline at end of file
+ElasticSearchConnector.AllowedFileExtensionsColon=Allowed file extensions\:
\ No newline at end of file

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/native2ascii/org/apache/manifoldcf/agents/output/elasticsearch/common_ja_JP.properties
Mon Mar 19 15:45:14 2012
@@ -19,8 +19,6 @@ ElasticSearchConnector.ServerLocation=ã
 ElasticSearchConnector.URLColon=(URL):
 ElasticSearchConnector.IndexNameColon=索引名:
 ElasticSearchConnector.IndexTypeColon=索引名:
-ElasticSearchConnector.UserNameColon=ユーザ名:
-ElasticSearchConnector.APIKeyColon=APIキー:
 
 ElasticSearchConnector.PleaseSupplyValidElasticSearchLocation=正しいElasticSearchサーバURLを入力してください
 ElasticSearchConnector.PleaseSupplyValidIndexName=正しい索引名を入力してください

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/editConfiguration_Parameters.html
Mon Mar 19 15:45:14 2012
@@ -37,16 +37,6 @@
     <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
@@ -54,7 +44,5 @@
 <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

Modified: incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
(original)
+++ incubator/lcf/branches/CONNECTORS-423/connectors/elasticsearch/connector/src/main/resources/org/apache/manifoldcf/agents/output/elasticsearch/viewConfiguration.html
Mon Mar 19 15:45:14 2012
@@ -29,12 +29,4 @@
     <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

Modified: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
(original)
+++ incubator/lcf/branches/CONNECTORS-423/site/src/documentation/content/xdocs/en_US/end-user-documentation.xml
Mon Mar 19 15:45:14 2012
@@ -510,26 +510,24 @@
             	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 multiple
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/>
+            	<figure src="images/en_US/elasticsearch-connection-parameters.png" alt="ElasticSearch,
parameters tab" width="80%"/>
+            	<br />
+            	<p>The parameters are:</p>
             	<ul>
-            		<li>Server location: An URL that references your ElasticSearch instance.
The default value (http://localhost:8080) is valid if your ElasticSearch instance runs
+            		<li>Server location: An URL that references your ElasticSearch instance.
The default value (http://localhost:9200) 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/>
+            	<br /><p>Once you created a new job, having selected the ElasticSearch
output connector, you will have the ElasticSearch tab. This tab let you:</p>
             	<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%"/-->
+            	<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%"/-->
+            	<figure src="images/en_US/elasticsearch-history-report.png" alt="ElasticSearch,
history report" width="80%"/>
              	<p>You may also refer to <a href="http://www.elasticsearch.org/guide">ElasticSearch's
user documentation</a>.</p>
             </section>
             

Added: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-connection-parameters.png
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-connection-parameters.png?rev=1302515&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-connection-parameters.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-history-report.png
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-history-report.png?rev=1302515&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-history-report.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Added: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-job-parameters.png
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-job-parameters.png?rev=1302515&view=auto
==============================================================================
Binary file - no diff available.

Propchange: incubator/lcf/branches/CONNECTORS-423/site/src/documentation/resources/images/en_US/elasticsearch-job-parameters.png
------------------------------------------------------------------------------
    svn:mime-type = image/png

Modified: incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/build.xml
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/build.xml?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/build.xml (original)
+++ incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/build.xml Mon Mar 19 15:45:14
2012
@@ -23,6 +23,7 @@
         <path refid="mcf-icmis-test-build.test-classpath"/>
         <fileset dir="../../connectors/elasticsearch/test-materials-proprietary">
             <include name="elasticsearch*/lib/*.jar"/>
+        	  <include name="elasticsearch*/plugins/mapper-attachments/*.jar"/>
         </fileset>
     </path>
 
@@ -38,11 +39,8 @@
                 <pathelement location="build/test/classes"/>
             </classpath>
             <formatter type="brief" usefile="false"/>
-            <batchtest todir="test-derby-output">
-                <fileset dir="build/test/classes">
-                    <include name="**/*DerbyIT.class"/>
-                </fileset>
-            </batchtest>
+        	  
+        	  <test name="org.apache.manifoldcf.elasticsearch_tests.APISanityDerbyIT" todir="test-derby-output"/>
         </junit>
     </target>
 

Modified: incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/APISanityDerbyIT.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/APISanityDerbyIT.java?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/APISanityDerbyIT.java
(original)
+++ incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/APISanityDerbyIT.java
Mon Mar 19 15:45:14 2012
@@ -325,18 +325,6 @@ public class APISanityDerbyIT extends Ba
       indexType.setValue("generictype");
       child.addChild(child.getChildCount(), indexType);
       
-      //username
-      ConfigurationNode username = new ConfigurationNode("_PARAMETER_");
-      username.setAttribute("name", "username");
-      username.setValue("");
-      child.addChild(child.getChildCount(), username);
-      
-      //apikey
-      ConfigurationNode apikey = new ConfigurationNode("_PARAMETER_");
-      apikey.setAttribute("name", "apikey");
-      apikey.setValue("");
-      child.addChild(child.getChildCount(), apikey);
-      
       connectionObject.addChild(connectionObject.getChildCount(),child);
       
       requestObject = new Configuration();

Modified: incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java
URL: http://svn.apache.org/viewvc/incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java?rev=1302515&r1=1302514&r2=1302515&view=diff
==============================================================================
--- incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java
(original)
+++ incubator/lcf/branches/CONNECTORS-423/tests/elasticsearch/src/test/java/org/apache/manifoldcf/elasticsearch_tests/NavigationDerbyUI.java
Mon Mar 19 15:45:14 2012
@@ -84,10 +84,6 @@ public class NavigationDerbyUI extends B
     textarea.setValue(testerInstance.createStringDescription("index"));
     textarea = form.findTextarea(testerInstance.createStringDescription("indextype"));
     textarea.setValue(testerInstance.createStringDescription("generictype"));
-    textarea = form.findTextarea(testerInstance.createStringDescription("username"));
-    textarea.setValue(testerInstance.createStringDescription("foo"));
-    textarea = form.findTextarea(testerInstance.createStringDescription("apikey"));
-    textarea.setValue(testerInstance.createStringDescription("bar"));
     
     // Go back to the Name tab
     link = window.findLink(testerInstance.createStringDescription("Name tab"));



Mime
View raw message