http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java index 0b24abc..9e2b9c6 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/ITBase.java @@ -63,20 +63,19 @@ import org.openrdf.repository.RepositoryConnection; import org.openrdf.sail.Sail; import com.google.common.io.Files; - -import io.fluo.api.client.FluoAdmin; -import io.fluo.api.client.FluoAdmin.AlreadyInitializedException; -import io.fluo.api.client.FluoAdmin.TableExistsException; -import io.fluo.api.client.FluoClient; -import io.fluo.api.client.FluoFactory; -import io.fluo.api.client.Snapshot; -import io.fluo.api.config.FluoConfiguration; -import io.fluo.api.config.ObserverConfiguration; -import io.fluo.api.config.ScannerConfiguration; -import io.fluo.api.data.Bytes; -import io.fluo.api.iterator.ColumnIterator; -import io.fluo.api.iterator.RowIterator; -import io.fluo.api.mini.MiniFluo; +import org.apache.fluo.api.client.FluoAdmin; +import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException; +import org.apache.fluo.api.client.FluoAdmin.TableExistsException; +import org.apache.fluo.api.client.FluoClient; +import org.apache.fluo.api.client.FluoFactory; +import org.apache.fluo.api.client.Snapshot; +import org.apache.fluo.api.config.FluoConfiguration; +import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.config.ScannerConfiguration; +import org.apache.fluo.api.data.Bytes; +import org.apache.fluo.api.iterator.ColumnIterator; +import org.apache.fluo.api.iterator.RowIterator; +import org.apache.fluo.api.mini.MiniFluo; import mvm.rya.accumulo.AccumuloRdfConfiguration; import mvm.rya.api.client.Install.InstallConfiguration; import mvm.rya.api.client.RyaClient; @@ -418,4 +417,4 @@ public abstract class ITBase { new FluoAdmin.InitOpts().setClearTable(true).setClearZookeeper(true) ); return FluoFactory.newMiniFluo(config); } -} \ No newline at end of file +}
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java index b8e068c..630b86d 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/CountStatementsIT.java @@ -29,13 +29,13 @@ import org.junit.Test; import com.google.common.base.Optional; -import io.fluo.api.client.FluoAdmin; -import io.fluo.api.client.FluoAdmin.AlreadyInitializedException; -import io.fluo.api.client.FluoAdmin.TableExistsException; -import io.fluo.api.client.FluoFactory; -import io.fluo.api.config.FluoConfiguration; -import io.fluo.api.config.ObserverConfiguration; -import io.fluo.api.mini.MiniFluo; +import org.apache.fluo.api.client.FluoAdmin; +import org.apache.fluo.api.client.FluoAdmin.AlreadyInitializedException; +import org.apache.fluo.api.client.FluoAdmin.TableExistsException; +import org.apache.fluo.api.client.FluoFactory; +import org.apache.fluo.api.config.FluoConfiguration; +import org.apache.fluo.api.config.ObserverConfiguration; +import org.apache.fluo.api.mini.MiniFluo; import mvm.rya.api.domain.RyaStatement; import mvm.rya.api.domain.RyaURI; http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java index 8434a8d..99e2191 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/ListQueryIdsIT.java @@ -32,7 +32,7 @@ import org.junit.Test; import com.beust.jcommander.internal.Lists; -import io.fluo.api.types.TypedTransaction; +import org.apache.fluo.recipes.core.types.TypedTransaction; /** * Integration tests the methods of {@link ListQueryIds}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java index 5cb68d3..d5ed447 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAOIT.java @@ -30,8 +30,8 @@ import org.openrdf.query.parser.ParsedQuery; import org.openrdf.query.parser.sparql.SPARQLParser; import org.openrdf.repository.RepositoryException; -import io.fluo.api.client.Snapshot; -import io.fluo.api.client.Transaction; +import org.apache.fluo.api.client.Snapshot; +import org.apache.fluo.api.client.Transaction; /** * Integration tests the methods of {@link FluoQueryMetadataDAO}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java index d173e82..dd634fb 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaExportIT.java @@ -113,4 +113,4 @@ public class RyaExportIT extends ITBase { // Verify the end results of the query match the expected results. assertEquals(expected, results); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java index 8cc7404..bc83eed 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/RyaInputIncrementalUpdateIT.java @@ -37,7 +37,7 @@ import org.openrdf.repository.RepositoryConnection; import com.google.common.collect.Sets; -import io.fluo.api.client.FluoClient; +import org.apache.fluo.api.client.FluoClient; import mvm.rya.accumulo.AccumuloRyaDAO; import mvm.rya.indexing.external.PrecomputedJoinIndexer; @@ -209,4 +209,4 @@ public class RyaInputIncrementalUpdateIT extends ITBase { Set<BindingSet> results = getQueryBindingSetValues(fluoClient, sparql); assertEquals(expected, results); } -} \ No newline at end of file +} http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/ca2743a0/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 8afa589..6e280c8 100644 --- a/pom.xml +++ b/pom.xml @@ -119,7 +119,8 @@ under the License. <!-- the maven-release-plugin makes this recommendation, due to plugin bugs --> <maven.min-version>3.0.4</maven.min-version> - <fluo.version>1.0.0-beta-2</fluo.version> + <fluo.version>1.0.0-incubating</fluo.version> + <fluo-recipes.version>1.0.0-incubating-SNAPSHOT</fluo-recipes.version> <jmh.version>1.13</jmh.version> <jsr305.version>3.0.1</jsr305.version> @@ -509,20 +510,25 @@ under the License. </dependency> <dependency> - <groupId>io.fluo</groupId> + <groupId>org.apache.fluo</groupId> <artifactId>fluo-api</artifactId> <version>${fluo.version}</version> </dependency> <dependency> - <groupId>io.fluo</groupId> + <groupId>org.apache.fluo</groupId> <artifactId>fluo-core</artifactId> <version>${fluo.version}</version> </dependency> <dependency> - <groupId>io.fluo</groupId> + <groupId>org.apache.fluo</groupId> <artifactId>fluo-mini</artifactId> <version>${fluo.version}</version> </dependency> + <dependency> + <groupId>org.apache.fluo</groupId> + <artifactId>fluo-recipes-core</artifactId> + <version>${fluo-recipes.version}</version> + </dependency> <dependency> <groupId>org.mockito</groupId>
