You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@rya.apache.org by mi...@apache.org on 2015/12/22 17:50:13 UTC

[49/56] [abbrv] incubator-rya git commit: RYA-7 POM and License Clean-up for Apache Move

RYA-7 POM and License Clean-up for Apache Move

Numerous POM and License Mods:
 - Make the apache pom the parent
 - Depend on Apache releases for Hadoop and ZooKeeper
 - Updated to most recent bug-fix release for dependencies
 - Moved Deps to Parent POM
 - Change groupId from mvn.rya to org.apache.rya
 - Set proper names for each maven module
 - Fix SCM block in parent pom
 - Remove Dead/CB Projects
 - Remove Extra Repos/Profiles
 - Moved rya.sail.impl to rya.sail


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

Branch: refs/heads/master
Commit: 80faf06d48165e65271a52856238896521fcf218
Parents: ce4a10f
Author: Aaron Mihalik <mi...@alum.mit.edu>
Authored: Tue Dec 1 15:11:17 2015 -0500
Committer: Aaron Mihalik <mi...@alum.mit.edu>
Committed: Fri Dec 4 11:14:06 2015 -0500

----------------------------------------------------------------------
 NOTICE                                          |     6 +
 README.md                                       |    17 +
 common/pom.xml                                  |    32 +-
 common/rya.api/pom.xml                          |    48 +-
 .../InvalidValueTypeMarkerRuntimeException.java |    31 +-
 .../api/RdfCloudTripleStoreConfiguration.java   |    31 +-
 .../rya/api/RdfCloudTripleStoreConstants.java   |    31 +-
 .../rya/api/RdfCloudTripleStoreStatement.java   |    31 +-
 .../mvm/rya/api/RdfCloudTripleStoreUtils.java   |    33 +-
 .../rya/api/date/DateTimeTtlValueConverter.java |    31 +-
 .../api/date/TimestampTtlStrValueConverter.java |    31 +-
 .../api/date/TimestampTtlValueConverter.java    |    31 +-
 .../mvm/rya/api/date/TtlValueConverter.java     |    31 +-
 .../src/main/java/mvm/rya/api/domain/Node.java  |    31 +-
 .../main/java/mvm/rya/api/domain/RangeURI.java  |    31 +-
 .../java/mvm/rya/api/domain/RangeValue.java     |    31 +-
 .../main/java/mvm/rya/api/domain/RyaRange.java  |    31 +-
 .../main/java/mvm/rya/api/domain/RyaSchema.java |    31 +-
 .../java/mvm/rya/api/domain/RyaStatement.java   |    31 +-
 .../main/java/mvm/rya/api/domain/RyaType.java   |    31 +-
 .../java/mvm/rya/api/domain/RyaTypePrefix.java  |    31 +-
 .../java/mvm/rya/api/domain/RyaTypeRange.java   |    31 +-
 .../main/java/mvm/rya/api/domain/RyaURI.java    |    31 +-
 .../java/mvm/rya/api/domain/RyaURIPrefix.java   |    31 +-
 .../java/mvm/rya/api/domain/RyaURIRange.java    |    31 +-
 .../api/domain/utils/RyaStatementWritable.java  |    31 +-
 .../mvm/rya/api/layout/TableLayoutStrategy.java |    31 +-
 .../api/layout/TablePrefixLayoutStrategy.java   |    31 +-
 .../mvm/rya/api/persist/RdfDAOException.java    |    31 +-
 .../mvm/rya/api/persist/RdfEvalStatsDAO.java    |    31 +-
 .../java/mvm/rya/api/persist/RyaConfigured.java |    31 +-
 .../main/java/mvm/rya/api/persist/RyaDAO.java   |    31 +-
 .../mvm/rya/api/persist/RyaDAOException.java    |    31 +-
 .../rya/api/persist/RyaNamespaceManager.java    |    31 +-
 .../api/persist/index/RyaSecondaryIndexer.java  |    20 +
 .../persist/joinselect/SelectivityEvalDAO.java  |    31 +-
 .../rya/api/persist/query/BatchRyaQuery.java    |    31 +-
 .../mvm/rya/api/persist/query/RyaQuery.java     |    31 +-
 .../rya/api/persist/query/RyaQueryEngine.java   |    31 +-
 .../rya/api/persist/query/RyaQueryOptions.java  |    31 +-
 .../rya/api/persist/query/join/HashJoin.java    |    31 +-
 .../api/persist/query/join/IterativeJoin.java   |    31 +-
 .../mvm/rya/api/persist/query/join/Join.java    |    31 +-
 .../rya/api/persist/query/join/MergeJoin.java   |    31 +-
 .../mvm/rya/api/persist/utils/RyaDAOHelper.java |    31 +-
 .../strategy/AbstractTriplePatternStrategy.java |    31 +-
 .../mvm/rya/api/query/strategy/ByteRange.java   |    31 +-
 .../query/strategy/TriplePatternStrategy.java   |    31 +-
 .../HashedPoWholeRowTriplePatternStrategy.java  |    31 +-
 .../HashedSpoWholeRowTriplePatternStrategy.java |    31 +-
 .../OspWholeRowTriplePatternStrategy.java       |    31 +-
 .../PoWholeRowTriplePatternStrategy.java        |    31 +-
 .../SpoWholeRowTriplePatternStrategy.java       |    31 +-
 .../resolver/CustomRyaTypeResolverMapping.java  |    31 +-
 .../rya/api/resolver/RdfToRyaConversions.java   |    31 +-
 .../java/mvm/rya/api/resolver/RyaContext.java   |    31 +-
 .../rya/api/resolver/RyaToRdfConversions.java   |    31 +-
 .../mvm/rya/api/resolver/RyaTripleContext.java  |    31 +-
 .../mvm/rya/api/resolver/RyaTypeResolver.java   |    31 +-
 .../api/resolver/RyaTypeResolverException.java  |    31 +-
 .../api/resolver/RyaTypeResolverMapping.java    |    31 +-
 .../resolver/impl/BooleanRyaTypeResolver.java   |    31 +-
 .../api/resolver/impl/ByteRyaTypeResolver.java  |    31 +-
 .../resolver/impl/CustomDatatypeResolver.java   |    31 +-
 .../resolver/impl/DateTimeRyaTypeResolver.java  |    31 +-
 .../resolver/impl/DoubleRyaTypeResolver.java    |    31 +-
 .../api/resolver/impl/FloatRyaTypeResolver.java |    31 +-
 .../resolver/impl/IntegerRyaTypeResolver.java   |    31 +-
 .../api/resolver/impl/LongRyaTypeResolver.java  |    31 +-
 .../api/resolver/impl/RyaTypeResolverImpl.java  |    31 +-
 .../rya/api/resolver/impl/RyaURIResolver.java   |    31 +-
 .../ServiceBackedRyaTypeResolverMappings.java   |    31 +-
 .../api/resolver/impl/ShortRyaTypeResolver.java |    31 +-
 .../mvm/rya/api/resolver/triple/TripleRow.java  |    31 +-
 .../rya/api/resolver/triple/TripleRowRegex.java |    31 +-
 .../api/resolver/triple/TripleRowResolver.java  |    31 +-
 .../triple/TripleRowResolverException.java      |    31 +-
 .../impl/WholeRowHashedTripleResolver.java      |    31 +-
 .../triple/impl/WholeRowTripleResolver.java     |    31 +-
 .../mvm/rya/api/security/SecurityProvider.java  |    20 +
 .../api/utils/CloseableIterableIteration.java   |    31 +-
 .../mvm/rya/api/utils/EnumerationWrapper.java   |    31 +-
 .../java/mvm/rya/api/utils/IteratorWrapper.java |    31 +-
 .../rya/api/utils/NullableStatementImpl.java    |    31 +-
 .../api/utils/PeekingCloseableIteration.java    |    31 +-
 .../RyaStatementAddBindingSetFunction.java      |    31 +-
 ...ementRemoveBindingSetCloseableIteration.java |    31 +-
 .../mvm/rya/api/domain/RyaURIPrefixTest.java    |    31 +-
 .../mvm/rya/api/persist/query/RyaQueryTest.java |    31 +-
 .../AbstractTriplePatternStrategyTest.java      |    31 +-
 ...shedPoWholeRowTriplePatternStrategyTest.java |    31 +-
 ...hedSpoWholeRowTriplePatternStrategyTest.java |    31 +-
 .../wholerow/MockRdfCloudConfiguration.java     |    20 +
 .../OspWholeRowTriplePatternStrategyTest.java   |    34 +-
 .../PoWholeRowTriplePatternStrategyTest.java    |    34 +-
 .../SpoWholeRowTriplePatternStrategyTest.java   |    34 +-
 .../mvm/rya/api/resolver/RyaContextTest.java    |    31 +-
 .../impl/CustomDatatypeResolverTest.java        |    31 +-
 .../impl/DateTimeRyaTypeResolverTest.java       |    31 +-
 .../impl/DoubleRyaTypeResolverTest.java         |    31 +-
 .../impl/IntegerRyaTypeResolverTest.java        |    31 +-
 .../resolver/impl/LongRyaTypeResolverTest.java  |    31 +-
 .../api/resolver/impl/RyaURIResolverTest.java   |    31 +-
 .../impl/HashedWholeRowTripleResolverTest.java  |    31 +-
 .../triple/impl/WholeRowTripleResolverTest.java |    31 +-
 .../test/java/mvm/rya/api/utils/RdfIOTest.java  |    34 +-
 common/rya.provenance/pom.xml                   |    64 +-
 .../provenance/LoggingProvenanceCollector.java  |    31 +-
 .../ProvenanceCollectionException.java          |    20 +
 .../provenance/ProvenanceCollector.java         |    20 +
 .../TriplestoreProvenanceCollector.java         |    20 +
 .../provenance/rdf/BaseProvenanceModel.java     |    20 +
 .../provenance/rdf/RDFProvenanceModel.java      |    20 +
 .../TriplestoreProvenanceCollectorTest.java     |    20 +
 .../provenance/rdf/BaseProvenanceModelTest.java |    20 +
 dao/accumulo.rya/pom.xml                        |   103 +-
 .../AccumuloNamespaceTableIterator.java         |    31 +-
 .../rya/accumulo/AccumuloRdfConfiguration.java  |    31 +-
 .../mvm/rya/accumulo/AccumuloRdfConstants.java  |    31 +-
 .../rya/accumulo/AccumuloRdfEvalStatsDAO.java   |    31 +-
 .../rya/accumulo/AccumuloRdfQueryIterator.java  |    34 +-
 .../java/mvm/rya/accumulo/AccumuloRdfUtils.java |    31 +-
 .../java/mvm/rya/accumulo/AccumuloRyaDAO.java   |    31 +-
 .../accumulo/DefineTripleQueryRangeFactory.java |    36 +-
 .../mvm/rya/accumulo/RyaTableKeyValues.java     |    33 +-
 .../rya/accumulo/RyaTableMutationsFactory.java  |    33 +-
 .../experimental/AbstractAccumuloIndexer.java   |    20 +
 .../accumulo/experimental/AccumuloIndexer.java  |    22 +-
 .../rya/accumulo/mr/AbstractAccumuloMRTool.java |    31 +-
 .../accumulo/mr/eval/AccumuloRdfCountTool.java  |    33 +-
 .../mr/fileinput/BulkNtripsInputTool.java       |    31 +-
 .../mr/fileinput/RdfFileInputByLineTool.java    |    31 +-
 .../mr/fileinput/RdfFileInputFormat.java        |    31 +-
 .../accumulo/mr/fileinput/RdfFileInputTool.java |    31 +-
 .../rya/accumulo/mr/upgrade/Upgrade322Tool.java |    31 +-
 .../mr/utils/AccumuloHDFSFileInputFormat.java   |    31 +-
 .../rya/accumulo/mr/utils/AccumuloProps.java    |    31 +-
 .../java/mvm/rya/accumulo/mr/utils/MRUtils.java |    31 +-
 .../accumulo/query/AccumuloRyaQueryEngine.java  |    42 +-
 .../query/KeyValueToRyaStatementFunction.java   |    31 +-
 .../accumulo/query/RangeBindingSetEntries.java  |    31 +-
 .../RyaStatementBindingSetKeyValueIterator.java |    31 +-
 .../query/RyaStatementKeyValueIterator.java     |    31 +-
 .../query/ScannerBaseCloseableIterable.java     |    31 +-
 .../mvm/rya/accumulo/utils/TimeRangeFilter.java |    33 +-
 .../accumulo/AccumuloRdfConfigurationTest.java  |    31 +-
 .../mvm/rya/accumulo/AccumuloRyaDAOTest.java    |    31 +-
 .../DefineTripleQueryRangeFactoryTest.java      |    34 +-
 .../mr/eval/AccumuloRdfCountToolTest.java       |    31 +-
 .../mr/fileinput/RdfFileInputToolTest.java      |    31 +-
 .../accumulo/mr/upgrade/Upgrade322ToolTest.java |    31 +-
 .../upgrade/UpgradeObjectSerializationTest.java |    33 +-
 dao/cloudbase.rya/pom.xml                       |   103 -
 .../mvm/rya/cloudbase/BatchScannerIterator.java |    59 -
 .../CloudbaseNamespaceTableIterator.java        |    78 -
 .../cloudbase/CloudbaseRdfConfiguration.java    |    44 -
 .../rya/cloudbase/CloudbaseRdfConstants.java    |    20 -
 .../rya/cloudbase/CloudbaseRdfEvalStatsDAO.java |   138 -
 .../mvm/rya/cloudbase/CloudbaseRdfUtils.java    |    50 -
 .../java/mvm/rya/cloudbase/CloudbaseRyaDAO.java |   428 -
 .../mvm/rya/cloudbase/RyaTableKeyValues.java    |    93 -
 .../rya/cloudbase/RyaTableMutationsFactory.java |    81 -
 .../mr/eval/CloudbaseRdfCountTool.java          |   350 -
 .../mr/fileinput/BulkNtripsInputTool.java       |   318 -
 .../mr/fileinput/RdfFileInputByLineTool.java    |   230 -
 .../mr/fileinput/RdfFileInputFormat.java        |   115 -
 .../mr/fileinput/RdfFileInputTool.java          |   185 -
 .../fileinput/ShardedBulkNtripsInputTool.java   |   314 -
 .../mr/upgrade/UpgradeCloudbaseRdfTables.java   |   350 -
 .../mvm/rya/cloudbase/mr/utils/MRUtils.java     |    94 -
 .../query/BatchScannerCloseableIterable.java    |    34 -
 .../query/CloudbaseRyaQueryEngine.java          |   385 -
 .../query/KeyValueToRyaStatementFunction.java   |    47 -
 .../cloudbase/query/RangeBindingSetEntries.java |    37 -
 .../RyaStatementBindingSetKeyValueIterator.java |   129 -
 .../query/RyaStatementKeyValueIterator.java     |    82 -
 .../query/ScannerCloseableIterable.java         |    35 -
 .../rya/cloudbase/CloudbaseResearchMain.java    |    77 -
 .../mvm/rya/cloudbase/CloudbaseRyaDAOTest.java  |   588 -
 .../DefineTripleQueryRangeFactoryTest.java      |   242 -
 dao/mongodb.rya/pom.xml                         |    72 +-
 .../mvm/rya/mongodb/MongoDBQueryEngine.java     |    20 +
 .../rya/mongodb/MongoDBRdfConfiguration.java    |    22 +-
 .../java/mvm/rya/mongodb/MongoDBRyaDAO.java     |    20 +
 .../mongodb/dao/MongoDBNamespaceManager.java    |    20 +
 .../rya/mongodb/dao/MongoDBStorageStrategy.java |    20 +
 .../dao/SimpleMongoDBNamespaceManager.java      |    28 +-
 .../dao/SimpleMongoDBStorageStrategy.java       |    20 +
 .../NonCloseableRyaStatementCursorIterator.java |    20 +
 .../RyaStatementBindingSetCursorIterator.java   |    20 +
 .../iter/RyaStatementCursorIterable.java        |    20 +
 .../iter/RyaStatementCursorIterator.java        |    20 +
 dao/pom.xml                                     |    32 +-
 extras/cloudbase.rya.giraph/pom.xml             |    69 -
 .../format/CloudbaseRyaVertexInputFormat.java   |    88 -
 .../format/CloudbaseRyaVertexOutputFormat.java  |    94 -
 .../format/CloudbaseVertexInputFormat.java      |   179 -
 .../format/CloudbaseVertexOutputFormat.java     |   189 -
 .../giraph/format/PrintVertexOutputFormat.java  |    94 -
 .../rya/cloudbase/giraph/format/BspCase.java    |   253 -
 .../format/TestCloudbaseVertexFormat.java       |   211 -
 extras/generic.mr/generic.mr.accumulo/pom.xml   |    58 -
 .../generic/mr/accumulo/AccumuloMRInfo.groovy   |   146 -
 .../services/mvm.rya.generic.mr.api.MRInfo      |     1 -
 extras/generic.mr/generic.mr.api/pom.xml        |    32 -
 .../groovy/mvm/rya/generic/mr/api/MRInfo.groovy |    43 -
 .../mvm/rya/generic/mr/api/MRInfoContext.groovy |    28 -
 extras/generic.mr/generic.mr.cloudbase/pom.xml  |    33 -
 .../generic/mr/cloudbase/CloudbaseMRInfo.groovy |   146 -
 .../services/mvm.rya.generic.mr.api.MRInfo      |     1 -
 extras/generic.mr/pom.xml                       |    27 -
 extras/indexing/pom.xml                         |   177 +-
 .../documentIndex/DocIndexIteratorUtil.java     |    20 +
 .../rya/accumulo/documentIndex/TextColumn.java  |    20 +
 .../rya/accumulo/mr/NullFreeTextIndexer.java    |    31 +-
 .../mvm/rya/accumulo/mr/NullGeoIndexer.java     |    33 +-
 .../rya/accumulo/mr/NullTemporalIndexer.java    |    20 +
 .../mvm/rya/accumulo/mr/RyaOutputFormat.java    |    31 +-
 .../mvm/rya/accumulo/mr/StatementWritable.java  |    31 +-
 .../fileinput/BulkNtripsInputToolIndexing.java  |    31 +-
 .../mr/fileinput/RyaBatchWriterInputTool.java   |    31 +-
 .../AccumuloPrecompQueryIndexer.java            |    20 +
 .../java/mvm/rya/indexing/DocIdIndexer.java     |    26 +-
 .../rya/indexing/FilterFunctionOptimizer.java   |    20 +
 .../java/mvm/rya/indexing/FreeTextIndexer.java  |    33 +-
 .../main/java/mvm/rya/indexing/GeoIndexer.java  |    31 +-
 .../ExternalIndexMatcher.java                   |    24 +-
 .../GeneralizedExternalProcessor.java           |    37 +-
 .../IndexPlanValidator/IndexListPruner.java     |    20 +
 .../IndexPlanValidator/IndexPlanValidator.java  |    20 +
 .../IndexPlanValidator/IndexTupleGenerator.java |    22 +-
 .../IndexedExecutionPlanGenerator.java          |    20 +
 .../IndexedQueryPlanSelector.java               |    21 +-
 .../ThreshholdPlanSelector.java                 |    21 +-
 .../TupleExecutionPlanGenerator.java            |    25 +-
 .../IndexPlanValidator/TupleReArranger.java     |    20 +
 .../IndexPlanValidator/TupleValidator.java      |    21 +-
 .../ValidIndexCombinationGenerator.java         |    22 +-
 .../VarConstantIndexListPruner.java             |    20 +
 .../java/mvm/rya/indexing/IndexingExpr.java     |    22 +-
 .../rya/indexing/IndexingFunctionRegistry.java  |    21 +-
 .../java/mvm/rya/indexing/IteratorFactory.java  |    20 +
 .../main/java/mvm/rya/indexing/KeyParts.java    |    24 +-
 .../mvm/rya/indexing/PrecompQueryIndexer.java   |    23 +-
 .../java/mvm/rya/indexing/RyaSailFactory.java   |    20 +
 .../java/mvm/rya/indexing/SearchFunction.java   |    22 +-
 .../mvm/rya/indexing/SearchFunctionFactory.java |    22 +-
 .../mvm/rya/indexing/StatementContraints.java   |    31 +-
 .../java/mvm/rya/indexing/TemporalIndexer.java  |    23 +-
 .../java/mvm/rya/indexing/TemporalInstant.java  |    22 +-
 .../java/mvm/rya/indexing/TemporalInterval.java |    20 +
 .../mvm/rya/indexing/accumulo/ConfigUtils.java  |    33 +-
 .../java/mvm/rya/indexing/accumulo/Md5Hash.java |    31 +-
 .../indexing/accumulo/StatementSerializer.java  |    31 +-
 .../accumulo/entity/AccumuloDocIdIndexer.java   |    20 +
 .../accumulo/entity/EntityCentricIndex.java     |    20 +
 .../entity/EntityLocalityGroupSetter.java       |    20 +
 .../accumulo/entity/EntityOptimizer.java        |    20 +
 .../accumulo/entity/EntityTupleSet.java         |    20 +
 .../rya/indexing/accumulo/entity/StarQuery.java |    20 +
 .../freetext/AccumuloFreeTextIndexer.java       |    36 +-
 .../accumulo/freetext/ColumnPrefixes.java       |    31 +-
 .../accumulo/freetext/FreeTextTupleSet.java     |    21 +-
 .../accumulo/freetext/LuceneTokenizer.java      |    31 +-
 .../accumulo/freetext/SimpleTokenizer.java      |    31 +-
 .../indexing/accumulo/freetext/Tokenizer.java   |    33 +-
 .../freetext/iterators/AndingIterator.java      |    31 +-
 .../freetext/iterators/BooleanTreeIterator.java |    31 +-
 .../accumulo/freetext/query/ASTExpression.java  |    31 +-
 .../accumulo/freetext/query/ASTNodeUtils.java   |    31 +-
 .../accumulo/freetext/query/ASTSimpleNode.java  |   915 +-
 .../accumulo/freetext/query/ASTTerm.java        |    31 +-
 .../freetext/query/JJTQueryParserState.java     |   915 +-
 .../indexing/accumulo/freetext/query/Node.java  |   915 +-
 .../accumulo/freetext/query/ParseException.java |   915 +-
 .../accumulo/freetext/query/QueryParser.java    |   915 +-
 .../accumulo/freetext/query/QueryParser.jjt     |    23 +-
 .../freetext/query/QueryParserConstants.java    |   915 +-
 .../freetext/query/QueryParserTokenManager.java |   915 +-
 .../query/QueryParserTreeConstants.java         |   915 +-
 .../freetext/query/SimpleCharStream.java        |   915 +-
 .../accumulo/freetext/query/SimpleNode.java     |   915 +-
 .../indexing/accumulo/freetext/query/Token.java |   915 +-
 .../accumulo/freetext/query/TokenMgrError.java  |   915 +-
 .../rya/indexing/accumulo/geo/GeoConstants.java |    31 +-
 .../accumulo/geo/GeoMesaGeoIndexer.java         |    31 +-
 .../indexing/accumulo/geo/GeoParseUtils.java    |    20 +
 .../rya/indexing/accumulo/geo/GeoTupleSet.java  |    20 +
 .../temporal/AccumuloTemporalIndexer.java       |    20 +
 .../temporal/TemporalInstantRfc3339.java        |    20 +
 .../accumulo/temporal/TemporalTupleSet.java     |    20 +
 .../indexing/external/ExternalIndexMain.java    |    31 +-
 .../indexing/external/ExternalProcessor.java    |    31 +-
 .../mvm/rya/indexing/external/ExternalSail.java |    31 +-
 .../indexing/external/ExternalSailExample.java  |    31 +-
 .../indexing/external/PrecompJoinOptimizer.java |    20 +
 .../external/QueryVariableNormalizer.java       |    20 +
 .../external/tupleSet/AccumuloIndexSet.java     |    31 +-
 .../external/tupleSet/ExternalTupleSet.java     |    35 +-
 .../tupleSet/SimpleExternalTupleSet.java        |    31 +-
 .../indexing/mongodb/AbstractMongoIndexer.java  |    25 +-
 .../mongodb/GeoMongoDBStorageStrategy.java      |    21 +-
 .../rya/indexing/mongodb/MongoGeoIndexer.java   |    24 +-
 .../rya/indexing/mongodb/MongoGeoTupleSet.java  |    20 +
 .../ValidIndexCombinationGeneratorTest.java     |    19 +
 .../DocumentIndexIntersectingIteratorTest.java  |    20 +
 .../GeneralizedExternalProcessorTest.java       |    20 +
 .../IndexPlanValidatorTest.java                 |    20 +
 .../IndexedExecutionPlanGeneratorTest.java      |    20 +
 .../ThreshholdPlanSelectorTest.java             |    20 +
 .../TupleExecutionPlanGeneratorTest.java        |    20 +
 .../IndexPlanValidator/TupleReArrangerTest.java |    20 +
 .../ValidIndexCombinationGeneratorTest.java     |    20 +
 .../VarConstantIndexListPrunerTest.java         |    20 +
 .../accumulo/StatementSerializerTest.java       |    31 +-
 .../accumulo/entity/AccumuloDocIndexerTest.java |    20 +
 .../accumulo/entity/EntityOptimizerTest.java    |    20 +
 .../indexing/accumulo/entity/StarQueryTest.java |    20 +
 .../freetext/AccumuloFreeTextIndexerTest.java   |    31 +-
 .../freetext/query/QueryParserTest.java         |    31 +-
 .../indexing/accumulo/geo/GeoIndexerSfTest.java |    31 +-
 .../indexing/accumulo/geo/GeoIndexerTest.java   |    31 +-
 .../temporal/AccumuloTemporalIndexerTest.java   |    20 +
 .../accumulo/temporal/TemporalInstantTest.java  |    20 +
 .../accumulo/temporal/TemporalIntervalTest.java |    20 +
 .../external/AccumuloConstantIndexSetTest.java  |    20 +
 .../indexing/external/AccumuloIndexSetTest.java |    31 +-
 .../external/AccumuloIndexSetTest2.java         |    20 +
 .../PrecompJoinOptimizerIntegrationTest.java    |    22 +-
 .../external/PrecompJoinOptimizerTest.java      |    20 +
 .../tupleSet/ExternalProcessorTest.java         |    31 +-
 .../tupleSet/QueryVariableNormalizerTest.java   |    31 +-
 .../tupleSet/VarConstExternalProcessorTest.java |    20 +
 .../VarConstQueryVariableNormalizerTest.java    |    20 +
 extras/indexingExample/pom.xml                  |    99 +
 .../src/main/assembly/assembly.xml              |    70 +
 .../src/main/java/EntityDirectExample.java      |   311 +
 .../src/main/java/MongoRyaDirectExample.java    |   307 +
 .../src/main/java/RyaDirectExample.java         |   700 +
 .../src/main/scripts/RunRyaDirectExample.bat    |    41 +
 extras/indexingSailExample/pom.xml              |    80 -
 .../src/main/assembly/assembly.xml              |    50 -
 .../src/main/java/EntityDirectExample.java      |   292 -
 .../src/main/java/MongoRyaDirectExample.java    |   288 -
 .../src/main/java/RyaDirectExample.java         |   681 -
 .../src/main/scripts/RunRyaDirectExample.bat    |    25 -
 extras/pom.xml                                  |    42 +-
 extras/rya.console/pom.xml                      |   106 +-
 .../java/mvm/rya/console/RyaBannerProvider.java |    40 +-
 .../mvm/rya/console/RyaConsoleCommands.java     |    21 +-
 .../rya/console/RyaHistoryFileNameProvider.java |    31 +-
 .../java/mvm/rya/console/RyaPromptProvider.java |    31 +-
 .../META-INF/spring/spring-shell-plugin.xml     |    22 +-
 extras/rya.geo/pom.xml                          |    25 -
 .../src/main/java/mvm/rya/geo/GeoDistance.java  |    34 -
 .../java/mvm/rya/geo/GeoRyaTypeResolver.java    |    16 -
 .../src/main/java/mvm/rya/geo/RyaGeoSchema.java |    16 -
 .../src/main/java/mvm/rya/geo/Verify.java       |    68 -
 .../src/main/java/mvm/rya/geo/WithinRange.java  |    69 -
 .../mvm.rya.api.resolver.RyaTypeResolver        |     1 -
 ...f.query.algebra.evaluation.function.Function |     1 -
 .../mvm/rya/geo/GeoRyaTypeResolverTest.java     |    25 -
 .../test/java/mvm/rya/geo/WithinRangeTest.java  |    43 -
 extras/rya.manual/pom.xml                       |    29 +-
 extras/rya.manual/src/site/markdown/_index.md   |    21 +
 extras/rya.manual/src/site/markdown/alx.md      |    21 +
 .../src/site/markdown/build-source.md           |    21 +
 extras/rya.manual/src/site/markdown/eval.md     |    21 +
 extras/rya.manual/src/site/markdown/index.md    |    21 +
 extras/rya.manual/src/site/markdown/infer.md    |    21 +
 .../src/site/markdown/loadPrecomputedJoin.md    |    21 +
 extras/rya.manual/src/site/markdown/loaddata.md |    21 +
 extras/rya.manual/src/site/markdown/overview.md |    21 +
 .../rya.manual/src/site/markdown/querydata.md   |    21 +
 .../rya.manual/src/site/markdown/quickstart.md  |    21 +
 .../rya.manual/src/site/markdown/sm-addauth.md  |    21 +
 .../src/site/markdown/sm-firststeps.md          |    21 +
 extras/rya.manual/src/site/markdown/sm-infer.md |    21 +
 .../src/site/markdown/sm-namedgraph.md          |    21 +
 .../src/site/markdown/sm-simpleaqr.md           |    21 +
 .../src/site/markdown/sm-sparqlquery.md         |    21 +
 .../src/site/markdown/sm-updatedata.md          |    21 +
 .../src/site/resources/js/fixmarkdownlinks.js   |    21 +-
 extras/rya.manual/src/site/site.xml             |    22 +-
 extras/rya.prospector/pom.xml                   |   178 +-
 .../mvm/rya/prospector/domain/IndexEntry.groovy |    19 +
 .../domain/IntermediateProspect.groovy          |    19 +
 .../rya/prospector/domain/TripleValueType.java  |    22 +-
 .../mvm/rya/prospector/mr/Prospector.groovy     |    19 +
 .../rya/prospector/mr/ProspectorCombiner.groovy |    21 +-
 .../rya/prospector/mr/ProspectorMapper.groovy   |    21 +-
 .../rya/prospector/mr/ProspectorReducer.groovy  |    21 +-
 .../rya/prospector/plans/IndexWorkPlan.groovy   |    21 +-
 .../plans/IndexWorkPlanManager.groovy           |    21 +-
 .../rya/prospector/plans/impl/CountPlan.groovy  |    19 +
 .../ServicesBackedIndexWorkPlanManager.groovy   |    19 +
 .../prospector/service/ProspectorService.groovy |    19 +
 .../ProspectorServiceEvalStatsDAO.groovy        |    19 +
 .../mvm/rya/prospector/utils/CustomEntry.groovy |    19 +
 .../prospector/utils/ProspectorConstants.groovy |    19 +
 .../rya/prospector/utils/ProspectorUtils.groovy |    19 +
 .../joinselect/AccumuloSelectivityEvalDAO.java  |    31 +-
 .../mvm/rya/joinselect/CardinalityCalcUtil.java |    31 +-
 .../mvm/rya/joinselect/mr/FullTableSize.java    |    31 +-
 .../rya/joinselect/mr/JoinSelectAggregate.java  |    38 +-
 .../mvm/rya/joinselect/mr/JoinSelectDriver.java |    31 +-
 .../joinselect/mr/JoinSelectProspectOutput.java |    36 +-
 .../joinselect/mr/JoinSelectSpoTableOutput.java |    36 +-
 .../joinselect/mr/JoinSelectStatisticsSum.java  |    31 +-
 .../mvm/rya/joinselect/mr/utils/CardList.java   |    31 +-
 .../joinselect/mr/utils/CardinalityType.java    |    31 +-
 .../rya/joinselect/mr/utils/CompositeType.java  |    31 +-
 .../mr/utils/JoinSelectConstants.java           |    31 +-
 .../mr/utils/JoinSelectStatsUtil.java           |    31 +-
 .../mvm/rya/joinselect/mr/utils/TripleCard.java |    31 +-
 .../rya/joinselect/mr/utils/TripleEntry.java    |    31 +-
 .../mvm/rya/prospector/mr/ProspectorTest.groovy |    40 +-
 .../ProspectorServiceEvalStatsDAOTest.groovy    |    38 +-
 .../AccumuloSelectivityEvalDAOTest.java         |    31 +-
 .../mr/CardinalityIdentityReducerTest.java      |    31 +-
 .../joinselect/mr/CardinalityMapperTest.java    |    31 +-
 .../rya/joinselect/mr/FullTableSizeTest.java    |    31 +-
 .../mvm/rya/joinselect/mr/JoinReducerTest.java  |    31 +-
 .../rya/joinselect/mr/JoinSelectMapperTest.java |    31 +-
 .../mr/JoinSelectProspectOutputTest.java        |    20 +
 .../mr/JoinSelectStatisticsSumTest.java         |    31 +-
 .../joinselect/mr/JoinSelectStatisticsTest.java |    42 +-
 .../src/test/resources/stats_cluster_config.xml |    21 +
 extras/tinkerpop.rya/pom.xml                    |   100 +-
 .../config/RyaGraphConfiguration.groovy         |    19 +
 .../mvm/rya/blueprints/sail/RyaSailEdge.groovy  |    19 +
 .../blueprints/sail/RyaSailEdgeSequence.groovy  |    19 +
 .../mvm/rya/blueprints/sail/RyaSailGraph.groovy |    19 +
 .../rya/blueprints/sail/RyaSailVertex.groovy    |    19 +
 .../sail/RyaSailVertexSequence.groovy           |    19 +
 .../mvm/rya/blueprints/sail/RyaSailEdge.java    |    31 +-
 .../mvm/rya/blueprints/sail/RyaSailVertex.java  |    31 +-
 .../mvm/rya/blueprints/TstGremlinRya.groovy     |    38 +-
 .../config/RyaGraphConfigurationTest.groovy     |    38 +-
 .../sail/RyaSailVertexSequenceTest.groovy       |    38 +-
 .../src/test/resources/log4j.properties         |    34 +-
 iterators/accumulo.iterators/pom.xml            |    34 -
 .../mvm/rya/iterators/LimitingAgeOffFilter.java |   138 -
 .../rya/iterators/LimitingAgeOffFilterTest.java |    80 -
 iterators/cloudbase.iterators/pom.xml           |    29 -
 .../mvm/rya/iterators/LimitingAgeOffFilter.java |    76 -
 .../rya/iterators/LimitingAgeOffFilterTest.java |    59 -
 iterators/pom.xml                               |    25 -
 osgi/alx.rya.console/pom.xml                    |    36 +-
 .../mvm/rya/alx/command/AbstractRyaCommand.java |    33 +-
 .../alx/command/GetStatementsRyaCommand.java    |    31 +-
 .../mvm/rya/alx/command/InfoRyaCommand.java     |    31 +-
 .../blueprint/alx.rya.console-blueprint.xml     |    20 +
 osgi/alx.rya/pom.xml                            |    46 +-
 .../src/main/features/alx.rya-features.xml      |    22 +-
 .../mvm/rya/alx/util/ConfigurationFactory.java  |    31 +-
 .../META-INF/spring/alx.rya-spring-osgi.xml     |    31 +-
 .../META-INF/spring/alx.rya-spring.xml          |    28 +-
 .../src/main/resources/ROOT/crossdomain.xml     |    22 +-
 osgi/camel.rya/pom.xml                          |    76 +-
 .../mvm/rya/camel/cbsail/CbSailComponent.java   |    31 +-
 .../mvm/rya/camel/cbsail/CbSailEndpoint.java    |    31 +-
 .../mvm/rya/camel/cbsail/CbSailProducer.java    |    31 +-
 .../rya/camel/cbsail/CbSailIntegrationTest.java |    33 +-
 .../mvm/rya/camel/cbsail/CbSailPojoMain.java    |    31 +-
 .../java/mvm/rya/camel/cbsail/CbSailTest.java   |    31 +-
 osgi/pom.xml                                    |    51 +-
 osgi/sesame-runtime-osgi/pom.xml                |    35 +-
 partition/common-query-ext/pom.xml              |    71 -
 .../ext/EncodedSortedRangeIterator.java         |    44 -
 .../src/test/java/GVDateFilterTest.java         |   156 -
 .../src/test/java/GVFrequencyFilterTest.java    |   144 -
 .../src/test/java/IteratorTest.java             |   554 -
 .../src/test/java/JTSFilterTest.java            |   181 -
 .../src/test/java/OGCFilterTest.java            |   163 -
 .../src/test/java/SampleData.java               |   228 -
 .../src/test/java/SampleGVData.java             |   182 -
 .../src/test/java/SampleJTSData.java            |   171 -
 partition/common-query/pom.xml                  |   103 -
 .../iterators/CellLevelFilteringIterator.java   |   163 -
 .../core/iterators/CellLevelRecordIterator.java |   144 -
 .../core/iterators/ConversionIterator.java      |   151 -
 .../iterators/GMDenIntersectingIterator.java    |   363 -
 .../core/iterators/IntersectingIterator.java    |   557 -
 .../core/iterators/IntersectionRange.java       |   330 -
 .../core/iterators/IteratorConstants.java       |    11 -
 .../core/iterators/SortedMinIterator.java       |   173 -
 .../core/iterators/SortedRangeIterator.java     |   136 -
 .../core/iterators/UniqueIterator.java          |    95 -
 .../core/iterators/conversion/Operation.java    |   109 -
 .../core/iterators/filter/CBConverter.java      |   117 -
 .../iterators/filter/general/GVDateFilter.java  |   169 -
 .../filter/general/GVFrequencyFilter.java       |    92 -
 .../core/iterators/filter/jts/JTSFilter.java    |   191 -
 .../core/iterators/filter/ogc/OGCFilter.java    |   241 -
 .../ogc/operation/AbstractComparisonOp.java     |    80 -
 .../filter/ogc/operation/AbstractLogicalOp.java |    40 -
 .../iterators/filter/ogc/operation/And.java     |    29 -
 .../iterators/filter/ogc/operation/BBOX.java    |   125 -
 .../filter/ogc/operation/IOperation.java        |    30 -
 .../iterators/filter/ogc/operation/Not.java     |    35 -
 .../core/iterators/filter/ogc/operation/Or.java |    29 -
 .../filter/ogc/operation/PropertyIsBetween.java |    76 -
 .../filter/ogc/operation/PropertyIsEqualTo.java |    30 -
 .../ogc/operation/PropertyIsGreaterThan.java    |    29 -
 .../PropertyIsGreaterThanOrEqualTo.java         |    29 -
 .../ogc/operation/PropertyIsLessThan.java       |    31 -
 .../operation/PropertyIsLessThanOrEqualTo.java  |    29 -
 .../filter/ogc/operation/PropertyIsLike.java    |   144 -
 .../ogc/operation/PropertyIsNotEqualTo.java     |    30 -
 .../filter/ogc/operation/PropertyIsNull.java    |    38 -
 .../filter/ogc/operation/ShapeFactory.java      |   133 -
 .../core/iterators/filter/ogc/util/GeoUtil.java |    32 -
 .../src/test/java/GVDateFilterTest.java         |   156 -
 .../src/test/java/GVFrequencyFilterTest.java    |   144 -
 .../src/test/java/IteratorTest.java             |   554 -
 .../src/test/java/JTSFilterTest.java            |   181 -
 .../src/test/java/OGCFilterTest.java            |   163 -
 .../common-query/src/test/java/SampleData.java  |   228 -
 .../src/test/java/SampleGVData.java             |   182 -
 .../src/test/java/SampleJTSData.java            |   171 -
 partition/iterator-test/filter.txt              |     6 -
 partition/iterator-test/pom.xml                 |    99 -
 .../src/main/java/dss/webservice/itr/Main.java  |   348 -
 .../src/main/java/dss/webservice/itr/Test.java  |     9 -
 .../dss/webservice/itr/test/AddTestRecords.java |    43 -
 .../dss/webservice/itr/test/BaseTileTest.java   |   132 -
 .../dss/webservice/itr/test/ConversionTest.java |   159 -
 partition/iterator-test/test.sh                 |     3 -
 partition/mr.partition.rdf/pom.xml              |    79 -
 .../mr.partition.rdf/src/main/assembly/job.xml  |    38 -
 .../src/main/groovy/convertrdfdir.groovy        |    33 -
 .../mvm/mmrts/rdf/partition/mr/MrTstBed.java    |   104 -
 .../mr/SparqlPartitionStoreInputFormat.java     |   411 -
 .../rdf/partition/mr/SparqlTestDriver.java      |   155 -
 .../mvm/mmrts/rdf/partition/mr/TestDriver.java  |   154 -
 .../mr/compat/ChangeShardDateFormatTool.java    |   229 -
 .../partition/mr/compat/MoveShardIndexTool.java |   171 -
 .../mr/fileinput/RdfFileInputFormat.java        |   155 -
 .../fileinput/RdfFileInputToCloudbaseTool.java  |   210 -
 .../mr/fileinput/RdfFileInputToFileTool.java    |   159 -
 .../mr/fileinput/bulk/BulkNtripsInputTool.java  |   326 -
 .../bulk/EmbedKeyRangePartitioner.java          |    28 -
 .../iterators/SortedEncodedRangeIterator.java   |    45 -
 .../AggregateTriplesBySubjectCombiner.java      |    31 -
 .../AggregateTriplesBySubjectReducer.java       |    37 -
 .../mr/transform/KeyValueToMapWrMapper.java     |    78 -
 .../mr/transform/SparqlCloudbaseIFJob.java      |   118 -
 .../transform/SparqlCloudbaseIFTransformer.java |   331 -
 .../SparqlCloudbaseIFTransformerConstants.java  |    12 -
 .../compat/ChangeShardDateFormatToolTest.java   |    33 -
 .../mr/fileinput/RdfFileInputToolTest.java      |    80 -
 .../bulk/EmbedKeyRangePartitionerTest.java      |    20 -
 partition/partition.rdf/pom.xml                 |   281 -
 .../InvalidValueTypeMarkerRuntimeException.java |    34 -
 .../rdf/partition/PartitionConnection.java      |   306 -
 .../mmrts/rdf/partition/PartitionConstants.java |   141 -
 .../mvm/mmrts/rdf/partition/PartitionSail.java  |   122 -
 .../rdf/partition/PartitionTripleSource.java    |    40 -
 .../converter/ContextColVisConverter.java       |    14 -
 .../partition/iterators/NamespaceIterator.java  |    93 -
 .../evaluation/FilterTimeIndexVisitor.java      |   113 -
 .../evaluation/PartitionEvaluationStrategy.java |    70 -
 .../ShardSubjectLookupStatementIterator.java    |   493 -
 .../evaluation/SubjectGroupingOptimizer.java    |   178 -
 .../query/evaluation/select/FilterIterator.java |   100 -
 .../evaluation/select/SelectAllIterator.java    |    54 -
 .../query/evaluation/select/SelectIterator.java |   270 -
 .../select/SubjectSelectIterator.java           |    40 -
 .../select/utils/DocumentIterator.java          |   107 -
 .../query/operators/ShardSubjectLookup.java     |   167 -
 .../shard/DateHashModShardValueGenerator.java   |    52 -
 .../partition/shard/ShardValueGenerator.java    |    12 -
 .../partition/utils/ContextsStatementImpl.java  |    30 -
 .../rdf/partition/utils/CountPredObjPairs.java  |    39 -
 .../rdf/partition/utils/PartitionUtils.java     |     9 -
 .../mvm/mmrts/rdf/partition/utils/RdfIO.java    |   166 -
 .../main/resources/partitionTableLoad.cbexec    |     4 -
 .../mmrts/rdf/partition/LoadPartitionData.java  |    79 -
 .../mmrts/rdf/partition/LoadPartitionData2.java |    69 -
 .../mvm/mmrts/rdf/partition/LoadSampleData.java |    64 -
 .../mvm/mmrts/rdf/partition/MemStoreTst.java    |    71 -
 .../rdf/partition/PartitionConnectionTest.java  |   771 -
 .../mmrts/rdf/partition/QueryPartitionData.java |   675 -
 .../java/mvm/mmrts/rdf/partition/TstBed.java    |    90 -
 .../mvm/mmrts/rdf/partition/TstBedGMDen.java    |    94 -
 .../mmrts/rdf/partition/TstDocumentReader.java  |   217 -
 .../mvm/mmrts/rdf/partition/TstScanner.java     |    59 -
 .../DateHashModShardValueGeneratorTest.java     |    30 -
 .../mmrts/rdf/partition/utils/RdfIOTest.java    |    82 -
 partition/web.partition.rdf/cimRdf.xml          | 15740 -----------------
 partition/web.partition.rdf/pom.xml             |    63 -
 .../web/partition/AbstractRDFWebServlet.java    |    66 -
 .../rdf/web/partition/DeleteDataServlet.java    |    46 -
 .../rdf/web/partition/LoadDataServlet.java      |    56 -
 .../rdf/web/partition/QueryDataServlet.java     |   158 -
 .../web/partition/QuerySerqlDataServlet.java    |   116 -
 .../rdf/web/partition/RDFWebConstants.java      |    15 -
 .../src/main/webapp/WEB-INF/web.xml             |    77 -
 .../src/main/webapp/crossdomain.xml             |     5 -
 .../src/main/webapp/serqlQuery.jsp              |    36 -
 .../src/main/webapp/sparqlQuery.jsp             |    47 -
 .../cloudbase/sail/DeleteDataServletRun.java    |   455 -
 .../web/cloudbase/sail/LoadDataServletRun.java  |    51 -
 .../web/cloudbase/sail/QueryDataServletRun.java |   444 -
 .../src/test/resources/cdrdf.xml                |    20 -
 .../src/test/resources/n3trips.txt              |     4 -
 pig/accumulo.pig/pom.xml                        |   111 +-
 .../mvm/rya/accumulo/pig/AccumuloStorage.java   |    33 +-
 .../mvm/rya/accumulo/pig/IndexWritingTool.java  |    31 +-
 .../rya/accumulo/pig/SparqlQueryPigEngine.java  |    31 +-
 .../pig/SparqlToPigTransformVisitor.java        |    31 +-
 .../accumulo/pig/StatementPatternStorage.java   |    31 +-
 .../pig/optimizer/SimilarVarJoinOptimizer.java  |    33 +-
 .../rya/accumulo/pig/AccumuloStorageTest.java   |    31 +-
 .../rya/accumulo/pig/IndexWritingToolTest.java  |    20 +
 .../accumulo/pig/SparqlQueryPigEngineTest.java  |    31 +-
 .../pig/SparqlToPigTransformVisitorTest.java    |    31 +-
 .../pig/StatementPatternStorageTest.java        |    31 +-
 pig/cloudbase.pig/pom.xml                       |    65 -
 .../mvm/rya/cloudbase/pig/CloudbaseStorage.java |   318 -
 .../rya/cloudbase/pig/SparqlQueryPigEngine.java |   237 -
 .../pig/SparqlToPigTransformVisitor.java        |   323 -
 .../cloudbase/pig/StatementPatternStorage.java  |   278 -
 .../rya/cloudbase/pig/dep/CloudbaseStorage.java |   299 -
 .../pig/dep/StatementPatternStorage.java        |   178 -
 .../pig/optimizer/SimilarVarJoinOptimizer.java  |   189 -
 .../mapred/PreferLocalMapTaskSelector.java      |    39 -
 .../cloudbase/pig/CloudbaseInputFormatMain.java |    50 -
 .../rya/cloudbase/pig/CloudbaseStorageTest.java |   250 -
 .../cloudbase/pig/SparqlQueryPigEngineTest.java |    55 -
 .../pig/SparqlToPigTransformVisitorTest.java    |   367 -
 .../pig/StatementPatternStorageTest.java        |   148 -
 pig/pom.xml                                     |    30 +-
 pom.xml                                         |   508 +-
 sail/pom.xml                                    |   100 +-
 sail/rya.sail.impl/pom.xml                      |   126 -
 .../rya/rdftriplestore/RdfCloudTripleStore.java |   178 -
 .../RdfCloudTripleStoreConnection.java          |   622 -
 .../RdfCloudTripleStoreFactory.java             |    55 -
 .../RdfCloudTripleStoreSailConfig.java          |   132 -
 .../rya/rdftriplestore/RyaSailRepository.java   |    52 -
 .../RyaSailRepositoryConnection.java            |   108 -
 .../evaluation/ExternalBatchingIterator.java    |    32 -
 .../ExternalMultipleBindingSetsIterator.java    |   108 -
 .../evaluation/FilterRangeVisitor.java          |    96 -
 .../evaluation/MultipleBindingSetsIterator.java |   107 -
 .../ParallelEvaluationStrategyImpl.java         |   280 -
 .../evaluation/ParallelJoinIterator.java        |   138 -
 .../evaluation/PushJoinDownVisitor.java         |    56 -
 .../evaluation/QueryJoinOptimizer.java          |   283 -
 .../evaluation/QueryJoinSelectOptimizer.java    |   259 -
 ...RdfCloudTripleStoreEvaluationStatistics.java |   280 -
 ...pleStoreSelectivityEvaluationStatistics.java |   127 -
 .../evaluation/ReorderJoinVisitor.java          |    69 -
 .../evaluation/SeparateFilterJoinsVisitor.java  |    54 -
 .../inference/AbstractInferVisitor.java         |   107 -
 .../rdftriplestore/inference/DoNotExpandSP.java |    50 -
 .../inference/InferConstants.java               |    33 -
 .../rya/rdftriplestore/inference/InferJoin.java |    49 -
 .../rdftriplestore/inference/InferUnion.java    |    47 -
 .../inference/InferenceEngine.java              |   409 -
 .../inference/InferenceEngineException.java     |    42 -
 .../inference/InverseOfVisitor.java             |    79 -
 .../rdftriplestore/inference/SameAsVisitor.java |   186 -
 .../inference/SubClassOfVisitor.java            |   107 -
 .../inference/SubPropertyOfVisitor.java         |   120 -
 .../inference/SymmetricPropertyVisitor.java     |    77 -
 .../inference/TransitivePropertyVisitor.java    |    68 -
 .../namespace/NamespaceManager.java             |   166 -
 .../utils/CombineContextsRdfInserter.java       |   164 -
 .../rdftriplestore/utils/DefaultStatistics.java |    57 -
 .../utils/FixedStatementPattern.java            |    58 -
 .../utils/TransitivePropertySP.java             |    51 -
 .../META-INF/org.openrdf.store.schemas          |     1 -
 .../META-INF/schemas/cloudbasestore-schema.ttl  |    20 -
 .../org.openrdf.sail.config.SailFactory         |     1 -
 .../src/main/resources/ehcache.xml              |    26 -
 .../java/mvm/rya/ArbitraryLengthQueryTest.java  |   499 -
 .../src/test/java/mvm/rya/HashJoinTest.java     |   373 -
 .../test/java/mvm/rya/IterativeJoinTest.java    |   364 -
 .../src/test/java/mvm/rya/MergeJoinTest.java    |   369 -
 .../rya/RdfCloudTripleStoreConnectionTest.java  |  1362 --
 .../java/mvm/rya/RdfCloudTripleStoreTest.java   |   698 -
 .../mvm/rya/RdfCloudTripleStoreUtilsTest.java   |    86 -
 .../QueryJoinSelectOptimizerTest.java           |   991 --
 ...toreSelectivityEvaluationStatisticsTest.java |   303 -
 .../rya/triplestore/inference/SameAsTest.java   |   114 -
 sail/rya.sail.impl/src/test/resources/cdrdf.xml |    40 -
 .../src/test/resources/namedgraphs.trig         |    37 -
 sail/rya.sail.impl/src/test/resources/ntriples  |     1 -
 .../src/test/resources/reification.xml          |    35 -
 .../src/test/resources/univ-bench.owl           |   466 -
 .../rya/rdftriplestore/RdfCloudTripleStore.java |   179 +
 .../RdfCloudTripleStoreConnection.java          |   623 +
 .../RdfCloudTripleStoreFactory.java             |    56 +
 .../RdfCloudTripleStoreSailConfig.java          |   133 +
 .../rya/rdftriplestore/RyaSailRepository.java   |    53 +
 .../RyaSailRepositoryConnection.java            |   109 +
 .../evaluation/ExternalBatchingIterator.java    |    33 +
 .../ExternalMultipleBindingSetsIterator.java    |   109 +
 .../evaluation/FilterRangeVisitor.java          |    97 +
 .../evaluation/MultipleBindingSetsIterator.java |   108 +
 .../ParallelEvaluationStrategyImpl.java         |   281 +
 .../evaluation/ParallelJoinIterator.java        |   139 +
 .../evaluation/PushJoinDownVisitor.java         |    57 +
 .../evaluation/QueryJoinOptimizer.java          |   284 +
 .../evaluation/QueryJoinSelectOptimizer.java    |   260 +
 ...RdfCloudTripleStoreEvaluationStatistics.java |   281 +
 ...pleStoreSelectivityEvaluationStatistics.java |   128 +
 .../evaluation/ReorderJoinVisitor.java          |    70 +
 .../evaluation/SeparateFilterJoinsVisitor.java  |    55 +
 .../inference/AbstractInferVisitor.java         |   108 +
 .../rdftriplestore/inference/DoNotExpandSP.java |    51 +
 .../inference/InferConstants.java               |    34 +
 .../rya/rdftriplestore/inference/InferJoin.java |    50 +
 .../rdftriplestore/inference/InferUnion.java    |    48 +
 .../inference/InferenceEngine.java              |   410 +
 .../inference/InferenceEngineException.java     |    43 +
 .../inference/InverseOfVisitor.java             |    80 +
 .../rdftriplestore/inference/SameAsVisitor.java |   187 +
 .../inference/SubClassOfVisitor.java            |   108 +
 .../inference/SubPropertyOfVisitor.java         |   121 +
 .../inference/SymmetricPropertyVisitor.java     |    78 +
 .../inference/TransitivePropertyVisitor.java    |    69 +
 .../namespace/NamespaceManager.java             |   167 +
 .../utils/CombineContextsRdfInserter.java       |   165 +
 .../rdftriplestore/utils/DefaultStatistics.java |    58 +
 .../utils/FixedStatementPattern.java            |    59 +
 .../utils/TransitivePropertySP.java             |    52 +
 .../META-INF/org.openrdf.store.schemas          |     1 +
 .../META-INF/schemas/cloudbasestore-schema.ttl  |    20 +
 .../org.openrdf.sail.config.SailFactory         |     1 +
 sail/src/main/resources/ehcache.xml             |    46 +
 .../java/mvm/rya/ArbitraryLengthQueryTest.java  |   500 +
 sail/src/test/java/mvm/rya/HashJoinTest.java    |   374 +
 .../test/java/mvm/rya/IterativeJoinTest.java    |   365 +
 sail/src/test/java/mvm/rya/MergeJoinTest.java   |   370 +
 .../rya/RdfCloudTripleStoreConnectionTest.java  |  1363 ++
 .../java/mvm/rya/RdfCloudTripleStoreTest.java   |   699 +
 .../mvm/rya/RdfCloudTripleStoreUtilsTest.java   |    86 +
 .../QueryJoinSelectOptimizerTest.java           |   992 ++
 ...toreSelectivityEvaluationStatisticsTest.java |   304 +
 .../rya/triplestore/inference/SameAsTest.java   |   115 +
 sail/src/test/resources/cdrdf.xml               |    41 +
 sail/src/test/resources/namedgraphs.trig        |    37 +
 sail/src/test/resources/ntriples.nt             |     1 +
 sail/src/test/resources/reification.xml         |    36 +
 sail/src/test/resources/univ-bench.owl          |   466 +
 utils/cloudbase.utils/pom.xml                   |    67 -
 .../utils/bulk/KeyRangePartitioner.java         |    35 -
 .../utils/filters/TimeRangeFilter.java          |    64 -
 .../input/CloudbaseBatchScannerInputFormat.java |   872 -
 .../utils/scanner/BatchScannerList.java         |   108 -
 .../cloudbase/utils/scanner/RangesScanner.java  |   236 -
 .../cloudbase/utils/shard/HashAlgorithm.java    |     9 -
 .../utils/shard/HashCodeHashAlgorithm.java      |    14 -
 .../utils/shard/ShardedBatchWriter.java         |    51 -
 .../cloudbase/utils/shard/ShardedConnector.java |   158 -
 ...mentTabletServerBatchReaderIteratorTest.java |    15 -
 .../utils/filters/TimeRangeFilterTest.java      |    53 -
 .../utils/shard/ShardedConnectorTest.java       |    76 -
 utils/pom.xml                                   |    22 -
 web/pom.xml                                     |    30 +-
 web/web.rya/pom.xml                             |   163 +-
 web/web.rya/resources/environment.properties    |    19 +-
 .../cloudbase/sail/AbstractRDFWebServlet.java   |    34 +-
 .../web/cloudbase/sail/DeleteDataServlet.java   |    34 +-
 .../rdf/web/cloudbase/sail/LoadDataServlet.java |    34 +-
 .../web/cloudbase/sail/QueryDataServlet.java    |    34 +-
 .../cloudbase/sail/QuerySerqlDataServlet.java   |    34 +-
 .../rdf/web/cloudbase/sail/RDFWebConstants.java |    34 +-
 .../mvm/cloud/rdf/web/sail/RdfController.java   |    31 +-
 .../mvm/cloud/rdf/web/sail/ResultFormat.java    |    31 +-
 .../rdf/web/sail/SecurityProviderImpl.java      |    20 +
 .../webapp/WEB-INF/spring/spring-accumulo.xml   |    20 +
 .../webapp/WEB-INF/spring/spring-cloudbase.xml  |    20 +
 .../webapp/WEB-INF/spring/spring-mongodb.xml    |    20 +
 .../WEB-INF/spring/spring-root-extensions.xml   |    20 +
 .../main/webapp/WEB-INF/spring/spring-root.xml  |    20 +
 .../webapp/WEB-INF/spring/spring-security.xml   |    20 +
 web/web.rya/src/main/webapp/WEB-INF/web.xml     |    20 +
 web/web.rya/src/main/webapp/crossdomain.xml     |    22 +-
 web/web.rya/src/main/webapp/sparqlQuery.jsp     |    21 +-
 .../cloudbase/sail/DeleteDataServletRun.java    |    31 +-
 .../web/cloudbase/sail/LoadDataServletRun.java  |    31 +-
 .../web/cloudbase/sail/QueryDataServletRun.java |    31 +-
 .../web/sail/RdfControllerIntegrationTest.java  |    20 +
 .../cloud/rdf/web/sail/RdfControllerTest.java   |    31 +-
 web/web.rya/src/test/resources/cdrdf.xml        |    39 +-
 .../controllerIntegrationTest-accumulo.xml      |    37 +-
 .../controllerIntegrationTest-root.xml          |    21 +
 .../test/resources/controllerTest-context.xml   |    37 +-
 793 files changed, 31450 insertions(+), 63210 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/NOTICE
