Updated package naming for Apache Fluo
diff --git a/modules/core/src/test/java/io/fluo/webindex/core/models/URLTest.java b/modules/core/src/test/java/io/fluo/webindex/core/models/URLTest.java
index b99f784..925d22c 100644
--- a/modules/core/src/test/java/io/fluo/webindex/core/models/URLTest.java
+++ b/modules/core/src/test/java/io/fluo/webindex/core/models/URLTest.java
@@ -16,7 +16,6 @@
import java.text.ParseException;
-import io.fluo.webindex.core.models.URL;
import org.junit.Assert;
import org.junit.Test;
diff --git a/modules/data/pom.xml b/modules/data/pom.xml
index 0bd48b7..d50554b 100644
--- a/modules/data/pom.xml
+++ b/modules/data/pom.xml
@@ -45,34 +45,6 @@
</dependency>
<dependency>
<groupId>io.fluo</groupId>
- <artifactId>fluo-api</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-mapreduce</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-accumulo</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-core</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-kryo</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-spark</artifactId>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
<artifactId>webindex-core</artifactId>
</dependency>
<dependency>
@@ -86,6 +58,34 @@
</exclusions>
</dependency>
<dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-api</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-mapreduce</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-accumulo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-core</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-kryo</artifactId>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-spark</artifactId>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<exclusions>
@@ -125,8 +125,14 @@
<groupId>org.slf4j</groupId>
<artifactId>slf4j-log4j12</artifactId>
</dependency>
+ <!-- Test Dependencies -->
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>junit</groupId>
+ <artifactId>junit</artifactId>
+ <scope>test</scope>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-mini</artifactId>
<scope>test</scope>
<exclusions>
@@ -137,16 +143,10 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-recipes-test</artifactId>
<scope>test</scope>
</dependency>
- <!-- Test Dependencies -->
- <dependency>
- <groupId>junit</groupId>
- <artifactId>junit</artifactId>
- <scope>test</scope>
- </dependency>
</dependencies>
<build>
<plugins>
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/CalcSplits.java b/modules/data/src/main/java/io/fluo/webindex/data/CalcSplits.java
index 5aee658..4faa608 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/CalcSplits.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/CalcSplits.java
@@ -16,14 +16,14 @@
import java.util.SortedSet;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.RowColumn;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.fluo.UriMap.UriInfo;
import io.fluo.webindex.data.spark.IndexEnv;
import io.fluo.webindex.data.spark.IndexStats;
import io.fluo.webindex.data.spark.IndexUtil;
import io.fluo.webindex.data.util.WARCFileInputFormat;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumn;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.io.Text;
import org.apache.spark.SparkConf;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/Configure.java b/modules/data/src/main/java/io/fluo/webindex/data/Configure.java
index 87c8570..f12504f 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/Configure.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/Configure.java
@@ -19,9 +19,9 @@
import java.io.PrintWriter;
import java.util.Iterator;
-import io.fluo.api.config.FluoConfiguration;
import io.fluo.webindex.core.DataConfig;
import io.fluo.webindex.data.spark.IndexEnv;
+import org.apache.fluo.api.config.FluoConfiguration;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/FluoApp.java b/modules/data/src/main/java/io/fluo/webindex/data/FluoApp.java
index 4df5745..19b7ddb 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/FluoApp.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/FluoApp.java
@@ -14,17 +14,17 @@
package io.fluo.webindex.data;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.config.ObserverConfiguration;
-import io.fluo.recipes.accumulo.export.AccumuloExport;
-import io.fluo.recipes.accumulo.export.AccumuloExporter;
-import io.fluo.recipes.accumulo.export.TableInfo;
-import io.fluo.recipes.export.ExportQueue;
-import io.fluo.recipes.kryo.KryoSimplerSerializer;
import io.fluo.webindex.data.fluo.DomainMap;
import io.fluo.webindex.data.fluo.PageObserver;
import io.fluo.webindex.data.fluo.UriMap;
import io.fluo.webindex.serialization.WebindexKryoFactory;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.config.ObserverConfiguration;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExport;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExporter;
+import org.apache.fluo.recipes.accumulo.export.TableInfo;
+import org.apache.fluo.recipes.export.ExportQueue;
+import org.apache.fluo.recipes.kryo.KryoSimplerSerializer;
public class FluoApp {
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/LoadHdfs.java b/modules/data/src/main/java/io/fluo/webindex/data/LoadHdfs.java
index 6bead65..4aad131 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/LoadHdfs.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/LoadHdfs.java
@@ -20,15 +20,15 @@
import java.util.List;
import com.google.common.util.concurrent.RateLimiter;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.client.LoaderExecutor;
-import io.fluo.api.config.FluoConfiguration;
import io.fluo.webindex.core.DataConfig;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.fluo.PageLoader;
import io.fluo.webindex.data.spark.IndexEnv;
import io.fluo.webindex.data.util.ArchiveUtil;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.client.LoaderExecutor;
+import org.apache.fluo.api.config.FluoConfiguration;
import org.apache.hadoop.fs.FSDataInputStream;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/LoadS3.java b/modules/data/src/main/java/io/fluo/webindex/data/LoadS3.java
index cfc6a69..fdd44a1 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/LoadS3.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/LoadS3.java
@@ -19,15 +19,15 @@
import java.util.List;
import com.google.common.util.concurrent.RateLimiter;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.client.LoaderExecutor;
-import io.fluo.api.config.FluoConfiguration;
import io.fluo.webindex.core.DataConfig;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.fluo.PageLoader;
import io.fluo.webindex.data.spark.IndexEnv;
import io.fluo.webindex.data.util.ArchiveUtil;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.client.LoaderExecutor;
+import org.apache.fluo.api.config.FluoConfiguration;
import org.apache.spark.SparkConf;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainExport.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainExport.java
index 875edf4..89ffb0b 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainExport.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainExport.java
@@ -18,9 +18,9 @@
import java.util.Map;
import java.util.Optional;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.RowColumn;
-import io.fluo.recipes.accumulo.export.DifferenceExport;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumn;
+import org.apache.fluo.recipes.accumulo.export.DifferenceExport;
import static io.fluo.webindex.data.util.FluoConstants.PAGECOUNT_COL;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainMap.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainMap.java
index d4697ac..e22e92d 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainMap.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/DomainMap.java
@@ -17,17 +17,17 @@
import java.util.Iterator;
import java.util.Optional;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.observer.Observer.Context;
-import io.fluo.recipes.accumulo.export.AccumuloExport;
-import io.fluo.recipes.export.ExportQueue;
-import io.fluo.recipes.map.CollisionFreeMap;
-import io.fluo.recipes.map.CollisionFreeMap.Options;
-import io.fluo.recipes.map.Combiner;
-import io.fluo.recipes.map.Update;
-import io.fluo.recipes.map.UpdateObserver;
import io.fluo.webindex.data.FluoApp;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.observer.Observer.Context;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExport;
+import org.apache.fluo.recipes.export.ExportQueue;
+import org.apache.fluo.recipes.map.CollisionFreeMap;
+import org.apache.fluo.recipes.map.CollisionFreeMap.Options;
+import org.apache.fluo.recipes.map.Combiner;
+import org.apache.fluo.recipes.map.Update;
+import org.apache.fluo.recipes.map.UpdateObserver;
public class DomainMap {
public static final String DOMAIN_MAP_ID = "dm";
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageExport.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageExport.java
index 8f25b8d..0c7c3b3 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageExport.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageExport.java
@@ -19,11 +19,11 @@
import java.util.List;
import com.google.common.collect.Sets.SetView;
-import io.fluo.recipes.accumulo.export.AccumuloExport;
import io.fluo.webindex.core.Constants;
import io.fluo.webindex.core.models.Link;
import io.fluo.webindex.core.models.Page;
import org.apache.accumulo.core.data.Mutation;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExport;
public class PageExport implements AccumuloExport<String> {
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageLoader.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageLoader.java
index 1ebc1e9..650c303 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageLoader.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageLoader.java
@@ -19,13 +19,13 @@
import com.google.common.base.Preconditions;
import com.google.gson.Gson;
-import io.fluo.api.client.Loader;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.types.TypedTransactionBase;
-import io.fluo.recipes.data.RowHasher;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.core.models.URL;
import io.fluo.webindex.data.util.FluoConstants;
+import org.apache.fluo.api.client.Loader;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.recipes.data.RowHasher;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageObserver.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageObserver.java
index 2c380d3..d53548c 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageObserver.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/PageObserver.java
@@ -20,21 +20,21 @@
import com.google.common.collect.Sets;
import com.google.gson.Gson;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.observer.AbstractObserver;
-import io.fluo.api.types.TypedSnapshotBase.Value;
-import io.fluo.api.types.TypedTransactionBase;
-import io.fluo.recipes.accumulo.export.AccumuloExport;
-import io.fluo.recipes.data.RowHasher;
-import io.fluo.recipes.export.ExportQueue;
-import io.fluo.recipes.map.CollisionFreeMap;
import io.fluo.webindex.core.models.Link;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.FluoApp;
import io.fluo.webindex.data.fluo.UriMap.UriInfo;
import io.fluo.webindex.data.util.FluoConstants;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.observer.AbstractObserver;
+import org.apache.fluo.api.types.TypedSnapshotBase.Value;
+import org.apache.fluo.api.types.TypedTransactionBase;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExport;
+import org.apache.fluo.recipes.data.RowHasher;
+import org.apache.fluo.recipes.export.ExportQueue;
+import org.apache.fluo.recipes.map.CollisionFreeMap;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriCountExport.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriCountExport.java
index 18acad5..327d5e4 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriCountExport.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriCountExport.java
@@ -19,10 +19,6 @@
import java.util.Map;
import java.util.Optional;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.RowColumn;
-import io.fluo.recipes.accumulo.export.DifferenceExport;
import io.fluo.webindex.core.Constants;
import io.fluo.webindex.core.models.URL;
import io.fluo.webindex.data.fluo.UriMap.UriInfo;
@@ -31,6 +27,10 @@
import org.apache.accumulo.core.client.lexicoder.ReverseLexicoder;
import org.apache.accumulo.core.client.lexicoder.ULongLexicoder;
import org.apache.commons.codec.binary.Hex;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.RowColumn;
+import org.apache.fluo.recipes.accumulo.export.DifferenceExport;
public class UriCountExport extends DifferenceExport<String, UriInfo> {
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriMap.java b/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriMap.java
index 19ba516..361192c 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriMap.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/fluo/UriMap.java
@@ -21,18 +21,18 @@
import java.util.Optional;
import com.google.common.base.Preconditions;
-import io.fluo.api.client.TransactionBase;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.observer.Observer.Context;
-import io.fluo.recipes.accumulo.export.AccumuloExport;
-import io.fluo.recipes.export.ExportQueue;
-import io.fluo.recipes.map.CollisionFreeMap;
-import io.fluo.recipes.map.CollisionFreeMap.Options;
-import io.fluo.recipes.map.Combiner;
-import io.fluo.recipes.map.Update;
-import io.fluo.recipes.map.UpdateObserver;
import io.fluo.webindex.core.models.URL;
import io.fluo.webindex.data.FluoApp;
+import org.apache.fluo.api.client.TransactionBase;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.observer.Observer.Context;
+import org.apache.fluo.recipes.accumulo.export.AccumuloExport;
+import org.apache.fluo.recipes.export.ExportQueue;
+import org.apache.fluo.recipes.map.CollisionFreeMap;
+import org.apache.fluo.recipes.map.CollisionFreeMap.Options;
+import org.apache.fluo.recipes.map.Combiner;
+import org.apache.fluo.recipes.map.Update;
+import org.apache.fluo.recipes.map.UpdateObserver;
/**
* This class contains code related to a CollisionFreeMap that keeps track of the count of
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexEnv.java b/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexEnv.java
index 1fded9d..d283ddf 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexEnv.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexEnv.java
@@ -29,15 +29,6 @@
import java.util.stream.Stream;
import com.google.common.base.Preconditions;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.RowColumn;
-import io.fluo.core.util.AccumuloUtil;
-import io.fluo.recipes.accumulo.export.TableInfo;
-import io.fluo.recipes.accumulo.ops.TableOperations;
-import io.fluo.recipes.common.Pirtos;
-import io.fluo.recipes.spark.FluoSparkHelper;
-import io.fluo.recipes.spark.FluoSparkHelper.BulkImportOptions;
import io.fluo.webindex.core.DataConfig;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.FluoApp;
@@ -48,6 +39,15 @@
import org.apache.accumulo.core.client.Connector;
import org.apache.accumulo.core.client.TableExistsException;
import org.apache.accumulo.core.client.TableNotFoundException;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumn;
+import org.apache.fluo.core.util.AccumuloUtil;
+import org.apache.fluo.recipes.accumulo.export.TableInfo;
+import org.apache.fluo.recipes.accumulo.ops.TableOperations;
+import org.apache.fluo.recipes.common.Pirtos;
+import org.apache.fluo.recipes.spark.FluoSparkHelper;
+import org.apache.fluo.recipes.spark.FluoSparkHelper.BulkImportOptions;
import org.apache.hadoop.conf.Configuration;
import org.apache.hadoop.fs.FileSystem;
import org.apache.hadoop.fs.LocatedFileStatus;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexUtil.java b/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexUtil.java
index e0ea210..c803c61 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexUtil.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/spark/IndexUtil.java
@@ -21,13 +21,6 @@
import java.util.TreeSet;
import com.google.gson.Gson;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.RowColumn;
-import io.fluo.api.data.RowColumnValue;
-import io.fluo.recipes.kryo.KryoSimplerSerializer;
-import io.fluo.recipes.map.CollisionFreeMap;
-import io.fluo.recipes.map.CollisionFreeMap.Initializer;
import io.fluo.webindex.core.Constants;
import io.fluo.webindex.core.models.Link;
import io.fluo.webindex.core.models.Page;
@@ -40,6 +33,13 @@
import io.fluo.webindex.data.util.ArchiveUtil;
import io.fluo.webindex.data.util.FluoConstants;
import io.fluo.webindex.serialization.WebindexKryoFactory;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.RowColumn;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.recipes.kryo.KryoSimplerSerializer;
+import org.apache.fluo.recipes.map.CollisionFreeMap;
+import org.apache.fluo.recipes.map.CollisionFreeMap.Initializer;
import org.apache.hadoop.io.Text;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
diff --git a/modules/data/src/main/java/io/fluo/webindex/data/util/FluoConstants.java b/modules/data/src/main/java/io/fluo/webindex/data/util/FluoConstants.java
index b001fd3..5d60185 100644
--- a/modules/data/src/main/java/io/fluo/webindex/data/util/FluoConstants.java
+++ b/modules/data/src/main/java/io/fluo/webindex/data/util/FluoConstants.java
@@ -14,10 +14,10 @@
package io.fluo.webindex.data.util;
-import io.fluo.api.data.Column;
-import io.fluo.api.types.StringEncoder;
-import io.fluo.api.types.TypeLayer;
import io.fluo.webindex.core.Constants;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.types.StringEncoder;
+import org.apache.fluo.api.types.TypeLayer;
public class FluoConstants {
diff --git a/modules/data/src/test/java/io/fluo/webindex/data/fluo/it/IndexIT.java b/modules/data/src/test/java/io/fluo/webindex/data/fluo/it/IndexIT.java
index 89e2375..8fb0929 100644
--- a/modules/data/src/test/java/io/fluo/webindex/data/fluo/it/IndexIT.java
+++ b/modules/data/src/test/java/io/fluo/webindex/data/fluo/it/IndexIT.java
@@ -22,15 +22,6 @@
import java.util.Map;
import com.google.common.collect.Lists;
-import io.fluo.api.client.FluoClient;
-import io.fluo.api.client.FluoFactory;
-import io.fluo.api.client.LoaderExecutor;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.RowColumn;
-import io.fluo.api.data.RowColumnValue;
-import io.fluo.recipes.test.AccumuloExportITBase;
-import io.fluo.recipes.test.FluoITHelper;
import io.fluo.webindex.core.models.Link;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.core.models.URL;
@@ -43,6 +34,15 @@
import io.fluo.webindex.data.spark.IndexUtil;
import io.fluo.webindex.data.util.ArchiveUtil;
import io.fluo.webindex.data.util.DataUrl;
+import org.apache.fluo.api.client.FluoClient;
+import org.apache.fluo.api.client.FluoFactory;
+import org.apache.fluo.api.client.LoaderExecutor;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumn;
+import org.apache.fluo.api.data.RowColumnValue;
+import org.apache.fluo.recipes.test.AccumuloExportITBase;
+import org.apache.fluo.recipes.test.FluoITHelper;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
diff --git a/modules/data/src/test/java/io/fluo/webindex/data/spark/Hex.java b/modules/data/src/test/java/io/fluo/webindex/data/spark/Hex.java
index e5a1e56..8a3d916 100644
--- a/modules/data/src/test/java/io/fluo/webindex/data/spark/Hex.java
+++ b/modules/data/src/test/java/io/fluo/webindex/data/spark/Hex.java
@@ -16,9 +16,9 @@
import java.io.ByteArrayOutputStream;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.Column;
-import io.fluo.api.data.RowColumn;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.Column;
+import org.apache.fluo.api.data.RowColumn;
import scala.Tuple2;
public class Hex {
diff --git a/modules/data/src/test/java/io/fluo/webindex/data/spark/IndexUtilTest.java b/modules/data/src/test/java/io/fluo/webindex/data/spark/IndexUtilTest.java
index 2876bfe..75b507f 100644
--- a/modules/data/src/test/java/io/fluo/webindex/data/spark/IndexUtilTest.java
+++ b/modules/data/src/test/java/io/fluo/webindex/data/spark/IndexUtilTest.java
@@ -21,13 +21,13 @@
import java.util.Iterator;
import java.util.List;
-import io.fluo.api.data.Bytes;
-import io.fluo.api.data.RowColumn;
import io.fluo.webindex.core.models.Link;
import io.fluo.webindex.core.models.Page;
import io.fluo.webindex.data.SparkTestUtil;
import io.fluo.webindex.data.fluo.UriMap.UriInfo;
import io.fluo.webindex.data.util.DataUrl;
+import org.apache.fluo.api.data.Bytes;
+import org.apache.fluo.api.data.RowColumn;
import org.apache.spark.api.java.JavaPairRDD;
import org.apache.spark.api.java.JavaRDD;
import org.apache.spark.api.java.JavaSparkContext;
diff --git a/modules/ui/pom.xml b/modules/ui/pom.xml
index e892dd9..2592301 100644
--- a/modules/ui/pom.xml
+++ b/modules/ui/pom.xml
@@ -39,6 +39,30 @@
</dependency>
<dependency>
<groupId>io.fluo</groupId>
+ <artifactId>webindex-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.accumulo</groupId>
+ <artifactId>accumulo-core</artifactId>
+ <exclusions>
+ <exclusion>
+ <groupId>log4j</groupId>
+ <artifactId>log4j</artifactId>
+ </exclusion>
+ <exclusion>
+ <groupId>com.google.guava</groupId>
+ <artifactId>guava</artifactId>
+ </exclusion>
+ </exclusions>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-api</artifactId>
<exclusions>
<exclusion>
@@ -48,7 +72,7 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
+ <groupId>org.apache.fluo</groupId>
<artifactId>fluo-core</artifactId>
<exclusions>
<exclusion>
@@ -74,30 +98,6 @@
</exclusions>
</dependency>
<dependency>
- <groupId>io.fluo</groupId>
- <artifactId>webindex-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
- <groupId>org.apache.accumulo</groupId>
- <artifactId>accumulo-core</artifactId>
- <exclusions>
- <exclusion>
- <groupId>log4j</groupId>
- <artifactId>log4j</artifactId>
- </exclusion>
- <exclusion>
- <groupId>com.google.guava</groupId>
- <artifactId>guava</artifactId>
- </exclusion>
- </exclusions>
- </dependency>
- <dependency>
<groupId>junit</groupId>
<artifactId>junit</artifactId>
<scope>test</scope>
diff --git a/modules/ui/src/main/java/io/fluo/webindex/ui/WebIndexApp.java b/modules/ui/src/main/java/io/fluo/webindex/ui/WebIndexApp.java
index 75a1ca0..9f6522e 100644
--- a/modules/ui/src/main/java/io/fluo/webindex/ui/WebIndexApp.java
+++ b/modules/ui/src/main/java/io/fluo/webindex/ui/WebIndexApp.java
@@ -21,10 +21,10 @@
import io.dropwizard.setup.Bootstrap;
import io.dropwizard.setup.Environment;
import io.dropwizard.views.ViewBundle;
-import io.fluo.api.config.FluoConfiguration;
-import io.fluo.core.util.AccumuloUtil;
import io.fluo.webindex.core.DataConfig;
import org.apache.accumulo.core.client.Connector;
+import org.apache.fluo.api.config.FluoConfiguration;
+import org.apache.fluo.core.util.AccumuloUtil;
public class WebIndexApp extends Application<WebIndexConfig> {
diff --git a/pom.xml b/pom.xml
index 0918961..1f111a2 100644
--- a/pom.xml
+++ b/pom.xml
@@ -36,7 +36,7 @@
<accumulo.version>1.7.1</accumulo.version>
<dropwizard.version>0.8.2</dropwizard.version>
<fluo-recipes.version>1.0.0-beta-3-SNAPSHOT</fluo-recipes.version>
- <fluo.version>1.0.0-beta-2</fluo.version>
+ <fluo.version>1.0.0-beta-3-SNAPSHOT</fluo.version>
<hadoop.version>2.6.3</hadoop.version>
<maven.compiler.source>1.8</maven.compiler.source>
<maven.compiler.target>1.8</maven.compiler.target>
@@ -76,57 +76,6 @@
</dependency>
<dependency>
<groupId>io.fluo</groupId>
- <artifactId>fluo-api</artifactId>
- <version>${fluo.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-core</artifactId>
- <version>${fluo.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-integration</artifactId>
- <version>${fluo.version}</version>
- <type>test-jar</type>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-mapreduce</artifactId>
- <version>${fluo.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-mini</artifactId>
- <version>${fluo.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-accumulo</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-core</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-kryo</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-spark</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
- <artifactId>fluo-recipes-test</artifactId>
- <version>${fluo-recipes.version}</version>
- </dependency>
- <dependency>
- <groupId>io.fluo</groupId>
<artifactId>webindex-core</artifactId>
<version>${project.version}</version>
</dependency>
@@ -161,6 +110,57 @@
<version>${accumulo.version}</version>
</dependency>
<dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-api</artifactId>
+ <version>${fluo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-core</artifactId>
+ <version>${fluo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-integration</artifactId>
+ <version>${fluo.version}</version>
+ <type>test-jar</type>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-mapreduce</artifactId>
+ <version>${fluo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-mini</artifactId>
+ <version>${fluo.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-accumulo</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-core</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-kryo</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-spark</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
+ <dependency>
+ <groupId>org.apache.fluo</groupId>
+ <artifactId>fluo-recipes-test</artifactId>
+ <version>${fluo-recipes.version}</version>
+ </dependency>
+ <dependency>
<groupId>org.apache.hadoop</groupId>
<artifactId>hadoop-client</artifactId>
<version>${hadoop.version}</version>
