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/05/28 16:05:34 UTC

svn commit: r1598017 - in /jena/Experimental/jena-fuseki2/src/main: java/org/apache/jena/fuseki/mgt/ActionDescription.java java/org/apache/jena/fuseki/mgt/ActionStatus.java webapp/WEB-INF/web.xml

Author: andy
Date: Wed May 28 14:05:34 2014
New Revision: 1598017

URL: http://svn.apache.org/r1598017
Log:
Rename the operation tied to /$/status to be ActionStatus

Added:
    jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java
      - copied, changed from r1597826, jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
Removed:
    jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java
Modified:
    jena/Experimental/jena-fuseki2/src/main/webapp/WEB-INF/web.xml

Copied: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java (from r1597826, jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java)
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java?p2=jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java&p1=jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java&r1=1597826&r2=1598017&rev=1598017&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionDescription.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/mgt/ActionStatus.java Wed May 28 14:05:34 2014
@@ -36,9 +36,9 @@ import org.apache.jena.fuseki.servlets.H
 import org.apache.jena.fuseki.servlets.ServletOps ;
 
 /** Description of datasets for a server */ 
-public class ActionDescription extends ActionCtl
+public class ActionStatus extends ActionCtl
 {
-    public ActionDescription() { super() ; }
+    public ActionStatus() { super() ; }
     
     @Override
     protected void doGet(HttpServletRequest req, HttpServletResponse resp) {
@@ -76,9 +76,9 @@ public class ActionDescription extends A
     private void describeServer(JsonBuilder builder, int requestPort) {
         String versionStr = Fuseki.VERSION ;
         String builtDateStr = Fuseki.BUILD_DATE ;
-        if ( versionStr == null )
+        if ( versionStr == null || versionStr.startsWith("${") )
             versionStr = "Development" ;
-        if ( builtDateStr == null )
+        if ( builtDateStr == null || builtDateStr.startsWith("${") )
             builtDateStr = "Unknown" ;
 
 //        builder

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=1598017&r1=1598016&r2=1598017&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 Wed May 28 14:05:34 2014
@@ -107,7 +107,7 @@
 
   <servlet>
     <servlet-name>StatusServlet</servlet-name>
-    <servlet-class>org.apache.jena.fuseki.mgt.ActionDescription</servlet-class>
+    <servlet-class>org.apache.jena.fuseki.mgt.ActionStatus</servlet-class>
   </servlet>
 
   <servlet>