You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by ca...@apache.org on 2011/12/15 20:50:12 UTC
svn commit: r1214935 - in /incubator/jena/Scratch/PC/tdbloader3/trunk/src:
main/java/cmd/ main/java/org/apache/jena/tdbloader2/
main/java/org/apache/jena/tdbloader3/ test/java/cmd/
test/java/org/apache/jena/tdbloader2/ test/java/org/apache/jena/tdbload...
Author: castagna
Date: Thu Dec 15 19:50:11 2011
New Revision: 1214935
URL: http://svn.apache.org/viewvc?rev=1214935&view=rev
Log:
JENA-117 - Renamed packages and classes.
Added:
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java (contents, props changed)
- copied, changed from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/
- copied from r1214919, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/MultiThreadedSortedDataBag.java
- copied, changed from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder2.java
- copied, changed from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java (contents, props changed)
- copied, changed from r1214919, incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java (contents, props changed)
- copied, changed from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/
- copied from r1214919, incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader2/
Removed:
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader2/
Modified:
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/CustomLabelToNode.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairComparator.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairInputStream.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairOutputStream.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairSerializationFactory.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/ProgressLogger.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/QuadSerializationFactory.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TripleSerializationFactory.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleComparator.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleInputStream.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleOutputStream.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/TestMultiThreadedSortedDataBag.java
incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/resources/log4j.properties
Copied: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java (from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java?p2=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java&p1=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java&r1=1214929&r2=1214935&rev=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java Thu Dec 15 19:50:11 2011
@@ -26,14 +26,14 @@ import java.util.Comparator;
import java.util.Iterator;
import java.util.List;
-import org.apache.jena.tdbloader2.CustomLabelToNode;
-import org.apache.jena.tdbloader2.DataStreamFactory;
-import org.apache.jena.tdbloader2.MultiThreadedSortedDataBag;
-import org.apache.jena.tdbloader2.NodeTableBuilder2;
-import org.apache.jena.tdbloader2.ProgressLogger;
-import org.apache.jena.tdbloader2.QuadSerializationFactory;
-import org.apache.jena.tdbloader2.TripleSerializationFactory;
-import org.apache.jena.tdbloader2.TupleComparator;
+import org.apache.jena.tdbloader3.CustomLabelToNode;
+import org.apache.jena.tdbloader3.DataStreamFactory;
+import org.apache.jena.tdbloader3.MultiThreadedSortedDataBag;
+import org.apache.jena.tdbloader3.NodeTableBuilder2;
+import org.apache.jena.tdbloader3.ProgressLogger;
+import org.apache.jena.tdbloader3.QuadSerializationFactory;
+import org.apache.jena.tdbloader3.TripleSerializationFactory;
+import org.apache.jena.tdbloader3.TupleComparator;
import org.openjena.atlas.AtlasException;
import org.openjena.atlas.data.DataBag;
import org.openjena.atlas.data.SerializationFactory;
@@ -93,10 +93,10 @@ import com.hp.hpl.jena.tdb.sys.Names;
import com.hp.hpl.jena.tdb.sys.SetupTDB;
import com.hp.hpl.jena.tdb.sys.SystemTDB;
-public class tdbloader2 extends CmdGeneral
+public class tdbloader3 extends CmdGeneral
{
static { Log.setLog4j() ; }
- private static Logger cmdLog = LoggerFactory.getLogger(tdbloader2.class) ;
+ private static Logger cmdLog = LoggerFactory.getLogger(tdbloader3.class) ;
private static String runId = String.valueOf(System.currentTimeMillis()) ; // a unique identifier for this run, it's used for blank node labels
@@ -125,10 +125,10 @@ public class tdbloader2 extends CmdGener
{
CmdTDB.setLogging() ;
SetupTDB.setOptimizerWarningFlag(false) ;
- new tdbloader2(argv).mainRun() ;
+ new tdbloader3(argv).mainRun() ;
}
- public tdbloader2(String...argv)
+ public tdbloader3(String...argv)
{
super(argv) ;
super.add(argLocation, "--loc", "Location") ;
Propchange: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/cmd/tdbloader3.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/CustomLabelToNode.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/CustomLabelToNode.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/CustomLabelToNode.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/CustomLabelToNode.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.util.HashMap;
import java.util.Map;
@@ -56,7 +56,7 @@ public class CustomLabelToNode extends L
@Override
public Node create(String label) {
- String strLabel = "tdbloader2_" + runId.hashCode() + "_" + filename.hashCode() + "_" + label;
+ String strLabel = "tdbloader3_" + runId.hashCode() + "_" + filename.hashCode() + "_" + label;
log.debug ("create({}) = {}", label, strLabel);
return Node.createAnon(new AnonId(strLabel)) ;
}
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/DataStreamFactory.java Thu Dec 15 19:50:11 2011
@@ -1,4 +1,4 @@
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.BufferedInputStream;
import java.io.BufferedOutputStream;
Copied: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/MultiThreadedSortedDataBag.java (from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/MultiThreadedSortedDataBag.java?p2=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/MultiThreadedSortedDataBag.java&p1=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java&r1=1214929&r2=1214935&rev=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/MultiThreadedSortedDataBag.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/MultiThreadedSortedDataBag.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.BufferedInputStream;
import java.io.File;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder.java Thu Dec 15 19:50:11 2011
@@ -16,13 +16,13 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import org.openjena.atlas.data.DataBag;
import org.openjena.atlas.lib.Sink;
import org.openjena.atlas.lib.Tuple;
-import cmd.tdbloader2;
+import cmd.tdbloader3;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -69,12 +69,12 @@ public class NodeTableBuilder implements
{
NodeId gId = nodeTable.getAllocateNodeId(g) ;
outputQuads.send(Tuple.create(gId.getId(), sId.getId(), pId.getId(), oId.getId())) ;
- if ( !tdbloader2.no_stats ) stats.record(gId, sId, pId, oId) ;
+ if ( !tdbloader3.no_stats ) stats.record(gId, sId, pId, oId) ;
}
else
{
outputTriples.send(Tuple.create(sId.getId(), pId.getId(), oId.getId())) ;
- if ( !tdbloader2.no_stats ) stats.record(null, sId, pId, oId) ;
+ if ( !tdbloader3.no_stats ) stats.record(null, sId, pId, oId) ;
}
monitor.tick() ;
}
Copied: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder2.java (from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder2.java?p2=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder2.java&p1=incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java&r1=1214929&r2=1214935&rev=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader2/NodeTableBuilder2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/NodeTableBuilder2.java Thu Dec 15 19:50:11 2011
@@ -16,11 +16,10 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
-import static cmd.tdbloader2.spill_size_auto;
-import static cmd.tdbloader2.spill_size;
-// import static cmd.tdbloader2.spill;
+import static cmd.tdbloader3.spill_size_auto;
+import static cmd.tdbloader3.spill_size;
import static com.hp.hpl.jena.tdb.lib.NodeLib.setHash;
import static com.hp.hpl.jena.tdb.sys.SystemTDB.LenNodeHash;
import static com.hp.hpl.jena.tdb.sys.SystemTDB.SizeOfNodeId;
@@ -46,7 +45,7 @@ import org.openjena.atlas.lib.Sink;
import org.openjena.atlas.lib.Tuple;
import org.slf4j.Logger;
-import cmd.tdbloader2;
+import cmd.tdbloader3;
import com.hp.hpl.jena.graph.Node;
import com.hp.hpl.jena.sparql.core.Quad;
@@ -127,13 +126,13 @@ public class NodeTableBuilder2 implement
public void send(Quad quad)
{
try {
- byte[] s = tdbloader2.serialize(quad.getSubject()).getBytes("UTF-8") ;
- byte[] p = tdbloader2.serialize(quad.getPredicate()).getBytes("UTF-8") ;
- byte[] o = tdbloader2.serialize(quad.getObject()).getBytes("UTF-8") ;
+ byte[] s = tdbloader3.serialize(quad.getSubject()).getBytes("UTF-8") ;
+ byte[] p = tdbloader3.serialize(quad.getPredicate()).getBytes("UTF-8") ;
+ byte[] o = tdbloader3.serialize(quad.getObject()).getBytes("UTF-8") ;
byte[] g = null ;
// Union graph?!
if ( ! quad.isTriple() && ! quad.isDefaultGraph() )
- g = tdbloader2.serialize(quad.getGraph()).getBytes("UTF-8") ;
+ g = tdbloader3.serialize(quad.getGraph()).getBytes("UTF-8") ;
digest.reset() ;
digest.update(s) ; // TODO: should we do something better here?
@@ -197,7 +196,7 @@ public class NodeTableBuilder2 implement
if ( ! leftIn.equals(curr) ) {
curr = leftIn ;
// generate the node id
- Node node = tdbloader2.parse(leftIn) ;
+ Node node = tdbloader3.parse(leftIn) ;
id = NodeLib.encodeStore(node, objects) ;
// add to hash|id
Hash hash = new Hash(SystemTDB.LenNodeHash);
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairComparator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairComparator.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairComparator.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairComparator.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.util.Comparator;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairInputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairInputStream.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairInputStream.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairInputStream.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.DataInputStream;
import java.io.IOException;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairOutputStream.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairOutputStream.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairOutputStream.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.DataOutputStream;
import java.io.IOException;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairSerializationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairSerializationFactory.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairSerializationFactory.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/PairSerializationFactory.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.InputStream;
import java.io.OutputStream;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/ProgressLogger.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/ProgressLogger.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/ProgressLogger.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/ProgressLogger.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import static com.hp.hpl.jena.sparql.util.Utils.nowAsString ;
import org.slf4j.Logger ;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/QuadSerializationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/QuadSerializationFactory.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/QuadSerializationFactory.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/QuadSerializationFactory.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.InputStream;
import java.io.OutputStream;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TripleSerializationFactory.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TripleSerializationFactory.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TripleSerializationFactory.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TripleSerializationFactory.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.InputStream;
import java.io.OutputStream;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleComparator.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleComparator.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleComparator.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleComparator.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.util.Comparator;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleInputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleInputStream.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleInputStream.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleInputStream.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.DataInputStream;
import java.io.IOException;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleOutputStream.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleOutputStream.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleOutputStream.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/main/java/org/apache/jena/tdbloader3/TupleOutputStream.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.DataOutputStream;
import java.io.IOException;
Copied: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java (from r1214919, incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader2.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java?p2=incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java&p1=incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader2.java&r1=1214919&r2=1214935&rev=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java Thu Dec 15 19:50:11 2011
@@ -1,6 +1,6 @@
package cmd;
-import org.apache.jena.tdbloader2.TestMultiThreadedSortedDataBag;
+import org.apache.jena.tdbloader3.TestMultiThreadedSortedDataBag;
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
@@ -8,8 +8,8 @@ import org.junit.runners.Suite;
@Suite.SuiteClasses( {
TestMultiThreadedSortedDataBag.class,
- TestTDBLoader2.class
+ TestTDBLoader3.class
})
-public class TS_TDBLoader2 {}
\ No newline at end of file
+public class TS_TDBLoader3 {}
\ No newline at end of file
Propchange: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TS_TDBLoader3.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java (from r1214929, incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java?p2=incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java&p1=incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java&r1=1214929&r2=1214935&rev=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader2.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java Thu Dec 15 19:50:11 2011
@@ -47,7 +47,7 @@ import com.hp.hpl.jena.tdb.store.Dataset
import com.hp.hpl.jena.util.iterator.ExtendedIterator;
@RunWith(Parameterized.class)
-public class TestTDBLoader2 {
+public class TestTDBLoader3 {
@Parameters
public static Collection<Object[]> data() {
@@ -62,7 +62,7 @@ public class TestTDBLoader2 {
private String input ;
private String output ;
- public TestTDBLoader2 ( String input, String output ) {
+ public TestTDBLoader3 ( String input, String output ) {
this.input = input ;
this.output = output ;
}
@@ -108,7 +108,7 @@ public class TestTDBLoader2 {
args = new String[] { "--loc", output, input };
}
- tdbloader2.main(args);
+ tdbloader3.main(args);
Location location = new Location(output);
DatasetGraph dsgDisk = TDBFactory.createDatasetGraph(location);
Propchange: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/cmd/TestTDBLoader3.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/TestMultiThreadedSortedDataBag.java
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/TestMultiThreadedSortedDataBag.java?rev=1214935&r1=1214919&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/TestMultiThreadedSortedDataBag.java (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/java/org/apache/jena/tdbloader3/TestMultiThreadedSortedDataBag.java Thu Dec 15 19:50:11 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.apache.jena.tdbloader2;
+package org.apache.jena.tdbloader3;
import java.io.File;
import java.util.ArrayList;
@@ -27,6 +27,7 @@ import java.util.Random;
import junit.framework.TestCase;
+import org.apache.jena.tdbloader3.MultiThreadedSortedDataBag;
import org.junit.Before;
import org.junit.Test;
import org.openjena.atlas.data.ThresholdPolicyCount;
Modified: incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/resources/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/resources/log4j.properties?rev=1214935&r1=1214934&r2=1214935&view=diff
==============================================================================
--- incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/resources/log4j.properties (original)
+++ incubator/jena/Scratch/PC/tdbloader3/trunk/src/test/resources/log4j.properties Thu Dec 15 19:50:11 2011
@@ -5,8 +5,4 @@ log4j.appender.stdlog=org.apache.log4j.C
log4j.appender.stdlog.layout=org.apache.log4j.PatternLayout
log4j.appender.stdlog.layout.ConversionPattern=%d{HH:mm:ss} %-5p %-25c{1} :: %m%n
-log4j.logger.org.apache.hadoop.metrics2=ERROR
-log4j.logger.org.apache.hadoop=ERROR
-log4j.logger.org.mortbay=ERROR
-
-log4j.logger.org.apache.jena.tdbloader2=DEBUG
+log4j.logger.org.apache.jena.tdbloader3=DEBUG