Now ships with new install script that automates copying of dependent

libraries, taking into account possible version conflicts. Upgraded to Elasticsearch 2.3.5, Norconex Committer Core 2.0.5, Norconex Commons Lang 1.12.0, Apache Commons Lang 2.6.
Norconex · Aug 29, 2016 · 454bbb2 · 454bbb2
1 parent 891cdb8
commit 454bbb2
Show file tree

Hide file tree

Showing 8 changed files with 486 additions and 413 deletions.
diff --git a/norconex-committer-elasticsearch/pom.xml b/norconex-committer-elasticsearch/pom.xml
diff --git a/norconex-committer-elasticsearch/src/changes/changes.xml b/norconex-committer-elasticsearch/src/changes/changes.xml
@@ -7,9 +7,14 @@
   </properties>
   <body>
 
-    <release version="2.0.3-SNAPSHOT" date="2016-??-??" description="Maintenance release">
+    <release version="2.1.0" date="2016-08-29" description="Feature release">
+      <action dev="essiembre" type="add">
+        Now ships with new install script that automates copying of dependent 
+        libraries, taking into account possible version conflicts.
+      </action>
       <action dev="dimassip" type="update">
-        Upgraded to Elasticsearch 2.1.0
+        Upgraded to Elasticsearch 2.3.5, Norconex Committer Core 2.0.5,
+        Norconex Commons Lang 1.12.0, Apache Commons Lang 2.6.
       </action>
     </release>
 

diff --git a/norconex-committer-elasticsearch/src/main/assembly/NOTICE.txt b/norconex-committer-elasticsearch/src/main/assembly/NOTICE.txt
@@ -1,5 +1,5 @@
 Norconex Elasticsearch Committer
-Copyright 2013 Norconex Inc.
+Copyright 2013-2016 Norconex Inc.
 
 General Information:
 ====================
@@ -8,7 +8,7 @@ For any inquiries about Norconex Elasticsearch Committer, please contact
 Norconex Inc. at info@norconex.com.
 
 This product website and documentation is located at:
-http://www.norconex.com/collectors/committer-elasticsearch/
+https://www.norconex.com/collectors/committer-elasticsearch/
 
 Norconex licenses:
 ==================

diff --git a/norconex-committer-elasticsearch/src/main/assembly/dist.xml b/norconex-committer-elasticsearch/src/main/assembly/dist.xml
@@ -21,8 +21,15 @@
     <format>zip</format>
   </formats>
   <includeSiteDirectory>false</includeSiteDirectory>
-<!--  -->
+
   <fileSets>
+    <fileSet>
+      <directory>${basedir}/src/main/scripts</directory>
+      <includes>
+        <include>**</include>
+      </includes>
+      <outputDirectory>/</outputDirectory>
+    </fileSet>  
     <fileSet>
       <directory>${basedir}/src/main/assembly/</directory>
       <includes>

diff --git a/norconex-committer-elasticsearch/src/main/javadoc/overview.html b/norconex-committer-elasticsearch/src/main/javadoc/overview.html
@@ -2,9 +2,9 @@
 
 <div style="text-align: center; font-weight: bold;">
 &nbsp;&nbsp;&nbsp;&nbsp;
-<a target="_top" href="http://www.norconex.com/collectors/committer-elasticsearch/">Web Site</a>
+<a target="_top" href="https://www.norconex.com/collectors/committer-elasticsearch/">Web Site</a>
 &nbsp;&nbsp;|&nbsp;&nbsp; 
-<a target="_top" href="http://www.norconex.com/collectors/committer-elasticsearch/support">Support</a>
+<a target="_top" href="https://www.norconex.com/collectors/committer-elasticsearch/support">Support</a>
 &nbsp;&nbsp;|&nbsp;&nbsp; 
 <a target="_top" href="https://github.com/norconex/committer-elasticsearch/issues">Issues</a>
 </div>