----------------------------------------------------------------------
diff --git a/NOTICE b/NOTICE
new file mode 100644
index 0000000..7148307
--- /dev/null
+++ b/NOTICE
@@ -0,0 +1,6 @@
+Apache Rya
+Copyright 2015 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/README.md
----------------------------------------------------------------------
diff --git a/README.md b/README.md
index bc548a0..7869bef 100644
--- a/README.md
+++ b/README.md
@@ -1,3 +1,20 @@
+<!-- Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License. -->
+
 # RYA
 
 ## Overview

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/pom.xml
----------------------------------------------------------------------
diff --git a/common/pom.xml b/common/pom.xml
index 478c6db..c14d712 100644
--- a/common/pom.xml
+++ b/common/pom.xml
@@ -1,17 +1,39 @@
 <?xml version="1.0" encoding="utf-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
 
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>mvm.rya</groupId>
-        <artifactId>parent</artifactId>
+        <groupId>org.apache.rya</groupId>
+        <artifactId>rya-project</artifactId>
         <version>3.2.10-SNAPSHOT</version>
     </parent>
+
     <artifactId>rya.common</artifactId>
+    <name>Apache Rya Common Projects</name>
+
     <packaging>pom</packaging>
-    <name>${project.groupId}.${project.artifactId}</name>
+
     <modules>
         <module>rya.api</module>
