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 2011/06/28 13:39:42 UTC
svn commit: r1140538 - in /incubator/jena/Experimental/TxTDB/trunk:
src-dev/setup/ src-dev/tx/ src/main/java/com/hp/hpl/jena/tdb/setup/
src/main/java/com/hp/hpl/jena/tdb/transaction/
src/test/java/com/hp/hpl/jena/tdb/
Author: andy
Date: Tue Jun 28 11:39:41 2011
New Revision: 1140538
URL: http://svn.apache.org/viewvc?rev=1140538&view=rev
Log: (empty)
Added:
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/
- copied from r1140034, incubator/jena/Experimental/TxTDB/trunk/src-dev/setup/
Removed:
incubator/jena/Experimental/TxTDB/trunk/src-dev/setup/
Modified:
incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/BlockMgrBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/ObjectFileBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TDBBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java
incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
Modified: incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java?rev=1140538&r1=1140537&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src-dev/tx/DatasetBuilderTxn2.java Tue Jun 28 11:39:41 2011
@@ -21,9 +21,9 @@ package tx;
import java.util.Properties ;
import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.setup.DatasetBuilder ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
-import setup.DatasetBuilder ;
/** Yet another dataset builder.
* This one builds the DatasetGraph and the transactional DatasetGraph toegther.
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/BlockMgrBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/BlockMgrBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/BlockMgrBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/BlockMgrBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import java.util.Properties ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/DatasetBuilderStd.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import static com.hp.hpl.jena.tdb.sys.SystemTDB.SizeOfNodeId ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/IndexBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/NodeTableBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/ObjectFileBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/ObjectFileBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/ObjectFileBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/ObjectFileBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFile ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/RangeIndexBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.FileSet ;
import com.hp.hpl.jena.tdb.base.record.RecordFactory ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TDBBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TDBBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TDBBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TDBBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import com.hp.hpl.jena.tdb.base.file.Location ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java?rev=1140538&r1=1140034&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/setup/TupleIndexBuilder.java Tue Jun 28 11:39:41 2011
@@ -4,7 +4,7 @@
* [See end of file]
*/
-package setup;
+package com.hp.hpl.jena.tdb.setup;
import org.openjena.atlas.lib.ColumnMap ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java?rev=1140538&r1=1140537&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/DatasetBuilderTxn.java Tue Jun 28 11:39:41 2011
@@ -12,13 +12,6 @@ import java.util.Properties ;
import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.logging.Log ;
-import setup.BlockMgrBuilder ;
-import setup.DatasetBuilderStd ;
-import setup.IndexBuilder ;
-import setup.NodeTableBuilder ;
-import setup.ObjectFileBuilder ;
-import setup.RangeIndexBuilder ;
-import setup.TupleIndexBuilder ;
import com.hp.hpl.jena.sparql.core.DatasetPrefixStorage ;
import com.hp.hpl.jena.tdb.base.block.BlockMgr ;
@@ -33,6 +26,13 @@ import com.hp.hpl.jena.tdb.base.objectfi
import com.hp.hpl.jena.tdb.base.objectfile.ObjectFileLogger ;
import com.hp.hpl.jena.tdb.nodetable.NodeTable ;
import com.hp.hpl.jena.tdb.nodetable.NodeTableLogger ;
+import com.hp.hpl.jena.tdb.setup.BlockMgrBuilder ;
+import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
+import com.hp.hpl.jena.tdb.setup.IndexBuilder ;
+import com.hp.hpl.jena.tdb.setup.NodeTableBuilder ;
+import com.hp.hpl.jena.tdb.setup.ObjectFileBuilder ;
+import com.hp.hpl.jena.tdb.setup.RangeIndexBuilder ;
+import com.hp.hpl.jena.tdb.setup.TupleIndexBuilder ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
import com.hp.hpl.jena.tdb.store.DatasetPrefixStorageLogger ;
import com.hp.hpl.jena.tdb.sys.ConcurrencyPolicy ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java?rev=1140538&r1=1140537&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/main/java/com/hp/hpl/jena/tdb/transaction/TransactionManager.java Tue Jun 28 11:39:41 2011
@@ -6,11 +6,11 @@
package com.hp.hpl.jena.tdb.transaction;
-import setup.DatasetBuilder ;
import com.hp.hpl.jena.sparql.core.DatasetGraph ;
import com.hp.hpl.jena.tdb.TDBException ;
import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.setup.DatasetBuilder ;
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
Modified: incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java?rev=1140538&r1=1140537&r2=1140538&view=diff
==============================================================================
--- incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java (original)
+++ incubator/jena/Experimental/TxTDB/trunk/src/test/java/com/hp/hpl/jena/tdb/TC_TDB.java Tue Jun 28 11:39:41 2011
@@ -17,6 +17,11 @@ import org.junit.runners.Suite ;
import com.hp.hpl.jena.sparql.engine.optimizer.reorder.ReorderLib ;
import com.hp.hpl.jena.tdb.assembler.TS_TDBAssembler ;
import com.hp.hpl.jena.tdb.base.TC_Base ;
+import com.hp.hpl.jena.tdb.base.block.TS_Block ;
+import com.hp.hpl.jena.tdb.base.file.TS_File ;
+import com.hp.hpl.jena.tdb.base.objectfile.TS_ObjectFile ;
+import com.hp.hpl.jena.tdb.base.record.TS_Record ;
+import com.hp.hpl.jena.tdb.base.recordfile.TS_RecordFile ;
import com.hp.hpl.jena.tdb.graph.TS_Graph ;
import com.hp.hpl.jena.tdb.index.TS_Index ;
import com.hp.hpl.jena.tdb.lib.TS_LibTDB ;
@@ -35,7 +40,7 @@ import com.hp.hpl.jena.tdb.transaction.T
@RunWith(Suite.class)
@Suite.SuiteClasses( {
// TDB
- TC_Base.class
+ TC_Base.class // ==> TS_Block, TS_File.class, TS_Record, TS_RecordFile
, TS_LibTDB.class
, TS_NodeTable.class
, TS_Index.class
@@ -48,6 +53,7 @@ import com.hp.hpl.jena.tdb.transaction.T
, TS_Jena.class
, TS_Migrate.class
, TS_Transaction.class
+ , TS_ObjectFile.class
} )
public class TC_TDB