svn commit: r1540760 - in /jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki: FusekiCmd.java mgt/ManagementServer.java server/ServerConfig.java

[andy]

Author: andy
Date: Mon Nov 11 16:09:47 2013
New Revision: 1540760

URL: http://svn.apache.org/r1540760
Log:
Starting point: /$/status on whatever the mgt port is.

Modified:
    
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.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/ServerConfig.java

Modified: 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: 
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1540760&r1=1540759&r2=1540760&view=diff
==============================================================================
--- 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
 (original)
+++ 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
 Mon Nov 11 16:09:47 2013
@@ -454,13 +454,14 @@ public class FusekiCmd extends CmdARQ {
         Fuseki.setServer(server) ;
 
         Server mgtServer = null ;
-
+        // mgtPort = -1 means no management functions.
+        
         if ( mgtPort > 0 && mgtPort != port ) {
             Fuseki.configLog.info("Management services on port " + mgtPort) ;
             mgtServer = ManagementServer.createManagementServer(mgtPort) ;
             ServletContextHandler context = 
(ServletContextHandler)mgtServer.getHandler() ;
-            ManagementServer.addServerFunctions(context, "/") ;
-            ManagementServer.addAdminFunctions(context, "/") ;
+            ManagementServer.addServerFunctions(context, "/$/") ;
+            ManagementServer.addAdminFunctions(context, "/$/") ;
 
             try {
                 mgtServer.start() ;
@@ -473,7 +474,7 @@ public class FusekiCmd extends CmdARQ {
             }
         }
 
-        if ( mgtPort <= 0 || mgtPort == port ) {
+        if ( mgtPort == 0 || mgtPort == port ) {
             // TODO Temporary!
             mgtServer = server.getServer() ;
             ServletContextHandler context = 
(ServletContextHandler)server.getServer().getHandler() ;

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=1540760&r1=1540759&r2=1540760&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
 Mon Nov 11 16:09:47 2013
@@ -67,7 +67,7 @@ public class ManagementServer
             throw new FusekiException("Base URI does not start with a '/'") ; 
         // Dump request
         addServlet(context, new DumpServlet(),          base+"dump") ;
-        addServlet(context, new DescriptionServlet(),   base+"datasets") ;
+        addServlet(context, new DescriptionServlet(),   base+"status") ;
     }
     
     public static void addAdminFunctions(ServletContextHandler context, String 
base) {

Modified: 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java
URL: 
http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java?rev=1540760&r1=1540759&r2=1540760&view=diff
==============================================================================
--- 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java
 (original)
+++ 
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/ServerConfig.java
 Mon Nov 11 16:09:47 2013
@@ -29,7 +29,7 @@ public class ServerConfig
     
     /** Port to run the server service on */
     public int port ;
-    /** Port for the management interface : -1 for no mamangement interface */ 
+    /** Port for the management interface : -1 for no management interface */ 
     public int mgtPort ;
     /** Port for the pages UI : this can be the same as the services port. */ 
     public int pagesPort ;