svn commit: r1233589 - in /incubator/jena/Scratch/AFS/Jena-Dev/trunk/src: dev/Run.java reports/archive/ReportJena131_TxnConcurrency.java reports/archive/ReportJena154_GraphVarScope.java tx/ExTxTDB.java tx/TxMain.java

[an...@apache.org]

Author: andy
Date: Thu Jan 19 21:51:35 2012
New Revision: 1233589

URL: http://svn.apache.org/viewvc?rev=1233589&view=rev
Log:
Adjust to align with TDB reorganisation.

Modified:
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena131_TxnConcurrency.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena154_GraphVarScope.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/ExTxTDB.java
    incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/TxMain.java

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java?rev=1233589&r1=1233588&r2=1233589&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/dev/Run.java Thu Jan 19 21:51:35 2012
@@ -33,8 +33,8 @@ import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.RDFReader ;
 import com.hp.hpl.jena.sparql.mgt.Explain.InfoLevel ;
 import com.hp.hpl.jena.sparql.util.Timer ;
-import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
 
 public class Run extends RunBase
 {

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena131_TxnConcurrency.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena131_TxnConcurrency.java?rev=1233589&r1=1233588&r2=1233589&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena131_TxnConcurrency.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena131_TxnConcurrency.java Thu Jan 19 21:51:35 2012
@@ -20,8 +20,8 @@ package reports.archive;
 
 import com.hp.hpl.jena.query.ReadWrite ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
 
 public class ReportJena131_TxnConcurrency
 {

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena154_GraphVarScope.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena154_GraphVarScope.java?rev=1233589&r1=1233588&r2=1233589&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena154_GraphVarScope.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/reports/archive/ReportJena154_GraphVarScope.java Thu Jan 19 21:51:35 2012
@@ -33,10 +33,10 @@ import com.hp.hpl.jena.sparql.core.Var ;
 import com.hp.hpl.jena.sparql.engine.QueryIterator ;
 import com.hp.hpl.jena.sparql.mgt.Explain ;
 import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
 import com.hp.hpl.jena.tdb.TDBFactory ;
 import com.hp.hpl.jena.tdb.base.file.Location ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
 
 public class ReportJena154_GraphVarScope
 {

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/ExTxTDB.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/ExTxTDB.java?rev=1233589&r1=1233588&r2=1233589&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/ExTxTDB.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/ExTxTDB.java Thu Jan 19 21:51:35 2012
@@ -26,8 +26,8 @@ import com.hp.hpl.jena.query.QueryExecut
 import com.hp.hpl.jena.query.ReadWrite ;
 import com.hp.hpl.jena.query.ResultSet ;
 import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
+import com.hp.hpl.jena.tdb.transaction.DatasetGraphTxn ;
 import com.hp.hpl.jena.update.UpdateExecutionFactory ;
 import com.hp.hpl.jena.update.UpdateFactory ;
 import com.hp.hpl.jena.update.UpdateProcessor ;

Modified: incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/TxMain.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/TxMain.java?rev=1233589&r1=1233588&r2=1233589&view=diff
==============================================================================
--- incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/TxMain.java (original)
+++ incubator/jena/Scratch/AFS/Jena-Dev/trunk/src/tx/TxMain.java Thu Jan 19 21:51:35 2012
@@ -43,7 +43,6 @@ import com.hp.hpl.jena.rdf.model.Model ;
 import com.hp.hpl.jena.rdf.model.ModelFactory ;
 import com.hp.hpl.jena.sparql.core.DatasetGraph ;
 import com.hp.hpl.jena.sparql.util.QueryExecUtils ;
-import com.hp.hpl.jena.tdb.DatasetGraphTxn ;
 import com.hp.hpl.jena.tdb.StoreConnection ;
 import com.hp.hpl.jena.tdb.base.file.BufferChannel ;
 import com.hp.hpl.jena.tdb.base.file.BufferChannelFile ;
@@ -54,10 +53,7 @@ import com.hp.hpl.jena.tdb.base.record.R
 import com.hp.hpl.jena.tdb.setup.DatasetBuilderStd ;
 import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
 import com.hp.hpl.jena.tdb.sys.FileRef ;
-import com.hp.hpl.jena.tdb.transaction.Journal ;
-import com.hp.hpl.jena.tdb.transaction.JournalControl ;
-import com.hp.hpl.jena.tdb.transaction.JournalEntryType ;
-import com.hp.hpl.jena.tdb.transaction.Transaction ;
+import com.hp.hpl.jena.tdb.transaction.* ;
 import com.hp.hpl.jena.update.UpdateAction ;
 import com.hp.hpl.jena.update.UpdateFactory ;
 import com.hp.hpl.jena.update.UpdateRequest ;