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 2012/01/24 09:21:58 UTC
svn commit: r1235161 - in
/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt:
ManagementServer.java MgtCmdServlet.java ServerServlet.java
Author: andy
Date: Tue Jan 24 08:21:57 2012
New Revision: 1235161
URL: http://svn.apache.org/viewvc?rev=1235161&view=rev
Log:
Rename management servlet ; restructure it's creation.
Added:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java
- copied, changed from r1234853, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ServerServlet.java
Removed:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ServerServlet.java
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java?rev=1235161&r1=1235160&r2=1235161&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ManagementServer.java Tue Jan 24 08:21:57 2012
@@ -56,7 +56,7 @@ public class ManagementServer
server.setHandler(context);
// Add the server control servlet
- addServlet(context, new ServerServlet(), "/mgt") ;
+ addServlet(context, new MgtCmdServlet(), "/mgt") ;
return server ;
// Old plan
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java (from r1234853, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ServerServlet.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ServerServlet.java&r1=1234853&r2=1235161&rev=1235161&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/ServerServlet.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtCmdServlet.java Tue Jan 24 08:21:57 2012
@@ -42,11 +42,11 @@ import com.hp.hpl.jena.tdb.TDB ;
/** Control functions for a Fuskei server */
-public class ServerServlet extends HttpServlet
+public class MgtCmdServlet extends HttpServlet
{
private static Logger log = Fuseki.serverLog ;
- public ServerServlet()
+ public MgtCmdServlet()
{
}
@@ -58,17 +58,17 @@ public class ServerServlet extends HttpS
}
public static String paramCmd = "cmd" ;
- public static String cmdBackup = "backup" ;
- public static String cmdRestart = "restart" ;
- public static String cmdShutdown = "shutdown" ;
+ public static String cmdBackup = "backup" ; // &dataset=/datasetname
+ public static String cmdRestart = "restart" ; // Not implemented.
+ public static String cmdShutdown = "shutdown" ; // Server stops, no questions asked.
ActionBackup actionBackup = new ActionBackup() ;
@Override
public void doPost(HttpServletRequest req, HttpServletResponse resp) throws IOException
{
- //Commands:
- // ?cmd=backup
+ //Commands format:
+ // ?cmd=backup&<other args per command>
String[] args = req.getParameterValues(paramCmd) ;
if ( args == null )
@@ -90,6 +90,7 @@ public class ServerServlet extends HttpS
}
if ( cmd.equalsIgnoreCase(cmdRestart))
{
+
continue ;
}
if ( cmd.equalsIgnoreCase(cmdShutdown))