svn commit: r1399208 - in /jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki: FusekiCmd.java server/SPARQLServer.java

[an...@apache.org]

Author: andy
Date: Wed Oct 17 12:47:03 2012
New Revision: 1399208

URL: http://svn.apache.org/viewvc?rev=1399208&view=rev
Log:
Flag to enable experimental feature - all purpose service including GSP direct naming of graphs.

Modified:
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
    jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1399208&r1=1399207&r2=1399208&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Wed Oct 17 12:47:03 2012
@@ -124,6 +124,7 @@ public class FusekiCmd extends CmdARQ
     private static ArgDecl argFusekiConfig  = new ArgDecl(ArgDecl.HasValue, "config", "conf") ;
     private static ArgDecl argJettyConfig   = new ArgDecl(ArgDecl.HasValue, "jetty-config") ;
     private static ArgDecl argGZip          = new ArgDecl(ArgDecl.HasValue, "gzip") ;
+    private static ArgDecl argUber          = new ArgDecl(ArgDecl.NoValue,  "uber") ;   // Use the uberservlet (experimental)
     
     private static ArgDecl argHome          = new ArgDecl(ArgDecl.HasValue, "home") ;
     private static ArgDecl argPages         = new ArgDecl(ArgDecl.HasValue, "pages") ;
@@ -182,6 +183,8 @@ public class FusekiCmd extends CmdARQ
         add(argHome, "--home=DIR",              "Root of Fuseki installation (overrides environment variable FUSEKI_HOME)") ; 
         add(argGZip, "--gzip=on|off",           "Enable GZip compression (HTTP Accept-Encoding) if request header set") ;
         
+        add(argUber) ;
+        
         super.modVersion.addClass(TDB.class) ;
         super.modVersion.addClass(Fuseki.class) ;
     }
@@ -365,6 +368,9 @@ public class FusekiCmd extends CmdARQ
                 throw new CmdException(argGZip.getNames().get(0)+": Not understood: "+getValue(argGZip)) ;
             enableCompression = super.hasValueOfTrue(argGZip) ;
         }
+        
+        if ( contains(argUber) )
+            SPARQLServer.überServlet = true ;
     }
 
     private static String sort_out_dir(String path)

Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1399208&r1=1399207&r2=1399208&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Wed Oct 17 12:47:03 2012
@@ -210,6 +210,11 @@ public class SPARQLServer
         
     }
     
+    // Experimental - off by default.
+    // The überservlet sits on the dataset name and handles all requests.
+    // Includes direct naming and quad access to the dataset.
+    public static boolean überServlet = false ;
+
     private void configureOneDataset(ServletContextHandler context, DatasetRef sDesc, boolean enableCompression)
     {
         String datasetPath = sDesc.name ;
@@ -231,10 +236,6 @@ public class SPARQLServer
         HttpServlet sparqlHttpRW    = new SPARQL_REST_RW(verboseLogging) ;
         HttpServlet sparqlDataset   = new SPARQL_UberServlet.AccessByConfig(verboseLogging) ;
 
-        // The überservlet sits on the dataset name and handles all requests.
-        // Includes direct naming and quad access to the dataset.
-        final boolean überServlet = false ;
-        
         if ( ! überServlet )
         {
             // If uberserver, these are unnecessary but can be used.