Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 6292E17322 for ; Tue, 22 Sep 2015 13:47:58 +0000 (UTC) Received: (qmail 73014 invoked by uid 500); 22 Sep 2015 13:47:56 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 72953 invoked by uid 500); 22 Sep 2015 13:47:56 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 72900 invoked by uid 99); 22 Sep 2015 13:47:56 -0000 Received: from git1-us-west.apache.org (HELO git1-us-west.apache.org) (140.211.11.23) by apache.org (qpsmtpd/0.29) with ESMTP; Tue, 22 Sep 2015 13:47:56 +0000 Received: by git1-us-west.apache.org (ASF Mail Server at git1-us-west.apache.org, from userid 33) id 50EC3E03CE; Tue, 22 Sep 2015 13:47:56 +0000 (UTC) Content-Type: text/plain; charset="us-ascii" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit From: andy@apache.org To: commits@jena.apache.org Message-Id: X-Mailer: ASF-Git Admin Mailer Subject: jena git commit: JENA-1029: Use JenaSystem.init, not ARQ.init. Date: Tue, 22 Sep 2015 13:47:56 +0000 (UTC) Repository: jena Updated Branches: refs/heads/master ce0a94e8d -> bc9af2bbe JENA-1029: Use JenaSystem.init, not ARQ.init. Project: http://git-wip-us.apache.org/repos/asf/jena/repo Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/bc9af2bb Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/bc9af2bb Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/bc9af2bb Branch: refs/heads/master Commit: bc9af2bbea86a9c4b62b0c6efa9ef3d476897867 Parents: ce0a94e Author: Andy Seaborne Authored: Tue Sep 22 14:47:43 2015 +0100 Committer: Andy Seaborne Committed: Tue Sep 22 14:47:43 2015 +0100 ---------------------------------------------------------------------- .../org/apache/jena/jdbc/AbstractJenaDriverTests.java | 3 ++- .../jdbc/connections/AbstractJenaConnectionTests.java | 3 ++- .../metadata/results/AbstractDatabaseMetadataTests.java | 3 ++- .../apache/jena/jdbc/results/AbstractResultSetTests.java | 4 ++-- .../main/java/org/apache/jena/jdbc/mem/MemDriver.java | 3 ++- .../apache/jena/jdbc/remote/RemoteEndpointDriver.java | 11 +++-------- .../results/AbstractRemoteEndpointResultSetTests.java | 3 ++- .../main/java/org/apache/jena/jdbc/tdb/TDBDriver.java | 6 ++---- 8 files changed, 17 insertions(+), 19 deletions(-) ---------------------------------------------------------------------- http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java index 8ff0fe9..d27f9dd 100644 --- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java +++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/AbstractJenaDriverTests.java @@ -33,6 +33,7 @@ import org.apache.jena.jdbc.postprocessing.ResultsPostProcessor ; import org.apache.jena.jdbc.preprocessing.CommandPreProcessor ; import org.apache.jena.jdbc.preprocessing.Echo ; import org.apache.jena.query.ARQ ; +import org.apache.jena.system.JenaSystem ; import org.junit.Assert ; import org.junit.Assume ; import org.junit.Test ; @@ -44,7 +45,7 @@ import org.junit.Test ; public abstract class AbstractJenaDriverTests { static { - ARQ.init(); + JenaSystem.init() ; } /** http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java index 564a7f1..c6cdbf7 100644 --- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java +++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/connections/AbstractJenaConnectionTests.java @@ -37,6 +37,7 @@ import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata ; import org.apache.jena.jdbc.utils.TestUtils ; import org.apache.jena.query.* ; import org.apache.jena.sparql.core.Quad ; +import org.apache.jena.system.JenaSystem ; import org.apache.jena.update.UpdateFactory ; import org.apache.jena.update.UpdateRequest ; import org.junit.Assert ; @@ -50,7 +51,7 @@ import org.junit.Test ; public abstract class AbstractJenaConnectionTests { static { - ARQ.init(); + JenaSystem.init() ; } /** http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/metadata/results/AbstractDatabaseMetadataTests.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/metadata/results/AbstractDatabaseMetadataTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/metadata/results/AbstractDatabaseMetadataTests.java index 3f364df..09074f2 100644 --- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/metadata/results/AbstractDatabaseMetadataTests.java +++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/metadata/results/AbstractDatabaseMetadataTests.java @@ -26,6 +26,7 @@ import java.util.List ; import org.apache.jena.jdbc.connections.JenaConnection ; import org.apache.jena.query.ARQ ; +import org.apache.jena.system.JenaSystem ; import org.junit.Assert ; import org.junit.Test ; @@ -48,7 +49,7 @@ public abstract class AbstractDatabaseMetadataTests { Connection.TRANSACTION_READ_UNCOMMITTED, Connection.TRANSACTION_REPEATABLE_READ, Connection.TRANSACTION_SERIALIZABLE }; static { - ARQ.init(); + JenaSystem.init() ; } /** http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java index 7fd00d0..a59bdf4 100644 --- a/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java +++ b/jena-jdbc/jena-jdbc-core/src/test/java/org/apache/jena/jdbc/results/AbstractResultSetTests.java @@ -30,12 +30,12 @@ import org.apache.jena.datatypes.xsd.XSDDatatype ; import org.apache.jena.jdbc.JdbcCompatibility ; import org.apache.jena.jdbc.results.metadata.AskResultsMetadata ; import org.apache.jena.jdbc.results.metadata.TripleResultsMetadata ; -import org.apache.jena.query.ARQ ; import org.apache.jena.query.Dataset ; import org.apache.jena.query.DatasetFactory ; import org.apache.jena.rdf.model.* ; import org.apache.jena.rdf.model.Statement ; import org.apache.jena.sparql.util.NodeFactoryExtra ; +import org.apache.jena.system.JenaSystem ; import org.apache.jena.vocabulary.XSD ; import org.junit.* ; @@ -48,7 +48,7 @@ import org.junit.* ; public abstract class AbstractResultSetTests { static { - ARQ.init(); + JenaSystem.init(); } private static Dataset empty, ds; http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java b/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java index d839bd7..136eb3c 100644 --- a/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java +++ b/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java @@ -31,6 +31,7 @@ import org.apache.jena.query.ARQ ; import org.apache.jena.query.Dataset ; import org.apache.jena.query.DatasetFactory ; import org.apache.jena.riot.RDFDataMgr; +import org.apache.jena.system.JenaSystem ; /** *