-      <module>rya.provenance</module>
+        <module>rya.provenance</module>
     </modules>
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/pom.xml
----------------------------------------------------------------------
diff --git a/common/rya.api/pom.xml b/common/rya.api/pom.xml
index 386d2c8..7c90521 100644
--- a/common/rya.api/pom.xml
+++ b/common/rya.api/pom.xml
@@ -1,44 +1,58 @@
 <?xml version="1.0" encoding="UTF-8"?>
+
+<!--
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements.  See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership.  The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License.  You may obtain a copy of the License at
+
+  http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied.  See the License for the
+specific language governing permissions and limitations
+under the License.
+-->
+
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+    <modelVersion>4.0.0</modelVersion>
     <parent>
-        <groupId>mvm.rya</groupId>
+        <groupId>org.apache.rya</groupId>
         <artifactId>rya.common</artifactId>
         <version>3.2.10-SNAPSHOT</version>
     </parent>
-    <modelVersion>4.0.0</modelVersion>
 
     <artifactId>rya.api</artifactId>
-    <name>${project.groupId}.${project.artifactId}</name>
+    <name>Apache Rya Common API</name>
+
     <dependencies>
         <dependency>
             <groupId>org.calrissian.mango</groupId>
             <artifactId>mango-core</artifactId>
         </dependency>
