You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by an...@apache.org on 2012/11/27 19:11:50 UTC
svn commit: r1414299 [1/3] - in /jena/trunk:
jena-fuseki/src/main/java/org/apache/jena/fuseki/
jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/
jena-fuseki/src/main/java/org/apache/jena/fuseki/http/
jena-fuseki/src/main/java/org/apache/jena/fus...
Author: andy
Date: Tue Nov 27 18:10:37 2012
New Revision: 1414299
URL: http://svn.apache.org/viewvc?rev=1414299&view=rev
Log:
Changes for moving org.openjena.atlas to org.apache.jena.atlas
Modified:
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/TDBGraphAssembler.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgr.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrCache.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockType.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/BufferBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBuffer.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBufferIterator.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileSet.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/MetaFile.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFile.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFilePersistent.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFile.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileLogger.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/StringFile.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/Page.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBlockMgr.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/record/Record.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordBufferPageBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordRangeIterator.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/Index.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexMap.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndex.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleIndexRecord.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/TupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeNodeBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPTreeRecords.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTree.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeParams.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeRewriter.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeRewriterUtils.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/BPlusTreeTools.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/bplustree/RecordBufferPageLinker.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/ext/ExtHash.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/ext/HashBucket.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/DumpOps.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/Lib2.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeFmtLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/NodeLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/lib/TupleLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/migrate/TransformDynamicDataset_Imperfect.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableCache.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableLogger.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableNative.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableSink.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTableWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableConcrete.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableView.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodeTupleTableWrapper.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/nodetable/NodecSSE.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/Builder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderBasic.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingNodeId.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/BindingTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/OpExecutorTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QC2.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryEngineTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/QueryIteratorIdToNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/SolverLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageGeneratorDirectTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/StageMatchTuple.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/Stats.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/solver/stats/StatsCollectorBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetGraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DatasetPrefixesTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DateTimeNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/DecimalNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphNamedTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTDBBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/GraphTriplesTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/Hash.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/IntegerNode.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/NodeId.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/QuadTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/SinkProgress.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TableBase.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/TripleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/BulkLoader.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/Destination.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoadMonitor.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader/LoaderNodeTupleTable.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexBuild.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdIndexCopy.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/CmdNodeTableBuilder.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/IndexFactory.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/RecordLib.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/RecordsFromInput.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/store/bulkloader2/WriteRows.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DatasetControlMRSW.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/DebugTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/FileRef.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SetupTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/sys/SystemTDB.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/BlockMgrJournal.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetGraphTransaction.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/Journal.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalControl.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/JournalEntryType.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/NodeTableTrans.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/ObjectFileTrans.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/Transaction.java
jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java
jena/trunk/jena-tdb/src/main/java/tdb/CmdRewriteIndex.java
jena/trunk/jena-tdb/src/main/java/tdb/cmdline/CmdTDB.java
jena/trunk/jena-tdb/src/main/java/tdb/cmdline/ModTDBDataset.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbclean.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbconfig.java
jena/trunk/jena-tdb/src/main/java/tdb/tdbnode.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpbpt.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/dumpnodetable.java
jena/trunk/jena-tdb/src/main/java/tdb/tools/tdbgenindex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/ConfigTest.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/TestTDBFactory.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/assembler/TestTDBAssembler.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/block/AbstractTestBlockMgr.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrMapped.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/block/TestBlockMgrTracked.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestPtrBuffer.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/buffer/TestRecordBuffer.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestBlockAccessFixedSize.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/AbstractTestChannel.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessDirect.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestBlockAccessMapped.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestChannelFile.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/file/TestMetaFile.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/AbstractTestObjectFile.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/AbstractTestStringFile.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileBuffering.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestObjectFileDisk.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/objectfile/TestStringFileDisk.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/record/RecordLib.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/record/TestRecord.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/base/recordfile/TestRecordBufferPage.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_QuadsObjectIsNull.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TDBWriteTransaction.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TimeoutUnionGraph.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystem.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TransSystemMultiDatasets.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/extra/T_TxnDeadlockTest.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestBulkUpdateTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/TestPrefixMappingTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/graph/basics/FactoryGraphTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestGenerator.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/IndexTestLib.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestRangeIndex.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleIndexRecord.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/TestTupleTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/CmdTestBPlusTreeRewriter.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPTreeRecords.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/bplustree/TestBPlusTreeRewriter.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/index/ext/ExtHashTestBase.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/junit/GraphLocation.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestNodeLib.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/lib/TestStringAbbrev.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/migrate/AbstractTestTransaction.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestCodec.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/nodetable/TestNodeTableBase.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/solver/TestSolverTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/AbstractStoreConnections.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestConcurrentAccess.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestDatasetTDBPersist.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestGraphTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestLoader.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestNodeId.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestQuadFilter.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/TestTripleTable.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/store/Test_SPARQL_TDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/sys/TestSys.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestNodeTableTrans.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestObjectFileTrans.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSeq.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/AbstractTestTransSequentialDisk.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestJournal.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestNodeTableTransDisk.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransIterator.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransRestart.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionTDB.java
jena/trunk/jena-tdb/src/test/java/com/hp/hpl/jena/tdb/transaction/TestTransactionUnionGraph.java
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/DEF.java Tue Nov 27 18:10:37 2012
@@ -18,8 +18,8 @@
package org.apache.jena.fuseki;
-import org.openjena.atlas.web.AcceptList ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.AcceptList ;
+import org.apache.jena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
public class DEF
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Tue Nov 27 18:10:37 2012
@@ -25,16 +25,16 @@ import java.net.InetAddress ;
import java.net.UnknownHostException ;
import java.util.List ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.mgt.ManagementServer ;
import org.apache.jena.fuseki.server.FusekiConfig ;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.fuseki.server.ServerConfig ;
import org.eclipse.jetty.server.Server ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.FileOps ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.lib.StrUtils ;
-import org.openjena.atlas.logging.Log ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotLoader ;
import org.openjena.riot.SysRIOT ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiLib.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import java.util.Map ;
import javax.servlet.http.HttpServletRequest ;
import org.apache.commons.lang.StringUtils ;
-import org.openjena.atlas.lib.MultiMap ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.lib.MultiMap ;
+import org.apache.jena.atlas.web.MediaType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.WebContent ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/conneg/ConNeg.java Tue Nov 27 18:10:37 2012
@@ -22,9 +22,9 @@ import static org.apache.jena.fuseki.Htt
import javax.servlet.http.HttpServletRequest ;
-import org.openjena.atlas.web.AcceptList ;
-import org.openjena.atlas.web.MediaRange ;
-import org.openjena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.AcceptList ;
+import org.apache.jena.atlas.web.MediaRange ;
+import org.apache.jena.atlas.web.MediaType ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/http/DatasetGraphAccessorHTTP.java Tue Nov 27 18:10:37 2012
@@ -36,13 +36,13 @@ import org.apache.http.params.HttpConnec
import org.apache.http.params.HttpParams ;
import org.apache.http.params.HttpProtocolParams ;
import org.apache.http.protocol.HTTP ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.IRILib ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.web.TypedInputStream ;
import org.apache.jena.fuseki.* ;
import org.apache.jena.fuseki.migrate.UnmodifiableGraph ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.IRILib ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.logging.Log ;
-import org.openjena.atlas.web.TypedInputStream ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.WebContent ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/ActionBackup.java Tue Nov 27 18:10:37 2012
@@ -29,6 +29,9 @@ import java.util.zip.GZIPOutputStream ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.http.HttpSC ;
@@ -36,9 +39,6 @@ import org.apache.jena.fuseki.server.Dat
import org.apache.jena.fuseki.server.DatasetRegistry ;
import org.apache.jena.fuseki.servlets.HttpAction ;
import org.apache.jena.fuseki.servlets.ServletBase ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.FileOps ;
-import org.openjena.atlas.logging.Log ;
import org.openjena.riot.out.NQuadsWriter ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java Tue Nov 27 18:10:37 2012
@@ -23,11 +23,11 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpSession ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.iterator.Iter ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.atlas.iterator.Iter ;
import com.hp.hpl.jena.shared.PrefixMapping ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java Tue Nov 27 18:10:37 2012
@@ -21,8 +21,8 @@ package org.apache.jena.fuseki.migrate;
import java.io.InputStream ;
+import org.apache.jena.atlas.lib.Sink ;
import org.apache.jena.fuseki.Fuseki ;
-import org.openjena.atlas.lib.Sink ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
import org.openjena.riot.RiotReader ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/SinkLimited.java Tue Nov 27 18:10:37 2012
@@ -18,8 +18,8 @@
package org.apache.jena.fuseki.migrate;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.lib.SinkWrapper ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.SinkWrapper ;
import org.openjena.riot.RiotException ;
public class SinkLimited<T> extends SinkWrapper<T>
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/migrate/WebIO.java Tue Nov 27 18:10:37 2012
@@ -27,8 +27,8 @@ import org.apache.http.client.HttpClient
import org.apache.http.client.methods.HttpGet ;
import org.apache.http.client.methods.HttpUriRequest ;
import org.apache.http.impl.client.DefaultHttpClient ;
+import org.apache.jena.atlas.io.IO ;
import org.apache.jena.fuseki.FusekiRequestException ;
-import org.openjena.atlas.io.IO ;
public class WebIO
{
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Tue Nov 27 18:10:37 2012
@@ -23,11 +23,11 @@ import java.util.ArrayList ;
import java.util.Arrays ;
import java.util.List ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiConfigException ;
import org.apache.jena.fuseki.HttpNames ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.StrUtils ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.assembler.Assembler ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpAction.java Tue Nov 27 18:10:37 2012
@@ -21,11 +21,11 @@ package org.apache.jena.fuseki.servlets;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.server.DatasetRef ;
-import org.openjena.atlas.logging.Log ;
-import org.openjena.atlas.web.MediaType ;
import com.hp.hpl.jena.query.ReadWrite ;
import com.hp.hpl.jena.shared.Lock ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/HttpServletResponseTracker.java Tue Nov 27 18:10:37 2012
@@ -25,7 +25,7 @@ import java.util.Map ;
import javax.servlet.http.HttpServletResponse ;
import javax.servlet.http.HttpServletResponseWrapper ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
/** Intercepting wrapper so we can track the response settings for logging purposes */
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/REST_Quads.java Tue Nov 27 18:10:37 2012
@@ -25,12 +25,12 @@ import java.io.IOException ;
import javax.servlet.ServletOutputStream ;
import javax.servlet.http.HttpServletRequest ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.TypedOutputStream ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.MediaType ;
-import org.openjena.atlas.web.TypedOutputStream ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotReader ;
import org.openjena.riot.RiotWriter ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseModel.java Tue Nov 27 18:10:37 2012
@@ -25,13 +25,13 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.conneg.WebLib ;
import org.apache.jena.fuseki.http.HttpSC ;
-import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.Lang ;
import org.openjena.riot.WebContent ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ResponseResultSet.java Tue Nov 27 18:10:37 2012
@@ -27,13 +27,13 @@ import javax.servlet.http.HttpServletReq
import javax.servlet.http.HttpServletResponse ;
import org.apache.commons.lang.StringUtils ;
+import org.apache.jena.atlas.web.AcceptList ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.conneg.ConNeg ;
import org.apache.jena.fuseki.http.HttpSC ;
-import static org.openjena.atlas.lib.Lib.equal ;
-import org.openjena.atlas.web.AcceptList ;
-import org.openjena.atlas.web.MediaType ;
+import static org.apache.jena.atlas.lib.Lib.equal ;
import org.openjena.riot.WebContent ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Protocol.java Tue Nov 27 18:10:37 2012
@@ -28,11 +28,11 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.iterator.Filter ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.servlets.SPARQL_Query.HttpActionQuery ;
-import org.openjena.atlas.iterator.Filter ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Lib ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryParseException ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Tue Nov 27 18:10:37 2012
@@ -38,15 +38,15 @@ import java.util.* ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.migrate.WebIO ;
import org.apache.jena.fuseki.server.DatasetRef ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
import com.hp.hpl.jena.query.* ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_QueryGeneral.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
+import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.fuseki.migrate.GraphLoadUtils ;
-import org.openjena.atlas.lib.InternalErrorException ;
import org.openjena.riot.RiotException ;
import com.hp.hpl.jena.query.Dataset ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST.java Tue Nov 27 18:10:37 2012
@@ -38,12 +38,12 @@ import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_REST_R.java Tue Nov 27 18:10:37 2012
@@ -25,11 +25,11 @@ import java.util.Iterator ;
import javax.servlet.ServletOutputStream ;
+import org.apache.jena.atlas.web.MediaType ;
+import org.apache.jena.atlas.web.TypedOutputStream ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.openjena.atlas.web.MediaType ;
-import org.openjena.atlas.web.TypedOutputStream ;
import org.openjena.riot.Lang ;
import org.openjena.riot.WebContent ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_UberServlet.java Tue Nov 27 18:10:37 2012
@@ -26,6 +26,9 @@ import java.util.List ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.iterator.Filter ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.DEF ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.HttpNames ;
@@ -33,9 +36,6 @@ import org.apache.jena.fuseki.conneg.Con
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.fuseki.server.DatasetRegistry ;
-import org.openjena.atlas.iterator.Filter ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
/** This servlet can be attached to a dataset location
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Update.java Tue Nov 27 18:10:37 2012
@@ -36,13 +36,13 @@ import javax.servlet.ServletException ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.web.MediaType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.web.MediaType ;
import org.openjena.riot.WebContent ;
import org.openjena.riot.system.IRIResolver ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Upload.java Tue Nov 27 18:10:37 2012
@@ -31,13 +31,13 @@ import org.apache.commons.fileupload.Fil
import org.apache.commons.fileupload.FileItemStream ;
import org.apache.commons.fileupload.servlet.ServletFileUpload ;
import org.apache.commons.fileupload.util.Streams ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.web.ContentType ;
import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
import org.apache.jena.fuseki.server.DatasetRef ;
import org.apache.jena.iri.IRI ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.web.ContentType ;
import org.openjena.riot.* ;
import org.openjena.riot.lang.LangRIOT ;
import org.openjena.riot.lang.SinkTriplesToGraph ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Tue Nov 27 18:10:37 2012
@@ -26,10 +26,10 @@ import javax.servlet.http.HttpServlet ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.HttpNames ;
import org.apache.jena.fuseki.http.HttpSC ;
-import org.openjena.atlas.lib.StrUtils ;
import org.slf4j.Logger ;
public abstract class ServletBase extends HttpServlet
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/DataValidator.java Tue Nov 27 18:10:37 2012
@@ -29,10 +29,10 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Sink ;
+import org.apache.jena.atlas.lib.SinkWrapper ;
import org.apache.jena.fuseki.FusekiLib ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Sink ;
-import org.openjena.atlas.lib.SinkWrapper ;
import org.openjena.riot.ErrorHandler ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotException ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/QueryValidator.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.io.IndentedWriter ;
import com.hp.hpl.jena.query.Query ;
import com.hp.hpl.jena.query.QueryFactory ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/validation/UpdateValidator.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import javax.servlet.ServletOutputStream
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.openjena.atlas.io.IndentedLineBuffer ;
-import org.openjena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedLineBuffer ;
+import org.apache.jena.atlas.io.IndentedWriter ;
import com.hp.hpl.jena.query.Syntax ;
import com.hp.hpl.jena.sparql.ARQException ;
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/ServerTest.java Tue Nov 27 18:10:37 2012
@@ -18,12 +18,12 @@
package org.apache.jena.fuseki;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.server.FusekiConfig ;
import org.apache.jena.fuseki.server.SPARQLServer ;
import org.apache.jena.fuseki.server.ServerConfig ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
-import org.openjena.atlas.logging.Log ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.sparql.core.DatasetGraphFactory ;
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java Tue Nov 27 18:10:37 2012
@@ -18,6 +18,7 @@
package org.apache.jena.fuseki;
+import org.apache.jena.atlas.logging.Log ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ;
import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ;
@@ -27,7 +28,6 @@ import org.junit.AfterClass ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
-import org.openjena.atlas.logging.Log ;
@RunWith(Suite.class)
Modified: jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java (original)
+++ jena/trunk/jena-fuseki/src/test/java/org/apache/jena/fuseki/WebTest.java Tue Nov 27 18:10:37 2012
@@ -27,7 +27,7 @@ import org.apache.http.client.HttpClient
import org.apache.http.client.methods.HttpGet ;
import org.apache.http.client.methods.HttpUriRequest ;
import org.apache.http.impl.client.DefaultHttpClient ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
public class WebTest extends BaseTest
{
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDB.java Tue Nov 27 18:10:37 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.tdb;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.lib.Sync ;
import org.openjena.riot.SysRIOT ;
import org.openjena.riot.lang.LangRDFXML ;
import org.slf4j.Logger ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/TDBBackup.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import java.io.FileOutputStream ;
import java.io.IOException ;
import java.io.OutputStream ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.logging.Log ;
import org.openjena.riot.out.NQuadsWriter ;
import com.hp.hpl.jena.query.Dataset ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/DatasetAssemblerTDB.java Tue Nov 27 18:10:37 2012
@@ -22,7 +22,7 @@ import static com.hp.hpl.jena.sparql.uti
import static com.hp.hpl.jena.sparql.util.graph.GraphUtils.getStringValue ;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pLocation ;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pUnionDefaultGraph ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.assembler.Assembler ;
import com.hp.hpl.jena.assembler.Mode ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/IndexAssembler.java Tue Nov 27 18:10:37 2012
@@ -22,7 +22,7 @@ import static com.hp.hpl.jena.sparql.uti
import static com.hp.hpl.jena.sparql.util.graph.GraphUtils.getAsStringValue;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pDescription;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.pFile;
-import org.openjena.atlas.lib.ColumnMap ;
+import org.apache.jena.atlas.lib.ColumnMap ;
import com.hp.hpl.jena.rdf.model.Resource;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/TDBGraphAssembler.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/TDBGraphAssembler.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/TDBGraphAssembler.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/assembler/TDBGraphAssembler.java Tue Nov 27 18:10:37 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.assembler;
import static com.hp.hpl.jena.sparql.util.graph.GraphUtils.*;
import static com.hp.hpl.jena.tdb.assembler.VocabTDB.*;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.query.Dataset;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/Block.java Tue Nov 27 18:10:37 2012
@@ -22,7 +22,7 @@ import java.io.ByteArrayOutputStream ;
import java.io.PrintStream ;
import java.nio.ByteBuffer ;
-import org.openjena.atlas.lib.ByteBufferLib ;
+import org.apache.jena.atlas.lib.ByteBufferLib ;
// import tx.base.BlockRef ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgr.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgr.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgr.java Tue Nov 27 18:10:37 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.tdb.base.block;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
public interface BlockMgr extends Sync, Closeable /*UnitMgr<Block>*/
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrBase.java Tue Nov 27 18:10:37 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.base.block;
import java.util.Iterator ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.FileOps ;
import org.slf4j.Logger ;
public abstract class BlockMgrBase implements BlockMgr
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrCache.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrCache.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrCache.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrCache.java Tue Nov 27 18:10:37 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.tdb.base.block;
import java.util.Iterator ;
-import org.openjena.atlas.lib.ActionKeyValue ;
-import org.openjena.atlas.lib.Cache ;
-import org.openjena.atlas.lib.CacheFactory ;
+import org.apache.jena.atlas.lib.ActionKeyValue ;
+import org.apache.jena.atlas.lib.Cache ;
+import org.apache.jena.atlas.lib.CacheFactory ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrFactory.java Tue Nov 27 18:10:37 2012
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.base.block;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.FileOps ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.file.BlockAccess ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockMgrTracker.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import java.util.ArrayList ;
import java.util.Iterator ;
import java.util.List ;
-import org.openjena.atlas.lib.MultiSet ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.MultiSet ;
+import org.apache.jena.atlas.lib.Pair ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockType.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockType.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockType.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/block/BlockType.java Tue Nov 27 18:10:37 2012
@@ -18,8 +18,8 @@
package com.hp.hpl.jena.tdb.base.block;
-import org.openjena.atlas.io.IndentedWriter ;
-import org.openjena.atlas.io.Printable ;
+import org.apache.jena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.Printable ;
import com.hp.hpl.jena.sparql.util.Named ;
import com.hp.hpl.jena.tdb.TDBException ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/BufferBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/BufferBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/BufferBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/BufferBase.java Tue Nov 27 18:10:37 2012
@@ -26,7 +26,8 @@ import static java.lang.String.format ;
import java.nio.ByteBuffer ;
import com.hp.hpl.jena.tdb.base.record.RecordException ;
-import org.openjena.atlas.lib.ByteBufferLib ;
+
+import org.apache.jena.atlas.lib.ByteBufferLib ;
/** ByteBuffer specialization - Common operations for RecordBuffer and PtrBuffer */
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBuffer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBuffer.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBuffer.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBuffer.java Tue Nov 27 18:10:37 2012
@@ -19,7 +19,7 @@
package com.hp.hpl.jena.tdb.base.buffer;
import static java.lang.String.format;
-import static org.openjena.atlas.lib.Alg.encodeIndex ;
+import static org.apache.jena.atlas.lib.Alg.encodeIndex ;
import java.nio.ByteBuffer;
import java.util.Iterator;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBufferIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBufferIterator.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBufferIterator.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/buffer/RecordBufferIterator.java Tue Nov 27 18:10:37 2012
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.base.buffer;
-import static org.openjena.atlas.lib.Alg.decodeIndex ;
+import static org.apache.jena.atlas.lib.Alg.decodeIndex ;
import java.util.Iterator;
import java.util.NoSuchElementException;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccess.java Tue Nov 27 18:10:37 2012
@@ -18,8 +18,8 @@
package com.hp.hpl.jena.tdb.base.file;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessBase.java Tue Nov 27 18:10:37 2012
@@ -23,7 +23,7 @@ import static java.lang.String.format ;
import java.nio.ByteBuffer ;
import java.util.concurrent.atomic.AtomicLong ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.FileOps ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BlockAccessDirect.java Tue Nov 27 18:10:37 2012
@@ -23,7 +23,7 @@ import static java.lang.String.format ;
import java.io.IOException ;
import java.nio.ByteBuffer ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.FileOps ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannel.java Tue Nov 27 18:10:37 2012
@@ -21,8 +21,8 @@ package com.hp.hpl.jena.tdb.base.file;
import java.nio.ByteBuffer ;
import java.nio.channels.FileChannel ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
/** Interface to storage : a simplified version of FileChannel.
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/BufferChannelFile.java Tue Nov 27 18:10:37 2012
@@ -24,8 +24,8 @@ import java.io.RandomAccessFile ;
import java.nio.ByteBuffer ;
import java.nio.channels.FileChannel ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.FileOps ;
public class BufferChannelFile implements BufferChannel
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileBase.java Tue Nov 27 18:10:37 2012
@@ -21,9 +21,9 @@ package com.hp.hpl.jena.tdb.base.file;
import java.io.IOException ;
import java.nio.channels.FileChannel ;
-import org.openjena.atlas.io.IO ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.io.IO ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileSet.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileSet.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileSet.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/FileSet.java Tue Nov 27 18:10:37 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.tdb.base.file ;
import java.io.File ;
-import org.openjena.atlas.lib.FileOps ;
-import org.openjena.atlas.lib.Tuple ;
+import org.apache.jena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.lib.Tuple ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/Location.java Tue Nov 27 18:10:37 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.base.file;
import java.io.File;
-import org.openjena.atlas.lib.Lib ;
+import org.apache.jena.atlas.lib.Lib ;
import com.hp.hpl.jena.tdb.sys.Names;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/MetaFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/MetaFile.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/MetaFile.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/MetaFile.java Tue Nov 27 18:10:37 2012
@@ -29,11 +29,7 @@ import java.util.Properties ;
import java.util.SortedSet ;
import java.util.TreeSet ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Lib ;
-import org.openjena.atlas.lib.PropertiesSorted ;
-import org.openjena.atlas.lib.PropertyUtils ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.* ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFile.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFile.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFile.java Tue Nov 27 18:10:37 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.tdb.base.file;
import java.nio.ByteBuffer;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
/** Single file, single ByteBuffer */
public abstract class PlainFile implements Sync, Closeable
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFilePersistent.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFilePersistent.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFilePersistent.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/file/PlainFilePersistent.java Tue Nov 27 18:10:37 2012
@@ -22,7 +22,7 @@ import java.io.IOException ;
import java.nio.ByteBuffer ;
import java.nio.channels.FileChannel ;
-import org.openjena.atlas.io.IO ;
+import org.apache.jena.atlas.io.IO ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFile.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFile.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFile.java Tue Nov 27 18:10:37 2012
@@ -23,9 +23,9 @@ import java.util.Iterator ;
import com.hp.hpl.jena.tdb.base.block.Block ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Sync ;
/**
* An ObjectFile is an append-read file, that is you can append data
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileLogger.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileLogger.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileLogger.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileLogger.java Tue Nov 27 18:10:37 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.base.objectf
import java.nio.ByteBuffer ;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileStorage.java Tue Nov 27 18:10:37 2012
@@ -24,10 +24,10 @@ import static com.hp.hpl.jena.tdb.sys.Sy
import java.nio.ByteBuffer ;
import java.util.Iterator ;
-import org.openjena.atlas.iterator.Iter ;
-import org.openjena.atlas.iterator.IteratorSlotted ;
-import org.openjena.atlas.lib.Pair ;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.iterator.Iter ;
+import org.apache.jena.atlas.iterator.IteratorSlotted ;
+import org.apache.jena.atlas.lib.Pair ;
+import org.apache.jena.atlas.logging.Log ;
import org.slf4j.Logger ;
import org.slf4j.LoggerFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileWrapper.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileWrapper.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileWrapper.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/ObjectFileWrapper.java Tue Nov 27 18:10:37 2012
@@ -23,7 +23,7 @@ import java.util.Iterator ;
import com.hp.hpl.jena.tdb.base.block.Block ;
-import org.openjena.atlas.lib.Pair ;
+import org.apache.jena.atlas.lib.Pair ;
/**
* An ObjectFile is an append-read file, that is you can append data
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/StringFile.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/StringFile.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/StringFile.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/objectfile/StringFile.java Tue Nov 27 18:10:37 2012
@@ -20,9 +20,9 @@ package com.hp.hpl.jena.tdb.base.objectf
import java.nio.ByteBuffer ;
-import org.openjena.atlas.lib.Bytes ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Bytes ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/Page.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/Page.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/Page.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/Page.java Tue Nov 27 18:10:37 2012
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.base.page;
-import org.openjena.atlas.io.Printable ;
+import org.apache.jena.atlas.io.Printable ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBase.java Tue Nov 27 18:10:37 2012
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.base.page;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBlockMgr.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBlockMgr.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBlockMgr.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/page/PageBlockMgr.java Tue Nov 27 18:10:37 2012
@@ -18,7 +18,7 @@
package com.hp.hpl.jena.tdb.base.page;
-import org.openjena.atlas.logging.Log ;
+import org.apache.jena.atlas.logging.Log ;
import com.hp.hpl.jena.tdb.base.block.Block ;
import com.hp.hpl.jena.tdb.base.block.BlockConverter ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/record/Record.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/record/Record.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/record/Record.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/record/Record.java Tue Nov 27 18:10:37 2012
@@ -22,7 +22,7 @@ import static java.lang.String.format;
import java.util.Arrays;
-import org.openjena.atlas.lib.Bytes ;
+import org.apache.jena.atlas.lib.Bytes ;
import com.hp.hpl.jena.tdb.sys.SystemTDB;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordBufferPageBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordBufferPageBase.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordBufferPageBase.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordBufferPageBase.java Tue Nov 27 18:10:37 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.base.recordb
import java.nio.ByteBuffer;
-import org.openjena.atlas.io.IndentedWriter ;
+import org.apache.jena.atlas.io.IndentedWriter ;
import com.hp.hpl.jena.tdb.base.block.Block ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordRangeIterator.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordRangeIterator.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordRangeIterator.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/base/recordbuffer/RecordRangeIterator.java Tue Nov 27 18:10:37 2012
@@ -18,12 +18,12 @@
package com.hp.hpl.jena.tdb.base.recordbuffer;
-import static org.openjena.atlas.lib.Alg.decodeIndex ;
+import static org.apache.jena.atlas.lib.Alg.decodeIndex ;
import java.util.Iterator;
import java.util.NoSuchElementException;
-import org.openjena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Closeable ;
import com.hp.hpl.jena.tdb.base.StorageException ;
import com.hp.hpl.jena.tdb.base.block.BlockException ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/graph/BulkUpdateHandlerTDB.java Tue Nov 27 18:10:37 2012
@@ -20,7 +20,7 @@ package com.hp.hpl.jena.tdb.graph;
import java.util.Iterator;
-import org.openjena.atlas.lib.Tuple ;
+import org.apache.jena.atlas.lib.Tuple ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/Index.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/Index.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/Index.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/Index.java Tue Nov 27 18:10:37 2012
@@ -20,8 +20,8 @@ package com.hp.hpl.jena.tdb.index;
import java.util.Iterator ;
-import org.openjena.atlas.lib.Closeable ;
-import org.openjena.atlas.lib.Sync ;
+import org.apache.jena.atlas.lib.Closeable ;
+import org.apache.jena.atlas.lib.Sync ;
import com.hp.hpl.jena.tdb.base.record.Record ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
Modified: jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java?rev=1414299&r1=1414298&r2=1414299&view=diff
==============================================================================
--- jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java (original)
+++ jena/trunk/jena-tdb/src/main/java/com/hp/hpl/jena/tdb/index/IndexLib.java Tue Nov 27 18:10:37 2012
@@ -21,7 +21,7 @@ package com.hp.hpl.jena.tdb.index;
import java.util.Iterator;
-import org.openjena.atlas.lib.Tuple ;
+import org.apache.jena.atlas.lib.Tuple ;
import com.hp.hpl.jena.tdb.store.NodeId;