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:23 UTC

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

RYA-198 Fixing Source Files


Project: http://git-wip-us.apache.org/repos/asf/incubator-rya/repo
Commit: http://git-wip-us.apache.org/repos/asf/incubator-rya/commit/17bde6d8
Tree: http://git-wip-us.apache.org/repos/asf/incubator-rya/tree/17bde6d8
Diff: http://git-wip-us.apache.org/repos/asf/incubator-rya/diff/17bde6d8

Branch: refs/heads/master
Commit: 17bde6d85bceb163301f1f8dc6495ef2dbc8d6c4
Parents: 44a2dcf
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Fri Oct 14 16:08:29 2016 -0400
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Fri Oct 14 16:13:20 2016 -0400

----------------------------------------------------------------------
 .../InvalidValueTypeMarkerRuntimeException.java |   2 +-
 .../api/RdfCloudTripleStoreConfiguration.java   |   8 +-
 .../rya/api/RdfCloudTripleStoreConstants.java   |  10 +-
 .../rya/api/RdfCloudTripleStoreStatement.java   |   2 +-
 .../rya/api/RdfCloudTripleStoreUtils.java       |   8 +-
 .../apache/rya/api/client/BatchUpdatePCJ.java   |   2 +-
 .../org/apache/rya/api/client/CreatePCJ.java    |   2 +-
 .../org/apache/rya/api/client/DeletePCJ.java    |   2 +-
 .../rya/api/client/GetInstanceDetails.java      |   4 +-
 .../java/org/apache/rya/api/client/Install.java |   2 +-
 .../client/InstanceDoesNotExistException.java   |   2 +-
 .../apache/rya/api/client/InstanceExists.java   |   2 +-
 .../apache/rya/api/client/ListInstances.java    |   2 +-
 .../api/client/PCJDoesNotExistException.java    |   2 +-
 .../org/apache/rya/api/client/RyaClient.java    |   2 +-
 .../rya/api/client/RyaClientException.java      |   2 +-
 .../rya/api/date/DateTimeTtlValueConverter.java |   2 +-
 .../api/date/TimestampTtlStrValueConverter.java |   2 +-
 .../api/date/TimestampTtlValueConverter.java    |   2 +-
 .../apache/rya/api/date/TtlValueConverter.java  |   2 +-
 .../java/org/apache/rya/api/domain/Node.java    |   2 +-
 .../org/apache/rya/api/domain/RangeURI.java     |   2 +-
 .../org/apache/rya/api/domain/RangeValue.java   |   2 +-
 .../org/apache/rya/api/domain/RyaRange.java     |   2 +-
 .../org/apache/rya/api/domain/RyaSchema.java    |  10 +-
 .../org/apache/rya/api/domain/RyaStatement.java |   2 +-
 .../java/org/apache/rya/api/domain/RyaType.java |   2 +-
 .../apache/rya/api/domain/RyaTypePrefix.java    |   6 +-
 .../org/apache/rya/api/domain/RyaTypeRange.java |   2 +-
 .../java/org/apache/rya/api/domain/RyaURI.java  |   2 +-
 .../org/apache/rya/api/domain/RyaURIPrefix.java |   4 +-
 .../org/apache/rya/api/domain/RyaURIRange.java  |   2 +-
 .../rya/api/instance/ConfigurationFields.java   |   2 +-
 .../org/apache/rya/api/instance/RyaDetails.java |   2 +-
 .../rya/api/instance/RyaDetailsRepository.java  |   2 +-
 .../api/instance/RyaDetailsToConfiguration.java |   2 +-
 .../rya/api/instance/RyaDetailsUpdater.java     |   8 +-
 .../rya/api/layout/TableLayoutStrategy.java     |   2 +-
 .../api/layout/TablePrefixLayoutStrategy.java   |   4 +-
 .../apache/rya/api/persist/RdfDAOException.java |   2 +-
 .../apache/rya/api/persist/RdfEvalStatsDAO.java |   4 +-
 .../apache/rya/api/persist/RyaConfigured.java   |   4 +-
 .../java/org/apache/rya/api/persist/RyaDAO.java |  10 +-
 .../apache/rya/api/persist/RyaDAOException.java |   2 +-
 .../rya/api/persist/RyaNamespaceManager.java    |   4 +-
 .../api/persist/index/RyaSecondaryIndexer.java  |   6 +-
 .../persist/joinselect/SelectivityEvalDAO.java  |   6 +-
 .../rya/api/persist/query/BatchRyaQuery.java    |   8 +-
 .../apache/rya/api/persist/query/RyaQuery.java  |   4 +-
 .../rya/api/persist/query/RyaQueryEngine.java   |  10 +-
 .../rya/api/persist/query/RyaQueryOptions.java  |   4 +-
 .../rya/api/persist/query/join/HashJoin.java    |  20 ++--
 .../api/persist/query/join/IterativeJoin.java   |  16 +--
 .../apache/rya/api/persist/query/join/Join.java |  12 +-
 .../rya/api/persist/query/join/MergeJoin.java   |  14 +--
 .../rya/api/persist/utils/RyaDAOHelper.java     |  18 +--
 .../strategy/AbstractTriplePatternStrategy.java |  12 +-
 .../rya/api/query/strategy/ByteRange.java       |   2 +-
 .../query/strategy/TriplePatternStrategy.java   |  12 +-
 .../AbstractHashedTriplePatternStrategy.java    |  14 +--
 .../HashedPoWholeRowTriplePatternStrategy.java  |  26 ++---
 .../HashedSpoWholeRowTriplePatternStrategy.java |  28 ++---
 .../OspWholeRowTriplePatternStrategy.java       |  26 ++---
 .../PoWholeRowTriplePatternStrategy.java        |  24 ++--
 .../SpoWholeRowTriplePatternStrategy.java       |  24 ++--
 .../resolver/CustomRyaTypeResolverMapping.java  |   2 +-
 .../rya/api/resolver/RdfToRyaConversions.java   |   4 +-
 .../org/apache/rya/api/resolver/RyaContext.java |  30 ++---
 .../rya/api/resolver/RyaToRdfConversions.java   |   8 +-
 .../rya/api/resolver/RyaTripleContext.java      |  36 +++---
 .../rya/api/resolver/RyaTypeResolver.java       |   8 +-
 .../api/resolver/RyaTypeResolverException.java  |   2 +-
 .../api/resolver/RyaTypeResolverMapping.java    |   2 +-
 .../resolver/impl/BooleanRyaTypeResolver.java   |   4 +-
 .../api/resolver/impl/ByteRyaTypeResolver.java  |   4 +-
 .../resolver/impl/CustomDatatypeResolver.java   |  10 +-
 .../resolver/impl/DateTimeRyaTypeResolver.java  |   4 +-
 .../resolver/impl/DoubleRyaTypeResolver.java    |   4 +-
 .../api/resolver/impl/FloatRyaTypeResolver.java |   4 +-
 .../resolver/impl/IntegerRyaTypeResolver.java   |   4 +-
 .../api/resolver/impl/LongRyaTypeResolver.java  |   4 +-
 .../api/resolver/impl/RyaTypeResolverImpl.java  |  14 +--
 .../rya/api/resolver/impl/RyaURIResolver.java   |   6 +-
 .../ServiceBackedRyaTypeResolverMappings.java   |   6 +-
 .../api/resolver/impl/ShortRyaTypeResolver.java |   4 +-
 .../rya/api/resolver/triple/TripleRow.java      |   2 +-
 .../rya/api/resolver/triple/TripleRowRegex.java |   2 +-
 .../api/resolver/triple/TripleRowResolver.java  |  12 +-
 .../triple/TripleRowResolverException.java      |   2 +-
 .../impl/WholeRowHashedTripleResolver.java      |  28 ++---
 .../triple/impl/WholeRowTripleResolver.java     |  20 ++--
 .../rya/api/security/SecurityProvider.java      |   2 +-
 .../api/utils/CloseableIterableIteration.java   |   2 +-
 .../rya/api/utils/EnumerationWrapper.java       |   2 +-
 .../apache/rya/api/utils/IteratorWrapper.java   |   2 +-
 .../rya/api/utils/NullableStatementImpl.java    |   2 +-
 .../api/utils/PeekingCloseableIteration.java    |   2 +-
 .../RyaStatementAddBindingSetFunction.java      |   8 +-
 ...ementRemoveBindingSetCloseableIteration.java |   6 +-
 .../org/apache/rya/api/domain/RyaTypeTest.java  |   2 +-
 .../apache/rya/api/domain/RyaURIPrefixTest.java |   2 +-
 .../apache/rya/api/instance/RyaDetailsTest.java |  22 ++--
 .../instance/RyaDetailsToConfigurationTest.java |  32 ++---
 .../rya/api/instance/RyaDetailsUpdaterTest.java |  26 ++---
 .../rya/api/persist/query/RyaQueryTest.java     |   6 +-
 .../AbstractTriplePatternStrategyTest.java      |  34 +++---
 ...shedPoWholeRowTriplePatternStrategyTest.java |  28 ++---
 ...hedSpoWholeRowTriplePatternStrategyTest.java |  22 ++--
 .../wholerow/MockRdfCloudConfiguration.java     |   4 +-
 .../OspWholeRowTriplePatternStrategyTest.java   |  10 +-
 .../PoWholeRowTriplePatternStrategyTest.java    |  10 +-
 .../SpoWholeRowTriplePatternStrategyTest.java   |  10 +-
 .../apache/rya/api/resolver/RyaContextTest.java |  16 +--
 .../impl/CustomDatatypeResolverTest.java        |   4 +-
 .../impl/DateTimeRyaTypeResolverTest.java       |   8 +-
 .../impl/DoubleRyaTypeResolverTest.java         |   4 +-
 .../impl/IntegerRyaTypeResolverTest.java        |   4 +-
 .../resolver/impl/LongRyaTypeResolverTest.java  |   4 +-
 .../api/resolver/impl/RyaURIResolverTest.java   |   6 +-
 .../impl/HashedWholeRowTripleResolverTest.java  |  10 +-
 .../triple/impl/WholeRowTripleResolverTest.java |  12 +-
 .../org/apache/rya/api/utils/RdfIOTest.java     |   6 +-
 .../provenance/LoggingProvenanceCollector.java  |   4 +-
 .../ProvenanceCollectionException.java          |   2 +-
 .../provenance/ProvenanceCollector.java         |   2 +-
 .../TriplestoreProvenanceCollector.java         |   8 +-
 .../provenance/rdf/BaseProvenanceModel.java     |   4 +-
 .../provenance/rdf/RDFProvenanceModel.java      |   2 +-
 .../TriplestoreProvenanceCollectorTest.java     |   2 +-
 .../provenance/rdf/BaseProvenanceModelTest.java |   2 +-
 .../AccumuloNamespaceTableIterator.java         |   4 +-
 .../rya/accumulo/AccumuloRdfConfiguration.java  |   6 +-
 .../rya/accumulo/AccumuloRdfConstants.java      |   2 +-
 .../rya/accumulo/AccumuloRdfEvalStatsDAO.java   |  28 ++---
 .../rya/accumulo/AccumuloRdfQueryIterator.java  |  16 +--
 .../apache/rya/accumulo/AccumuloRdfUtils.java   |   8 +-
 .../org/apache/rya/accumulo/AccumuloRyaDAO.java |  42 +++----
 .../accumulo/DefineTripleQueryRangeFactory.java |  10 +-
 .../apache/rya/accumulo/RyaTableKeyValues.java  |  18 +--
 .../rya/accumulo/RyaTableMutationsFactory.java  |  22 ++--
 .../experimental/AbstractAccumuloIndexer.java   |   6 +-
 .../accumulo/experimental/AccumuloIndexer.java  |   6 +-
 .../AccumuloRyaInstanceDetailsRepository.java   |   6 +-
 .../accumulo/instance/RyaDetailsSerializer.java |   6 +-
 .../accumulo/query/AccumuloRyaQueryEngine.java  |  44 +++----
 .../query/KeyValueToRyaStatementFunction.java   |  14 +--
 .../accumulo/query/RangeBindingSetEntries.java  |   2 +-
 .../RyaStatementBindingSetKeyValueIterator.java |  18 +--
 .../query/RyaStatementKeyValueIterator.java     |  16 +--
 .../query/ScannerBaseCloseableIterable.java     |   2 +-
 .../rya/accumulo/utils/TimeRangeFilter.java     |   2 +-
 .../accumulo/utils/VisibilitySimplifier.java    |   2 +-
 .../org/apache/rya/accumulo/AccumuloITBase.java |   2 +-
 .../accumulo/AccumuloRdfConfigurationTest.java  |   2 +-
 .../apache/rya/accumulo/AccumuloRyaDAOTest.java |  18 +--
 .../apache/rya/accumulo/AccumuloRyaITBase.java  |  26 ++---
 .../DefineTripleQueryRangeFactoryTest.java      |  14 +--
 .../accumulo/MiniAccumuloClusterInstance.java   |   2 +-
 .../AccumuloRyaDetailsRepositoryIT.java         |  38 +++---
 .../utils/VisibilitySimplifierTest.java         |   2 +-
 .../rya/mongodb/MongoConnectorFactory.java      |   2 +-
 .../apache/rya/mongodb/MongoDBQueryEngine.java  |  24 ++--
 .../rya/mongodb/MongoDBRdfConfiguration.java    |   6 +-
 .../org/apache/rya/mongodb/MongoDBRyaDAO.java   |  26 ++---
 .../apache/rya/mongodb/MongoSecondaryIndex.java |   4 +-
 .../mongodb/dao/MongoDBNamespaceManager.java    |  10 +-
 .../rya/mongodb/dao/MongoDBStorageStrategy.java |   6 +-
 .../dao/SimpleMongoDBNamespaceManager.java      |   6 +-
 .../dao/SimpleMongoDBStorageStrategy.java       |  10 +-
 .../mongodb/instance/MongoDetailsAdapter.java   |  24 ++--
 .../MongoRyaInstanceDetailsRepository.java      |   8 +-
 .../NonCloseableRyaStatementCursorIterator.java |   6 +-
 .../RyaStatementBindingSetCursorIterator.java   |  10 +-
 .../iter/RyaStatementCursorIterable.java        |   8 +-
 .../iter/RyaStatementCursorIterator.java        |  10 +-
 .../rya/mongodb/MongoDBQueryEngineTest.java     |  12 +-
 .../org/apache/rya/mongodb/MongoDBRyaDAOIT.java |  14 +--
 .../apache/rya/mongodb/MongoDBRyaDAOTest.java   |  12 +-
 .../SimpleMongoDBStorageStrategyTest.java       |  12 +-
 .../instance/MongoDetailsAdapterTest.java       |  26 ++---
 .../instance/MongoRyaDetailsRepositoryIT.java   |  34 +++---
 .../documentIndex/DocIndexIteratorUtil.java     |   2 +-
 .../DocumentIndexIntersectingIterator.java      |   2 +-
 .../rya/accumulo/documentIndex/TextColumn.java  |   2 +-
 .../iterators/BindingSetHashJoinIterator.java   |   4 +-
 .../pcj/iterators/IteratorCombiner.java         |   2 +-
 .../PCJKeyToCrossProductBindingSetIterator.java |   4 +-
 .../PCJKeyToJoinBindingSetIterator.java         |   6 +-
 .../client/accumulo/AccumuloBatchUpdatePCJ.java |  40 +++----
 .../api/client/accumulo/AccumuloCommand.java    |   2 +-
 .../accumulo/AccumuloConnectionDetails.java     |   2 +-
 .../api/client/accumulo/AccumuloCreatePCJ.java  |  40 +++----
 .../api/client/accumulo/AccumuloDeletePCJ.java  |  20 ++--
 .../accumulo/AccumuloGetInstanceDetails.java    |  20 ++--
 .../api/client/accumulo/AccumuloInstall.java    |  48 ++++----
 .../client/accumulo/AccumuloInstanceExists.java |  10 +-
 .../client/accumulo/AccumuloListInstances.java  |   8 +-
 .../accumulo/AccumuloRyaClientFactory.java      |   4 +-
 .../api/client/accumulo/FluoClientFactory.java  |   2 +-
 .../org/apache/rya/indexing/DocIdIndexer.java   |   4 +-
 .../rya/indexing/FilterFunctionOptimizer.java   |  18 +--
 .../apache/rya/indexing/FreeTextIndexer.java    |   4 +-
 .../org/apache/rya/indexing/GeoConstants.java   |   2 +-
 .../ExternalIndexMatcher.java                   |   2 +-
 .../GeneralizedExternalProcessor.java           |   6 +-
 .../IndexPlanValidator/IndexListPruner.java     |   4 +-
 .../IndexPlanValidator/IndexPlanValidator.java  |   4 +-
 .../IndexPlanValidator/IndexTupleGenerator.java |   2 +-
 .../IndexedExecutionPlanGenerator.java          |   6 +-
 .../IndexedQueryPlanSelector.java               |   2 +-
 .../ThreshholdPlanSelector.java                 |   4 +-
 .../TupleExecutionPlanGenerator.java            |   4 +-
 .../IndexPlanValidator/TupleReArranger.java     |   8 +-
 .../IndexPlanValidator/TupleValidator.java      |   2 +-
 .../ValidIndexCombinationGenerator.java         |   4 +-
 .../VarConstantIndexListPruner.java             |   4 +-
 .../org/apache/rya/indexing/IndexingExpr.java   |   2 +-
 .../rya/indexing/IndexingFunctionRegistry.java  |   2 +-
 .../apache/rya/indexing/IteratorFactory.java    |   2 +-
 .../java/org/apache/rya/indexing/KeyParts.java  |   2 +-
 .../java/org/apache/rya/indexing/Md5Hash.java   |   2 +-
 .../org/apache/rya/indexing/SearchFunction.java |   2 +-
 .../rya/indexing/SearchFunctionFactory.java     |   2 +-
 .../rya/indexing/StatementConstraints.java      |   2 +-
 .../rya/indexing/StatementSerializer.java       |   2 +-
 .../apache/rya/indexing/TemporalIndexer.java    |   4 +-
 .../apache/rya/indexing/TemporalInstant.java    |   2 +-
 .../rya/indexing/TemporalInstantRfc3339.java    |   2 +-
 .../apache/rya/indexing/TemporalInterval.java   |   2 +-
 .../apache/rya/indexing/TemporalTupleSet.java   |   4 +-
 .../rya/indexing/accumulo/ConfigUtils.java      |  28 ++---
 .../accumulo/entity/AccumuloDocIdIndexer.java   |  26 ++---
 .../accumulo/entity/EntityCentricIndex.java     |  32 ++---
 .../entity/EntityLocalityGroupSetter.java       |   4 +-
 .../accumulo/entity/EntityOptimizer.java        |  18 +--
 .../accumulo/entity/EntityTupleSet.java         |  22 ++--
 .../rya/indexing/accumulo/entity/StarQuery.java |  16 +--
 .../freetext/AccumuloFreeTextIndexer.java       |  46 ++++----
 .../accumulo/freetext/ColumnPrefixes.java       |   4 +-
 .../accumulo/freetext/FreeTextTupleSet.java     |  14 +--
 .../accumulo/freetext/LuceneTokenizer.java      |   2 +-
 .../accumulo/freetext/SimpleTokenizer.java      |   2 +-
 .../indexing/accumulo/freetext/Tokenizer.java   |   2 +-
 .../freetext/iterators/AndingIterator.java      |   2 +-
 .../freetext/iterators/BooleanTreeIterator.java |  30 ++---
 .../accumulo/freetext/query/ASTExpression.java  |   2 +-
 .../accumulo/freetext/query/ASTNodeUtils.java   |   2 +-
 .../accumulo/freetext/query/ASTSimpleNode.java  |   2 +-
 .../accumulo/freetext/query/ASTTerm.java        |   2 +-
 .../freetext/query/JJTQueryParserState.java     |   2 +-
 .../indexing/accumulo/freetext/query/Node.java  |   2 +-
 .../accumulo/freetext/query/ParseException.java |   2 +-
 .../accumulo/freetext/query/QueryParser.java    |   2 +-
 .../freetext/query/QueryParserConstants.java    |   2 +-
 .../freetext/query/QueryParserTokenManager.java |   2 +-
 .../query/QueryParserTreeConstants.java         |   2 +-
 .../freetext/query/SimpleCharStream.java        |   2 +-
 .../accumulo/freetext/query/SimpleNode.java     |   2 +-
 .../indexing/accumulo/freetext/query/Token.java |   2 +-
 .../accumulo/freetext/query/TokenMgrError.java  |   2 +-
 .../temporal/AccumuloTemporalIndexer.java       |  26 ++---
 .../external/PrecomputedJoinIndexer.java        |  16 +--
 .../external/PrecomputedJoinIndexerConfig.java  |   6 +-
 .../PrecomputedJoinStorageSupplier.java         |   6 +-
 .../PrecomputedJoinUpdaterSupplier.java         |   6 +-
 .../accumulo/AccumuloPcjStorageConfig.java      |   4 +-
 .../accumulo/AccumuloPcjStorageSupplier.java    |   6 +-
 .../indexing/external/fluo/FluoPcjUpdater.java  |   4 +-
 .../external/fluo/FluoPcjUpdaterConfig.java     |   4 +-
 .../external/fluo/FluoPcjUpdaterSupplier.java   |  18 +--
 .../rya/indexing/external/fluo/NoOpUpdater.java |   6 +-
 .../external/fluo/NoOpUpdaterSupplier.java      |   4 +-
 .../fluo/PcjUpdaterSupplierFactory.java         |   6 +-
 .../external/tupleSet/AccumuloIndexSet.java     |  22 ++--
 .../external/tupleSet/ExternalTupleSet.java     |   2 +-
 .../external/tupleSet/ParsedQueryUtil.java      |   2 +-
 .../tupleSet/SimpleExternalTupleSet.java        |   2 +-
 .../indexing/mongodb/AbstractMongoIndexer.java  |  18 +--
 .../mongodb/IndexingMongoDBStorageStrategy.java |   6 +-
 .../mongodb/freetext/MongoFreeTextIndexer.java  |  10 +-
 .../freetext/TextMongoDBStorageStrategy.java    |   6 +-
 .../mongodb/temporal/MongoTemporalIndexer.java  |  20 ++--
 .../TemporalMongoDBStorageStrategy.java         |  10 +-
 .../pcj/matching/AbstractPCJMatcher.java        |   6 +-
 .../pcj/matching/AbstractQuerySegment.java      |   4 +-
 .../pcj/matching/FlattenedOptional.java         |   6 +-
 .../rya/indexing/pcj/matching/JoinSegment.java  |   8 +-
 .../pcj/matching/JoinSegmentPCJMatcher.java     |   4 +-
 .../pcj/matching/OptionalJoinSegment.java       |   8 +-
 .../matching/OptionalJoinSegmentPCJMatcher.java |   4 +-
 .../rya/indexing/pcj/matching/PCJMatcher.java   |   4 +-
 .../pcj/matching/PCJMatcherFactory.java         |   2 +-
 .../pcj/matching/PCJNodeConsolidator.java       |   2 +-
 .../rya/indexing/pcj/matching/PCJOptimizer.java |  26 ++---
 .../pcj/matching/PCJOptimizerUtilities.java     |   6 +-
 .../pcj/matching/QueryNodesToTupleExpr.java     |   2 +-
 .../rya/indexing/pcj/matching/QuerySegment.java |   6 +-
 .../pcj/matching/QueryVariableNormalizer.java   |   2 +-
 .../pcj/matching/TopOfQueryFilterRelocator.java |   2 +-
 .../rya/sail/config/RyaAccumuloSailConfig.java  |   4 +-
 .../rya/sail/config/RyaAccumuloSailFactory.java |  12 +-
 .../apache/rya/sail/config/RyaSailFactory.java  |  36 +++---
 .../ValidIndexCombinationGeneratorTest.java     |   8 +-
 .../DocumentIndexIntersectingIteratorTest.java  |  22 ++--
 .../accumulo/AccumuloBatchUpdatePCJIT.java      |  18 +--
 .../client/accumulo/AccumuloCreatePCJIT.java    |  20 ++--
 .../client/accumulo/AccumuloDeletePCJIT.java    |  10 +-
 .../accumulo/AccumuloGetInstanceDetailsIT.java  |  36 +++---
 .../api/client/accumulo/AccumuloInstallIT.java  |  18 +--
 .../accumulo/AccumuloInstanceExistsIT.java      |  10 +-
 .../accumulo/AccumuloListInstancesIT.java       |  12 +-
 .../rya/api/client/accumulo/FluoITBase.java     |  26 ++---
 .../GeneralizedExternalProcessorTest.java       |   6 +-
 .../IndexPlanValidatorTest.java                 |   8 +-
 .../IndexedExecutionPlanGeneratorTest.java      |   6 +-
 .../ThreshholdPlanSelectorTest.java             |   8 +-
 .../TupleExecutionPlanGeneratorTest.java        |   2 +-
 .../IndexPlanValidator/TupleReArrangerTest.java |   2 +-
 .../ValidIndexCombinationGeneratorTest.java     |   6 +-
 .../VarConstantIndexListPrunerTest.java         |   6 +-
 .../accumulo/StatementSerializerTest.java       |   4 +-
 .../accumulo/entity/AccumuloDocIndexerTest.java |  20 ++--
 .../accumulo/entity/EntityCentricIndexTest.java |  14 +--
 .../accumulo/entity/EntityOptimizerTest.java    |  20 ++--
 .../indexing/accumulo/entity/StarQueryTest.java |  14 +--
 .../freetext/AccumuloFreeTextIndexerTest.java   |  18 +--
 .../freetext/query/QueryParserTest.java         |  14 +--
 .../temporal/AccumuloTemporalIndexerTest.java   |  28 ++---
 .../accumulo/temporal/TemporalInstantTest.java  |   6 +-
 .../accumulo/temporal/TemporalIntervalTest.java |   8 +-
 .../AccumuloConstantPcjIntegrationTest.java     |   6 +-
 .../external/AccumuloPcjIntegrationTest.java    |  22 ++--
 .../indexing/external/PCJOptionalTestIT.java    |  16 +--
 .../external/PcjIntegrationTestingUtil.java     |  16 +--
 .../PrecompJoinOptimizerIntegrationTest.java    |   6 +-
 .../external/PrecompJoinOptimizerTest.java      |   8 +-
 .../external/PrecompJoinOptimizerTest2.java     |  10 +-
 .../PrecompJoinOptimizerVarToConstTest.java     |   8 +-
 .../PrecomputedJoinStorageSupplierTest.java     |   6 +-
 .../PrecomputedJoinUpdaterSupplierTest.java     |   8 +-
 .../AccumuloIndexSetColumnVisibilityTest.java   |  32 ++---
 .../external/tupleSet/AccumuloIndexSetTest.java |  22 ++--
 .../external/tupleSet/ParsedQueryUtilTest.java  |   2 +-
 .../tupleSet/QueryVariableNormalizerTest.java   |   4 +-
 .../tupleSet/SimpleExternalTupleSetTest.java    |   2 +-
 .../VarConstQueryVariableNormalizerTest.java    |   4 +-
 .../mongo/MongoFreeTextIndexerTest.java         |  22 ++--
 .../mongo/MongoTemporalIndexerTest.java         |  26 ++---
 .../pcj/matching/FlattenedOptionalTest.java     |   2 +-
 .../pcj/matching/JoinSegmentPCJMatcherTest.java |   6 +-
 .../indexing/pcj/matching/JoinSegmentTest.java  |   4 +-
 .../OptionalJoinSegmentPCJMatcherTest.java      |   6 +-
 .../pcj/matching/OptionalJoinSegmentTest.java   |   4 +-
 .../pcj/matching/PCJNodeConsolidatorTest.java   |   2 +-
 .../indexing/pcj/matching/PCJOptimizerTest.java |   8 +-
 .../pcj/matching/PCJOptimizerUtilitesTest.java  |   4 +-
 .../sail/config/RyaAccumuloSailFactoryTest.java |   6 +-
 .../src/main/java/EntityDirectExample.java      |   6 +-
 .../src/main/java/MongoRyaDirectExample.java    |  14 +--
 .../src/main/java/RyaClientExample.java         |  16 +--
 .../src/main/java/RyaDirectExample.java         |  18 +--
 .../benchmark/query/PCJOptimizerBenchmark.java  |   6 +-
 .../rya/benchmark/query/QueryBenchmark.java     |  10 +-
 .../benchmark/query/QueryBenchmarkRunIT.java    |  18 +--
 .../org/apache/rya/shell/RyaAdminCommands.java  |  30 ++---
 .../org/apache/rya/shell/RyaBannerProvider.java |   2 +-
 .../apache/rya/shell/RyaConnectionCommands.java |  18 +--
 .../org/apache/rya/shell/RyaPromptProvider.java |   4 +-
 .../org/apache/rya/shell/SharedShellState.java  |   6 +-
 .../apache/rya/shell/util/ConnectorFactory.java |   2 +-
 .../apache/rya/shell/util/InstallPrompt.java    |   4 +-
 .../rya/shell/util/InstanceNamesFormatter.java  |   2 +-
 .../org/apache/rya/shell/util/JLinePrompt.java  |   2 +-
 .../apache/rya/shell/util/PasswordPrompt.java   |   2 +-
 .../rya/shell/util/RyaDetailsFormatter.java     |   8 +-
 .../org/apache/rya/shell/util/SparqlPrompt.java |   2 +-
 .../apache/rya/shell/RyaAdminCommandsTest.java  |  54 ++++-----
 .../rya/shell/RyaConnectionCommandsIT.java      |  12 +-
 .../apache/rya/shell/RyaPromptProviderTest.java |   6 +-
 .../org/apache/rya/shell/RyaShellITBase.java    |   4 +-
 .../apache/rya/shell/SharedShellStateTest.java  |  10 +-
 .../rya/shell/util/ConnectorFactoryIT.java      |   4 +-
 .../shell/util/InstanceNamesFormatterTest.java  |   2 +-
 .../rya/shell/util/RyaDetailsFormatterTest.java |  24 ++--
 .../GeoEnabledFilterFunctionOptimizer.java      |  24 ++--
 .../org/apache/rya/indexing/GeoIndexer.java     |   4 +-
 .../apache/rya/indexing/GeoRyaSailFactory.java  |  36 +++---
 .../rya/indexing/OptionalConfigUtils.java       |  34 +++---
 .../accumulo/geo/GeoMesaGeoIndexer.java         |  22 ++--
 .../indexing/accumulo/geo/GeoParseUtils.java    |   4 +-
 .../rya/indexing/accumulo/geo/GeoTupleSet.java  |  16 +--
 .../mongodb/geo/GeoMongoDBStorageStrategy.java  |  10 +-
 .../indexing/mongodb/geo/MongoGeoIndexer.java   |  20 ++--
 .../indexing/mongodb/geo/MongoGeoTupleSet.java  |  18 +--
 .../indexing/accumulo/geo/GeoIndexerSfTest.java |  16 +--
 .../indexing/accumulo/geo/GeoIndexerTest.java   |  12 +-
 .../indexing/mongo/MongoGeoIndexerSfTest.java   |  20 ++--
 .../rya/indexing/mongo/MongoGeoIndexerTest.java |  16 +--
 .../storage/accumulo/AccumuloPcjSerializer.java |  16 +--
 .../storage/accumulo/AccumuloPcjStorage.java    |  18 +--
 .../accumulo/BindingSetStringConverter.java     |   4 +-
 .../pcj/update/PrecomputedJoinUpdater.java      |   2 +-
 .../accumulo/AccumuloPcjSerialzerTest.java      |   2 +-
 .../accumulo/PcjTablesIntegrationTest.java      |  12 +-
 .../storage/accumulo/PcjTablesWithMockTest.java |  10 +-
 .../accumulo/accumulo/AccumuloPcjStorageIT.java |  12 +-
 .../AbstractDualInstanceAccumuloMRTool.java     |  12 +-
 .../apache/rya/accumulo/mr/merge/CopyTool.java  |  46 ++++----
 .../apache/rya/accumulo/mr/merge/MergeTool.java |  28 ++---
 .../accumulo/mr/merge/common/InstanceType.java  |   4 +-
 .../mr/merge/gui/DateTimePickerDialog.java      |   4 +-
 .../merge/mappers/AccumuloCopyToolMapper.java   |   4 +-
 .../mr/merge/mappers/AccumuloRyaRuleMapper.java |   8 +-
 .../mr/merge/mappers/BaseCopyToolMapper.java    |  20 ++--
 .../mr/merge/mappers/BaseRuleMapper.java        |  34 +++---
 .../mr/merge/mappers/FileCopyToolMapper.java    |  16 +--
 .../mr/merge/mappers/MergeToolMapper.java       |  38 +++---
 .../mr/merge/mappers/RowRuleMapper.java         |  16 +--
 .../mr/merge/reducers/MultipleFileReducer.java  |   6 +-
 .../mr/merge/util/AccumuloInstanceDriver.java   |  18 +--
 .../mr/merge/util/AccumuloQueryRuleset.java     |  22 ++--
 .../mr/merge/util/AccumuloRyaUtils.java         |  24 ++--
 .../rya/accumulo/mr/merge/util/CopyRule.java    |   6 +-
 .../rya/accumulo/mr/merge/util/GroupedRow.java  |   4 +-
 .../accumulo/mr/merge/util/QueryRuleset.java    |  34 +++---
 .../rya/accumulo/mr/merge/util/TimeUtils.java   |   4 +-
 .../accumulo/mr/merge/util/ToolConfigUtils.java |   4 +-
 .../rya/accumulo/mr/merge/CopyToolTest.java     |  40 +++----
 .../rya/accumulo/mr/merge/MergeToolTest.java    |  38 +++---
 .../rya/accumulo/mr/merge/RulesetCopyIT.java    |  38 +++---
 .../accumulo/mr/merge/demo/CopyToolDemo.java    |  42 +++----
 .../accumulo/mr/merge/demo/MergeToolDemo.java   |  34 +++---
 .../mr/merge/demo/util/DemoUtilities.java       |   4 +-
 .../driver/AccumuloDualInstanceDriver.java      |  14 +--
 .../merge/driver/MiniAccumuloClusterDriver.java |  20 ++--
 .../rya/accumulo/mr/merge/util/TestUtils.java   |  14 +--
 .../indexing/pcj/fluo/api/InsertTriples.java    |  10 +-
 .../pcj/fluo/app/FluoStringConverter.java       |   4 +-
 .../rya/indexing/pcj/fluo/app/IncUpdateDAO.java |  10 +-
 .../fluo/app/observers/QueryResultObserver.java |   2 +-
 .../pcj/fluo/client/PcjAdminClient.java         |   8 +-
 .../pcj/fluo/client/PcjAdminClientCommand.java  |   2 +-
 .../CountUnprocessedStatementsCommand.java      |   2 +-
 .../fluo/client/command/ListQueriesCommand.java |   2 +-
 .../fluo/client/command/LoadTriplesCommand.java |   2 +-
 .../fluo/client/command/NewQueryCommand.java    |   2 +-
 .../fluo/client/command/QueryReportCommand.java |   2 +-
 .../pcj/fluo/client/util/FluoLoader.java        |   4 +-
 .../apache/rya/indexing/pcj/fluo/demo/Demo.java |   2 +-
 .../rya/indexing/pcj/fluo/demo/DemoDriver.java  |  34 +++---
 .../pcj/fluo/demo/FluoAndHistoricPcjsDemo.java  |  10 +-
 .../apache/rya/indexing/pcj/fluo/ITBase.java    |  28 ++---
 .../pcj/fluo/api/CountStatementsIT.java         |   4 +-
 .../indexing/pcj/fluo/api/GetQueryReportIT.java |   2 +-
 .../indexing/pcj/fluo/integration/InputIT.java  |   2 +-
 .../indexing/pcj/fluo/integration/QueryIT.java  |   2 +-
 .../pcj/fluo/integration/RyaExportIT.java       |   2 +-
 .../RyaInputIncrementalUpdateIT.java            |   4 +-
 .../pcj/fluo/visibility/PcjVisibilityIT.java    |  16 +--
 .../rya/prospector/domain/IndexEntry.groovy     |   2 +-
 .../domain/IntermediateProspect.groovy          |   4 +-
 .../rya/prospector/domain/TripleValueType.java  |   2 +-
 .../apache/rya/prospector/mr/Prospector.groovy  |  10 +-
 .../rya/prospector/mr/ProspectorCombiner.groovy |  10 +-
 .../rya/prospector/mr/ProspectorMapper.groovy   |  18 +--
 .../rya/prospector/mr/ProspectorReducer.groovy  |  10 +-
 .../rya/prospector/plans/IndexWorkPlan.groovy   |   8 +-
 .../plans/IndexWorkPlanManager.groovy           |   2 +-
 .../rya/prospector/plans/impl/CountPlan.groovy  |  20 ++--
 .../ServicesBackedIndexWorkPlanManager.groovy   |   6 +-
 .../prospector/service/ProspectorService.groovy |  16 +--
 .../ProspectorServiceEvalStatsDAO.groovy        |  14 +--
 .../rya/prospector/utils/CustomEntry.groovy     |   2 +-
 .../prospector/utils/ProspectorConstants.groovy |   2 +-
 .../rya/prospector/utils/ProspectorUtils.groovy |   6 +-
 .../joinselect/AccumuloSelectivityEvalDAO.java  |  14 +--
 .../rya/joinselect/CardinalityCalcUtil.java     |   2 +-
 .../apache/rya/joinselect/mr/FullTableSize.java |  10 +-
 .../rya/joinselect/mr/JoinSelectAggregate.java  |  22 ++--
 .../rya/joinselect/mr/JoinSelectDriver.java     |   2 +-
 .../joinselect/mr/JoinSelectProspectOutput.java |  16 +--
 .../joinselect/mr/JoinSelectSpoTableOutput.java |  28 ++---
 .../joinselect/mr/JoinSelectStatisticsSum.java  |  14 +--
 .../rya/joinselect/mr/utils/CardList.java       |   2 +-
 .../joinselect/mr/utils/CardinalityType.java    |   2 +-
 .../rya/joinselect/mr/utils/CompositeType.java  |   2 +-
 .../mr/utils/JoinSelectConstants.java           |   2 +-
 .../mr/utils/JoinSelectStatsUtil.java           |  18 +--
 .../rya/joinselect/mr/utils/TripleCard.java     |   2 +-
 .../rya/joinselect/mr/utils/TripleEntry.java    |   2 +-
 .../rya/prospector/mr/ProspectorTest.groovy     |  24 ++--
 .../ProspectorServiceEvalStatsDAOTest.groovy    |  16 +--
 .../AccumuloSelectivityEvalDAOTest.java         |  14 +--
 .../mr/CardinalityIdentityReducerTest.java      |   6 +-
 .../joinselect/mr/CardinalityMapperTest.java    |  10 +-
 .../rya/joinselect/mr/FullTableSizeTest.java    |   4 +-
 .../rya/joinselect/mr/JoinReducerTest.java      |  14 +--
 .../rya/joinselect/mr/JoinSelectMapperTest.java |  26 ++---
 .../mr/JoinSelectProspectOutputTest.java        |  10 +-
 .../mr/JoinSelectStatisticsSumTest.java         |   8 +-
 .../joinselect/mr/JoinSelectStatisticsTest.java |  66 +++++------
 .../apache/rya/reasoning/AbstractReasoner.java  |   2 +-
 .../org/apache/rya/reasoning/Derivation.java    |   4 +-
 .../java/org/apache/rya/reasoning/Fact.java     |   6 +-
 .../org/apache/rya/reasoning/LocalReasoner.java |   2 +-
 .../java/org/apache/rya/reasoning/OWL2.java     |   2 +-
 .../java/org/apache/rya/reasoning/OwlClass.java |   2 +-
 .../org/apache/rya/reasoning/OwlProperty.java   |   2 +-
 .../java/org/apache/rya/reasoning/OwlRule.java  |   2 +-
 .../java/org/apache/rya/reasoning/Schema.java   |   2 +-
 .../org/apache/rya/reasoning/TypeReasoner.java  |   2 +-
 .../rya/reasoning/mr/AbstractReasoningTool.java |  14 +--
 .../rya/reasoning/mr/ConformanceTest.java       |   8 +-
 .../rya/reasoning/mr/DuplicateElimination.java  |   8 +-
 .../apache/rya/reasoning/mr/ForwardChain.java   |  14 +--
 .../rya/reasoning/mr/MRReasoningUtils.java      |  28 ++---
 .../org/apache/rya/reasoning/mr/OutputTool.java |   8 +-
 .../rya/reasoning/mr/ReasoningDriver.java       |   2 +-
 .../rya/reasoning/mr/ResourceWritable.java      |   2 +-
 .../apache/rya/reasoning/mr/RunStatistics.java  |   2 +-
 .../apache/rya/reasoning/mr/SchemaFilter.java   |   8 +-
 .../apache/rya/reasoning/mr/SchemaWritable.java |   8 +-
 .../apache/rya/reasoning/LocalReasonerTest.java |   2 +-
 .../apache/rya/reasoning/ReasonerFactTest.java  |   2 +-
 .../rya/reasoning/SchemaReasoningTest.java      |   2 +-
 .../org/apache/rya/reasoning/SchemaTest.java    |   2 +-
 .../org/apache/rya/reasoning/TestUtils.java     |   6 +-
 .../reasoning/mr/DuplicateEliminationTest.java  |  22 ++--
 .../rya/reasoning/mr/ForwardChainTest.java      |  22 ++--
 .../rya/accumulo/mr/AbstractAccumuloMRTool.java |  14 +--
 .../mr/AccumuloHDFSFileInputFormat.java         |   2 +-
 .../org/apache/rya/accumulo/mr/MRUtils.java     |   4 +-
 .../rya/accumulo/mr/RdfFileInputFormat.java     |   8 +-
 .../apache/rya/accumulo/mr/RyaInputFormat.java  |  14 +--
 .../apache/rya/accumulo/mr/RyaOutputFormat.java |  34 +++---
 .../rya/accumulo/mr/RyaStatementWritable.java   |  18 +--
 .../accumulo/mr/examples/TextOutputExample.java |  20 ++--
 .../accumulo/mr/tools/AccumuloRdfCountTool.java |  22 ++--
 .../rya/accumulo/mr/tools/RdfFileInputTool.java |  10 +-
 .../rya/accumulo/mr/tools/Upgrade322Tool.java   |   8 +-
 .../rya/accumulo/mr/RdfFileInputFormatTest.java |   4 +-
 .../rya/accumulo/mr/RyaInputFormatTest.java     |  18 +--
 .../rya/accumulo/mr/RyaOutputFormatTest.java    |  36 +++---
 .../accumulo/mr/RyaStatementWritableTest.java   |  12 +-
 .../org/apache/rya/accumulo/mr/TestUtils.java   |  14 +--
 .../mr/tools/AccumuloRdfCountToolTest.java      |  16 +--
 .../accumulo/mr/tools/RdfFileInputToolTest.java |  16 +--
 .../accumulo/mr/tools/Upgrade322ToolTest.java   |  32 ++---
 .../tools/UpgradeObjectSerializationTest.java   |   6 +-
 .../rya/alx/command/AbstractRyaCommand.java     |   4 +-
 .../alx/command/GetStatementsRyaCommand.java    |   4 +-
 .../apache/rya/alx/command/InfoRyaCommand.java  |   4 +-
 .../rya/alx/util/ConfigurationFactory.java      |   6 +-
 .../rya/camel/cbsail/CbSailComponent.java       |   2 +-
 .../apache/rya/camel/cbsail/CbSailEndpoint.java |   2 +-
 .../apache/rya/camel/cbsail/CbSailProducer.java |   8 +-
 .../rya/camel/cbsail/CbSailIntegrationTest.java |  12 +-
 .../apache/rya/camel/cbsail/CbSailPojoMain.java |   4 +-
 .../org/apache/rya/camel/cbsail/CbSailTest.java |  18 +--
 .../rya/accumulo/pig/AccumuloStorage.java       |   2 +-
 .../rya/accumulo/pig/IndexWritingTool.java      |   2 +-
 .../rya/accumulo/pig/SparqlQueryPigEngine.java  |  24 ++--
 .../pig/SparqlToPigTransformVisitor.java        |   8 +-
 .../accumulo/pig/StatementPatternStorage.java   |  34 +++---
 .../pig/optimizer/SimilarVarJoinOptimizer.java  |   2 +-
 .../rya/accumulo/pig/AccumuloStorageTest.java   |   2 +-
 .../rya/accumulo/pig/IndexWritingToolTest.java  |   2 +-
 .../accumulo/pig/SparqlQueryPigEngineTest.java  |   4 +-
 .../pig/SparqlToPigTransformVisitorTest.java    |   4 +-
 .../pig/StatementPatternStorageTest.java        |  14 +--
 .../rya/rdftriplestore/RdfCloudTripleStore.java |  18 +--
 .../RdfCloudTripleStoreConnection.java          |  60 +++++-----
 .../rya/rdftriplestore/RyaSailRepository.java   |   2 +-
 .../RyaSailRepositoryConnection.java            |   4 +-
 .../evaluation/ExternalBatchingIterator.java    |   2 +-
 .../ExternalMultipleBindingSetsIterator.java    |   2 +-
 .../evaluation/FilterRangeVisitor.java          |  12 +-
 .../evaluation/MultipleBindingSetsIterator.java |   2 +-
 .../ParallelEvaluationStrategyImpl.java         |  18 +--
 .../evaluation/ParallelJoinIterator.java        |   2 +-
 .../evaluation/PushJoinDownVisitor.java         |   2 +-
 .../evaluation/QueryJoinOptimizer.java          |   2 +-
 .../evaluation/QueryJoinSelectOptimizer.java    |  10 +-
 ...RdfCloudTripleStoreEvaluationStatistics.java |  12 +-
 ...pleStoreSelectivityEvaluationStatistics.java |  12 +-
 .../evaluation/ReorderJoinVisitor.java          |   2 +-
 .../evaluation/SeparateFilterJoinsVisitor.java  |   2 +-
 .../inference/AbstractInferVisitor.java         |  12 +-
 .../rdftriplestore/inference/DoNotExpandSP.java |   2 +-
 .../inference/InferConstants.java               |   2 +-
 .../rya/rdftriplestore/inference/InferJoin.java |   2 +-
 .../rdftriplestore/inference/InferUnion.java    |   2 +-
 .../inference/InferenceEngine.java              |  10 +-
 .../inference/InferenceEngineException.java     |   2 +-
 .../inference/InverseOfVisitor.java             |   4 +-
 .../rdftriplestore/inference/InverseURI.java    |   2 +-
 .../inference/PropertyChainVisitor.java         |  10 +-
 .../rdftriplestore/inference/SameAsVisitor.java |  10 +-
 .../inference/SubClassOfVisitor.java            |  10 +-
 .../inference/SubPropertyOfVisitor.java         |  10 +-
 .../inference/SymmetricPropertyVisitor.java     |   4 +-
 .../inference/TransitivePropertyVisitor.java    |   8 +-
 .../namespace/NamespaceManager.java             |  10 +-
 .../utils/CombineContextsRdfInserter.java       |   2 +-
 .../rdftriplestore/utils/DefaultStatistics.java |   2 +-
 .../utils/FixedStatementPattern.java            |   2 +-
 .../utils/TransitivePropertySP.java             |   2 +-
 .../apache/rya/ArbitraryLengthQueryTest.java    |  14 +--
 .../test/java/org/apache/rya/HashJoinTest.java  |  18 +--
 .../java/org/apache/rya/IterativeJoinTest.java  |  18 +--
 .../test/java/org/apache/rya/MergeJoinTest.java |  18 +--
 .../rya/RdfCloudTripleStoreConnectionTest.java  |  46 ++++----
 .../org/apache/rya/RdfCloudTripleStoreTest.java |  70 +++++------
 .../rya/RdfCloudTripleStoreUtilsTest.java       |   4 +-
 .../QueryJoinSelectOptimizerTest.java           |  18 +--
 ...toreSelectivityEvaluationStatisticsTest.java |  14 +--
 .../inference/PropertyChainTest.java            |  14 +--
 .../rya/triplestore/inference/SameAsTest.java   |  14 +--
 .../cloudbase/sail/AbstractRDFWebServlet.java   |   6 +-
 .../web/cloudbase/sail/DeleteDataServlet.java   |   4 +-
 .../rdf/web/cloudbase/sail/LoadDataServlet.java |   2 +-
 .../web/cloudbase/sail/QueryDataServlet.java    |   2 +-
 .../cloudbase/sail/QuerySerqlDataServlet.java   |   2 +-
 .../rdf/web/cloudbase/sail/RDFWebConstants.java |   2 +-
 .../cloud/rdf/web/sail/RdfController.java       |  10 +-
 .../apache/cloud/rdf/web/sail/ResultFormat.java |   2 +-
 .../rdf/web/sail/SecurityProviderImpl.java      |   4 +-
 .../cloudbase/sail/DeleteDataServletRun.java    | 116 +++++++++----------
 .../web/cloudbase/sail/LoadDataServletRun.java  |   2 +-
 .../web/cloudbase/sail/QueryDataServletRun.java | 112 +++++++++---------
 .../rdf/web/sail/RdfControllerAccumuloTest.java |   2 +-
 .../cloud/rdf/web/sail/RdfControllerTest.java   |   2 +-
 632 files changed, 3260 insertions(+), 3260 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/InvalidValueTypeMarkerRuntimeException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/InvalidValueTypeMarkerRuntimeException.java b/common/rya.api/src/main/java/org/apache/rya/api/InvalidValueTypeMarkerRuntimeException.java
