http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java index 8780599..f923a75 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/MergeTool.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge; +package org.apache.rya.accumulo.mr.merge; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -62,18 +62,18 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableList; import com.google.common.collect.ImmutableMap; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.mr.AccumuloHDFSFileInputFormat; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.gui.DateTimePickerDialog; -import mvm.rya.accumulo.mr.merge.mappers.MergeToolMapper; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.accumulo.mr.merge.util.ToolConfigUtils; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.mr.AccumuloHDFSFileInputFormat; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.gui.DateTimePickerDialog; +import org.apache.rya.accumulo.mr.merge.mappers.MergeToolMapper; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.indexing.accumulo.ConfigUtils; /** * Handles merging a child accumulo instance's data back into its parent's
http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/common/InstanceType.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/common/InstanceType.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/common/InstanceType.java index d976384..cbb7652 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/common/InstanceType.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/common/InstanceType.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.common; +package org.apache.rya.accumulo.mr.merge.common; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java index 4bf004f..c035915 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/gui/DateTimePickerDialog.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.gui; +package org.apache.rya.accumulo.mr.merge.gui; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloCopyToolMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloCopyToolMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloCopyToolMapper.java index c530b9e..1aa7fbe 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloCopyToolMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloCopyToolMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloRyaRuleMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloRyaRuleMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloRyaRuleMapper.java index 68850c6..badd26c 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloRyaRuleMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/AccumuloRyaRuleMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -27,8 +27,8 @@ import org.apache.accumulo.core.data.Mutation; import org.apache.accumulo.core.data.Value; import org.apache.hadoop.io.Text; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; /** * Rule mapper that inserts any copied statements into a child Accumulo Rya instance, and outputs http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseCopyToolMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseCopyToolMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseCopyToolMapper.java index 0af3e03..6b4f082 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseCopyToolMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseCopyToolMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -44,14 +44,14 @@ import com.google.common.base.Joiner; import com.google.common.base.Splitter; import com.google.common.collect.Lists; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.CopyTool; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RyaTripleContext; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.CopyTool; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RyaTripleContext; import twitter4j.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseRuleMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseRuleMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseRuleMapper.java index 9bbf4fe..ab50215 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseRuleMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/BaseRuleMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -33,21 +33,21 @@ import org.openrdf.query.QueryEvaluationException; import org.openrdf.query.algebra.Or; import org.openrdf.query.algebra.ValueExpr; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.util.AccumuloQueryRuleset; -import mvm.rya.accumulo.mr.merge.util.CopyRule; -import mvm.rya.accumulo.mr.merge.util.QueryRuleset.QueryRulesetException; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.RyaToRdfConversions; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolver; -import mvm.rya.api.resolver.triple.TripleRowResolverException; -import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver; -import mvm.rya.rdftriplestore.evaluation.ParallelEvaluationStrategyImpl; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.util.AccumuloQueryRuleset; +import org.apache.rya.accumulo.mr.merge.util.CopyRule; +import org.apache.rya.accumulo.mr.merge.util.QueryRuleset.QueryRulesetException; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolver; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; +import org.apache.rya.rdftriplestore.evaluation.ParallelEvaluationStrategyImpl; /** * Take in rows from a table and range defined by query-based rules, convert the rows to http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/FileCopyToolMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/FileCopyToolMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/FileCopyToolMapper.java index 7a306f2..962138f 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/FileCopyToolMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/FileCopyToolMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -27,12 +27,12 @@ import org.apache.accumulo.core.data.Key; import org.apache.accumulo.core.data.Value; import org.apache.log4j.Logger; -import mvm.rya.accumulo.AccumuloRdfUtils; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfUtils; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Extended {@link BaseCopyToolMapper} that handles the {@code AccumuloFileOutputFormat} for the copy tool. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java index a662ee6..26a00bd 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/MergeToolMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -45,23 +45,23 @@ import org.apache.log4j.Logger; import com.google.common.base.Charsets; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRdfConstants; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.RyaTableMutationsFactory; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.CopyTool; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRdfConstants; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.RyaTableMutationsFactory; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.CopyTool; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; /** * Reads from the Parent and Child tables comparing their the keys and adds or deletes the keys http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/RowRuleMapper.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/RowRuleMapper.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/RowRuleMapper.java index 5960ab1..c34e2f2 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/RowRuleMapper.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/mappers/RowRuleMapper.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.mappers; +package org.apache.rya.accumulo.mr.merge.mappers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -34,12 +34,12 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.Authorizations; import org.apache.log4j.Logger; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.GroupedRow; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.GroupedRow; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; /** * Rule mapper that outputs statements as serialized Accumulo rows along with their destination http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/reducers/MultipleFileReducer.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/reducers/MultipleFileReducer.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/reducers/MultipleFileReducer.java index c526e6d..7705f3a 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/reducers/MultipleFileReducer.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/reducers/MultipleFileReducer.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.reducers; +package org.apache.rya.accumulo.mr.merge.reducers; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -27,7 +27,7 @@ import org.apache.accumulo.core.data.Value; import org.apache.hadoop.mapreduce.Reducer; import org.apache.hadoop.mapreduce.lib.output.MultipleOutputs; -import mvm.rya.accumulo.mr.merge.util.GroupedRow; +import org.apache.rya.accumulo.mr.merge.util.GroupedRow; /** * Outputs rows to different files according to their associated group names, for use with {@link AccumuloFileOutputFormat}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloInstanceDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloInstanceDriver.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloInstanceDriver.java index 896bdb4..781f885 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloInstanceDriver.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloInstanceDriver.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -49,13 +49,13 @@ import com.google.common.base.Preconditions; import com.google.common.collect.ImmutableList; import com.google.common.io.Files; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.indexing.accumulo.ConfigUtils; import twitter4j.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloQueryRuleset.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloQueryRuleset.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloQueryRuleset.java index 1b95ea6..f2b5c4c 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloQueryRuleset.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloQueryRuleset.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -36,15 +36,15 @@ import org.openrdf.model.URI; import org.openrdf.query.algebra.StatementPattern; import org.openrdf.query.algebra.Var; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.RdfCloudTripleStoreUtils; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.query.strategy.ByteRange; -import mvm.rya.api.query.strategy.TriplePatternStrategy; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.api.resolver.RyaTripleContext; -import mvm.rya.api.utils.NullableStatementImpl; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.RdfCloudTripleStoreUtils; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.query.strategy.ByteRange; +import org.apache.rya.api.query.strategy.TriplePatternStrategy; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.resolver.RyaTripleContext; +import org.apache.rya.api.utils.NullableStatementImpl; /** * A {@link QueryRuleset} that additionally maps rules to ranges in Accumulo tables. Also enables http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java index a3d5961..8bf36ed 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/AccumuloRyaUtils.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -57,16 +57,16 @@ import com.google.common.base.Joiner; import com.google.common.collect.ImmutableSet; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RdfToRyaConversions; -import mvm.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.indexing.accumulo.ConfigUtils; /** * Utility methods for an Accumulo Rya instance. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/CopyRule.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/CopyRule.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/CopyRule.java index b398c2b..eaf3636 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/CopyRule.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/CopyRule.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -40,7 +40,7 @@ import org.openrdf.query.algebra.evaluation.QueryBindingSet; import org.openrdf.query.algebra.evaluation.ValueExprEvaluationException; import org.openrdf.query.algebra.helpers.QueryModelVisitorBase; -import mvm.rya.accumulo.mr.merge.util.QueryRuleset.QueryRulesetException; +import org.apache.rya.accumulo.mr.merge.util.QueryRuleset.QueryRulesetException; /** * A rule that defines a subset of statements to copy at the RDF level. Consists of a http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/GroupedRow.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/GroupedRow.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/GroupedRow.java index a1ef2f1..10b7d58 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/GroupedRow.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/GroupedRow.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/QueryRuleset.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/QueryRuleset.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/QueryRuleset.java index c14a067..b9b5af2 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/QueryRuleset.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/QueryRuleset.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -54,21 +54,21 @@ import org.openrdf.query.parser.ParsedTupleQuery; import org.openrdf.query.parser.QueryParserUtil; import org.openrdf.sail.SailException; -import mvm.rya.accumulo.mr.merge.CopyTool; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.inference.InferJoin; -import mvm.rya.rdftriplestore.inference.InferUnion; -import mvm.rya.rdftriplestore.inference.InferenceEngine; -import mvm.rya.rdftriplestore.inference.InverseOfVisitor; -import mvm.rya.rdftriplestore.inference.SameAsVisitor; -import mvm.rya.rdftriplestore.inference.SubClassOfVisitor; -import mvm.rya.rdftriplestore.inference.SubPropertyOfVisitor; -import mvm.rya.rdftriplestore.inference.SymmetricPropertyVisitor; -import mvm.rya.rdftriplestore.inference.TransitivePropertyVisitor; -import mvm.rya.rdftriplestore.utils.FixedStatementPattern; -import mvm.rya.rdftriplestore.utils.TransitivePropertySP; -import mvm.rya.sail.config.RyaSailFactory; +import org.apache.rya.accumulo.mr.merge.CopyTool; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.inference.InferJoin; +import org.apache.rya.rdftriplestore.inference.InferUnion; +import org.apache.rya.rdftriplestore.inference.InferenceEngine; +import org.apache.rya.rdftriplestore.inference.InverseOfVisitor; +import org.apache.rya.rdftriplestore.inference.SameAsVisitor; +import org.apache.rya.rdftriplestore.inference.SubClassOfVisitor; +import org.apache.rya.rdftriplestore.inference.SubPropertyOfVisitor; +import org.apache.rya.rdftriplestore.inference.SymmetricPropertyVisitor; +import org.apache.rya.rdftriplestore.inference.TransitivePropertyVisitor; +import org.apache.rya.rdftriplestore.utils.FixedStatementPattern; +import org.apache.rya.rdftriplestore.utils.TransitivePropertySP; +import org.apache.rya.sail.config.RyaSailFactory; /** * Represents a set of {@link CopyRule} instances derived from a query. The ruleset determines a logical http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java index 8a9d3d2..b8ac63b 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/TimeUtils.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/ToolConfigUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/ToolConfigUtils.java b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/ToolConfigUtils.java index 4e06166..cc16bf7 100644 --- a/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/ToolConfigUtils.java +++ b/extras/rya.merger/src/main/java/org/apache/rya/accumulo/mr/merge/util/ToolConfigUtils.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java index d8b505b..c4ec2ae 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/CopyToolTest.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge; +package org.apache.rya.accumulo.mr.merge; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,11 +20,11 @@ package mvm.rya.accumulo.mr.merge; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.TODAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; -import static mvm.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.TODAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; +import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -52,19 +52,19 @@ import org.junit.BeforeClass; import org.junit.Test; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.common.InstanceType; -import mvm.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TestUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.common.InstanceType; +import org.apache.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TestUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.indexing.accumulo.ConfigUtils; /** * Tests for {@link CopyTool}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java index f27146e..1f077db 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/MergeToolTest.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge; +package org.apache.rya.accumulo.mr.merge; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,11 +20,11 @@ package mvm.rya.accumulo.mr.merge; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.TODAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; -import static mvm.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.TODAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; +import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; import static org.junit.Assert.assertEquals; import static org.junit.Assert.fail; @@ -49,18 +49,18 @@ import org.junit.BeforeClass; import org.junit.Test; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TestUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TestUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; /** * Tests for {@link MergeTool}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java index b131591..448a467 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/RulesetCopyIT.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge; +package org.apache.rya.accumulo.mr.merge; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,8 +20,8 @@ package mvm.rya.accumulo.mr.merge; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; -import static mvm.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; +import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; import java.util.Arrays; import java.util.HashMap; @@ -58,21 +58,21 @@ import org.openrdf.sail.Sail; import info.aduna.iteration.CloseableIteration; import junit.framework.Assert; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.common.InstanceType; -import mvm.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TestUtils; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; -import mvm.rya.api.resolver.RyaToRdfConversions; -import mvm.rya.indexing.accumulo.ConfigUtils; -import mvm.rya.sail.config.RyaSailFactory; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.common.InstanceType; +import org.apache.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TestUtils; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.sail.config.RyaSailFactory; public class RulesetCopyIT { private static final Logger log = Logger.getLogger(RulesetCopyIT.class); http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java index a160d3c..5879dc5 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/CopyToolDemo.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.demo; +package org.apache.rya.accumulo.mr.merge.demo; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,11 +20,11 @@ package mvm.rya.accumulo.mr.merge.demo; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.TODAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; -import static mvm.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.TODAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.YESTERDAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; +import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; import java.util.Date; import java.util.Iterator; @@ -47,20 +47,20 @@ import org.apache.hadoop.conf.Configuration; import org.apache.hadoop.io.Text; import org.apache.log4j.Logger; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.CopyTool; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.common.InstanceType; -import mvm.rya.accumulo.mr.merge.demo.util.DemoUtilities; -import mvm.rya.accumulo.mr.merge.demo.util.DemoUtilities.LoggingDetail; -import mvm.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.CopyTool; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.common.InstanceType; +import org.apache.rya.accumulo.mr.merge.demo.util.DemoUtilities; +import org.apache.rya.accumulo.mr.merge.demo.util.DemoUtilities.LoggingDetail; +import org.apache.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.indexing.accumulo.ConfigUtils; /** * Tests for {@link CopyTool}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java index d017504..e8e9eb2 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/MergeToolDemo.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.demo; +package org.apache.rya.accumulo.mr.merge.demo; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,8 +20,8 @@ package mvm.rya.accumulo.mr.merge.demo; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; -import static mvm.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; +import static org.apache.rya.accumulo.mr.merge.util.ToolConfigUtils.makeArgument; import java.util.Date; import java.util.Iterator; @@ -34,19 +34,19 @@ import org.apache.accumulo.core.data.Value; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.log4j.Logger; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.MRUtils; -import mvm.rya.accumulo.mr.merge.CopyTool; -import mvm.rya.accumulo.mr.merge.MergeTool; -import mvm.rya.accumulo.mr.merge.demo.util.DemoUtilities; -import mvm.rya.accumulo.mr.merge.demo.util.DemoUtilities.LoggingDetail; -import mvm.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TestUtils; -import mvm.rya.accumulo.mr.merge.util.TimeUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.MRUtils; +import org.apache.rya.accumulo.mr.merge.CopyTool; +import org.apache.rya.accumulo.mr.merge.MergeTool; +import org.apache.rya.accumulo.mr.merge.demo.util.DemoUtilities; +import org.apache.rya.accumulo.mr.merge.demo.util.DemoUtilities.LoggingDetail; +import org.apache.rya.accumulo.mr.merge.driver.AccumuloDualInstanceDriver; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TestUtils; +import org.apache.rya.accumulo.mr.merge.util.TimeUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; /** * Tests for {@link MergeTool}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/util/DemoUtilities.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/util/DemoUtilities.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/util/DemoUtilities.java index 2b64714..809f30b 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/util/DemoUtilities.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/demo/util/DemoUtilities.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.demo.util; +package org.apache.rya.accumulo.mr.merge.demo.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/AccumuloDualInstanceDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/AccumuloDualInstanceDriver.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/AccumuloDualInstanceDriver.java index c10d2dd..f779624 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/AccumuloDualInstanceDriver.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/AccumuloDualInstanceDriver.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.driver; +package org.apache.rya.accumulo.mr.merge.driver; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -37,11 +37,11 @@ import org.apache.accumulo.core.security.Authorizations; import org.apache.accumulo.core.security.ColumnVisibility; import org.apache.accumulo.minicluster.MiniAccumuloCluster; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.mr.merge.util.AccumuloInstanceDriver; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.mr.merge.util.AccumuloInstanceDriver; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; import twitter4j.Logger; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java index 7bc845d..02391f9 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/driver/MiniAccumuloClusterDriver.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.driver; +package org.apache.rya.accumulo.mr.merge.driver; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -20,9 +20,9 @@ package mvm.rya.accumulo.mr.merge.driver; * #L% */ -import static mvm.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.TODAY; -import static mvm.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.LAST_MONTH; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.TODAY; +import static org.apache.rya.accumulo.mr.merge.util.TestUtils.createRyaStatement; import java.io.IOException; import java.util.ArrayList; @@ -31,11 +31,11 @@ import java.util.List; import org.apache.accumulo.minicluster.MiniAccumuloCluster; import org.apache.log4j.Logger; -import mvm.rya.accumulo.mr.merge.util.AccumuloRyaUtils; -import mvm.rya.accumulo.mr.merge.util.TestUtils; -import mvm.rya.api.RdfCloudTripleStoreConstants; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.accumulo.mr.merge.util.AccumuloRyaUtils; +import org.apache.rya.accumulo.mr.merge.util.TestUtils; +import org.apache.rya.api.RdfCloudTripleStoreConstants; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.persist.RyaDAOException; /** * Runs a {@link MiniAccumuloCluster}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java ---------------------------------------------------------------------- diff --git a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java index 981fe28..31b6884 100644 --- a/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java +++ b/extras/rya.merger/src/test/java/org/apache/rya/accumulo/mr/merge/util/TestUtils.java @@ -1,8 +1,8 @@ -package mvm.rya.accumulo.mr.merge.util; +package org.apache.rya.accumulo.mr.merge.util; /* * #%L - * mvm.rya.accumulo.mr.merge + * org.apache.rya.accumulo.mr.merge * %% * Copyright (C) 2014 Rya * %% @@ -26,11 +26,11 @@ import static org.junit.Assert.assertTrue; import java.util.Date; import info.aduna.iteration.CloseableIteration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; -import mvm.rya.api.persist.RyaDAOException; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.persist.RyaDAOException; /** * Utility methods for testing merging/copying. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java index b184ff3..9312523 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java +++ b/extras/rya.pcj.fluo/pcj.fluo.api/src/main/java/org/apache/rya/indexing/pcj/fluo/api/InsertTriples.java @@ -32,11 +32,11 @@ import com.google.common.base.Optional; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.Transaction; import org.apache.fluo.api.data.Bytes; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; -import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; /** * Insert a batch of Triples into. This will trigger observers that will update http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java index aa7c959..98f3620 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/FluoStringConverter.java @@ -33,8 +33,8 @@ import org.openrdf.query.BindingSet; import org.openrdf.query.algebra.StatementPattern; import org.openrdf.query.algebra.Var; -import mvm.rya.api.domain.RyaType; -import mvm.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.resolver.RdfToRyaConversions; /** * Contains method that convert between the Sesame representations of RDF http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java index 513ab40..b78562c 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/IncUpdateDAO.java @@ -30,11 +30,11 @@ import org.apache.fluo.api.client.scanner.CellScanner; import org.apache.fluo.api.data.Bytes; import org.apache.fluo.api.data.Column; import org.apache.fluo.api.data.RowColumnValue; -import mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.triple.TripleRow; -import mvm.rya.api.resolver.triple.TripleRowResolverException; -import mvm.rya.api.resolver.triple.impl.WholeRowTripleResolver; +import org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.triple.TripleRow; +import org.apache.rya.api.resolver.triple.TripleRowResolverException; +import org.apache.rya.api.resolver.triple.impl.WholeRowTripleResolver; public class IncUpdateDAO { http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java index 0944f9b..bbca128 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java +++ b/extras/rya.pcj.fluo/pcj.fluo.app/src/main/java/org/apache/rya/indexing/pcj/fluo/app/observers/QueryResultObserver.java @@ -42,7 +42,7 @@ 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 mvm.rya.accumulo.utils.VisibilitySimplifier; +import org.apache.rya.accumulo.utils.VisibilitySimplifier; /** * Performs incremental result exporting to the configured destinations. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java index 1e70d6e..9ee45e0 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClient.java @@ -57,10 +57,10 @@ import com.google.common.collect.Lists; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.client.FluoFactory; import org.apache.fluo.api.config.FluoConfiguration; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * An application that helps Rya PCJ administrators interact with the cluster. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java index afe6b9f..48ddf55 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/PcjAdminClientCommand.java @@ -23,7 +23,7 @@ import javax.annotation.ParametersAreNonnullByDefault; import org.apache.accumulo.core.client.Connector; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that may be executed by the {@link PcjAdminClient}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java index 151501d..9fb3599 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/CountUnprocessedStatementsCommand.java @@ -28,7 +28,7 @@ import org.apache.rya.indexing.pcj.fluo.api.CountStatements; import org.apache.rya.indexing.pcj.fluo.client.PcjAdminClientCommand; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that prints the number of RDF Statements that are loaded into the http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 20ddf17..16a76cb 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 @@ -42,7 +42,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that lists information about the queries that are being managed by the Fluo app. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java index 2562378..a8b2c28 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/LoadTriplesCommand.java @@ -46,7 +46,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that loads the contents of an NTriple file into the Fluo application. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 0f553d6..23b93cd 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 @@ -46,7 +46,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * A command that creates a creates a new PCJ in the Fluo app and loads historic http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java index 5ae29b6..675a844 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/command/QueryReportCommand.java @@ -33,7 +33,7 @@ import com.beust.jcommander.Parameter; import com.beust.jcommander.ParameterException; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * TODO implement this. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java index c5ec7cc..206cf9d 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java +++ b/extras/rya.pcj.fluo/pcj.fluo.client/src/main/java/org/apache/rya/indexing/pcj/fluo/client/util/FluoLoader.java @@ -33,8 +33,8 @@ import org.openrdf.rio.helpers.RDFHandlerBase; import com.google.common.base.Optional; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.resolver.RdfToRyaConversions; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.resolver.RdfToRyaConversions; /** * When used as the handler of an {@link RDFParser}, instances of this class http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java ---------------------------------------------------------------------- diff --git a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java index f02b099..1bc5f1b 100644 --- a/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java +++ b/extras/rya.pcj.fluo/pcj.fluo.demo/src/main/java/org/apache/rya/indexing/pcj/fluo/demo/Demo.java @@ -24,7 +24,7 @@ import org.openrdf.repository.RepositoryConnection; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.mini.MiniFluo; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * Represents a demonstration that uses Rya and Fluo on top of Accumulo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 b1a1c91..6b3b973 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 @@ -57,23 +57,23 @@ import org.apache.fluo.api.client.FluoFactory; import org.apache.fluo.api.config.FluoConfiguration; import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.mini.MiniFluo; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository; -import mvm.rya.api.RdfCloudTripleStoreConfiguration; -import mvm.rya.api.instance.RyaDetails; -import mvm.rya.api.instance.RyaDetails.EntityCentricIndexDetails; -import mvm.rya.api.instance.RyaDetails.FreeTextIndexDetails; -import mvm.rya.api.instance.RyaDetails.GeoIndexDetails; -import mvm.rya.api.instance.RyaDetails.JoinSelectivityDetails; -import mvm.rya.api.instance.RyaDetails.PCJIndexDetails; -import mvm.rya.api.instance.RyaDetails.ProspectorDetails; -import mvm.rya.api.instance.RyaDetails.TemporalIndexDetails; -import mvm.rya.api.instance.RyaDetailsRepository; -import mvm.rya.api.instance.RyaDetailsRepository.AlreadyInitializedException; -import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException; -import mvm.rya.rdftriplestore.RdfCloudTripleStore; -import mvm.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository; +import org.apache.rya.api.RdfCloudTripleStoreConfiguration; +import org.apache.rya.api.instance.RyaDetails; +import org.apache.rya.api.instance.RyaDetails.EntityCentricIndexDetails; +import org.apache.rya.api.instance.RyaDetails.FreeTextIndexDetails; +import org.apache.rya.api.instance.RyaDetails.GeoIndexDetails; +import org.apache.rya.api.instance.RyaDetails.JoinSelectivityDetails; +import org.apache.rya.api.instance.RyaDetails.PCJIndexDetails; +import org.apache.rya.api.instance.RyaDetails.ProspectorDetails; +import org.apache.rya.api.instance.RyaDetails.TemporalIndexDetails; +import org.apache.rya.api.instance.RyaDetailsRepository; +import org.apache.rya.api.instance.RyaDetailsRepository.AlreadyInitializedException; +import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException; +import org.apache.rya.rdftriplestore.RdfCloudTripleStore; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * Runs {@link Demo}s that require Rya and Fluo. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 cb4420d..09f2854 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 @@ -47,11 +47,11 @@ import com.google.common.collect.Sets; import org.apache.fluo.api.client.FluoClient; import org.apache.fluo.api.mini.MiniFluo; -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.rdftriplestore.RyaSailRepository; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.rdftriplestore.RyaSailRepository; /** * Demonstrates historicly added Rya statements that are stored within the core http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 a5288ec..041c7ba 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 @@ -78,20 +78,20 @@ import org.openrdf.sail.Sail; import com.google.common.io.Files; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.client.Install.InstallConfiguration; -import mvm.rya.api.client.RyaClient; -import mvm.rya.api.client.accumulo.AccumuloConnectionDetails; -import mvm.rya.api.client.accumulo.AccumuloRyaClientFactory; -import mvm.rya.api.domain.RyaStatement; -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.PrecomputedJoinIndexerConfig; -import mvm.rya.rdftriplestore.RyaSailRepository; -import mvm.rya.sail.config.RyaSailFactory; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.client.Install.InstallConfiguration; +import org.apache.rya.api.client.RyaClient; +import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails; +import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement.RyaStatementBuilder; +import org.apache.rya.api.domain.RyaType; +import org.apache.rya.api.domain.RyaURI; +import org.apache.rya.api.resolver.RyaToRdfConversions; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.sail.config.RyaSailFactory; /** * Integration tests that ensure the Fluo application processes PCJs results http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 f7d4ee1..3bb54c4 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 @@ -36,8 +36,8 @@ import org.apache.fluo.api.client.FluoFactory; import org.apache.fluo.api.config.FluoConfiguration; import org.apache.fluo.api.config.ObserverSpecification; import org.apache.fluo.api.mini.MiniFluo; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.api.domain.RyaURI; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaURI; /** * Tests the methods of {@link CountStatements}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 bab74e9..0fe44bd 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 @@ -38,7 +38,7 @@ import org.junit.Test; import com.google.common.base.Optional; import com.google.common.collect.Sets; -import mvm.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement; /** * Integration tests the methods of {@link GetQueryReportl}. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 ebd2759..d0f6b21 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 @@ -38,7 +38,7 @@ import org.openrdf.query.impl.BindingImpl; import com.google.common.base.Optional; import com.google.common.collect.Sets; -import mvm.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement; /** * Performs integration tests over the Fluo application geared towards various types of input. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 4dba84b..57b679a 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 @@ -38,7 +38,7 @@ import org.openrdf.query.impl.BindingImpl; import com.google.common.base.Optional; import com.google.common.collect.Sets; -import mvm.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement; /** * Performs integration tests over the Fluo application geared towards various query structures. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 dd634fb..07b4640 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 @@ -36,7 +36,7 @@ import org.openrdf.query.impl.BindingImpl; import com.google.common.base.Optional; import com.google.common.collect.Sets; -import mvm.rya.api.domain.RyaStatement; +import org.apache.rya.api.domain.RyaStatement; /** * Performs integration tests over the Fluo application geared towards Rya PCJ exporting. http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 82f568e..9056c99 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 @@ -39,8 +39,8 @@ import org.openrdf.repository.RepositoryConnection; import com.google.common.collect.Sets; import org.apache.fluo.api.client.FluoClient; -import mvm.rya.accumulo.AccumuloRyaDAO; -import mvm.rya.indexing.external.PrecomputedJoinIndexer; +import org.apache.rya.accumulo.AccumuloRyaDAO; +import org.apache.rya.indexing.external.PrecomputedJoinIndexer; /** http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/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 79e1b84..e799ddd 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 @@ -57,14 +57,14 @@ import org.openrdf.sail.Sail; import com.beust.jcommander.internal.Sets; import com.google.common.base.Optional; -import mvm.rya.accumulo.AccumuloRdfConfiguration; -import mvm.rya.api.client.RyaClient; -import mvm.rya.api.client.accumulo.AccumuloConnectionDetails; -import mvm.rya.api.client.accumulo.AccumuloRyaClientFactory; -import mvm.rya.api.domain.RyaStatement; -import mvm.rya.indexing.accumulo.ConfigUtils; -import mvm.rya.rdftriplestore.RyaSailRepository; -import mvm.rya.sail.config.RyaSailFactory; +import org.apache.rya.accumulo.AccumuloRdfConfiguration; +import org.apache.rya.api.client.RyaClient; +import org.apache.rya.api.client.accumulo.AccumuloConnectionDetails; +import org.apache.rya.api.client.accumulo.AccumuloRyaClientFactory; +import org.apache.rya.api.domain.RyaStatement; +import org.apache.rya.indexing.accumulo.ConfigUtils; +import org.apache.rya.rdftriplestore.RyaSailRepository; +import org.apache.rya.sail.config.RyaSailFactory; /** * Integration tests that ensure the Fluo Application properly exports PCJ http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IndexEntry.groovy ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IndexEntry.groovy b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IndexEntry.groovy index 6017da4..8b0b670 100644 --- a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IndexEntry.groovy +++ b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IndexEntry.groovy @@ -17,7 +17,7 @@ * under the License. */ -package mvm.rya.prospector.domain +package org.apache.rya.prospector.domain /** * Date: 12/5/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IntermediateProspect.groovy ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IntermediateProspect.groovy b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IntermediateProspect.groovy index fadf6e8..c5e34c0 100644 --- a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IntermediateProspect.groovy +++ b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/IntermediateProspect.groovy @@ -17,11 +17,11 @@ * under the License. */ -package mvm.rya.prospector.domain +package org.apache.rya.prospector.domain import org.apache.hadoop.io.WritableComparable -import static mvm.rya.prospector.domain.TripleValueType.* +import static org.apache.rya.prospector.domain.TripleValueType.* /** * Date: 12/3/12 http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/TripleValueType.java ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/TripleValueType.java b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/TripleValueType.java index 183b0d2..0c53076 100644 --- a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/TripleValueType.java +++ b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/domain/TripleValueType.java @@ -1,4 +1,4 @@ -package mvm.rya.prospector.domain; +package org.apache.rya.prospector.domain; /* * Licensed to the Apache Software Foundation (ASF) under one http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/mr/Prospector.groovy ---------------------------------------------------------------------- diff --git a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/mr/Prospector.groovy b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/mr/Prospector.groovy index 6c4a055..c51ecef 100644 --- a/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/mr/Prospector.groovy +++ b/extras/rya.prospector/src/main/groovy/org/apache/rya/prospector/mr/Prospector.groovy @@ -17,9 +17,9 @@ * under the License. */ -package mvm.rya.prospector.mr +package org.apache.rya.prospector.mr -import mvm.rya.prospector.utils.ProspectorUtils +import org.apache.rya.prospector.utils.ProspectorUtils import org.apache.accumulo.core.data.Mutation import org.apache.accumulo.core.data.Value import org.apache.accumulo.core.security.ColumnVisibility @@ -33,12 +33,12 @@ import org.apache.hadoop.mapreduce.Job import org.apache.hadoop.io.LongWritable import org.apache.commons.lang.time.DateUtils -import mvm.rya.prospector.domain.IntermediateProspect +import org.apache.rya.prospector.domain.IntermediateProspect import com.google.common.collect.Lists -import static mvm.rya.prospector.utils.ProspectorConstants.* -import static mvm.rya.prospector.utils.ProspectorUtils.* +import static org.apache.rya.prospector.utils.ProspectorConstants.* +import static org.apache.rya.prospector.utils.ProspectorUtils.* /** * Date: 12/3/12
