Repository: incubator-rya Updated Branches: refs/heads/develop 9efae3eae -> 14073a23f
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java index 0194eb5..1e167b1 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FilterMetadata.java @@ -26,11 +26,10 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import com.google.common.base.Objects; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Metadata that is specific to Filter nodes. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java index 83985da..e33ab07 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/FluoQueryMetadataDAO.java @@ -26,6 +26,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import com.google.common.collect.Sets; @@ -35,7 +36,6 @@ import io.fluo.api.data.Bytes; import io.fluo.api.data.Column; import io.fluo.api.types.Encoder; import io.fluo.api.types.StringEncoder; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Reads and writes {@link FluoQuery} instances and their components to/from http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java index 566ce61..9696449 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/JoinMetadata.java @@ -25,11 +25,10 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import com.google.common.base.Objects; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Metadata that is specific to Join nodes. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java index 1815177..f3cd739 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/QueryMetadata.java @@ -25,11 +25,10 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import com.google.common.base.Objects; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Metadata that is specific to a Projection. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java index 25b4e4f..c3ff0a0 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/SparqlFluoQueryBuilder.java @@ -39,6 +39,7 @@ import org.apache.rya.indexing.pcj.fluo.app.FilterResultUpdater; import org.apache.rya.indexing.pcj.fluo.app.FluoStringConverter; import org.apache.rya.indexing.pcj.fluo.app.NodeType; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.openrdf.query.algebra.Filter; import org.openrdf.query.algebra.Join; import org.openrdf.query.algebra.LeftJoin; @@ -53,8 +54,6 @@ import com.google.common.base.Optional; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Creates the {@link FluoQuery} metadata that is required by the Fluo * application to process a SPARQL query. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java index b76bb29..253a41a 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/query/StatementPatternMetadata.java @@ -25,11 +25,10 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import com.google.common.base.Objects; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Metadata that is specific to Statement Pattern nodes. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/LeftOuterJoinTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/LeftOuterJoinTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/LeftOuterJoinTest.java index 08d5cef..c061f33 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/LeftOuterJoinTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/LeftOuterJoinTest.java @@ -28,6 +28,7 @@ import java.util.Set; import org.apache.rya.indexing.pcj.fluo.app.JoinResultUpdater.IterativeJoin; import org.apache.rya.indexing.pcj.fluo.app.JoinResultUpdater.LeftOuterJoin; +import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet; import org.junit.Test; import org.openrdf.model.ValueFactory; import org.openrdf.model.impl.ValueFactoryImpl; @@ -37,8 +38,6 @@ import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import mvm.rya.indexing.accumulo.VisibilityBindingSet; - /** * Tests the methods of {@link LeftOuterJoin}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java index 651ea11..7874a9e 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/test/java/org/apache/rya/indexing/pcj/fluo/app/NaturalJoinTest.java @@ -28,6 +28,7 @@ import java.util.Set; import org.apache.rya.indexing.pcj.fluo.app.JoinResultUpdater.IterativeJoin; import org.apache.rya.indexing.pcj.fluo.app.JoinResultUpdater.NaturalJoin; +import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet; import org.junit.Test; import org.openrdf.model.ValueFactory; import org.openrdf.model.impl.ValueFactoryImpl; @@ -37,8 +38,6 @@ import org.openrdf.query.impl.MapBindingSet; import com.google.common.collect.Lists; import com.google.common.collect.Sets; -import mvm.rya.indexing.accumulo.VisibilityBindingSet; - /** * Tests the methods of {@link NaturalJoin}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java index 1764853..731e182 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/ListQueriesCommand.java @@ -33,13 +33,13 @@ import org.apache.rya.indexing.pcj.fluo.api.GetPcjMetadata.NotInAccumuloExceptio import org.apache.rya.indexing.pcj.fluo.api.GetPcjMetadata.NotInFluoException; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand; import org.apache.rya.indexing.pcj.fluo.client.util.PcjMetadataRenderer; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; import com.beust.jcommander.JCommander; import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import io.fluo.api.client.FluoClient; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; import mvm.rya.rdftriplestore.RyaSailRepository; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java index 1e15fc8..9ac87c7 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/NewQueryCommand.java @@ -34,6 +34,7 @@ import org.apache.logging.log4j.Logger; import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand; import org.apache.rya.indexing.pcj.fluo.client.util.ParsedQueryRequest; +import org.apache.rya.indexing.pcj.storage.PcjException; import org.openrdf.query.MalformedQueryException; import org.openrdf.query.QueryEvaluationException; import org.openrdf.sail.SailException; @@ -43,7 +44,6 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import io.fluo.api.client.FluoClient; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjException; import mvm.rya.rdftriplestore.RyaSailRepository; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java index 252c875..2993f17 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/ParsedQueryRequest.java @@ -31,8 +31,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import javax.annotation.concurrent.Immutable; import org.apache.commons.lang3.builder.EqualsBuilder; - -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; /** * Represents a request to create a new PCJ in the Fluo app. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java index 50929bc..93570ea 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/PcjMetadataRenderer.java @@ -26,13 +26,12 @@ import java.util.Map.Entry; import org.apache.commons.lang3.StringUtils; import org.apache.rya.indexing.pcj.fluo.client.util.Report.ReportItem; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.openrdf.query.parser.ParsedQuery; import org.openrdf.query.parser.sparql.SPARQLParser; import org.openrdf.queryrender.sparql.SPARQLQueryRenderer; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Pretty renders the state of a query's {@link PcjMetadata}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/ParsedQueryRequestTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/ParsedQueryRequestTest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/ParsedQueryRequestTest.java index 432cf8a..4b35832 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/ParsedQueryRequestTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/ParsedQueryRequestTest.java @@ -24,12 +24,11 @@ import java.io.IOException; import java.util.HashSet; import org.apache.rya.indexing.pcj.fluo.client.util.ParsedQueryRequest; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import com.google.common.collect.Sets; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Tests the methods of {@link ParsedQueryRequest}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/PcjMetadataRendererTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/PcjMetadataRendererTest.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/PcjMetadataRendererTest.java index a200039..646d3f1 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/PcjMetadataRendererTest.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/test/java/org/apache/rya/indexing/pcj/fluo/client/PcjMetadataRendererTest.java @@ -24,13 +24,12 @@ import java.util.LinkedHashMap; import java.util.Map; import org.apache.rya.indexing.pcj.fluo.client.util.PcjMetadataRenderer; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import com.google.common.collect.Sets; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Tests the methods of {@link PcjMetadataRenderer}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java index d985b06..5ea5532 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/DemoDriver.java @@ -58,7 +58,6 @@ import io.fluo.api.mini.MiniFluo; import mvm.rya.accumulo.AccumuloRdfConfiguration; import mvm.rya.accumulo.AccumuloRyaDAO; import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.indexing.accumulo.ConfigUtils; import mvm.rya.rdftriplestore.RdfCloudTripleStore; import mvm.rya.rdftriplestore.RyaSailRepository; @@ -70,6 +69,11 @@ public class DemoDriver { private static final String RYA_TABLE_PREFIX = "demo_"; + public static final String USE_MOCK_INSTANCE = ".useMockInstance"; + public static final String CLOUDBASE_INSTANCE = "sc.cloudbase.instancename"; + public static final String CLOUDBASE_USER = "sc.cloudbase.username"; + public static final String CLOUDBASE_PASSWORD = "sc.cloudbase.password"; + // Rya data store and connections. private static MiniAccumuloCluster accumulo = null; private static Connector accumuloConn = null; @@ -234,11 +238,11 @@ public class DemoDriver { conf.setTablePrefix("demo_"); conf.setDisplayQueryPlan(true); - conf.setBoolean(ConfigUtils.USE_MOCK_INSTANCE, true); + conf.setBoolean(USE_MOCK_INSTANCE, true); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, RYA_TABLE_PREFIX); - conf.set(ConfigUtils.CLOUDBASE_USER, "root"); - conf.set(ConfigUtils.CLOUDBASE_PASSWORD, "password"); - conf.set(ConfigUtils.CLOUDBASE_INSTANCE, accumulo.getInstanceName()); + conf.set(CLOUDBASE_USER, "root"); + conf.set(CLOUDBASE_PASSWORD, "password"); + conf.set(CLOUDBASE_INSTANCE, accumulo.getInstanceName()); crdfdao.setConf(conf); ryaStore.setRyaDAO(crdfdao); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java index eb7fb17..04d4e55 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/FluoAndHistoricPcjsDemo.java @@ -37,6 +37,12 @@ import org.apache.log4j.Logger; import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; +import org.apache.rya.indexing.pcj.storage.PcjException; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; +import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTables; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.openrdf.model.Statement; import org.openrdf.query.BindingSet; import org.openrdf.query.MalformedQueryException; @@ -61,12 +67,6 @@ import mvm.rya.api.domain.RyaStatement; import mvm.rya.api.domain.RyaType; import mvm.rya.api.domain.RyaURI; import mvm.rya.api.resolver.RyaToRdfConversions; -import mvm.rya.indexing.external.tupleSet.AccumuloPcjSerializer; -import mvm.rya.indexing.external.tupleSet.BindingSetConverter.BindingSetConversionException; -import mvm.rya.indexing.external.tupleSet.PcjTables; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjException; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; import mvm.rya.rdftriplestore.RyaSailRepository; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/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 cfb5248..618cab9 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 @@ -46,6 +46,8 @@ import org.apache.rya.indexing.pcj.fluo.app.observers.TripleObserver; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryMetadataDAO; import org.apache.rya.indexing.pcj.fluo.app.query.QueryMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetStringConverter; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.After; import org.junit.Before; import org.openrdf.model.Statement; @@ -76,9 +78,6 @@ import mvm.rya.api.domain.RyaStatement.RyaStatementBuilder; import mvm.rya.api.domain.RyaType; import mvm.rya.api.domain.RyaURI; import mvm.rya.api.resolver.RyaToRdfConversions; -import mvm.rya.indexing.accumulo.ConfigUtils; -import mvm.rya.indexing.external.tupleSet.BindingSetStringConverter; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; import mvm.rya.rdftriplestore.RdfCloudTripleStore; import mvm.rya.rdftriplestore.RyaSailRepository; @@ -90,6 +89,11 @@ import mvm.rya.rdftriplestore.RyaSailRepository; public abstract class ITBase { private static final Logger log = Logger.getLogger(ITBase.class); + public static final String USE_MOCK_INSTANCE = ".useMockInstance"; + public static final String CLOUDBASE_INSTANCE = "sc.cloudbase.instancename"; + public static final String CLOUDBASE_USER = "sc.cloudbase.username"; + public static final String CLOUDBASE_PASSWORD = "sc.cloudbase.password"; + protected static final String RYA_TABLE_PREFIX = "demo_"; // Rya data store and connections. @@ -319,11 +323,11 @@ public abstract class ITBase { conf.setTablePrefix("demo_"); conf.setDisplayQueryPlan(true); - conf.setBoolean(ConfigUtils.USE_MOCK_INSTANCE, true); + conf.setBoolean(USE_MOCK_INSTANCE, true); conf.set(RdfCloudTripleStoreConfiguration.CONF_TBL_PREFIX, RYA_TABLE_PREFIX); - conf.set(ConfigUtils.CLOUDBASE_USER, "root"); - conf.set(ConfigUtils.CLOUDBASE_PASSWORD, "password"); - conf.set(ConfigUtils.CLOUDBASE_INSTANCE, accumulo.getInstanceName()); + conf.set(CLOUDBASE_USER, "root"); + conf.set(CLOUDBASE_PASSWORD, "password"); + conf.set(CLOUDBASE_INSTANCE, accumulo.getInstanceName()); crdfdao.setConf(conf); ryaStore.setRyaDAO(crdfdao); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java index c4b00e7..e41eb7b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetPcjMetadataIT.java @@ -30,6 +30,9 @@ import org.apache.accumulo.core.client.TableExistsException; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.api.GetPcjMetadata.NotInAccumuloException; import org.apache.rya.indexing.pcj.fluo.api.GetPcjMetadata.NotInFluoException; +import org.apache.rya.indexing.pcj.storage.PcjException; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import org.openrdf.query.MalformedQueryException; import org.openrdf.query.QueryEvaluationException; @@ -37,10 +40,6 @@ import org.openrdf.sail.SailException; import com.google.common.collect.Sets; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjException; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; - /** * Integration tests the methods of {@link GetPcjMetadata}. */ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java index 0e766b1..7eae3e4 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/api/GetQueryReportIT.java @@ -31,14 +31,14 @@ import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.api.GetQueryReport.QueryReport; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQuery; import org.apache.rya.indexing.pcj.fluo.app.query.StatementPatternMetadata; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import com.google.common.base.Optional; import com.google.common.collect.Sets; import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Integration tests the methods of {@link GetQueryReportl}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/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 d18a497..51f9bf5 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 @@ -28,12 +28,12 @@ import org.apache.accumulo.core.client.AccumuloSecurityException; import org.apache.accumulo.core.client.TableExistsException; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.app.StringTypeLayer; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTableNameFactory; import org.junit.Test; import com.beust.jcommander.internal.Lists; import io.fluo.api.types.TypedTransaction; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjTableNameFactory; /** * Integration tests the methods of {@link ListQueryIds}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/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 601dfd4..bfb71a5 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 @@ -23,6 +23,7 @@ import static org.junit.Assert.assertEquals; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.app.query.JoinMetadata.JoinType; import org.apache.rya.indexing.pcj.fluo.app.query.SparqlFluoQueryBuilder.NodeIds; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import org.openrdf.query.MalformedQueryException; import org.openrdf.query.parser.ParsedQuery; @@ -30,7 +31,6 @@ import org.openrdf.query.parser.sparql.SPARQLParser; import io.fluo.api.client.Snapshot; import io.fluo.api.client.Transaction; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Integration tests the methods of {@link FluoQueryMetadataDAO}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java index 6e633f6..2381346 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/InputIT.java @@ -27,6 +27,7 @@ import java.util.Set; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import org.openrdf.model.Statement; import org.openrdf.model.impl.URIImpl; @@ -37,7 +38,6 @@ import com.google.common.base.Optional; import com.google.common.collect.Sets; import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Performs integration tests over the Fluo application geared towards various types of input. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/QueryIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/QueryIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/QueryIT.java index f408a1c..e83e977 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/QueryIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/integration/QueryIT.java @@ -26,6 +26,7 @@ import java.util.Set; import org.apache.rya.indexing.pcj.fluo.ITBase; import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import org.openrdf.model.impl.NumericLiteralImpl; import org.openrdf.model.impl.URIImpl; @@ -37,7 +38,6 @@ import com.google.common.base.Optional; import com.google.common.collect.Sets; import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Performs integration tests over the Fluo application geared towards various query structures. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/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 b75e624..1ebc29b 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 @@ -38,6 +38,12 @@ import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.fluo.app.export.rya.RyaExportParameters; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; +import org.apache.rya.indexing.pcj.storage.PcjException; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; +import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTables; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; import org.junit.Test; import org.openrdf.model.impl.URIImpl; import org.openrdf.query.BindingSet; @@ -51,12 +57,6 @@ import com.google.common.collect.Sets; import io.fluo.api.client.Snapshot; import io.fluo.api.data.Bytes; import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.external.tupleSet.AccumuloPcjSerializer; -import mvm.rya.indexing.external.tupleSet.BindingSetConverter.BindingSetConversionException; -import mvm.rya.indexing.external.tupleSet.PcjTables; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjException; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; /** * Performs integration tests over the Fluo application geared towards Rya PCJ exporting. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java index 07211d5..2e00e6b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java +++ b/extras/rya.pcj.fluo/pcj.fluo.integration/src/test/java/org/apache/rya/indexing/pcj/fluo/visibility/PcjVisibilityIT.java @@ -44,6 +44,16 @@ import org.apache.rya.indexing.pcj.fluo.api.CreatePcj; import org.apache.rya.indexing.pcj.fluo.api.InsertTriples; import org.apache.rya.indexing.pcj.fluo.app.export.rya.RyaExportParameters; import org.apache.rya.indexing.pcj.fluo.app.query.FluoQueryColumns; +import org.apache.rya.indexing.pcj.storage.PcjException; +import org.apache.rya.indexing.pcj.storage.PcjMetadata; +import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjSerializer; +import org.apache.rya.indexing.pcj.storage.accumulo.BindingSetConverter.BindingSetConversionException; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTableNameFactory; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjTables; +import org.apache.rya.indexing.pcj.storage.accumulo.PcjVarOrderFactory; +import org.apache.rya.indexing.pcj.storage.accumulo.ShiftVarOrderFactory; +import org.apache.rya.indexing.pcj.storage.accumulo.VariableOrder; +import org.apache.rya.indexing.pcj.storage.accumulo.VisibilityBindingSet; import org.junit.Test; import org.openrdf.model.impl.NumericLiteralImpl; import org.openrdf.model.impl.URIImpl; @@ -62,16 +72,6 @@ import io.fluo.api.client.Snapshot; import io.fluo.api.data.Bytes; import mvm.rya.api.domain.RyaStatement; import mvm.rya.api.resolver.RyaTypeResolverException; -import mvm.rya.indexing.accumulo.VisibilityBindingSet; -import mvm.rya.indexing.external.tupleSet.AccumuloPcjSerializer; -import mvm.rya.indexing.external.tupleSet.BindingSetConverter.BindingSetConversionException; -import mvm.rya.indexing.external.tupleSet.PcjTables; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjException; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjMetadata; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjTableNameFactory; -import mvm.rya.indexing.external.tupleSet.PcjTables.PcjVarOrderFactory; -import mvm.rya.indexing.external.tupleSet.PcjTables.ShiftVarOrderFactory; -import mvm.rya.indexing.external.tupleSet.PcjTables.VariableOrder; public class PcjVisibilityIT extends ITBase { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/extras/rya.pcj.fluo/pom.xml ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pom.xml b/extras/rya.pcj.fluo/pom.xml index 6419aa4..e50dcc3 100644 --- a/extras/rya.pcj.fluo/pom.xml +++ b/extras/rya.pcj.fluo/pom.xml @@ -45,7 +45,6 @@ under the License. </modules> <properties> - <fluo.version>1.0.0-beta-2</fluo.version> <jcommander.version>1.48</jcommander.version> <hadoop.version>2.5.0</hadoop.version> </properties> @@ -82,21 +81,6 @@ under the License. <artifactId>hadoop-minicluster</artifactId> <version>${hadoop.version}</version> </dependency> - <dependency> - <groupId>org.apache.rya</groupId> - <artifactId>rya.pcj.fluo.api</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.rya</groupId> - <artifactId>rya.pcj.fluo.app</artifactId> - <version>${project.version}</version> - </dependency> - <dependency> - <groupId>org.apache.rya</groupId> - <artifactId>rya.pcj.fluo.client</artifactId> - <version>${project.version}</version> - </dependency> <dependency> <groupId>org.openrdf.sesame</groupId> @@ -105,22 +89,6 @@ under the License. </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-mini</artifactId> - <version>${fluo.version}</version> - </dependency> - - <dependency> <groupId>com.beust</groupId> <artifactId>jcommander</artifactId> <version>${jcommander.version}</version> http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/14073a23/pom.xml ---------------------------------------------------------------------- diff --git a/pom.xml b/pom.xml index 6308cc4..ad0e960 100644 --- a/pom.xml +++ b/pom.xml @@ -113,6 +113,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> </properties> <dependencyManagement> <dependencies> @@ -169,6 +171,26 @@ under the License. <version>${project.version}</version> </dependency> <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.indexing.pcj</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.pcj.fluo.api</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.pcj.fluo.app</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> + <groupId>org.apache.rya</groupId> + <artifactId>rya.pcj.fluo.client</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.accumulo</groupId> <artifactId>accumulo-core</artifactId> <version>${accumulo.version}</version> @@ -469,6 +491,22 @@ under the License. </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-mini</artifactId> + <version>${fluo.version}</version> + </dependency> + + <dependency> <groupId>org.mockito</groupId> <artifactId>mockito-all</artifactId> <version>${mockito.version}</version>