index eea50f4..3e01ab1 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/InvalidValueTypeMarkerRuntimeException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/InvalidValueTypeMarkerRuntimeException.java
@@ -1,4 +1,4 @@
-package mvm.rya.api;
+package org.apache.rya.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java
index 86e22a2..f1aa3cf 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConfiguration.java
@@ -1,4 +1,4 @@
-package mvm.rya.api;
+package org.apache.rya.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,9 +23,9 @@ package mvm.rya.api;
 
 import java.util.List;
 
-import mvm.rya.api.layout.TableLayoutStrategy;
-import mvm.rya.api.layout.TablePrefixLayoutStrategy;
-import mvm.rya.api.persist.RdfEvalStatsDAO;
+import org.apache.rya.api.layout.TableLayoutStrategy;
+import org.apache.rya.api.layout.TablePrefixLayoutStrategy;
+import org.apache.rya.api.persist.RdfEvalStatsDAO;
 
 import org.apache.hadoop.conf.Configuration;
 import org.openrdf.query.algebra.evaluation.QueryOptimizer;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java
index 5311bd9..5019a6e 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreConstants.java
@@ -1,4 +1,4 @@
-package mvm.rya.api;
+package org.apache.rya.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,9 +21,9 @@ package mvm.rya.api;
 
 
 
