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/01/30 12:49:48 UTC
svn commit: r1562790 - in /jena/branches/jena-fuseki-new-ui:
pages/js/app/controllers/query-controller.js src-dev/dev/PROJECT.java
src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java
Author: andy
Date: Thu Jan 30 11:49:48 2014
New Revision: 1562790
URL: http://svn.apache.org/r1562790
Log:
No logging for ping (no request id allocation either)
Fix query-controller creation.
Modified:
jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js
jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java
Modified: jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js?rev=1562790&r1=1562789&r2=1562790&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js (original)
+++ jena/branches/jena-fuseki-new-ui/pages/js/app/controllers/query-controller.js Thu Jan 30 11:49:48 2014
@@ -12,7 +12,7 @@ define(
};
// add the behaviours defined on the controller
- _.extend( ValidationController.prototype, {
+ _.extend( QueryController.prototype, {
initEvents: function() {
_.bindAll( this, "onServerModelReady" );
fui.vent.on( "models.fuseki-server.ready", this.onServerModelReady );
Modified: jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java?rev=1562790&r1=1562789&r2=1562790&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java (original)
+++ jena/branches/jena-fuseki-new-ui/src-dev/dev/PROJECT.java Thu Jan 30 11:49:48 2014
@@ -19,7 +19,9 @@
package dev;
public class PROJECT {
- // Backup
+ // status -> two entries
+
+ // Backup task + polling
// Access point stats? HTTP stats?
// Create dataset - check for existing.
// Timeouts
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java?rev=1562790&r1=1562789&r2=1562790&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/mgt/ActionPing.java Thu Jan 30 11:49:48 2014
@@ -18,19 +18,25 @@
package org.apache.jena.fuseki.mgt;
+import static org.apache.jena.riot.WebContent.charsetUTF8 ;
+import static org.apache.jena.riot.WebContent.contentTypeTextPlain ;
+
import java.io.IOException ;
import javax.servlet.ServletOutputStream ;
+import javax.servlet.http.HttpServlet ;
import javax.servlet.http.HttpServletRequest ;
import javax.servlet.http.HttpServletResponse ;
-import org.apache.jena.atlas.io.IO ;
-import org.apache.jena.fuseki.servlets.HttpAction ;
-import org.apache.jena.fuseki.servlets.ServletOps ;
-import static org.apache.jena.riot.WebContent.* ;
+import org.apache.jena.fuseki.Fuseki ;
+import org.apache.jena.fuseki.FusekiLib ;
+import org.apache.jena.web.HttpSC ;
-public class ActionPing extends ActionCtl
+public class ActionPing extends HttpServlet
{
+ // Ping is special.
+ // To avoid excessive logging and id allocation for a "noise" operation,
+ // this is a raw servlet.
public ActionPing() { super() ; }
@Override
@@ -49,20 +55,16 @@ public class ActionPing extends ActionCt
doCommon(req, resp);
}
- @Override
- protected void perform(HttpAction action) {
+ protected void doCommon(HttpServletRequest request, HttpServletResponse response) {
try {
- perform$(action) ;
- ServletOps.success(action);
- } catch (IOException ex) { IO.exception(ex) ; }
- }
-
- protected void perform$(HttpAction action) throws IOException {
- HttpServletResponse response = action.response ;
- ServletOutputStream out = action.response.getOutputStream() ;
- response.setContentType(contentTypeTextPlain);
- response.setCharacterEncoding(charsetUTF8) ;
-
+ FusekiLib.setNoCache(response) ;
+ ServletOutputStream out = response.getOutputStream() ;
+ response.setContentType(contentTypeTextPlain);
+ response.setCharacterEncoding(charsetUTF8) ;
+ response.setStatus(HttpSC.OK_200);
+ } catch (IOException ex) {
+ Fuseki.serverLog.warn("ping :: IOException :: "+ex.getMessage());
+ }
}
}