@@ -88,7 +89,7 @@ public class MemDriver extends JenaDriver { */ static { try { - ARQ.init(); + JenaSystem.init() ; register(); } catch (SQLException e) { throw new RuntimeException("Failed to register Jena In-Memory JDBC Driver", e); http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java index d70cfbb..74e91d4 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java @@ -28,17 +28,12 @@ import java.util.List; import java.util.Map; import java.util.Properties; -import org.apache.jena.atlas.web.auth.ApacheModAuthFormLogin; -import org.apache.jena.atlas.web.auth.FormLogin; -import org.apache.jena.atlas.web.auth.FormsAuthenticator; -import org.apache.jena.atlas.web.auth.HttpAuthenticator; -import org.apache.jena.atlas.web.auth.PreemptiveBasicAuthenticator; -import org.apache.jena.atlas.web.auth.SimpleAuthenticator; +import org.apache.jena.atlas.web.auth.* ; import org.apache.jena.jdbc.JdbcCompatibility; import org.apache.jena.jdbc.JenaDriver; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection; -import org.apache.jena.query.ARQ ; +import org.apache.jena.system.JenaSystem ; /** *

@@ -220,7 +215,7 @@ public class RemoteEndpointDriver extends JenaDriver { */ static { try { - ARQ.init(); + JenaSystem.init() ; register(); } catch (SQLException e) { throw new RuntimeException("Failed to register Jena Remote Endpoint JDBC Driver", e); http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java index 99404c6..53d507b 100644 --- a/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java +++ b/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java @@ -23,6 +23,7 @@ import org.apache.jena.fuseki.Fuseki; import org.apache.jena.jdbc.results.AbstractResultSetTests; import org.apache.jena.query.ARQ ; import org.apache.jena.riot.web.HttpOp; +import org.apache.jena.system.JenaSystem ; import org.junit.AfterClass; import org.junit.BeforeClass; @@ -37,7 +38,7 @@ public abstract class AbstractRemoteEndpointResultSetTests extends AbstractResul static HttpClient globalCachingClient = HttpOp.createCachingHttpClient() ; @BeforeClass public static void beforeClassAbstract1() { - ARQ.init(); + JenaSystem.init() ; Fuseki.init(); HttpOp.setDefaultHttpClient(globalCachingClient) ; } http://git-wip-us.apache.org/repos/asf/jena/blob/bc9af2bb/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java ---------------------------------------------------------------------- diff --git a/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java b/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java index 031bbca..171bb51 100644 --- a/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java +++ b/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java @@ -29,9 +29,8 @@ import java.util.Properties; import org.apache.jena.jdbc.JenaDriver; import org.apache.jena.jdbc.connections.JenaConnection; import org.apache.jena.jdbc.tdb.connections.TDBConnection; -import org.apache.jena.query.ARQ ; import org.apache.jena.query.Dataset ; -import org.apache.jena.tdb.TDB ; +import org.apache.jena.system.JenaSystem ; import org.apache.jena.tdb.TDBFactory ; import org.slf4j.Logger; import org.slf4j.LoggerFactory; @@ -95,8 +94,7 @@ public class TDBDriver extends JenaDriver { */ static { try { - ARQ.init(); - TDB.init(); + JenaSystem.init() ; register(); } catch (SQLException e) { throw new RuntimeException("Failed to register Jena TDB JDBC Driver", e);