You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@rya.apache.org by mi...@apache.org on 2016/10/15 20:07:19 UTC

[59/69] [abbrv] incubator-rya git commit: RYA-198 Fixing Source Files

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java
index b40beb6..3700988 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/entity/StarQuery.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.entity;
+package org.apache.rya.indexing.accumulo.entity;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,13 +25,13 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import mvm.rya.accumulo.documentIndex.TextColumn;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.resolver.RdfToRyaConversions;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.resolver.RyaTypeResolverException;
-import mvm.rya.joinselect.AccumuloSelectivityEvalDAO;
+import org.apache.rya.accumulo.documentIndex.TextColumn;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.RdfToRyaConversions;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.resolver.RyaTypeResolverException;
+import org.apache.rya.joinselect.AccumuloSelectivityEvalDAO;
 
 import org.apache.accumulo.core.client.TableNotFoundException;
 import org.apache.hadoop.io.Text;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
index a15ab45..7d0006a 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/AccumuloFreeTextIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.indexing.accumulo.freetext;
 
 
 
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.getNodeIterator;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.getNodeIterator;
 
 import java.io.IOException;
 import java.nio.charset.CharacterCodingException;
@@ -66,25 +66,25 @@ import org.openrdf.query.QueryEvaluationException;
 import com.google.common.base.Charsets;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.FreeTextIndexer;
