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 2014/01/01 21:30:47 UTC
svn commit: r1554671 - in /jena/branches/jena-fuseki-new-ui: ./ src-dev/dev/
src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/
src/test/java/org/apache/jena/fuseki/
Author: andy
Date: Wed Jan 1 20:30:46 2014
New Revision: 1554671
URL: http://svn.apache.org/r1554671
Log:
Tidying up.
Removed:
jena/branches/jena-fuseki-new-ui/assembly-soh.xml
jena/branches/jena-fuseki-new-ui/config-examples.ttl
jena/branches/jena-fuseki-new-ui/config-tdb-text.ttl
Modified:
jena/branches/jena-fuseki-new-ui/DEPENDENCIES
jena/branches/jena-fuseki-new-ui/pom.xml
jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SystemState.java
jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAdmin.java
Modified: jena/branches/jena-fuseki-new-ui/DEPENDENCIES
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/DEPENDENCIES?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/DEPENDENCIES (original)
+++ jena/branches/jena-fuseki-new-ui/DEPENDENCIES Wed Jan 1 20:30:46 2014
@@ -1,13 +1,16 @@
This file lists the dependences for Apache Jena Fuseki.
Version numbers are given in the POM file for a particular distribution.
-Apache Projects: Apache Software License
+Apache Projects:
+Apache Software License
Apache Jena, including the Jena IRI library
Apache Xerces-J
Apache log4j
Apache HttpComponents (HTTP Client)
Apache Commons Codec
- Apache Common FileUpload
+ Apache Commons FileUpload
+ Apache Lucene
+ Apache Solr
SLF4J : http://www.slf4j.org/
Copyright (c) 2004-2008 QOS.ch
Modified: jena/branches/jena-fuseki-new-ui/pom.xml
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pom.xml?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pom.xml (original)
+++ jena/branches/jena-fuseki-new-ui/pom.xml Wed Jan 1 20:30:46 2014
@@ -350,21 +350,6 @@
<artifactId>maven-assembly-plugin</artifactId>
<!-- After shared jar - same phase -->
<executions>
- <!--
- <execution>
- <id>create-soh-assembly</id>
- <phase>package</phase>
- <goals><goal>single</goal></goals>
- <configuration>
- <finalName>${assembly.soh.name}</finalName>
- <!- -<appendAssemblyId>false</appendAssemblyId> - ->
- <descriptors>
- <descriptor>assembly-soh.xml</descriptor>
- </descriptors>
- </configuration>
- </execution>
- -->
-
<execution>
<id>create-zip-assembly</id>
<phase>package</phase>
Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Wed Jan 1 20:30:46 2014
@@ -22,6 +22,13 @@ public class PROJECT {
// Naming
// fuseki:Service is the endpoints = dataset
+ // Test for servlet context
+
+ // async operations e.g. backup, stats
+
+ // TDB and server configuration parameters.
+ // per database -> assembler.
+
// WebContent tidying
// DEFs
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionCtl.java Wed Jan 1 20:30:46 2014
@@ -89,6 +89,11 @@ public abstract class ActionCtl extends
finishRequest(action) ;
}
+ final
+ protected boolean isContainerAction(HttpAction action) {
+ return (action.dsRef.name == null ) ;
+ }
+
protected abstract void perform(HttpAction action) ;
// /** Map request to uri in the registry.
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionDatasets.java Wed Jan 1 20:30:46 2014
@@ -120,10 +120,11 @@ public class ActionDatasets extends Acti
protected void execGet(HttpAction action) {
JsonValue v ;
- if (action.dsRef.name == null )
+ if ( isContainerAction(action) )
v = execGetContainer(action) ;
else
v = execGetDataset(action) ;
+
try {
HttpServletResponse response = action.response ;
ServletOutputStream out = response.getOutputStream() ;
@@ -159,16 +160,13 @@ public class ActionDatasets extends Acti
return builder.build() ;
}
- // XXX Split contained and per-dataset operations into separate servlets?
- // XXX ActionContainerItem
-
// ---- POST
// POST /$/datasets/ -- to the container -> register new dataset
// POST /$/datasets/name -- change something about an existing dataset
protected void execPost(HttpAction action) {
- if (action.dsRef.name == null )
+ if ( isContainerAction(action) )
execPostContainer(action) ;
else
execPostDataset(action) ;
@@ -314,7 +312,8 @@ public class ActionDatasets extends Acti
if ( name == null )
name = "" ;
action.log.info(format("[%d] DELETE ds=%s", action.id, name)) ;
- if ( action.dsRef.name == null ) {
+
+ if ( isContainerAction(action) ) {
ServletOps.errorBadRequest("DELETE only applies to a specific dataset.") ;
return ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java Wed Jan 1 20:30:46 2014
@@ -42,13 +42,13 @@ public class ManagementServer
connector.setMaxIdleTime(0) ; // Jetty outputs a lot of messages if this goes off.
//if ( loopback )
- if ( true )
+ if ( server.getServerPort() == port )
connector.setHost("localhost");
connector.setPort(port) ;
- // Some people do try very large operations ...
- connector.setRequestHeaderSize(64 * 1024) ;
- connector.setRequestBufferSize(5 * 1024 * 1024) ;
- connector.setResponseBufferSize(5 * 1024 * 1024) ;
+ // Control - defaults OK
+// connector.setRequestHeaderSize(64 * 1024) ;
+// connector.setRequestBufferSize(5 * 1024 * 1024) ;
+// connector.setResponseBufferSize(5 * 1024 * 1024) ;
jettyServer.addConnector(connector);
ServletContextHandler context = new ServletContextHandler() ;
jettyServer.setHandler(context) ;
@@ -62,7 +62,7 @@ public class ManagementServer
if ( !base.startsWith("/"))
throw new FusekiException("Base URI does not start with a '/'") ;
- addServlet(context, new DumpServlet(), base+MgtConst.opDump) ; // XXX Remove.?
+ addServlet(context, new DumpServlet(), base+MgtConst.opDump) ;
addServlet(context, new ActionDescription(), base+MgtConst.opStatus) ;
addServlet(context, new ActionPing(), base+MgtConst.opPing) ;
}
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiVocab.java Wed Jan 1 20:30:46 2014
@@ -32,7 +32,6 @@ public class FusekiVocab
public static final Resource tServer = resource("Server") ;
- // XXX Constants
public static final Resource fusekiService = resource("Service") ;
public static final Property pServices = property("services") ;
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SystemState.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SystemState.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SystemState.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/SystemState.java Wed Jan 1 20:30:46 2014
@@ -27,7 +27,6 @@ import com.hp.hpl.jena.tdb.base.file.Loc
import com.hp.hpl.jena.tdb.transaction.DatasetGraphTransaction ;
public class SystemState {
- // XXX Make part of the mgt webapp.
private static String SystemDatabaseLocation = "system" ;
// Testing may reset this.
public static Location location = new Location(SystemDatabaseLocation) ;
@@ -35,7 +34,6 @@ public class SystemState {
private static Dataset dataset = null ;
private static DatasetGraphTransaction dsg = null ;
-
public static Dataset getDataset() {
init() ;
return dataset ;
Modified: jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAdmin.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAdmin.java?rev=1554671&r1=1554670&r2=1554671&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAdmin.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/test/java/org/apache/jena/fuseki/TestAdmin.java Wed Jan 1 20:30:46 2014
@@ -135,7 +135,7 @@ public class TestAdmin extends BaseTest
}
// Specific dataset
- @Test public void add_dataset_1() {
+ @Test public void add_delete_dataset_1() {
checkNotThere(dsTest) ;
addTestDataset() ;
@@ -149,7 +149,7 @@ public class TestAdmin extends BaseTest
}
// Try to add twice
- @Test public void add_dataset_2() {
+ @Test public void add_delete_dataset_2() {
checkNotThere(dsTest) ;
File f = new File("testing/config-ds-1.ttl") ;
@@ -172,7 +172,7 @@ public class TestAdmin extends BaseTest
deleteDataset(dsTest) ;
}
- @Test public void add_dataset_3() throws Exception {
+ @Test public void add_delete_dataset_3() throws Exception {
String name = "MEMTEST" ;
//String args = "dbType=mem&dbName="+name ;
@@ -186,6 +186,16 @@ public class TestAdmin extends BaseTest
deleteDataset(name) ;
}
+ @Test public void delete_dataset_1() {
+ String name = "NoSuchDataset" ;
+ try {
+ execHttpDelete(ServerTest.urlRoot+"$/"+opDatasets+"/"+name) ;
+ fail("delete did not cause an Http Exception") ;
+ } catch ( HttpException ex ) {
+ assertEquals(HttpSC.NOT_FOUND_404, ex.getResponseCode()) ;
+ }
+ }
+
// ---- Active/dormant.
@Test public void state_1() {