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 2016/06/29 14:44:00 UTC
[1/2] jena git commit: Refactor NCSA formatting for plain servlet
Repository: jena
Updated Branches:
refs/heads/master c5bf5c5eb -> fc4056538
Refactor NCSA formatting for plain servlet
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a626d1ab
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a626d1ab
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a626d1ab
Branch: refs/heads/master
Commit: a626d1ab3b0ca2ce8a8c36e55c18f033858d4a12
Parents: c5bf5c5
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 29 15:38:35 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 29 15:38:35 2016 +0100
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/server/RequestLog.java | 7 +++++--
1 file changed, 5 insertions(+), 2 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a626d1ab/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
index db79d6a..60f5082 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/RequestLog.java
@@ -65,10 +65,13 @@ NCSA extended/combined log format
* XXX.XXX.XXX.XXX - - [01/Feb/2014:03:19:09 +0000] "GET / HTTP/1.1" 200 6190 "-" "check_http/v1.4.16 (nagios-plugins 1.4.16)"
*/
public static String combinedNCSA(HttpAction action) {
- StringBuilder builder = new StringBuilder() ;
HttpServletRequest request = action.request ;
HttpServletResponse response = action.response ;
-
+ return combinedNCSA(request, response) ;
+ }
+
+ public static String combinedNCSA(HttpServletRequest request, HttpServletResponse response) {
+ StringBuilder builder = new StringBuilder() ;
// Remote
String remote = get(request, "X-Forwarded-For", request.getRemoteAddr()) ;
builder.append(remote) ;
[2/2] jena git commit: JENA-1200: Support Accept-Encoding (gzip etc)
Posted by an...@apache.org.
JENA-1200: Support Accept-Encoding (gzip etc)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/fc405653
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/fc405653
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/fc405653
Branch: refs/heads/master
Commit: fc40565383fc1a9526a1ed56c87d21ff39614eb4
Parents: a626d1a
Author: Andy Seaborne <an...@apache.org>
Authored: Wed Jun 29 15:39:22 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Wed Jun 29 15:39:22 2016 +0100
----------------------------------------------------------------------
.../org/apache/jena/fuseki/jetty/JettyFuseki.java | 15 ++++++++++++---
1 file changed, 12 insertions(+), 3 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/fc405653/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
index 7e87b49..b8ca877 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
@@ -31,7 +31,10 @@ import org.apache.jena.fuseki.mgt.MgtJMX ;
import org.apache.jena.fuseki.server.FusekiEnv ;
import org.eclipse.jetty.security.* ;
import org.eclipse.jetty.security.authentication.BasicAuthenticator ;
-import org.eclipse.jetty.server.* ;
+import org.eclipse.jetty.server.HttpConnectionFactory ;
+import org.eclipse.jetty.server.Server ;
+import org.eclipse.jetty.server.ServerConnector ;
+import org.eclipse.jetty.server.handler.gzip.GzipHandler ;
import org.eclipse.jetty.servlet.ServletContextHandler ;
import org.eclipse.jetty.util.security.Constraint ;
import org.eclipse.jetty.webapp.WebAppContext ;
@@ -87,9 +90,15 @@ public class JettyFuseki {
private JettyFuseki(JettyServerConfig config) {
this.serverConfig = config ;
- buildServerWebapp(serverConfig.contextPath, serverConfig.jettyConfigFile, config.enableCompression) ;
+ buildServerWebapp(serverConfig.contextPath, serverConfig.jettyConfigFile) ;
if ( mgtConnector == null )
mgtConnector = serverConnector ;
+
+ if ( config.enableCompression ) {
+ GzipHandler gzipHandler = new GzipHandler();
+ gzipHandler.setHandler(server.getHandler());
+ server.setHandler(gzipHandler);
+ }
}
/**
@@ -218,7 +227,7 @@ public class JettyFuseki {
return currentResourceBase ;
}
- private void buildServerWebapp(String contextPath, String jettyConfig, boolean enableCompression) {
+ private void buildServerWebapp(String contextPath, String jettyConfig) {
if ( jettyConfig != null )
// --jetty-config=jetty-fuseki.xml
// for detailed configuration of the server using Jetty features.