Merge branch 'develop'

Norconex · Jun 3, 2016 · f5a060f · f5a060f
2 parents cd280a1 + f1f8f6b
commit f5a060f
Show file tree

Hide file tree

Showing 5 changed files with 22 additions and 6 deletions.
diff --git a/norconex-collector-filesystem/pom.xml b/norconex-collector-filesystem/pom.xml
@@ -19,7 +19,7 @@
   <modelVersion>4.0.0</modelVersion>
   <groupId>com.norconex.collectors</groupId>
   <artifactId>norconex-collector-filesystem</artifactId>
-  <version>2.4.0</version>
+  <version>2.5.0</version>
   <name>Norconex Filesystem Collector</name>
 
   <properties>
@@ -60,7 +60,7 @@
     <dependency>
       <groupId>com.norconex.collectors</groupId>
       <artifactId>norconex-collector-core</artifactId>
-      <version>1.4.0</version>
+      <version>1.5.0</version>
     </dependency>
     <dependency>
         <groupId>joda-time</groupId>

diff --git a/norconex-collector-filesystem/src/changes/changes.xml b/norconex-collector-filesystem/src/changes/changes.xml
@@ -7,6 +7,19 @@
   </properties>
   <body>
 
+    <release version="2.5.0" date="2016-06-03" description="Minor release">
+      <action dev="essiembre" type="update">
+        MVStore is now the default URL crawl store.
+      </action>
+      <action dev="essiembre" type="update">
+        Maven dependency updates: Norconex Collector Core 1.5.0.
+      </action>
+      <action dev="essiembre" type="update">
+        JDBCCrawlDataStoreFactory now deprecated in favor of 
+        BasicJDBCCrawlDataStoreFactory from Collector Core. 
+      </action>
+    </release>
+
     <release version="2.4.0" date="2016-02-28" description="Minor release">
       <action dev="essiembre" type="add">
         Now supports specifying relative paths in startPaths (for local

diff --git a/...r-filesystem/src/main/java/com/norconex/collector/fs/crawler/FilesystemCrawlerConfig.java b/...r-filesystem/src/main/java/com/norconex/collector/fs/crawler/FilesystemCrawlerConfig.java
@@ -29,7 +29,7 @@
 
 import com.norconex.collector.core.checksum.IMetadataChecksummer;
 import com.norconex.collector.core.crawler.AbstractCrawlerConfig;
-import com.norconex.collector.core.data.store.impl.mapdb.MapDBCrawlDataStoreFactory;
+import com.norconex.collector.core.data.store.impl.mvstore.MVStoreCrawlDataStoreFactory;
 import com.norconex.collector.fs.checksum.impl.FileMetadataChecksummer;
 import com.norconex.collector.fs.doc.IFileDocumentProcessor;
 import com.norconex.commons.lang.config.ConfigurationUtil;
@@ -59,7 +59,7 @@ public class FilesystemCrawlerConfig extends AbstractCrawlerConfig {
 
     public FilesystemCrawlerConfig() {
         super();
-        setCrawlDataStoreFactory(new MapDBCrawlDataStoreFactory());
+        setCrawlDataStoreFactory(new MVStoreCrawlDataStoreFactory());
     }
 
     public String[] getStartPaths() {

diff --git a/...c/main/java/com/norconex/collector/fs/data/store/impl/jdbc/JDBCCrawlDataStoreFactory.java b/...c/main/java/com/norconex/collector/fs/data/store/impl/jdbc/JDBCCrawlDataStoreFactory.java
@@ -1,4 +1,4 @@
-/* Copyright 2014 Norconex Inc.
+/* Copyright 2014-2016 Norconex Inc.
  *
  * Licensed under the Apache License, Version 2.0 (the "License");
  * you may not use this file except in compliance with the License.
@@ -16,6 +16,7 @@
 
 import com.norconex.collector.core.data.store.ICrawlDataStore;
 import com.norconex.collector.core.data.store.impl.jdbc.AbstractJDBCDataStoreFactory;
+import com.norconex.collector.core.data.store.impl.jdbc.BasicJDBCCrawlDataStoreFactory;
 import com.norconex.collector.core.data.store.impl.jdbc.BasicJDBCSerializer;
 import com.norconex.collector.core.data.store.impl.jdbc.IJDBCSerializer;
 import com.norconex.collector.core.data.store.impl.jdbc.JDBCCrawlDataStore.Database;
@@ -34,7 +35,9 @@
  * </pre>
  *
  * @author Pascal Essiembre
+ * @deprecated Since 1.5.0, use {@link BasicJDBCCrawlDataStoreFactory}
  */
+@Deprecated
 public class JDBCCrawlDataStoreFactory extends AbstractJDBCDataStoreFactory {
 
     public JDBCCrawlDataStoreFactory() {

diff --git a/...ollector-filesystem/src/site/resources/examples/collector-filesystem-config-reference.xml b/...ollector-filesystem/src/site/resources/examples/collector-filesystem-config-reference.xml
@@ -207,7 +207,7 @@
          options.  Please refer to committer for complete documentation.
          Below is an example using the FileSystemCommitter.
          -->
-    <committer class="$committer.core.impl.FileSystemCommitter">
+    <committer class="${committer}.core.impl.FileSystemCommitter">
       <directory>$workdir\crawledFiles</directory>
     </committer>