-import mvm.rya.indexing.Md5Hash;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.StatementSerializer;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.accumulo.freetext.iterators.BooleanTreeIterator;
-import mvm.rya.indexing.accumulo.freetext.query.ASTExpression;
-import mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils;
-import mvm.rya.indexing.accumulo.freetext.query.ASTSimpleNode;
-import mvm.rya.indexing.accumulo.freetext.query.ASTTerm;
-import mvm.rya.indexing.accumulo.freetext.query.ParseException;
-import mvm.rya.indexing.accumulo.freetext.query.QueryParser;
-import mvm.rya.indexing.accumulo.freetext.query.QueryParserTreeConstants;
-import mvm.rya.indexing.accumulo.freetext.query.SimpleNode;
-import mvm.rya.indexing.accumulo.freetext.query.TokenMgrError;
+import org.apache.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.FreeTextIndexer;
+import org.apache.rya.indexing.Md5Hash;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.StatementSerializer;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.accumulo.freetext.iterators.BooleanTreeIterator;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTExpression;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTSimpleNode;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTTerm;
+import org.apache.rya.indexing.accumulo.freetext.query.ParseException;
+import org.apache.rya.indexing.accumulo.freetext.query.QueryParser;
+import org.apache.rya.indexing.accumulo.freetext.query.QueryParserTreeConstants;
+import org.apache.rya.indexing.accumulo.freetext.query.SimpleNode;
+import org.apache.rya.indexing.accumulo.freetext.query.TokenMgrError;
 
 /**
  * The {@link AccumuloFreeTextIndexer} stores and queries "free text" data from statements into tables in Accumulo. Specifically, this class
@@ -630,7 +630,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements
      * @return the Free Text Document index table's name
      */
     public static String getFreeTextDocTablename(Configuration conf) {
-        return mvm.rya.indexing.accumulo.ConfigUtils.getTablePrefix(conf)  + TABLE_SUFFFIX_DOC;
+        return org.apache.rya.indexing.accumulo.ConfigUtils.getTablePrefix(conf)  + TABLE_SUFFFIX_DOC;
     }
 
     /**
@@ -639,7 +639,7 @@ public class AccumuloFreeTextIndexer extends AbstractAccumuloIndexer implements
      * @return the Free Text Term index table's name
      */
     public static String getFreeTextTermTablename(Configuration conf) {
-        return mvm.rya.indexing.accumulo.ConfigUtils.getTablePrefix(conf)  + TABLE_SUFFIX_TERM;
+        return org.apache.rya.indexing.accumulo.ConfigUtils.getTablePrefix(conf)  + TABLE_SUFFIX_TERM;
     }
 
     private void deleteStatement(Statement statement) throws IOException {

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java
index b33206b..e8825f4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/ColumnPrefixes.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -28,7 +28,7 @@ import org.apache.commons.lang.StringUtils;
 import org.apache.hadoop.io.Text;
 import org.openrdf.model.Statement;
 
-import mvm.rya.indexing.StatementSerializer;
+import org.apache.rya.indexing.StatementSerializer;
 
 /**
  * Row ID: shardId

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java
index cfb0f38..6b01811 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/FreeTextTupleSet.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,12 +25,12 @@ import info.aduna.iteration.CloseableIteration;
 import java.io.IOException;
 import java.util.Set;
 
-import mvm.rya.indexing.FreeTextIndexer;
-import mvm.rya.indexing.IndexingExpr;
-import mvm.rya.indexing.IteratorFactory;
-import mvm.rya.indexing.SearchFunction;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.FreeTextIndexer;
+import org.apache.rya.indexing.IndexingExpr;
+import org.apache.rya.indexing.IteratorFactory;
+import org.apache.rya.indexing.SearchFunction;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 import org.apache.hadoop.conf.Configuration;
 import org.openrdf.model.Statement;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java
index abda04a..3378fc0 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/LuceneTokenizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/SimpleTokenizer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/SimpleTokenizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/SimpleTokenizer.java
index e98e676..1cdb91c 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/SimpleTokenizer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/SimpleTokenizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/Tokenizer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/Tokenizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/Tokenizer.java
index 24b40cd..e0ff1c3 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/Tokenizer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/Tokenizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext;
+package org.apache.rya.indexing.accumulo.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/AndingIterator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/AndingIterator.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/AndingIterator.java
index 355fe14..b63e0d2 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/AndingIterator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/AndingIterator.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext.iterators;
+package org.apache.rya.indexing.accumulo.freetext.iterators;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/BooleanTreeIterator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/BooleanTreeIterator.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/BooleanTreeIterator.java
index a69b78a..89ff261 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/BooleanTreeIterator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/iterators/BooleanTreeIterator.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext.iterators;
+package org.apache.rya.indexing.accumulo.freetext.iterators;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,12 +21,12 @@ package mvm.rya.indexing.accumulo.freetext.iterators;
 
 
 
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.allChildrenAreNot;
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.findFirstNonNotChild;
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.getNodeIterator;
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.isNotFlag;
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.pushChild;
-import static mvm.rya.indexing.accumulo.freetext.query.ASTNodeUtils.swapChildren;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.allChildrenAreNot;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.findFirstNonNotChild;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.getNodeIterator;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.isNotFlag;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.pushChild;
+import static org.apache.rya.indexing.accumulo.freetext.query.ASTNodeUtils.swapChildren;
 
 import java.io.IOException;
 import java.util.ArrayList;
@@ -36,14 +36,14 @@ import java.util.List;
 import java.util.Map;
 import java.util.NoSuchElementException;
 
-import mvm.rya.indexing.accumulo.freetext.ColumnPrefixes;
-import mvm.rya.indexing.accumulo.freetext.query.ASTExpression;
-import mvm.rya.indexing.accumulo.freetext.query.ASTTerm;
-import mvm.rya.indexing.accumulo.freetext.query.ParseException;
-import mvm.rya.indexing.accumulo.freetext.query.QueryParser;
-import mvm.rya.indexing.accumulo.freetext.query.QueryParserTreeConstants;
-import mvm.rya.indexing.accumulo.freetext.query.SimpleNode;
-import mvm.rya.indexing.accumulo.freetext.query.TokenMgrError;
+import org.apache.rya.indexing.accumulo.freetext.ColumnPrefixes;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTExpression;
+import org.apache.rya.indexing.accumulo.freetext.query.ASTTerm;
+import org.apache.rya.indexing.accumulo.freetext.query.ParseException;
+import org.apache.rya.indexing.accumulo.freetext.query.QueryParser;
+import org.apache.rya.indexing.accumulo.freetext.query.QueryParserTreeConstants;
+import org.apache.rya.indexing.accumulo.freetext.query.SimpleNode;
+import org.apache.rya.indexing.accumulo.freetext.query.TokenMgrError;
 
 import org.apache.accumulo.core.client.IteratorSetting;
 import org.apache.accumulo.core.data.ByteSequence;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTExpression.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTExpression.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTExpression.java
index 95783e5..4b7ed54 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTExpression.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTExpression.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTNodeUtils.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTNodeUtils.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTNodeUtils.java
index 27edaac..fab463c 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTNodeUtils.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTNodeUtils.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTSimpleNode.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTSimpleNode.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTSimpleNode.java
index 71ff16a..9c2413a 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTSimpleNode.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTSimpleNode.java
@@ -1,6 +1,6 @@
 /* Generated By:JJTree: Do not edit this line. ASTSimpleNode.java Version 4.3 */
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=false,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTTerm.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTTerm.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTTerm.java
index 6232096..ca65477 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTTerm.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ASTTerm.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/JJTQueryParserState.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/JJTQueryParserState.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/JJTQueryParserState.java
index dfcc429..61a6af0 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/JJTQueryParserState.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/JJTQueryParserState.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. JJTQueryParserState.java Version 5.0 */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Node.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Node.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Node.java
index 1ef0bad..815828c 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Node.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Node.java
@@ -1,6 +1,6 @@
 /* Generated By:JJTree: Do not edit this line. Node.java Version 4.3 */
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=false,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ParseException.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ParseException.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ParseException.java
index 9200770..6f9517b 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ParseException.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/ParseException.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. ParseException.java Version 5.0 */
 /* JavaCCOptions:KEEP_LINE_COL=null */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParser.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParser.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParser.java
index 65e7125..8ebcd1e 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParser.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParser.java
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParser.java */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserConstants.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserConstants.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserConstants.java
index caac3a9..581dabd 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserConstants.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserConstants.java
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserConstants.java */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTokenManager.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTokenManager.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTokenManager.java
index 5c92c7b..cac2c09 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTokenManager.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTokenManager.java
@@ -1,5 +1,5 @@
 /* Generated By:JJTree&JavaCC: Do not edit this line. QueryParserTokenManager.java */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTreeConstants.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTreeConstants.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTreeConstants.java
index fcf0dc7..8d452a7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTreeConstants.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/QueryParserTreeConstants.java
@@ -1,5 +1,5 @@
 /* Generated By:JavaCC: Do not edit this line. QueryParserTreeConstants.java Version 5.0 */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleCharStream.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleCharStream.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleCharStream.java
index 3f49d1f..5d69967 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleCharStream.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleCharStream.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. SimpleCharStream.java Version 5.0 */
 /* JavaCCOptions:STATIC=false,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleNode.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleNode.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleNode.java
index d372615..3ec5d32 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleNode.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/SimpleNode.java
@@ -1,6 +1,6 @@
 /* Generated By:JJTree: Do not edit this line. SimpleNode.java Version 4.3 */
 /* JavaCCOptions:MULTI=true,NODE_USES_PARSER=false,VISITOR=false,TRACK_TOKENS=false,NODE_PREFIX=AST,NODE_EXTENDS=,NODE_FACTORY=,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Token.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Token.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Token.java
index 95292d3..aef8ae4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Token.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/Token.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. Token.java Version 5.0 */
 /* JavaCCOptions:TOKEN_EXTENDS=,KEEP_LINE_COL=null,SUPPORT_CLASS_VISIBILITY_PUBLIC=true */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/TokenMgrError.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/TokenMgrError.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/TokenMgrError.java
index ab3b0f1..94ce30e 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/TokenMgrError.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/freetext/query/TokenMgrError.java
@@ -1,6 +1,6 @@
 /* Generated By:JavaCC: Do not edit this line. TokenMgrError.java Version 5.0 */
 /* JavaCCOptions: */
-package mvm.rya.indexing.accumulo.freetext.query;
+package org.apache.rya.indexing.accumulo.freetext.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
index d5dfd3b..1a5e803 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/accumulo/temporal/AccumuloTemporalIndexer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.accumulo.temporal;
+package org.apache.rya.indexing.accumulo.temporal;
 
 import java.io.IOException;
 import java.nio.charset.CharacterCodingException;
@@ -60,18 +60,18 @@ import org.openrdf.query.QueryEvaluationException;
 
 import java.util.Arrays;
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.KeyParts;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.StatementSerializer;
-import mvm.rya.indexing.TemporalIndexer;
-import mvm.rya.indexing.TemporalInstant;
-import mvm.rya.indexing.TemporalInstantRfc3339;
-import mvm.rya.indexing.TemporalInterval;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.KeyParts;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.StatementSerializer;
+import org.apache.rya.indexing.TemporalIndexer;
+import org.apache.rya.indexing.TemporalInstant;
+import org.apache.rya.indexing.TemporalInstantRfc3339;
+import org.apache.rya.indexing.TemporalInterval;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 public class AccumuloTemporalIndexer extends AbstractAccumuloIndexer implements TemporalIndexer {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
index 311b745..37d3305 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexer.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external;
+package org.apache.rya.indexing.external;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -42,13 +42,13 @@ import org.openrdf.model.URI;
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 
-import mvm.rya.accumulo.experimental.AbstractAccumuloIndexer;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.persist.RyaDAO;
-import mvm.rya.indexing.external.accumulo.AccumuloPcjStorageSupplier;
-import mvm.rya.indexing.external.fluo.PcjUpdaterSupplierFactory;
+import org.apache.rya.accumulo.experimental.AbstractAccumuloIndexer;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.persist.RyaDAO;
+import org.apache.rya.indexing.external.accumulo.AccumuloPcjStorageSupplier;
+import org.apache.rya.indexing.external.fluo.PcjUpdaterSupplierFactory;
 
 /**
  * Updates the state of the Precomputed Join indices that are used by Rya.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
index 3c76601..a4f0c2d 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinIndexerConfig.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external;
+package org.apache.rya.indexing.external;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import mvm.rya.api.persist.index.RyaSecondaryIndexer;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.api.persist.index.RyaSecondaryIndexer;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinStorageSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinStorageSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinStorageSupplier.java
index d79989c..59b75c4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinStorageSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinStorageSupplier.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external;
+package org.apache.rya.indexing.external;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -29,8 +29,8 @@ import org.apache.rya.indexing.pcj.storage.PrecomputedJoinStorage;
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
-import mvm.rya.indexing.external.accumulo.AccumuloPcjStorageSupplier;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
+import org.apache.rya.indexing.external.accumulo.AccumuloPcjStorageSupplier;
 
 /**
  * Creates an instance of {@link PrecomputedJoinStorage} based on the application's configuration.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinUpdaterSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinUpdaterSupplier.java
index cabadb4..01dab18 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/PrecomputedJoinUpdaterSupplier.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external;
+package org.apache.rya.indexing.external;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -27,8 +27,8 @@ import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
-import mvm.rya.indexing.external.fluo.FluoPcjUpdaterSupplier;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
+import org.apache.rya.indexing.external.fluo.FluoPcjUpdaterSupplier;
 
 /**
  * Creates instance of {@link PrecomputedJoinUpdater} based on the application's configuration.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java
index 3f4806e..6c82ee0 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageConfig.java
@@ -16,14 +16,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.accumulo;
+package org.apache.rya.indexing.external.accumulo;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 
 /**
  * Configuration values required to initialize a {@link AccumuloPcjStorage}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageSupplier.java
index b6d4121..79f15a6 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/accumulo/AccumuloPcjStorageSupplier.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.accumulo;
+package org.apache.rya.indexing.external.accumulo;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
@@ -28,8 +28,8 @@ import org.apache.rya.indexing.pcj.storage.accumulo.AccumuloPcjStorage;
 import com.google.common.base.Optional;
 import com.google.common.base.Supplier;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig;
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinStorageType;
 
 /**
  * Creates instances of {@link AccumuloPcjStorage} using the values found in a {@link Configuration}.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
index f53727d..c31ef02 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdater.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 
@@ -31,7 +31,7 @@ import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
 import com.google.common.base.Optional;
 
 import org.apache.fluo.api.client.FluoClient;
-import mvm.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaStatement;
 
 /**
  * Updates the PCJ indices by forwarding the statement additions/removals to

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java
index 2a34a82..3b01d56 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterConfig.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
 import static com.google.common.base.Preconditions.checkNotNull;
-import mvm.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
 
 import org.apache.hadoop.conf.Configuration;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
index c0895ba..d0e4c23 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/FluoPcjUpdaterSupplier.java
@@ -16,24 +16,24 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
 import static com.google.common.base.Preconditions.checkArgument;
 import static com.google.common.base.Preconditions.checkNotNull;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_INSTANCE;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_PASSWORD;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_USERNAME;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_ZOOKEEPERS;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.FLUO_APP_NAME;
-import static mvm.rya.indexing.external.fluo.FluoPcjUpdaterConfig.STATEMENT_VISIBILITY;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_INSTANCE;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_PASSWORD;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_USERNAME;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.ACCUMULO_ZOOKEEPERS;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.FLUO_APP_NAME;
+import static org.apache.rya.indexing.external.fluo.FluoPcjUpdaterConfig.STATEMENT_VISIBILITY;
 import org.apache.fluo.api.client.FluoClient;
 import org.apache.fluo.api.client.FluoFactory;
 import org.apache.fluo.api.config.FluoConfiguration;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig;
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig.PrecomputedJoinUpdaterType;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdater.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdater.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdater.java
index 66a6b24..461454f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdater.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdater.java
@@ -16,12 +16,12 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
 import java.util.Collection;
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.indexing.external.PrecomputedJoinIndexer;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexer;
 
 import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdaterSupplier.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdaterSupplier.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdaterSupplier.java
index 6831353..4520a3f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdaterSupplier.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/NoOpUpdaterSupplier.java
@@ -16,9 +16,9 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexer;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexer;
 
 import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/PcjUpdaterSupplierFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/PcjUpdaterSupplierFactory.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/PcjUpdaterSupplierFactory.java
index 0250b6d..dfef64b 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/PcjUpdaterSupplierFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/fluo/PcjUpdaterSupplierFactory.java
@@ -16,10 +16,10 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.fluo;
+package org.apache.rya.indexing.external.fluo;
 
-import mvm.rya.indexing.external.PrecomputedJoinIndexer;
-import mvm.rya.indexing.external.PrecomputedJoinIndexerConfig;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexer;
+import org.apache.rya.indexing.external.PrecomputedJoinIndexerConfig;
 
 import org.apache.hadoop.conf.Configuration;
 import org.apache.rya.indexing.pcj.update.PrecomputedJoinUpdater;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSet.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSet.java
index 04b6d2d..2bae1cf 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSet.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/AccumuloIndexSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.tupleSet;
+package org.apache.rya.indexing.external.tupleSet;
 
 import java.util.ArrayList;
 import java.util.Collection;
@@ -68,16 +68,16 @@ import com.google.common.collect.Multimap;
 import com.google.common.collect.Sets;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.accumulo.pcj.iterators.BindingSetHashJoinIterator;
-import mvm.rya.accumulo.pcj.iterators.BindingSetHashJoinIterator.HashJoinType;
-import mvm.rya.accumulo.pcj.iterators.IteratorCombiner;
-import mvm.rya.accumulo.pcj.iterators.PCJKeyToCrossProductBindingSetIterator;
-import mvm.rya.accumulo.pcj.iterators.PCJKeyToJoinBindingSetIterator;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.utils.IteratorWrapper;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.pcj.matching.PCJOptimizerUtilities;
-import mvm.rya.rdftriplestore.evaluation.ExternalBatchingIterator;
+import org.apache.rya.accumulo.pcj.iterators.BindingSetHashJoinIterator;
+import org.apache.rya.accumulo.pcj.iterators.BindingSetHashJoinIterator.HashJoinType;
+import org.apache.rya.accumulo.pcj.iterators.IteratorCombiner;
+import org.apache.rya.accumulo.pcj.iterators.PCJKeyToCrossProductBindingSetIterator;
+import org.apache.rya.accumulo.pcj.iterators.PCJKeyToJoinBindingSetIterator;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.utils.IteratorWrapper;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.pcj.matching.PCJOptimizerUtilities;
+import org.apache.rya.rdftriplestore.evaluation.ExternalBatchingIterator;
 
 /**
  * During query planning, this node is inserted into the parsed query to

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ExternalTupleSet.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ExternalTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ExternalTupleSet.java
index b53dd66..1a6c701 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ExternalTupleSet.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ExternalTupleSet.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.external.tupleSet;
+package org.apache.rya.indexing.external.tupleSet;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
index b41c9c9..434afb0 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/ParsedQueryUtil.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.tupleSet;
+package org.apache.rya.indexing.external.tupleSet;
 
 import static com.google.common.base.Preconditions.checkNotNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSet.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSet.java b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSet.java
index ccdb7a8..02d0a58 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSet.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/external/tupleSet/SimpleExternalTupleSet.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.indexing.external.tupleSet;
+package org.apache.rya.indexing.external.tupleSet;
 
 import java.util.ArrayList;
 import java.util.List;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java
index daa78e4..c73606f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/AbstractMongoIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb;
+package org.apache.rya.indexing.mongodb;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -38,14 +38,14 @@ import com.mongodb.MongoClient;
 import com.mongodb.QueryBuilder;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.resolver.RyaToRdfConversions;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.mongodb.MongoConnectorFactory;
-import mvm.rya.mongodb.MongoDBRdfConfiguration;
-import mvm.rya.mongodb.MongoDBRyaDAO;
-import mvm.rya.mongodb.MongoSecondaryIndex;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaURI;
+import org.apache.rya.api.resolver.RyaToRdfConversions;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.mongodb.MongoConnectorFactory;
+import org.apache.rya.mongodb.MongoDBRdfConfiguration;
+import org.apache.rya.mongodb.MongoDBRyaDAO;
+import org.apache.rya.mongodb.MongoSecondaryIndex;
 
 /**
  * Secondary Indexer using MondoDB

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/IndexingMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/IndexingMongoDBStorageStrategy.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/IndexingMongoDBStorageStrategy.java
index 2b73e6e..eebc7b7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/IndexingMongoDBStorageStrategy.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/IndexingMongoDBStorageStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb;
+package org.apache.rya.indexing.mongodb;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,8 +27,8 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBObject;
 import com.mongodb.QueryBuilder;
 
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.mongodb.dao.SimpleMongoDBStorageStrategy;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.mongodb.dao.SimpleMongoDBStorageStrategy;
 
 public class IndexingMongoDBStorageStrategy extends SimpleMongoDBStorageStrategy {
     public DBObject getQuery(final StatementConstraints contraints) {

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java
index 0689feb..5d27b7e 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/MongoFreeTextIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.freetext;
+package org.apache.rya.indexing.mongodb.freetext;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -27,10 +27,10 @@ import org.openrdf.query.QueryEvaluationException;
 import com.mongodb.QueryBuilder;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.FreeTextIndexer;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.mongodb.AbstractMongoIndexer;
+import org.apache.rya.indexing.FreeTextIndexer;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.AbstractMongoIndexer;
 
 public class MongoFreeTextIndexer extends AbstractMongoIndexer<TextMongoDBStorageStrategy> implements FreeTextIndexer {
     private static final String COLLECTION_SUFFIX = "freetext";

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/TextMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/TextMongoDBStorageStrategy.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/TextMongoDBStorageStrategy.java
index cc5029c..83d5a82 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/TextMongoDBStorageStrategy.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/freetext/TextMongoDBStorageStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.freetext;
+package org.apache.rya.indexing.mongodb.freetext;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +23,8 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
 
 public class TextMongoDBStorageStrategy extends IndexingMongoDBStorageStrategy {
 	private static final String text = "text";

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java
index be991c8..ce40a26 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/MongoTemporalIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.temporal;
+package org.apache.rya.indexing.mongodb.temporal;
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
  * or more contributor license agreements.  See the NOTICE file
@@ -18,9 +18,9 @@ package mvm.rya.indexing.mongodb.temporal;
  * under the License.
  */
 
-import static mvm.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INSTANT;
-import static mvm.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INTERVAL_END;
-import static mvm.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INTERVAL_START;
+import static org.apache.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INSTANT;
+import static org.apache.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INTERVAL_END;
+import static org.apache.rya.indexing.mongodb.temporal.TemporalMongoDBStorageStrategy.INTERVAL_START;
 
 import org.apache.log4j.Logger;
 import org.openrdf.model.Statement;
@@ -31,12 +31,12 @@ import com.mongodb.DBCollection;
 import com.mongodb.QueryBuilder;
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.indexing.StatementConstraints;
-import mvm.rya.indexing.TemporalIndexer;
-import mvm.rya.indexing.TemporalInstant;
-import mvm.rya.indexing.TemporalInterval;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.mongodb.AbstractMongoIndexer;
+import org.apache.rya.indexing.StatementConstraints;
+import org.apache.rya.indexing.TemporalIndexer;
+import org.apache.rya.indexing.TemporalInstant;
+import org.apache.rya.indexing.TemporalInterval;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.mongodb.AbstractMongoIndexer;
 
 /**
  * Indexes MongoDB based on time instants or intervals.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/TemporalMongoDBStorageStrategy.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/TemporalMongoDBStorageStrategy.java b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/TemporalMongoDBStorageStrategy.java
index 3292685..eefcfb1 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/TemporalMongoDBStorageStrategy.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/mongodb/temporal/TemporalMongoDBStorageStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.mongodb.temporal;
+package org.apache.rya.indexing.mongodb.temporal;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -25,10 +25,10 @@ import com.mongodb.BasicDBObject;
 import com.mongodb.DBCollection;
 import com.mongodb.DBObject;
 
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.indexing.TemporalInstantRfc3339;
-import mvm.rya.indexing.TemporalInterval;
-import mvm.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.indexing.TemporalInstantRfc3339;
+import org.apache.rya.indexing.TemporalInterval;
+import org.apache.rya.indexing.mongodb.IndexingMongoDBStorageStrategy;
 
 /**
  * Defines how time based intervals/instants are stored in MongoDB.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractPCJMatcher.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractPCJMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractPCJMatcher.java
index fdd9ccb..38e4045 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractPCJMatcher.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractPCJMatcher.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
 
 import org.openrdf.query.algebra.BinaryTupleOperator;
 import org.openrdf.query.algebra.Filter;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractQuerySegment.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractQuerySegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractQuerySegment.java
index 2f1e749..75a7098 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractQuerySegment.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/AbstractQuerySegment.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -27,7 +27,7 @@ import java.util.List;
 import java.util.Map;
 import java.util.Set;
 
-import mvm.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
+import org.apache.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.QueryModelNode;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/FlattenedOptional.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/FlattenedOptional.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/FlattenedOptional.java
index b4f8f28..934b90a 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/FlattenedOptional.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/FlattenedOptional.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.util.HashSet;
 import java.util.Map;
 import java.util.Set;
 
-import mvm.rya.rdftriplestore.inference.DoNotExpandSP;
-import mvm.rya.rdftriplestore.utils.FixedStatementPattern;
+import org.apache.rya.rdftriplestore.inference.DoNotExpandSP;
+import org.apache.rya.rdftriplestore.utils.FixedStatementPattern;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.Join;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegment.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegment.java
index 30f36cf..ca012a9 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegment.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegment.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,9 +22,9 @@ package mvm.rya.indexing.pcj.matching;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.rdftriplestore.inference.DoNotExpandSP;
-import mvm.rya.rdftriplestore.utils.FixedStatementPattern;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.rdftriplestore.inference.DoNotExpandSP;
+import org.apache.rya.rdftriplestore.utils.FixedStatementPattern;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.Join;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcher.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcher.java
index a74abec..a318d30 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcher.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/JoinSegmentPCJMatcher.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.indexing.pcj.matching;
 
 import java.util.ArrayList;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.Join;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegment.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegment.java
index ebe5243..0e4ff2f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegment.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegment.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package mvm.rya.indexing.pcj.matching;
 
 import java.util.List;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.rdftriplestore.inference.DoNotExpandSP;
-import mvm.rya.rdftriplestore.utils.FixedStatementPattern;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.rdftriplestore.inference.DoNotExpandSP;
+import org.apache.rya.rdftriplestore.utils.FixedStatementPattern;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.Join;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcher.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcher.java
index 37f6867..1141cbf 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcher.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/OptionalJoinSegmentPCJMatcher.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package mvm.rya.indexing.pcj.matching;
 import java.util.ArrayList;
 import java.util.List;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.Join;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcher.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcher.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcher.java
index d98d367..b0e6cfb 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcher.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcher.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package mvm.rya.indexing.pcj.matching;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.QueryModelNode;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcherFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcherFactory.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcherFactory.java
index 3a42a68..99fa801 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcherFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJMatcherFactory.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidator.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidator.java
index 47d00dc..85678e4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJNodeConsolidator.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizer.java
index 8ce89bf..da034e7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -55,18 +55,18 @@ import org.openrdf.sail.SailException;
 import com.google.common.collect.Lists;
 import com.google.common.collect.Maps;
 
-import mvm.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.instance.RyaDetailsRepository;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
-import mvm.rya.indexing.IndexPlanValidator.IndexPlanValidator;
-import mvm.rya.indexing.IndexPlanValidator.IndexedExecutionPlanGenerator;
-import mvm.rya.indexing.IndexPlanValidator.ThreshholdPlanSelector;
-import mvm.rya.indexing.IndexPlanValidator.TupleReArranger;
-import mvm.rya.indexing.IndexPlanValidator.ValidIndexCombinationGenerator;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.indexing.external.tupleSet.AccumuloIndexSet;
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.accumulo.instance.AccumuloRyaInstanceDetailsRepository;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.instance.RyaDetailsRepository;
+import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.indexing.IndexPlanValidator.IndexPlanValidator;
+import org.apache.rya.indexing.IndexPlanValidator.IndexedExecutionPlanGenerator;
+import org.apache.rya.indexing.IndexPlanValidator.ThreshholdPlanSelector;
+import org.apache.rya.indexing.IndexPlanValidator.TupleReArranger;
+import org.apache.rya.indexing.IndexPlanValidator.ValidIndexCombinationGenerator;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.indexing.external.tupleSet.AccumuloIndexSet;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
 
 /**
  * {@link QueryOptimizer} which matches {@link TupleExpr}s associated with

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilities.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilities.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilities.java
index 757fb40..19b608f 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilities.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/PCJOptimizerUtilities.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,8 +24,8 @@ import java.util.Iterator;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.pcj.matching.QueryVariableNormalizer.VarCollector;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.pcj.matching.QueryVariableNormalizer.VarCollector;
 
 import org.openrdf.query.algebra.Difference;
 import org.openrdf.query.algebra.EmptySet;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryNodesToTupleExpr.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryNodesToTupleExpr.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryNodesToTupleExpr.java
index ee0a7b0..b316095 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryNodesToTupleExpr.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryNodesToTupleExpr.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QuerySegment.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QuerySegment.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QuerySegment.java
index 2f7f499..0b74fa3 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QuerySegment.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QuerySegment.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,8 +22,8 @@ package mvm.rya.indexing.pcj.matching;
 import java.util.List;
 import java.util.Set;
 
-import mvm.rya.indexing.external.tupleSet.ExternalTupleSet;
-import mvm.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
+import org.apache.rya.indexing.external.tupleSet.ExternalTupleSet;
+import org.apache.rya.indexing.pcj.matching.QueryNodesToTupleExpr.TupleExprAndNodes;
 
 import org.openrdf.query.algebra.Filter;
 import org.openrdf.query.algebra.QueryModelNode;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryVariableNormalizer.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryVariableNormalizer.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryVariableNormalizer.java
index a3e6e04..2ed66c4 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryVariableNormalizer.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/QueryVariableNormalizer.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/TopOfQueryFilterRelocator.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/TopOfQueryFilterRelocator.java b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/TopOfQueryFilterRelocator.java
index 71e119e..ba6a6d3 100644
--- a/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/TopOfQueryFilterRelocator.java
+++ b/extras/indexing/src/main/java/org/apache/rya/indexing/pcj/matching/TopOfQueryFilterRelocator.java
@@ -1,4 +1,4 @@
-package mvm.rya.indexing.pcj.matching;
+package org.apache.rya.indexing.pcj.matching;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java
index d66fdd7..23b6ee7 100644
--- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java
+++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailConfig.java
@@ -1,4 +1,4 @@
-package mvm.rya.sail.config;
+package org.apache.rya.sail.config;
 
 import org.openrdf.model.Graph;
 import org.openrdf.model.Literal;
@@ -30,7 +30,7 @@ import org.openrdf.sail.config.SailImplConfigBase;
  * under the License.
  */
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
 
 /**
  * @deprecated Use {@link AccumuloRdfConfiguration} instead.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java
----------------------------------------------------------------------
diff --git a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java
index 83641bd..6f4d6c5 100644
--- a/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java
+++ b/extras/indexing/src/main/java/org/apache/rya/sail/config/RyaAccumuloSailFactory.java
@@ -1,4 +1,4 @@
-package mvm.rya.sail.config;
+package org.apache.rya.sail.config;
 
 import org.apache.accumulo.core.client.AccumuloException;
 import org.apache.accumulo.core.client.AccumuloSecurityException;
@@ -31,11 +31,11 @@ import org.openrdf.sail.config.SailImplConfig;
  * under the License.
  */
 
-import mvm.rya.accumulo.AccumuloRdfConfiguration;
-import mvm.rya.accumulo.AccumuloRyaDAO;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.indexing.accumulo.ConfigUtils;
-import mvm.rya.rdftriplestore.RdfCloudTripleStore;
+import org.apache.rya.accumulo.AccumuloRdfConfiguration;
+import org.apache.rya.accumulo.AccumuloRyaDAO;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.indexing.accumulo.ConfigUtils;
+import org.apache.rya.rdftriplestore.RdfCloudTripleStore;
 
 /**
  * @deprecated Use {@link RyaSailFactory} instead.