Author: andy
Date: Fri Jun 20 11:22:01 2014
New Revision: 1604141
URL: http://svn.apache.org/r1604141
Log:
JENA-718 : Use /$/server rather than /$/status
Added:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
- copied, changed from r1604120,
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java
Removed:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java
Modified:
jena/Experimental/jena-fuseki2/docs/fuseki-server-protocol.md
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/MgtConst.java
jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
Modified: jena/Experimental/jena-fuseki2/docs/fuseki-server-protocol.md
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/docs/fuseki-server-protocol.md?rev=1604141&r1=1604140&r2=1604141&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/docs/fuseki-server-protocol.md (original)
+++ jena/Experimental/jena-fuseki2/docs/fuseki-server-protocol.md Fri Jun 20
11:22:01 2014
@@ -82,7 +82,7 @@ for doing this:
* HTML Form upload the assembler file
* Use a built-in template (in-memory or persistent)
-All requite HTTP `POST`.
+All require HTTP `POST`.
Changes to the server state are carried across restarts.
Copied:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
(from r1604120,
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java)
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java?p2=jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java&p1=jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java&r1=1604120&r2=1604141&rev=1604141&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
Fri Jun 20 11:22:01 2014
@@ -36,22 +36,26 @@ import org.apache.jena.fuseki.servlets.H
import org.apache.jena.fuseki.servlets.ServletOps ;
/** Description of datasets for a server */
-public class ActionStatus extends ActionCtl
+public class ActionServerStatus extends ActionCtl
{
- public ActionStatus() { super() ; }
+ public ActionServerStatus() { super() ; }
@Override
protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
- doCommon(req, resp); }
-
+ doCommon(req, resp) ;
+ }
+
@Override
- protected void perform(HttpAction action)
- {
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp) {
+ doCommon(req, resp) ;
+ }
+
+ @Override
+ protected void perform(HttpAction action) {
try {
description(action) ;
ServletOps.success(action) ;
- }
- catch (IOException e) {
+ } catch (IOException e) {
ServletOps.errorOccurred(e) ;
}
}
Modified:
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/MgtConst.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/MgtConst.java?rev=1604141&r1=1604140&r2=1604141&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/MgtConst.java
(original)
+++
jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/MgtConst.java
Fri Jun 20 11:22:01 2014
@@ -20,12 +20,11 @@ package org.apache.jena.fuseki.mgt;
/** Various contants used in the admin functions */
public class MgtConst {
- public static final String opDump = "dump" ;
- public static final String opStatus = "status" ;
- public static final String opPing = "ping" ;
+ public static final String opDump = "dump" ;
+ public static final String opPing = "ping" ;
- public static final String opStats = "stats" ;
- public static final String opDatasets = "datasets" ;
- public static final String opSserver = "server" ;
+ public static final String opStats = "stats" ;
+ public static final String opDatasets = "datasets" ;
+ public static final String opServer = "server" ;
}
Modified: jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml?rev=1604141&r1=1604140&r2=1604141&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml (original)
+++ jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml Fri Jun 20
11:22:01 2014
@@ -106,8 +106,8 @@
</servlet>
<servlet>
- <servlet-name>StatusServlet</servlet-name>
- <servlet-class>org.apache.jena.fuseki.mgt.ActionStatus</servlet-class>
+ <servlet-name>ServerStatusServlet</servlet-name>
+
<servlet-class>org.apache.jena.fuseki.mgt.ActionServerStatus</servlet-class>
</servlet>
<servlet>
@@ -121,8 +121,8 @@
</servlet-mapping>
<servlet-mapping>
- <servlet-name>StatusServlet</servlet-name>
- <url-pattern>/$/status</url-pattern>
+ <servlet-name>ServerStatusServlet</servlet-name>
+ <url-pattern>/$/server</url-pattern>
</servlet-mapping>
<servlet-mapping>
Modified:
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js?rev=1604141&r1=1604140&r2=1604141&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
(original)
+++
jena/Experimental/jena-fuseki2/src/main/webapp/js/app/models/fuseki-server.js
Fri Jun 20 11:22:01 2014
@@ -66,7 +66,7 @@ define(
/** Load and cache the remote server description. Trigger change event
when done */
loadServerDescription: function() {
var self = this;
- return this.getJSON( "/$/status" ).done( function( data ) {
+ return this.getJSON( "/$/server" ).done( function( data ) {
self.saveServerDescription(
data );
} )
.then( function() {
Modified:
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
URL:
http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java?rev=1604141&r1=1604140&r2=1604141&view=diff
==============================================================================
---
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
(original)
+++
jena/Experimental/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TestAdmin.java
Fri Jun 20 11:22:01 2014
@@ -20,7 +20,7 @@ package org.apache.jena.fuseki;
import static org.apache.jena.fuseki.ServerTest.datasetPath ;
import static org.apache.jena.fuseki.ServerTest.urlRoot ;
-import static org.apache.jena.fuseki.mgt.MgtConst.opDatasets ;
+import static org.apache.jena.fuseki.mgt.MgtConst.* ;
import static org.apache.jena.fuseki.mgt.MgtConst.opPing ;
import static org.apache.jena.fuseki.mgt.MgtConst.opStats ;
import static org.apache.jena.riot.web.HttpOp.execHttpDelete ;
@@ -88,6 +88,16 @@ public class TestAdmin extends BaseTest
execHttpPost(ServerTest.urlRoot+"$/"+opPing, null) ;
}
+ // --- Server status
+
+ @Test public void server_1() {
+ execHttpGet(ServerTest.urlRoot+"$/"+opServer) ;
+ }
+
+ @Test public void server_2() {
+ execHttpPost(ServerTest.urlRoot+"$/"+opServer, null) ;
+ }
+
// --- List all datasets
@Test public void list_datasets_1() {
