jena-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From a...@apache.org
Subject [2/5] jena git commit: JENA-1638: Add /$/status as synonym for /$/server.
Date Mon, 26 Nov 2018 11:10:55 GMT
JENA-1638: Add /$/status as synonym for /$/server.


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/14dff31a
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/14dff31a
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/14dff31a

Branch: refs/heads/master
Commit: 14dff31aa92c8691a39778e8f4011ed4ffc9128d
Parents: 5a0843d
Author: Andy Seaborne <andy@apache.org>
Authored: Fri Nov 23 13:53:12 2018 +0000
Committer: Andy Seaborne <andy@apache.org>
Committed: Fri Nov 23 19:39:30 2018 +0000

----------------------------------------------------------------------
 .../jena/fuseki/mgt/ActionServerStatus.java      | 19 ++++---------------
 .../src/main/webapp/WEB-INF/web.xml              |  6 ++++++
 2 files changed, 10 insertions(+), 15 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/14dff31a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
index d3c0873..2a100e7 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/java/org/apache/jena/fuseki/mgt/ActionServerStatus.java
@@ -88,22 +88,11 @@ public class ActionServerStatus extends ActionCtl
         if ( builtDateStr == null || builtDateStr.startsWith("${") )
             builtDateStr = "Unknown" ;
 
-//        builder
-//            .key(JsonConst.server)
-//            .startObject()
-//            .key(JsonConst.port).value(port)
-//            .finishObject() ;
-//        builder
-//            .key(JsonConst.admin)
-//            .startObject()
-//            .key(JsonConst.port).value(requestPort)
-//            .finishObject() ;
-
         builder
-            .key(ServerMgtConst.version).value(versionStr)
-            .key(ServerMgtConst.built).value(builtDateStr)
-            .key(ServerMgtConst.startDT).value(Fuseki.serverStartedAt())
-            .key(ServerMgtConst.uptime).value(Fuseki.serverUptimeSeconds())
+            .pair(ServerMgtConst.version,   versionStr)
+            .pair(ServerMgtConst.built,     builtDateStr)
+            .pair(ServerMgtConst.startDT,   Fuseki.serverStartedAt())
+            .pair(ServerMgtConst.uptime,    Fuseki.serverUptimeSeconds())
             ;
             
     }

http://git-wip-us.apache.org/repos/asf/jena/blob/14dff31a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
index 7de2f92..ae3eb7c 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/jena-fuseki2/jena-fuseki-webapp/src/main/webapp/WEB-INF/web.xml
@@ -231,6 +231,12 @@
     <url-pattern>/$/server</url-pattern>
   </servlet-mapping>
 
+  <!-- Alternative name mentioned in default shiro.ini -->
+  <servlet-mapping>
+    <servlet-name>ServerStatusServlet</servlet-name>
+    <url-pattern>/$/status</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>ActionDatasets</servlet-name>
     <servlet-class>org.apache.jena.fuseki.mgt.ActionDatasets</servlet-class>


Mime
View raw message