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 2011/09/03 23:13:26 UTC
svn commit: r1164926 - in /incubator/jena/Jena2/Fuseki/trunk: ./
src/main/java/org/openjena/fuseki/config/
src/main/java/org/openjena/fuseki/server/
src/test/java/org/openjena/fuseki/ src/test/java/org/openjena/fuseki/http/
Author: andy
Date: Sat Sep 3 21:13:25 2011
New Revision: 1164926
URL: http://svn.apache.org/viewvc?rev=1164926&view=rev
Log:
Align the naming for client and server in the test suite.
Modified:
incubator/jena/Jena2/Fuseki/trunk/log4j.properties
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java
incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java
Modified: incubator/jena/Jena2/Fuseki/trunk/log4j.properties
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/log4j.properties?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/log4j.properties (original)
+++ incubator/jena/Jena2/Fuseki/trunk/log4j.properties Sat Sep 3 21:13:25 2011
@@ -30,8 +30,8 @@ log4j.logger.org.joseki=INFO
# Fuseki
# Server log.
-log4j.logger.org.openjena.fuseki.Server=INFO
+log4j.logger.org.openjena.fuseki.Server=ALL
# Request log.
-log4j.logger.org.openjena.fuseki.Fuseki=INFO
+log4j.logger.org.openjena.fuseki.Fuseki=ALL
# Internal logs
log4j.logger.org.openjena.fuseki=INFO
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java Sat Sep 3 21:13:25 2011
@@ -93,6 +93,8 @@ public class FusekiConfig
sDesc.uploadEP.add(HttpNames.ServiceUpload) ;
sDesc.readWriteGraphStoreEP.add(HttpNames.ServiceData) ;
}
+ else
+ sDesc.readGraphStoreEP.add(HttpNames.ServiceData) ;
return sDesc ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java Sat Sep 3 21:13:25 2011
@@ -277,6 +277,8 @@ public class SPARQLServer
{
if ( pathSpec.endsWith("/") )
pathSpec = pathSpec.substring(0, pathSpec.length()-1) ;
+ if ( pathSpec.startsWith("/") )
+ pathSpec = pathSpec.substring(1, pathSpec.length()) ;
addServlet(context, servlet, datasetPath+"/"+pathSpec) ;
}
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/BaseServerTest.java Sat Sep 3 21:13:25 2011
@@ -28,13 +28,13 @@ import com.hp.hpl.jena.sparql.sse.SSE ;
public class BaseServerTest extends BaseTest
{
- // Abstraction that runs one server.
- // Inherit from this class to add starting/stopping a server.
-
+ public static final int port = 3535 ;
public static final String datasetPath = "/dataset" ;
public static final String serviceUpdate = "http://localhost:"+ServerTest.port+datasetPath+"/update" ;
public static final String serviceQuery = "http://localhost:"+ServerTest.port+datasetPath+"/query" ;
- public static final String serviceREST = "http://localhost:"+ServerTest.port+datasetPath+"/data" ;
+ public static final String serviceREST = "http://localhost:"+ServerTest.port+datasetPath+"/data" ; // ??????
+
+
protected static final String gn1 = "http://graph/1" ;
protected static final String gn2 = "http://graph/2" ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/ServerTest.java Sat Sep 3 21:13:25 2011
@@ -22,7 +22,6 @@ import java.util.Arrays ;
import org.junit.AfterClass ;
import org.junit.BeforeClass ;
-import org.openjena.atlas.junit.BaseTest ;
import org.openjena.atlas.logging.Log ;
import org.openjena.fuseki.config.FusekiConfig ;
import org.openjena.fuseki.config.FusekiConfig.ServiceDesc ;
@@ -38,17 +37,11 @@ import com.hp.hpl.jena.sparql.core.Datas
\@AfterClass public static void afterClass() { ServerTest.freeServer() ; }
</pre>
*/
-public class ServerTest extends BaseTest
+public class ServerTest extends BaseServerTest
{
// Abstraction that runs one server.
// Inherit from this class to add starting/stopping a server.
- public static final int port = 3535 ;
- public static final String datasetPath = "/dataset" ;
- public static final String serviceUpdate = "http://localhost:"+port+datasetPath+"/update" ;
- public static final String serviceQuery = "http://localhost:"+port+datasetPath+"/query" ;
- public static final String serviceREST = "http://localhost:"+port+datasetPath+"/data" ;
-
private static int referenceCount = 0 ;
private static SPARQLServer server = null ;
@@ -75,8 +68,13 @@ public class ServerTest extends BaseTest
Log.logLevel("org.eclipse.jetty", org.apache.log4j.Level.WARN, java.util.logging.Level.WARNING) ;
DatasetGraph dsg = DatasetGraphFactory.createMem() ;
+ // This must agree with BaseServerTest
ServiceDesc sDesc = FusekiConfig.defaultConfiguration(datasetPath, dsg, true) ;
- SPARQLServer server = new SPARQLServer(null, port, Arrays.asList(sDesc) ) ;
+// public static final String serviceUpdate = "http://localhost:"+ServerTest.port+datasetPath+"/update" ;
+// public static final String serviceQuery = "http://localhost:"+ServerTest.port+datasetPath+"/query" ;
+// public static final String serviceREST = "http://localhost:"+ServerTest.port+datasetPath+"/data" ; // ??????
+
+ server = new SPARQLServer(null, port, Arrays.asList(sDesc) ) ;
server.start() ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java?rev=1164926&r1=1164925&r2=1164926&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/test/java/org/openjena/fuseki/http/TestDatasetGraphAccessorBase.java Sat Sep 3 21:13:25 2011
@@ -37,7 +37,6 @@ public abstract class TestDatasetGraphAc
@Test public void get_01()
{
-
DatasetGraphAccessor updater = getDatasetUpdater() ;
Graph graph = updater.httpGet() ;
assertNullOrEmpty(graph) ;
@@ -77,9 +76,7 @@ public abstract class TestDatasetGraphAc
@Test public void post_01()
{
-
DatasetGraphAccessor updater = getDatasetUpdater() ;
-
updater.httpPost(graph1) ;
updater.httpPost(graph2) ;
Graph graph = updater.httpGet() ;
@@ -94,7 +91,6 @@ public abstract class TestDatasetGraphAc
@Test public void post_02()
{
-
DatasetGraphAccessor updater = getDatasetUpdater() ;
updater.httpPost(n1, graph1) ;
updater.httpPost(n1, graph2) ;
@@ -113,7 +109,6 @@ public abstract class TestDatasetGraphAc
// Default graph
@Test public void delete_01()
{
-
DatasetGraphAccessor updater = getDatasetUpdater() ;
updater.httpDelete() ;
Graph graph = updater.httpGet() ;