Preparing for release.

essiembre · essiembre · commit e9e97f516f6c · 2017-05-25T00:13:08.000-04:00
diff --git a/norconex-committer-sql/pom.xml b/norconex-committer-sql/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.norconex.collectors</groupId>
   <artifactId>norconex-committer-sql</artifactId>
-  <version>1.0.0-SNAPSHOT</version>
+  <version>1.0.0</version>
   <name>Norconex Committer SQL</name>
   <description>SQL database implementation of Norconex Committer.</description>
 
diff --git a/norconex-committer-sql/src/changes/changes.xml b/norconex-committer-sql/src/changes/changes.xml
@@ -7,7 +7,7 @@
   </properties>
   <body>
 
-    <release version="1.0.0-SNAPSHOT" date="2017-??-??" description="Initial release">
+    <release version="1.0.0" date="2017-05-25" description="Initial release">
       <action dev="essiembre" type="add">
         Initial release.
       </action>
diff --git a/norconex-committer-sql/src/main/assembly/dist.xml b/norconex-committer-sql/src/main/assembly/dist.xml
@@ -40,10 +40,6 @@
     </fileSet>
     <fileSet>
       <directory>${project.build.directory}/shared-resources</directory>
-      <excludes>
-        <exclude>scripts/decrypt*</exclude>
-        <exclude>scripts/encrypt*</exclude>
-      </excludes>
       <outputDirectory>/</outputDirectory>
     </fileSet>
     <fileSet>
diff --git a/norconex-committer-sql/src/main/java/com/norconex/committer/sql/SQLCommitter.java b/norconex-committer-sql/src/main/java/com/norconex/committer/sql/SQLCommitter.java
@@ -145,6 +145,10 @@
  *        (Optional SQL for creating missing table if not found. 
  *         Default uses a predefined SQL.)
  *      &lt;/createTableSQL&gt;
+ *      &lt;multiValuesJoiner&gt;
+ *        (One or more characters to join multi-value fields.
+ *         Default is "|".)
+ *      &lt;/multiValuesJoiner&gt;
  *  
  *      &lt;!-- Use the following if authentication is required. --&gt;
  *      &lt;username&gt;(Optional user name)&lt;/username&gt;
@@ -193,10 +197,16 @@
  * 
  * <h4>Usage example:</h4>
  * <p>
- * The following example uses the minimum required settings:.  
+ * The following example uses an H2 database and creates fields as
+ * they are encountered. 
  * </p> 
  * <pre>
  *  &lt;committer class="com.norconex.committer.sql.SQLCommitter"&gt;
+ *      &lt;driverPath&gt;/path/to/driver/h2.jar&lt;/driverPath&gt;
+ *      &lt;driverClass&gt;org.h2.Driver&lt;/driverClass&gt;
+ *      &lt;connectionUrl&gt;jdbc:h2:file:///path/to/db/h2&lt;/connectionUrl&gt;
+ *      &lt;tableName&gt;test_table&lt;/tableName&gt;
+ *      &lt;createMissing&gt;true&lt;/createMissing&gt;
  *  &lt;/committer&gt;
  * </pre>
  *  
@@ -214,8 +224,7 @@ public class SQLCommitter extends AbstractMappedCommitter {
     public static final String DEFAULT_MULTI_VALUES_JOINER = "|";
 
     private static final String[] NO_REFLECT_FIELDS = new String[] {
-            "existingFields", "tableVerified", "tableExists", 
-            "multiValuesJoiner", "datasource"
+            "existingFields", "tableVerified", "tableExists", "datasource"
     }; 
     
     private String driverPath;
@@ -664,5 +673,5 @@ public String toString() {
         return new ReflectionToStringBuilder(this, 
                 ToStringStyle.SHORT_PREFIX_STYLE).setExcludeFieldNames(
                         NO_REFLECT_FIELDS).toString();
-    }    
+    }
 }
diff --git a/norconex-committer-sql/src/main/java/com/norconex/committer/sql/SQLCommitter.xsd b/norconex-committer-sql/src/main/java/com/norconex/committer/sql/SQLCommitter.xsd
@@ -29,6 +29,7 @@
             <xs:element name="driverPath" type="nonEmptyString" minOccurs="0" maxOccurs="1" />
             <xs:element ref="properties" minOccurs="0" maxOccurs="1" />
             <xs:element name="createTableSQL" type="nonEmptyString" minOccurs="0" maxOccurs="1" />
+            <xs:element name="multiValuesJoiner" type="xs:string" minOccurs="0" maxOccurs="1" />
             <xs:element name="username" type="nonEmptyString" minOccurs="0" maxOccurs="1" />
             <xs:element name="password" type="nonEmptyString" minOccurs="0" maxOccurs="1" />
             <xs:element name="passwordKey" type="nonEmptyString" minOccurs="0" maxOccurs="1" />
diff --git a/norconex-committer-sql/src/test/java/com/norconex/committer/sql/SQLCommitterConfigTest.java b/norconex-committer-sql/src/test/java/com/norconex/committer/sql/SQLCommitterConfigTest.java
@@ -46,6 +46,7 @@ public void testWriteRead() throws Exception {
         committer.setCreateMissing(true);
         committer.setToUppercase(true);
         committer.setCreateTableSQL("createTableSQL");
+        committer.setMultiValuesJoiner("^");
         
         committer.setQueueDir("my-queue-dir");
         committer.setSourceContentField("sourceContentField");
diff --git a/norconex-committer-sql/src/test/java/com/norconex/committer/sql/SQLCommitterConfigTest.xml b/norconex-committer-sql/src/test/java/com/norconex/committer/sql/SQLCommitterConfigTest.xml
@@ -27,6 +27,7 @@
   <toUppercase>true</toUppercase>
   <createMissing>true</createMissing>
   <createTableSQL>CREATE TABLE blah</createTableSQL>
+  <multiValuesJoiner>^^</multiValuesJoiner>
   <username>joe</username>
   <password>password</password>
   <passwordKey>/some/file</passwordKey>
