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 2018/08/20 07:39:08 UTC
[09/19] jena git commit: Put attribute names constants in Fuseki.
Put attribute names constants in Fuseki.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/21050fc9
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/21050fc9
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/21050fc9
Branch: refs/heads/master
Commit: 21050fc9300cc29eda22744c35466aae9f5b01c0
Parents: cb6d9b5
Author: Andy Seaborne <an...@apache.org>
Authored: Thu Aug 16 12:03:08 2018 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Thu Aug 16 12:03:08 2018 +0100
----------------------------------------------------------------------
.../src/main/java/org/apache/jena/fuseki/Fuseki.java | 8 ++++++--
.../apache/jena/fuseki/server/DataAccessPointRegistry.java | 6 +++---
.../apache/jena/fuseki/servlets/ServiceDispatchRegistry.java | 7 +++----
3 files changed, 12 insertions(+), 9 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/21050fc9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
index 0f1cf17..2b82a06 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/Fuseki.java
@@ -184,8 +184,12 @@ public class Fuseki {
*/
public static boolean verboseLogging = false ;
- /** ServletContext attibute for "verbose" - the value of the attirbiye is a Boolean */
- public static String attrVerbose = "jena-fuseki:verbose" ;
+ // Servlet context attribute names,
+
+ public static final String attrVerbose = "jena-fuseki:verbose";
+ public static final String attrNameRegistry = "jena-fuseki:dataAccessPointRegistry";
+ public static final String attrServiceRegistry = "jena-fuseki:ServiceDispatchRegistry";
+ public static final String attrSecurityContextRegistry = "jena-fuseki:SecurityContextRegistry";
public static void setVerbose(ServletContext cxt, boolean verbose) {
cxt.setAttribute(attrVerbose, Boolean.valueOf(verbose));
http://git-wip-us.apache.org/repos/asf/jena/blob/21050fc9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
index 5097cf0..9d16b84 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/server/DataAccessPointRegistry.java
@@ -22,6 +22,7 @@ import javax.servlet.ServletContext ;
import org.apache.jena.atlas.lib.Registry ;
import org.apache.jena.atlas.logging.Log ;
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.FusekiException ;
public class DataAccessPointRegistry extends Registry<String, DataAccessPoint>
@@ -57,15 +58,14 @@ public class DataAccessPointRegistry extends Registry<String, DataAccessPoint>
// The server DataAccessPointRegistry is held in the ServletContext for the server.
- private static final String attrNameRegistry = "jena-fuseki:dataAccessPointRegistry" ;
public static DataAccessPointRegistry get(ServletContext cxt) {
- DataAccessPointRegistry registry = (DataAccessPointRegistry)cxt.getAttribute(attrNameRegistry) ;
+ DataAccessPointRegistry registry = (DataAccessPointRegistry)cxt.getAttribute(Fuseki.attrNameRegistry) ;
if ( registry == null )
Log.warn(DataAccessPointRegistry.class, "No data access point registry for ServletContext") ;
return registry ;
}
public static void set(ServletContext cxt, DataAccessPointRegistry registry) {
- cxt.setAttribute(attrNameRegistry, registry) ;
+ cxt.setAttribute(Fuseki.attrNameRegistry, registry) ;
}
}
http://git-wip-us.apache.org/repos/asf/jena/blob/21050fc9/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServiceDispatchRegistry.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServiceDispatchRegistry.java b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServiceDispatchRegistry.java
index bbc1eb5..198eb5c 100644
--- a/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServiceDispatchRegistry.java
+++ b/jena-fuseki2/jena-fuseki-core/src/main/java/org/apache/jena/fuseki/servlets/ServiceDispatchRegistry.java
@@ -25,6 +25,7 @@ import java.util.concurrent.ConcurrentHashMap;
import javax.servlet.ServletContext;
import org.apache.jena.atlas.logging.Log;
+import org.apache.jena.fuseki.Fuseki;
import org.apache.jena.fuseki.server.DataService;
import org.apache.jena.fuseki.server.Operation;
import org.apache.jena.riot.WebContent;
@@ -117,16 +118,14 @@ public class ServiceDispatchRegistry {
// The server DataAccessPointRegistry is held in the ServletContext for the server.
- private static final String attrServiceRegistry = "jena-fuseki:ServiceDispatchRegistry" ;
-
public static ServiceDispatchRegistry get(ServletContext servletContext) {
- ServiceDispatchRegistry registry = (ServiceDispatchRegistry)servletContext.getAttribute(attrServiceRegistry) ;
+ ServiceDispatchRegistry registry = (ServiceDispatchRegistry)servletContext.getAttribute(Fuseki.attrServiceRegistry) ;
if ( registry == null )
Log.warn(ServiceDispatchRegistry.class, "No service registry for ServletContext") ;
return registry ;
}
public static void set(ServletContext cxt, ServiceDispatchRegistry registry) {
- cxt.setAttribute(attrServiceRegistry, registry) ;
+ cxt.setAttribute(Fuseki.attrServiceRegistry, registry) ;
}
}