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 2015/08/12 10:46:22 UTC
jena git commit: Update import com.hp.hpl.jena to org.apache.jena
Repository: jena
Updated Branches:
refs/heads/master 0ee1fd8f4 -> 957959c13
Update import com.hp.hpl.jena to org.apache.jena
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/957959c1
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/957959c1
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/957959c1
Branch: refs/heads/master
Commit: 957959c13f74cf88daf30e007d9b616e6557b65e
Parents: 0ee1fd8
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Aug 12 09:46:14 2015 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Aug 12 09:46:14 2015 +0100
----------------------------------------------------------------------
.../org/apache/jena/osgi/test/JenaOSGITest.java | 36 ++++++++++----------
.../java/org/apache/jena/fuseki/FusekiCmd.java | 1 -
.../src-examples/tdb/examples/ExQuadFilter.java | 20 +++++------
jena-tdb/src-examples/tdb/examples/ExTDB1.java | 6 ++--
jena-tdb/src-examples/tdb/examples/ExTDB2.java | 4 +--
jena-tdb/src-examples/tdb/examples/ExTDB3.java | 18 +++++-----
jena-tdb/src-examples/tdb/examples/ExTDB4.java | 16 ++++-----
jena-tdb/src-examples/tdb/examples/ExTDB5.java | 16 ++++-----
jena-tdb/src-examples/tdb/examples/ExTDB6.java | 16 ++++-----
.../src-examples/tdb/examples/ExTDB_Txn1.java | 18 +++++-----
.../src-examples/tdb/examples/ExTDB_Txn2.java | 18 +++++-----
.../src-examples/tdb/examples/ExTDB_Txn3.java | 8 ++---
12 files changed, 88 insertions(+), 89 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
----------------------------------------------------------------------
diff --git a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
index 86c03bc..2cb94f7 100644
--- a/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
+++ b/apache-jena-osgi/jena-osgi-test/src/test/java/org/apache/jena/osgi/test/JenaOSGITest.java
@@ -47,24 +47,24 @@ import org.ops4j.pax.exam.spi.reactors.ExamReactorStrategy;
import org.ops4j.pax.exam.spi.reactors.PerClass;
import org.osgi.framework.BundleContext;
-import com.hp.hpl.jena.ontology.Individual;
-import com.hp.hpl.jena.ontology.ObjectProperty;
-import com.hp.hpl.jena.ontology.OntModel;
-import com.hp.hpl.jena.ontology.OntModelSpec;
-import com.hp.hpl.jena.query.Dataset;
-import com.hp.hpl.jena.query.DatasetFactory;
-import com.hp.hpl.jena.query.Query;
-import com.hp.hpl.jena.query.QueryExecution;
-import com.hp.hpl.jena.query.QueryExecutionFactory;
-import com.hp.hpl.jena.query.QueryFactory;
-import com.hp.hpl.jena.query.QuerySolution;
-import com.hp.hpl.jena.query.ReadWrite;
-import com.hp.hpl.jena.query.ResultSet;
-import com.hp.hpl.jena.rdf.model.Model;
-import com.hp.hpl.jena.rdf.model.ModelFactory;
-import com.hp.hpl.jena.rdf.model.Property;
-import com.hp.hpl.jena.rdf.model.Resource;
-import com.hp.hpl.jena.tdb.TDBFactory;
+import org.apache.jena.ontology.Individual;
+import org.apache.jena.ontology.ObjectProperty;
+import org.apache.jena.ontology.OntModel;
+import org.apache.jena.ontology.OntModelSpec;
+import org.apache.jena.query.Dataset;
+import org.apache.jena.query.DatasetFactory;
+import org.apache.jena.query.Query;
+import org.apache.jena.query.QueryExecution;
+import org.apache.jena.query.QueryExecutionFactory;
+import org.apache.jena.query.QueryFactory;
+import org.apache.jena.query.QuerySolution;
+import org.apache.jena.query.ReadWrite;
+import org.apache.jena.query.ResultSet;
+import org.apache.jena.rdf.model.Model;
+import org.apache.jena.rdf.model.ModelFactory;
+import org.apache.jena.rdf.model.Property;
+import org.apache.jena.rdf.model.Resource;
+import org.apache.jena.tdb.TDBFactory;
/**
* Brief tests of the Jena modules covered by jena-osgi
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
index 3c902ef..6baf5d9 100644
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
@@ -70,7 +70,6 @@ public class FusekiCmd extends CmdARQ
, "## Everything"
, "log4j.rootLogger=INFO, jena.plain"
- , "log4j.logger.com.hp.hpl.jena=WARN"
, "log4j.logger.org.apache.jena=WARN"
, "# Server log."
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExQuadFilter.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExQuadFilter.java b/jena-tdb/src-examples/tdb/examples/ExQuadFilter.java
index 3c1a596..d6f98da 100644
--- a/jena-tdb/src-examples/tdb/examples/ExQuadFilter.java
+++ b/jena-tdb/src-examples/tdb/examples/ExQuadFilter.java
@@ -21,16 +21,16 @@ package tdb.examples;
import org.apache.jena.atlas.iterator.Filter ;
import org.apache.jena.atlas.lib.Tuple ;
-import com.hp.hpl.jena.graph.NodeFactory ;
-import com.hp.hpl.jena.query.* ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.sparql.core.Quad ;
-import com.hp.hpl.jena.sparql.sse.SSE ;
-import com.hp.hpl.jena.tdb.TDB ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
-import com.hp.hpl.jena.tdb.store.NodeId ;
-import com.hp.hpl.jena.tdb.sys.SystemTDB ;
-import com.hp.hpl.jena.tdb.sys.TDBInternal ;
+import org.apache.jena.graph.NodeFactory ;
+import org.apache.jena.query.* ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.Quad ;
+import org.apache.jena.sparql.sse.SSE ;
+import org.apache.jena.tdb.TDB ;
+import org.apache.jena.tdb.TDBFactory ;
+import org.apache.jena.tdb.store.NodeId ;
+import org.apache.jena.tdb.sys.SystemTDB ;
+import org.apache.jena.tdb.sys.TDBInternal ;
/** Example of how to filter quads as they are accessed at the lowest level.
* Can be used to exclude daat from specific graphs.
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB1.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB1.java b/jena-tdb/src-examples/tdb/examples/ExTDB1.java
index f05859f..8d5539d 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB1.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB1.java
@@ -18,10 +18,10 @@
package tdb.examples;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.rdf.model.Model;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.rdf.model.Model;
-import com.hp.hpl.jena.tdb.TDBFactory;
+import org.apache.jena.tdb.TDBFactory;
/** Example of creating a TDB-backed model.
* The preferred way is to create a dataset then get the mode required from the dataset.
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB2.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB2.java b/jena-tdb/src-examples/tdb/examples/ExTDB2.java
index 8a407e6..3d7e825 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB2.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB2.java
@@ -18,8 +18,8 @@
package tdb.examples;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.tdb.TDBFactory ;
/**
* Using an assembler description (see wiki for details of the assembler format for TDB)
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB3.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB3.java b/jena-tdb/src-examples/tdb/examples/ExTDB3.java
index 1b353b1..8d74c96 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB3.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB3.java
@@ -20,15 +20,15 @@ package tdb.examples;
import org.apache.jena.riot.RDFDataMgr ;
-import com.hp.hpl.jena.assembler.Assembler ;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.shared.JenaException ;
-import com.hp.hpl.jena.sparql.core.assembler.DatasetAssemblerVocab ;
-import com.hp.hpl.jena.sparql.util.TypeNotUniqueException ;
-import com.hp.hpl.jena.sparql.util.graph.GraphUtils ;
-import com.hp.hpl.jena.tdb.assembler.VocabTDB ;
+import org.apache.jena.assembler.Assembler ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.Resource ;
+import org.apache.jena.shared.JenaException ;
+import org.apache.jena.sparql.core.assembler.DatasetAssemblerVocab ;
+import org.apache.jena.sparql.util.TypeNotUniqueException ;
+import org.apache.jena.sparql.util.graph.GraphUtils ;
+import org.apache.jena.tdb.assembler.VocabTDB ;
/**
* Examples of finding an assembler for a TDB model in a larger collection
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB4.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB4.java b/jena-tdb/src-examples/tdb/examples/ExTDB4.java
index 564ae92..4b52b86 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB4.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB4.java
@@ -18,14 +18,14 @@
package tdb.examples;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.query.QueryFactory ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.query.ResultSetFormatter ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.QueryExecutionFactory ;
+import org.apache.jena.query.QueryFactory ;
+import org.apache.jena.query.ResultSet ;
+import org.apache.jena.query.ResultSetFormatter ;
+import org.apache.jena.tdb.TDBFactory ;
/** Example of creating a TDB-backed model.
* The preferred way is to create a dataset then get the mode required from the dataset.
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB5.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB5.java b/jena-tdb/src-examples/tdb/examples/ExTDB5.java
index 74364a7..255440e 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB5.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB5.java
@@ -18,14 +18,14 @@
package tdb.examples;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.query.QueryFactory ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.QueryExecutionFactory ;
+import org.apache.jena.query.QueryFactory ;
+import org.apache.jena.query.QuerySolution ;
+import org.apache.jena.query.ResultSet ;
+import org.apache.jena.tdb.TDBFactory ;
/** Example of creating a TDB-backed model.
* The preferred way is to create a dataset then get the mode required from the dataset.
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB6.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB6.java b/jena-tdb/src-examples/tdb/examples/ExTDB6.java
index f22f267..e5ce586 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB6.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB6.java
@@ -24,14 +24,14 @@ import java.util.Iterator ;
import org.apache.jena.iri.IRIFactory ;
-import com.hp.hpl.jena.graph.Graph ;
-import com.hp.hpl.jena.query.* ;
-import com.hp.hpl.jena.rdf.model.Model ;
-import com.hp.hpl.jena.rdf.model.Property ;
-import com.hp.hpl.jena.rdf.model.Resource ;
-import com.hp.hpl.jena.rdf.model.Statement ;
-import com.hp.hpl.jena.tdb.TDB ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
+import org.apache.jena.graph.Graph ;
+import org.apache.jena.query.* ;
+import org.apache.jena.rdf.model.Model ;
+import org.apache.jena.rdf.model.Property ;
+import org.apache.jena.rdf.model.Resource ;
+import org.apache.jena.rdf.model.Statement ;
+import org.apache.jena.tdb.TDB ;
+import org.apache.jena.tdb.TDBFactory ;
/** Example of single threaded use of TDB workign with the Jena RDF API */
public class ExTDB6
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB_Txn1.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn1.java b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn1.java
index f88dd70..57629a4 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn1.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn1.java
@@ -18,15 +18,15 @@
package tdb.examples;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.Query ;
-import com.hp.hpl.jena.query.QueryExecution ;
-import com.hp.hpl.jena.query.QueryExecutionFactory ;
-import com.hp.hpl.jena.query.QueryFactory ;
-import com.hp.hpl.jena.query.QuerySolution ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.query.ResultSet ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.Query ;
+import org.apache.jena.query.QueryExecution ;
+import org.apache.jena.query.QueryExecutionFactory ;
+import org.apache.jena.query.QueryFactory ;
+import org.apache.jena.query.QuerySolution ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.query.ResultSet ;
+import org.apache.jena.tdb.TDBFactory ;
/** Example of a READ transaction. */
public class ExTDB_Txn1
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB_Txn2.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn2.java b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn2.java
index 37a1e9a..a13293d 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn2.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn2.java
@@ -20,15 +20,15 @@ package tdb.examples;
import org.apache.jena.atlas.lib.StrUtils ;
-import com.hp.hpl.jena.query.Dataset ;
-import com.hp.hpl.jena.query.ReadWrite ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
-import com.hp.hpl.jena.update.GraphStore ;
-import com.hp.hpl.jena.update.GraphStoreFactory ;
-import com.hp.hpl.jena.update.UpdateExecutionFactory ;
-import com.hp.hpl.jena.update.UpdateFactory ;
-import com.hp.hpl.jena.update.UpdateProcessor ;
-import com.hp.hpl.jena.update.UpdateRequest ;
+import org.apache.jena.query.Dataset ;
+import org.apache.jena.query.ReadWrite ;
+import org.apache.jena.tdb.TDBFactory ;
+import org.apache.jena.update.GraphStore ;
+import org.apache.jena.update.GraphStoreFactory ;
+import org.apache.jena.update.UpdateExecutionFactory ;
+import org.apache.jena.update.UpdateFactory ;
+import org.apache.jena.update.UpdateProcessor ;
+import org.apache.jena.update.UpdateRequest ;
/** Example of a WRITE transaction. */
public class ExTDB_Txn2
http://git-wip-us.apache.org/repos/asf/jena/blob/957959c1/jena-tdb/src-examples/tdb/examples/ExTDB_Txn3.java
----------------------------------------------------------------------
diff --git a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn3.java b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn3.java
index 758fcc8..515b203 100644
--- a/jena-tdb/src-examples/tdb/examples/ExTDB_Txn3.java
+++ b/jena-tdb/src-examples/tdb/examples/ExTDB_Txn3.java
@@ -18,10 +18,10 @@
package tdb.examples;
-import com.hp.hpl.jena.query.* ;
-import com.hp.hpl.jena.sparql.core.DatasetGraph ;
-import com.hp.hpl.jena.tdb.TDBFactory ;
-import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
+import org.apache.jena.query.* ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.tdb.TDBFactory ;
+import org.apache.jena.tdb.transaction.DatasetGraphTransaction ;
/** Illustraion of working at the DatasetGraph level.
* Normally, applications work with {@link Dataset}.