diff --git a/norconex-committer-elasticsearch/src/main/scripts/install.bat b/norconex-committer-elasticsearch/src/main/scripts/install.bat
@@ -0,0 +1,24 @@
+@echo off
+cd %~dp0
+
+echo.
+echo PLEASE READ CAREFULLY
+echo.
+echo To install this component and its dependencies into another product, 
+echo please specify the target product directory where libraries (.jar files)
+echo can be found.
+echo.
+echo This is often a "lib" directory. For example, to install this component  
+echo into the Norconex HTTP Collector, specify the full path to the Collector
+echo "lib" directory, which may look somewhat like this:
+echo. 
+echo    C:\MyProject\norconex-collector-http-x.x.x\lib
+echo.
+echo If .jar duplicates are found, you will be asked how you wish to deal with
+echo them. It is recommended to try keep most recent versions upon encountering
+echo version conflicts. When in doubt, simply choose the default option.
+echo.
+
+java -Dfile.encoding=UTF8 -cp "./lib/*" com.norconex.commons.lang.jar.JarCopier ./lib
+
+pause
diff --git a/norconex-committer-elasticsearch/src/main/scripts/install.sh b/norconex-committer-elasticsearch/src/main/scripts/install.sh
@@ -0,0 +1,22 @@
+#!/bin/sh
+cd $(dirname $0)
+
+echo ""
+echo "PLEASE READ CAREFULLY"
+echo ""
+echo "To install this component and its dependencies into another product,"
+echo "please specify the target product directory where libraries (.jar files)"
+echo "can be found."
+echo ""
+echo "This is often a "lib" directory. For example, to install this component"
+echo "into the Norconex HTTP Collector, specify the full path to the Collector"
+echo "\"lib\" directory, which may look somewhat like this:"
+echo ""
+echo "   /myProject/norconex-collector-http-x.x.x/lib"
+echo ""
+echo "If .jar duplicates are found, you will be asked how you wish to deal with"
+echo "them. It is recommended to try keep most recent versions upon encountering"
+echo "version conflicts. When in doubt, simply choose the default option."
+echo ""
+
+java -Dfile.encoding=UTF8 -cp "./lib/*" com.norconex.commons.lang.jar.JarCopier "./lib"
diff --git a/...search/src/test/java/com/norconex/committer/elasticsearch/ElasticsearchCommitterTest.java b/...search/src/test/java/com/norconex/committer/elasticsearch/ElasticsearchCommitterTest.java
@@ -31,6 +31,7 @@
 import org.apache.commons.io.FileUtils;
 import org.apache.commons.io.IOUtils;
 import org.apache.commons.io.input.NullInputStream;
+import org.apache.commons.lang3.CharEncoding;
 import org.elasticsearch.action.get.GetResponse;
 import org.elasticsearch.action.index.IndexRequestBuilder;
 import org.elasticsearch.client.Client;
@@ -100,7 +101,7 @@ public void tearDown() throws Exception {
     @Test
     public void testCommitAdd() throws Exception {
         String content = "hello world!";
-        InputStream is = IOUtils.toInputStream(content);
+        InputStream is = IOUtils.toInputStream(content, CharEncoding.UTF_8);
 
         // Add new doc to ES
         String id = "1";
@@ -200,7 +201,7 @@ public void testWriteRead() throws Exception {
     public void testSetSourceReferenceField() throws Exception {
 
         String content = "hello world!";
-        InputStream is = IOUtils.toInputStream(content);
+        InputStream is = IOUtils.toInputStream(content, CharEncoding.UTF_8);
 
         // Force to use a reference field instead of the default
         // reference ID.
@@ -236,7 +237,7 @@ public void testSetSourceReferenceField() throws Exception {
     public void testKeepIdSourceField() throws Exception {
 
         String content = "hello world!";
-        InputStream is = IOUtils.toInputStream(content);
+        InputStream is = IOUtils.toInputStream(content, CharEncoding.UTF_8);
 
         // Force to use a reference field instead of the default
         // reference ID.
@@ -328,7 +329,7 @@ public void testKeepCustomsourceContentField() throws Exception {
     public void testCustomtargetContentField() throws Exception {
 
         String content = "hello world!";
-        InputStream is = IOUtils.toInputStream(content);
+        InputStream is = IOUtils.toInputStream(content, CharEncoding.UTF_8);
 
         String targetContentField = "customContent";
         Properties metadata = new Properties();