-import mvm.rya.api.domain.RyaSchema;
-import mvm.rya.api.domain.RyaType;
-import mvm.rya.api.domain.RyaURI;
+import org.apache.rya.api.domain.RyaSchema;
+import org.apache.rya.api.domain.RyaType;
+import org.apache.rya.api.domain.RyaURI;
 import org.apache.hadoop.io.Text;
 import org.openrdf.model.Literal;
 import org.openrdf.model.URI;
@@ -37,7 +37,7 @@ public class RdfCloudTripleStoreConstants {
     public static final String AUTH_NAMESPACE = RyaSchema.AUTH_NAMESPACE;
     public static ValueFactory VALUE_FACTORY = ValueFactoryImpl.getInstance();
     public static URI RANGE = VALUE_FACTORY.createURI(NAMESPACE, "range");
-    public static URI PARTITION_TIMERANGE = VALUE_FACTORY.createURI("urn:mvm.mmrts.partition.rdf/08/2011#", "timeRange");
+    public static URI PARTITION_TIMERANGE = VALUE_FACTORY.createURI("urn:org.apache.mmrts.partition.rdf/08/2011#", "timeRange");
     public static Literal EMPTY_LITERAL = VALUE_FACTORY.createLiteral(0);
     public static final byte EMPTY_BYTES[] = new byte[0];
     public static final Text EMPTY_TEXT = new Text();

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java
index 4a13c01..00ecb22 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreStatement.java
@@ -1,4 +1,4 @@
-package mvm.rya.api;
+package org.apache.rya.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java
index eeadb9b..0a366d7 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/RdfCloudTripleStoreUtils.java
@@ -1,4 +1,4 @@
-package mvm.rya.api;
+package org.apache.rya.api;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package mvm.rya.api;
 
 
 
-import mvm.rya.api.layout.TableLayoutStrategy;
-import mvm.rya.api.layout.TablePrefixLayoutStrategy;
+import org.apache.rya.api.layout.TableLayoutStrategy;
+import org.apache.rya.api.layout.TablePrefixLayoutStrategy;
 import org.openrdf.model.Literal;
 import org.openrdf.model.URI;
 import org.openrdf.model.Value;
@@ -36,7 +36,7 @@ import java.util.Map;
 import java.util.regex.Matcher;
 import java.util.regex.Pattern;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.TABLE_LAYOUT;
 
 public class RdfCloudTripleStoreUtils {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
index d6f3454..7fe77dd 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/BatchUpdatePCJ.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
index ae22ffe..57b4633 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/CreatePCJ.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
index 92b6b71..473361b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/DeletePCJ.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
index 536b5a8..a51076b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/GetInstanceDetails.java
@@ -16,13 +16,13 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 
 import com.google.common.base.Optional;
 
-import mvm.rya.api.instance.RyaDetails;
+import org.apache.rya.api.instance.RyaDetails;
 
 /**
  * Get configuration and maintenance information about a specific instance of Rya.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
index 28a0dc5..2e91b00 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/Install.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
index c8cc0aa..be08e9a 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceDoesNotExistException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
index 6f26fc6..8b207d9 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/InstanceExists.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
index 5edfbc4..f1396ad 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/ListInstances.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import java.util.List;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
index 89f095f..f58e7b4 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/PCJDoesNotExistException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java
index 851a273..8b52ad9 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClient.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
index 28c78aa..491fc35 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/client/RyaClientException.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.client;
+package org.apache.rya.api.client;
 
 import javax.annotation.ParametersAreNonnullByDefault;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java
index 199b63d..5b086d2 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/date/DateTimeTtlValueConverter.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.date;
+package org.apache.rya.api.date;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java
index de4ff8b..97e4804 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlStrValueConverter.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.date;
+package org.apache.rya.api.date;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java
index 75366dc..d2db8b1 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TimestampTtlValueConverter.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.date;
+package org.apache.rya.api.date;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java b/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java
index 1ba9841..b850002 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/date/TtlValueConverter.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.date;
+package org.apache.rya.api.date;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java
index f5ca08c..a5c1a02 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/Node.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java
index 67d5742..0623e51 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeURI.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java
index c27edfd..7d9ed24 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RangeValue.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaRange.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaRange.java
index e99f451..15d5716 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaRange.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaRange.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java
index 6744d20..adbad38 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaSchema.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.domain;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
 import org.openrdf.model.URI;
 
 /**
@@ -30,9 +30,9 @@ import org.openrdf.model.URI;
  */
 public class RyaSchema {
 
-    public static final String NAMESPACE = "urn:mvm.rya/2012/05#";
-    public static final String AUTH_NAMESPACE = "urn:mvm.rya/auth/2012/05#";
-    public static final String BNODE_NAMESPACE = "urn:mvm.rya/bnode/2012/07#";
+    public static final String NAMESPACE = "urn:org.apache.rya/2012/05#";
+    public static final String AUTH_NAMESPACE = "urn:org.apache.rya/auth/2012/05#";
+    public static final String BNODE_NAMESPACE = "urn:org.apache.rya/bnode/2012/07#";
 
     //datatypes
     public static final URI NODE = RdfCloudTripleStoreConstants.VALUE_FACTORY.createURI(NAMESPACE, "node");

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java
index 18bde98..869c23b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaStatement.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java
index 7a35253..94a0ecf 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaType.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java
index d394417..dab53a6 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypePrefix.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,8 +23,8 @@ package mvm.rya.api.domain;
 
 import org.openrdf.model.URI;
 
-import static mvm.rya.api.RdfCloudTripleStoreConstants.DELIM;
-import static mvm.rya.api.RdfCloudTripleStoreConstants.LAST;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.DELIM;
+import static org.apache.rya.api.RdfCloudTripleStoreConstants.LAST;
 
 /**
  * Date: 7/24/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java
index a744399..badde87 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaTypeRange.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java
index aa174c5..d90ba4b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURI.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java
index f808607..094eb65 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIPrefix.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.domain;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
 
 /**
  * Date: 7/24/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java
index 2c2b836..7fa9289 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/domain/RyaURIRange.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.domain;
+package org.apache.rya.api.domain;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
index 25212f4..b59a04e 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/ConfigurationFields.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
index 565b545..b56d255 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetails.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
index d05c65a..c93bbce 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsRepository.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
index 8734adc..6c31044 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsToConfiguration.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 import static java.util.Objects.requireNonNull;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
index 9d5dae7..8205c06 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/instance/RyaDetailsUpdater.java
@@ -16,7 +16,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package mvm.rya.api.instance;
+package org.apache.rya.api.instance;
 
 import static java.util.Objects.requireNonNull;
 
@@ -25,9 +25,9 @@ import javax.annotation.ParametersAreNonnullByDefault;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 
-import mvm.rya.api.instance.RyaDetailsRepository.ConcurrentUpdateException;
-import mvm.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
-import mvm.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
+import org.apache.rya.api.instance.RyaDetailsRepository.ConcurrentUpdateException;
+import org.apache.rya.api.instance.RyaDetailsRepository.RyaDetailsRepositoryException;
+import org.apache.rya.api.instance.RyaDetailsUpdater.RyaDetailsMutator.CouldNotApplyMutationException;
 
 /**
  * A utility that will attempt to commit a change to a Rya instance's details

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/layout/TableLayoutStrategy.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/layout/TableLayoutStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/layout/TableLayoutStrategy.java
index 61732d3..dc42e0b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/layout/TableLayoutStrategy.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/layout/TableLayoutStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.layout;
+package org.apache.rya.api.layout;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/layout/TablePrefixLayoutStrategy.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/layout/TablePrefixLayoutStrategy.java b/common/rya.api/src/main/java/org/apache/rya/api/layout/TablePrefixLayoutStrategy.java
index 0e995ab..165ff9e 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/layout/TablePrefixLayoutStrategy.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/layout/TablePrefixLayoutStrategy.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.layout;
+package org.apache.rya.api.layout;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.layout;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConstants;
+import org.apache.rya.api.RdfCloudTripleStoreConstants;
 
 /**
  * Created by IntelliJ IDEA.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfDAOException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfDAOException.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfDAOException.java
index 54444d4..67eb3eb 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfDAOException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfDAOException.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java
index 020464b..b1d46c3 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RdfEvalStatsDAO.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,7 +23,7 @@ package mvm.rya.api.persist;
 
 import java.util.List;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 
 import org.openrdf.model.Resource;
 import org.openrdf.model.Value;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaConfigured.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaConfigured.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaConfigured.java
index 00c246e..c271543 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaConfigured.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaConfigured.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.persist;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 
 /**
  * Date: 7/17/12

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java
index e326f7d..c3d314b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAO.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,10 +23,10 @@ package mvm.rya.api.persist;
 
 import java.util.Iterator;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.domain.RyaURI;
-import mvm.rya.api.persist.query.RyaQueryEngine;
+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.query.RyaQueryEngine;
 
 /**
  * Provides the access layer to the Rya triple store.

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAOException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAOException.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAOException.java
index 2322119..c8dedc1 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAOException.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaDAOException.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java
index 77cd4bd..8415edd 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/RyaNamespaceManager.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist;
+package org.apache.rya.api.persist;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package mvm.rya.api.persist;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 import org.openrdf.model.Namespace;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java
index 4047670..e1c1819 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/index/RyaSecondaryIndexer.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.index;
+package org.apache.rya.api.persist.index;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -29,8 +29,8 @@ import java.util.Set;
 import org.apache.hadoop.conf.Configurable;
 import org.openrdf.model.URI;
 
-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;
 
 public interface RyaSecondaryIndexer extends Closeable, Flushable, Configurable {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java
index 28f797b..af2a5d8 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/joinselect/SelectivityEvalDAO.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.joinselect;
+package org.apache.rya.api.persist.joinselect;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,8 +21,8 @@ package mvm.rya.api.persist.joinselect;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.persist.RdfEvalStatsDAO;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.persist.RdfEvalStatsDAO;
 import org.openrdf.query.algebra.StatementPattern;
 import org.openrdf.query.algebra.TupleExpr;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java
index 113ce51..2cef5a1 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/BatchRyaQuery.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query;
+package org.apache.rya.api.persist.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -23,11 +23,11 @@ package mvm.rya.api.persist.query;
 
 import com.google.common.base.Preconditions;
 import com.google.common.collect.Iterables;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
 
 /**
- * Query domain object contains the query to run as a {@link mvm.rya.api.domain.RyaStatement} and options for running the query
+ * Query domain object contains the query to run as a {@link org.apache.rya.api.domain.RyaStatement} and options for running the query
  */
 public class BatchRyaQuery extends RyaQueryOptions {
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQuery.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQuery.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQuery.java
index 5235989..c56b5e9 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQuery.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQuery.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query;
+package org.apache.rya.api.persist.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,7 +22,7 @@ package mvm.rya.api.persist.query;
 
 
 import com.google.common.base.Preconditions;
-import mvm.rya.api.domain.RyaStatement;
+import org.apache.rya.api.domain.RyaStatement;
 
 /**
  * Query domain object contains the query to run as a {@link RyaStatement} and options for running the query

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java
index 7454eea..7e5cbe4 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryEngine.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query;
+package org.apache.rya.api.persist.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -26,10 +26,10 @@ import info.aduna.iteration.CloseableIteration;
 import java.util.Collection;
 import java.util.Map;
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.domain.RyaStatement;
-import mvm.rya.api.persist.RyaConfigured;
-import mvm.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.domain.RyaStatement;
+import org.apache.rya.api.persist.RyaConfigured;
+import org.apache.rya.api.persist.RyaDAOException;
 
 import org.calrissian.mango.collect.CloseableIterable;
 import org.openrdf.query.BindingSet;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java
index c77796e..01a2b0d 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/RyaQueryOptions.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query;
+package org.apache.rya.api.persist.query;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -21,7 +21,7 @@ package mvm.rya.api.persist.query;
 
 
 
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java
index 286ea7a..353d1ee 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/HashJoin.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query.join;
+package org.apache.rya.api.persist.query.join;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -22,15 +22,15 @@ package mvm.rya.api.persist.query.join;
 
 
 import info.aduna.iteration.CloseableIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-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.persist.query.RyaQueryEngine;
-import mvm.rya.api.resolver.RyaContext;
-import mvm.rya.api.utils.EnumerationWrapper;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+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.persist.query.RyaQueryEngine;
+import org.apache.rya.api.resolver.RyaContext;
+import org.apache.rya.api.utils.EnumerationWrapper;
 
 import java.util.Enumeration;
 import java.util.Map;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/17bde6d8/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java
index 3cb48a5..965251b 100644
--- a/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java
+++ b/common/rya.api/src/main/java/org/apache/rya/api/persist/query/join/IterativeJoin.java
@@ -1,4 +1,4 @@
-package mvm.rya.api.persist.query.join;
+package org.apache.rya.api.persist.query.join;
 
 /*
  * Licensed to the Apache Software Foundation (ASF) under one
@@ -24,12 +24,12 @@ package mvm.rya.api.persist.query.join;
 import com.google.common.base.Preconditions;
 import info.aduna.iteration.CloseableIteration;
 import info.aduna.iteration.ConvertingIteration;
-import mvm.rya.api.RdfCloudTripleStoreConfiguration;
-import mvm.rya.api.RdfCloudTripleStoreUtils;
-import mvm.rya.api.domain.*;
-import mvm.rya.api.persist.RyaDAOException;
-import mvm.rya.api.persist.query.RyaQueryEngine;
-import mvm.rya.api.resolver.RyaContext;
+import org.apache.rya.api.RdfCloudTripleStoreConfiguration;
+import org.apache.rya.api.RdfCloudTripleStoreUtils;
+import org.apache.rya.api.domain.*;
+import org.apache.rya.api.persist.RyaDAOException;
+import org.apache.rya.api.persist.query.RyaQueryEngine;
+import org.apache.rya.api.resolver.RyaContext;
 import org.openrdf.query.BindingSet;
 
 import java.util.ArrayList;
@@ -83,7 +83,7 @@ public class IterativeJoin<C extends RdfCloudTripleStoreConfiguration> implement
      *
      * @param predObjs
      * @return
-     * @throws mvm.rya.api.persist.RyaDAOException
+     * @throws org.apache.rya.api.persist.RyaDAOException
      *
      */
     @Override