You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@jena.apache.org by rv...@apache.org on 2013/08/08 19:19:34 UTC
svn commit: r1511887 - in /jena/trunk/jena-jdbc:
jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/
jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/
jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/
jena-jdb...
Author: rvesse
Date: Thu Aug 8 17:19:33 2013
New Revision: 1511887
URL: http://svn.apache.org/r1511887
Log:
More solid init code to see if that resolves an apparent deadlock on the build server
Added:
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/AbstractRemoteEndpointConnectionTests.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
Modified:
jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-mem/src/main/java/org/apache/jena/jdbc/mem/MemDriver.java Thu Aug 8 17:19:33 2013
@@ -29,6 +29,7 @@ import org.apache.jena.jdbc.connections.
import org.apache.jena.jdbc.mem.connections.MemConnection;
import org.apache.jena.riot.RDFDataMgr;
+import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.query.Dataset;
import com.hp.hpl.jena.query.DatasetFactory;
@@ -88,6 +89,7 @@ public class MemDriver extends JenaDrive
*/
static {
try {
+ ARQ.init();
register();
} catch (SQLException e) {
throw new RuntimeException("Failed to register Jena In-Memory JDBC Driver", e);
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/main/java/org/apache/jena/jdbc/remote/RemoteEndpointDriver.java Thu Aug 8 17:19:33 2013
@@ -39,6 +39,8 @@ import org.apache.jena.jdbc.JenaDriver;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
+import com.hp.hpl.jena.query.ARQ;
+
/**
* <p>
* A Jena JDBC driver which creates connections to remote endpoints
@@ -219,6 +221,7 @@ public class RemoteEndpointDriver extend
*/
static {
try {
+ ARQ.init();
register();
} catch (SQLException e) {
throw new RuntimeException("Failed to register Jena Remote Endpoint JDBC Driver", e);
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/TS_JdbcDriverRemote.java Thu Aug 8 17:19:33 2013
@@ -17,6 +17,7 @@
*/
package org.apache.jena.jdbc.remote;
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnection;
import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithAuth;
import org.apache.jena.jdbc.remote.connections.TestRemoteEndpointConnectionWithGraphUris;
@@ -30,6 +31,8 @@ import org.apache.jena.jdbc.remote.state
import org.junit.runner.RunWith;
import org.junit.runners.Suite;
+import com.hp.hpl.jena.query.ARQ;
+
/**
* Test Suite for the Jena JDBC Remote Endpoint driver
*
@@ -50,4 +53,8 @@ import org.junit.runners.Suite;
})
public class TS_JdbcDriverRemote {
+ static {
+ ARQ.init();
+ Fuseki.init();
+ }
}
Added: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/AbstractRemoteEndpointConnectionTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/AbstractRemoteEndpointConnectionTests.java?rev=1511887&view=auto
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/AbstractRemoteEndpointConnectionTests.java (added)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/AbstractRemoteEndpointConnectionTests.java Thu Aug 8 17:19:33 2013
@@ -0,0 +1,34 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.jdbc.remote.connections;
+
+import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
+
+/**
+ * Abstract tests for remote endpoint driver connections
+ *
+ */
+public abstract class AbstractRemoteEndpointConnectionTests extends AbstractJenaConnectionTests {
+
+ static {
+ Fuseki.init();
+ }
+
+}
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnection.java Thu Aug 8 17:19:33 2013
@@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.conn
import java.sql.SQLException;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
import org.apache.jena.jdbc.utils.TestUtils;
@@ -35,7 +34,7 @@ import com.hp.hpl.jena.query.Dataset;
* Tests for the {@link RemoteEndpointConnection}
*
*/
-public class TestRemoteEndpointConnection extends AbstractJenaConnectionTests {
+public class TestRemoteEndpointConnection extends AbstractRemoteEndpointConnectionTests {
/**
* Setup for the tests by allocating a Fuseki instance to work with
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithAuth.java Thu Aug 8 17:19:33 2013
@@ -32,7 +32,6 @@ import org.apache.jena.fuseki.server.Fus
import org.apache.jena.fuseki.server.SPARQLServer;
import org.apache.jena.fuseki.server.ServerConfig;
import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
import org.apache.jena.jdbc.utils.TestUtils;
@@ -54,7 +53,7 @@ import com.hp.hpl.jena.update.UpdateProc
* authentication
*
*/
-public class TestRemoteEndpointConnectionWithAuth extends AbstractJenaConnectionTests {
+public class TestRemoteEndpointConnectionWithAuth extends AbstractRemoteEndpointConnectionTests {
private static String USER = "test";
private static String PASSWORD = "letmein";
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithGraphUris.java Thu Aug 8 17:19:33 2013
@@ -25,7 +25,6 @@ import java.util.List;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
import org.apache.jena.jdbc.utils.TestUtils;
@@ -42,7 +41,7 @@ import com.hp.hpl.jena.query.Dataset;
* default graph is used
*
*/
-public class TestRemoteEndpointConnectionWithGraphUris extends AbstractJenaConnectionTests {
+public class TestRemoteEndpointConnectionWithGraphUris extends AbstractRemoteEndpointConnectionTests {
/**
* Constant used for default graph URI in these tests
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/connections/TestRemoteEndpointConnectionWithResultSetTypes.java Thu Aug 8 17:19:33 2013
@@ -21,7 +21,6 @@ package org.apache.jena.jdbc.remote.conn
import java.sql.SQLException;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
-import org.apache.jena.jdbc.connections.AbstractJenaConnectionTests;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
import org.apache.jena.jdbc.utils.TestUtils;
@@ -36,7 +35,7 @@ import com.hp.hpl.jena.query.Dataset;
* Tests for the {@link RemoteEndpointConnection} where we use custom result set types
*
*/
-public class TestRemoteEndpointConnectionWithResultSetTypes extends AbstractJenaConnectionTests {
+public class TestRemoteEndpointConnectionWithResultSetTypes extends AbstractRemoteEndpointConnectionTests {
/**
* Setup for the tests by allocating a Fuseki instance to work with
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/metadata/TestRemoteConnectionMetadata.java Thu Aug 8 17:19:33 2013
@@ -16,7 +16,6 @@
* limitations under the License.
*/
-
package org.apache.jena.jdbc.remote.metadata;
import java.sql.Connection;
@@ -24,6 +23,7 @@ import java.sql.SQLException;
import java.util.ArrayList;
import java.util.List;
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -38,6 +38,10 @@ import org.junit.BeforeClass;
*
*/
public class TestRemoteConnectionMetadata extends AbstractDatabaseMetadataTests {
+
+ static {
+ Fuseki.init();
+ }
/**
* Setup for the tests by allocating a Fuseki instance to work with
Added: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java?rev=1511887&view=auto
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java (added)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/AbstractRemoteEndpointResultSetTests.java Thu Aug 8 17:19:33 2013
@@ -0,0 +1,33 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.jdbc.remote.results;
+
+import org.apache.jena.fuseki.Fuseki;
+import org.apache.jena.jdbc.results.AbstractResultSetTests;
+
+/**
+ * Abstract tests for remote endpoint connection result sets
+ *
+ */
+public abstract class AbstractRemoteEndpointResultSetTests extends AbstractResultSetTests {
+
+ static {
+ Fuseki.init();
+ }
+}
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResults.java Thu Aug 8 17:19:33 2013
@@ -26,7 +26,6 @@ import org.apache.jena.fuseki.ServerTest
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
-import org.apache.jena.jdbc.results.AbstractResultSetTests;
import org.apache.jena.jdbc.utils.TestUtils;
import org.junit.After;
import org.junit.AfterClass;
@@ -38,7 +37,7 @@ import com.hp.hpl.jena.query.Dataset;
* Tests result sets from a remote endpoint
*
*/
-public class TestRemoteEndpointResults extends AbstractResultSetTests {
+public class TestRemoteEndpointResults extends AbstractRemoteEndpointResultSetTests {
private static RemoteEndpointConnection connection;
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithAuth.java Thu Aug 8 17:19:33 2013
@@ -36,7 +36,6 @@ import org.apache.jena.fuseki.server.Ser
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
-import org.apache.jena.jdbc.results.AbstractResultSetTests;
import org.apache.jena.jdbc.utils.TestUtils;
import org.junit.After;
import org.junit.AfterClass;
@@ -55,7 +54,7 @@ import com.hp.hpl.jena.update.UpdateProc
* Tests result sets from a remote endpoint
*
*/
-public class TestRemoteEndpointResultsWithAuth extends AbstractResultSetTests {
+public class TestRemoteEndpointResultsWithAuth extends AbstractRemoteEndpointResultSetTests {
private static RemoteEndpointConnection connection;
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithGraphUris.java Thu Aug 8 17:19:33 2013
@@ -28,7 +28,6 @@ import org.apache.jena.fuseki.ServerTest
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
-import org.apache.jena.jdbc.results.AbstractResultSetTests;
import org.apache.jena.jdbc.utils.TestUtils;
import org.junit.After;
import org.junit.AfterClass;
@@ -40,7 +39,7 @@ import com.hp.hpl.jena.query.Dataset;
* Tests result sets from a remote endpoint
*
*/
-public class TestRemoteEndpointResultsWithGraphUris extends AbstractResultSetTests {
+public class TestRemoteEndpointResultsWithGraphUris extends AbstractRemoteEndpointResultSetTests {
/**
* Constant for default graph URI used in these tests
@@ -49,7 +48,6 @@ public class TestRemoteEndpointResultsWi
private static RemoteEndpointConnection connection;
-
/**
* Setup for the tests by allocating a Fuseki instance to work with
* @throws SQLException
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/results/TestRemoteEndpointResultsWithResultSetTypes.java Thu Aug 8 17:19:33 2013
@@ -25,7 +25,6 @@ import org.apache.jena.fuseki.ServerTest
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
import org.apache.jena.jdbc.remote.connections.RemoteEndpointConnection;
-import org.apache.jena.jdbc.results.AbstractResultSetTests;
import org.apache.jena.jdbc.utils.TestUtils;
import org.apache.jena.riot.WebContent;
import org.junit.After;
@@ -38,7 +37,7 @@ import com.hp.hpl.jena.query.Dataset;
* Tests result sets from a remote endpoint
*
*/
-public class TestRemoteEndpointResultsWithResultSetTypes extends AbstractResultSetTests {
+public class TestRemoteEndpointResultsWithResultSetTypes extends AbstractRemoteEndpointResultSetTests {
private static RemoteEndpointConnection connection;
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-remote/src/test/java/org/apache/jena/jdbc/remote/statements/TestRemoteEndpointStatements.java Thu Aug 8 17:19:33 2013
@@ -19,6 +19,8 @@
package org.apache.jena.jdbc.remote.statements;
import java.sql.SQLException;
+
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.ServerTest;
import org.apache.jena.jdbc.JdbcCompatibility;
import org.apache.jena.jdbc.connections.JenaConnection;
@@ -33,6 +35,10 @@ import org.junit.BeforeClass;
*
*/
public class TestRemoteEndpointStatements extends AbstractJenaStatementTests {
+
+ static {
+ Fuseki.init();
+ }
/**
* Setup for the tests by allocating a Fuseki instance to work with
Modified: jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java?rev=1511887&r1=1511886&r2=1511887&view=diff
==============================================================================
--- jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java (original)
+++ jena/trunk/jena-jdbc/jena-jdbc-driver-tdb/src/main/java/org/apache/jena/jdbc/tdb/TDBDriver.java Thu Aug 8 17:19:33 2013
@@ -32,7 +32,9 @@ import org.apache.jena.jdbc.tdb.connecti
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
+import com.hp.hpl.jena.query.ARQ;
import com.hp.hpl.jena.query.Dataset;
+import com.hp.hpl.jena.tdb.TDB;
import com.hp.hpl.jena.tdb.TDBFactory;
/**
@@ -94,6 +96,8 @@ public class TDBDriver extends JenaDrive
*/
static {
try {
+ ARQ.init();
+ TDB.init();
register();
} catch (SQLException e) {
throw new RuntimeException("Failed to register Jena TDB JDBC Driver", e);