+
         <dependency>
             <groupId>org.openrdf.sesame</groupId>
             <artifactId>sesame-model</artifactId>
-            <version>${openrdf.sesame.version}</version>
-        </dependency>
-        <dependency>
-            <groupId>junit</groupId>
-            <artifactId>junit</artifactId>
-            <scope>test</scope>
         </dependency>
         <dependency>
             <groupId>org.openrdf.sesame</groupId>
             <artifactId>sesame-query</artifactId>
-            <version>${openrdf.sesame.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrdf.sesame</groupId>
             <artifactId>sesame-queryalgebra-model</artifactId>
-            <version>${openrdf.sesame.version}</version>
         </dependency>
         <dependency>
             <groupId>org.openrdf.sesame</groupId>
             <artifactId>sesame-queryalgebra-evaluation</artifactId>
-            <version>${openrdf.sesame.version}</version>
         </dependency>
+
         <dependency>
             <groupId>com.google.guava</groupId>
             <artifactId>guava</artifactId>
@@ -48,13 +62,15 @@
             <artifactId>hadoop-common</artifactId>
         </dependency>
         <dependency>
-            <groupId>org.apache.hadoop</groupId>
-            <artifactId>hadoop-core</artifactId>
-        </dependency>
-        <dependency>
             <groupId>joda-time</groupId>
             <artifactId>joda-time</artifactId>
         </dependency>
+
+        <dependency>
+            <groupId>junit</groupId>
+            <artifactId>junit</artifactId>
+            <scope>test</scope>
+        </dependency>
     </dependencies>
 
 </project>

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/InvalidValueTypeMarkerRuntimeException.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/InvalidValueTypeMarkerRuntimeException.java b/common/rya.api/src/main/java/mvm/rya/api/InvalidValueTypeMarkerRuntimeException.java
index 4d8ce5a..eea50f4 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/InvalidValueTypeMarkerRuntimeException.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/InvalidValueTypeMarkerRuntimeException.java
@@ -1,25 +1,26 @@
 package mvm.rya.api;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 /**
  * Class InvalidValueTypeMarkerRuntimeException
  * Date: Jan 7, 2011

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java
index 077e268..1d0e165 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConfiguration.java
@@ -1,25 +1,26 @@
 package mvm.rya.api;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import java.util.List;
 
 import mvm.rya.api.layout.TableLayoutStrategy;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConstants.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConstants.java b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConstants.java
index d04ba27..5311bd9 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConstants.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreConstants.java
@@ -1,25 +1,26 @@
 package mvm.rya.api;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import mvm.rya.api.domain.RyaSchema;
 import mvm.rya.api.domain.RyaType;
 import mvm.rya.api.domain.RyaURI;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreStatement.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreStatement.java b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreStatement.java
index fa2bf5f..4a13c01 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreStatement.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreStatement.java
@@ -1,25 +1,26 @@
 package mvm.rya.api;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Resource;
 import org.openrdf.model.Statement;
 import org.openrdf.model.URI;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreUtils.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreUtils.java b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreUtils.java
index 2d04c11..eeadb9b 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreUtils.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/RdfCloudTripleStoreUtils.java
@@ -1,25 +1,26 @@
 package mvm.rya.api;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import mvm.rya.api.layout.TableLayoutStrategy;
 import mvm.rya.api.layout.TablePrefixLayoutStrategy;
 import org.openrdf.model.Literal;
@@ -416,4 +417,4 @@ public class RdfCloudTripleStoreUtils {
             return null;
     }
 
-}
\ No newline at end of file
+}

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/date/DateTimeTtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/date/DateTimeTtlValueConverter.java b/common/rya.api/src/main/java/mvm/rya/api/date/DateTimeTtlValueConverter.java
index e73a71b..199b63d 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/date/DateTimeTtlValueConverter.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/date/DateTimeTtlValueConverter.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.date;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Value;
 
 import javax.xml.datatype.DatatypeConfigurationException;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlStrValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlStrValueConverter.java b/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlStrValueConverter.java
index 297cf5c..de4ff8b 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlStrValueConverter.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlStrValueConverter.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.date;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Value;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlValueConverter.java b/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlValueConverter.java
index a709148..75366dc 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlValueConverter.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/date/TimestampTtlValueConverter.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.date;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Value;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/date/TtlValueConverter.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/date/TtlValueConverter.java b/common/rya.api/src/main/java/mvm/rya/api/date/TtlValueConverter.java
index 078d0f6..1ba9841 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/date/TtlValueConverter.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/date/TtlValueConverter.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.date;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Value;
 import org.openrdf.model.ValueFactory;
 import org.openrdf.model.impl.ValueFactoryImpl;

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java b/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java
index dea3a76..f5ca08c 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/Node.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.impl.URIImpl;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java
index f3e2302..67d5742 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeURI.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.URI;
 import org.openrdf.model.Value;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java
index 67c37e7..c27edfd 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RangeValue.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import org.openrdf.model.Value;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RyaRange.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaRange.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaRange.java
index 2214044..e99f451 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaRange.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaRange.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 /**
  * Date: 7/17/12
  * Time: 10:02 AM

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RyaSchema.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaSchema.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaSchema.java
index 380657c..6744d20 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaSchema.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaSchema.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import mvm.rya.api.RdfCloudTripleStoreConstants;
 import org.openrdf.model.URI;
 

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RyaStatement.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaStatement.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaStatement.java
index 439eee6..18bde98 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaStatement.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaStatement.java
@@ -1,25 +1,26 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
+
+
 import java.util.Arrays;
 
 /**

http://git-wip-us.apache.org/repos/asf/incubator-rya/blob/80faf06d/common/rya.api/src/main/java/mvm/rya/api/domain/RyaType.java
----------------------------------------------------------------------
diff --git a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaType.java b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaType.java
index 9af0cc7..ab580d6 100644
--- a/common/rya.api/src/main/java/mvm/rya/api/domain/RyaType.java
+++ b/common/rya.api/src/main/java/mvm/rya/api/domain/RyaType.java
@@ -1,26 +1,27 @@
 package mvm.rya.api.domain;
 
 /*
- * #%L
- * mvm.rya.rya.api
- * %%
- * Copyright (C) 2014 Rya
- * %%
- * Licensed under the Apache License, Version 2.0 (the "License");
- * you may not use this file except in compliance with the License.
- * You may obtain a copy of the License at
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements.  See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership.  The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License.  You may obtain a copy of the License at
  * 
- *      http://www.apache.org/licenses/LICENSE-2.0
+ *   http://www.apache.org/licenses/LICENSE-2.0
  * 
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- * #L%
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied.  See the License for the
+ * specific language governing permissions and limitations
+ * under the License.
  */
 
 
+
+
 import org.openrdf.model.URI;
 import org.openrdf.model.vocabulary.XMLSchema;