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/08/04 14:01:22 UTC

svn commit: r1615534 - in /jena/Experimental/jena-fuseki2: src-dev/dev/PROJECT.java src/main/java/org/apache/jena/fuseki/server/FusekiServer.java

Author: andy
Date: Mon Aug  4 12:01:21 2014
New Revision: 1615534

URL: http://svn.apache.org/r1615534
Log:
Sync

Modified:
    jena/Experimental/jena-fuseki2/src-dev/dev/PROJECT.java
    jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java

Modified: jena/Experimental/jena-fuseki2/src-dev/dev/PROJECT.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src-dev/dev/PROJECT.java?rev=1615534&r1=1615533&r2=1615534&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src-dev/dev/PROJECT.java (original)
+++ jena/Experimental/jena-fuseki2/src-dev/dev/PROJECT.java Mon Aug  4 12:01:21 2014
@@ -23,6 +23,9 @@ public class PROJECT {
     // URI parsed during execCommonWorker and again in uber dispatch
     //  --> do once. Info in action (context path, dataset name, operation) + admin
     
+    // UI "reset" to reread configuration
+    // And poll read configuration files.
+    
     // Refindable backups
     // Name of backup in the response to back up starting.
     //   Task specific return as well?

Modified: jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
URL: http://svn.apache.org/viewvc/jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java?rev=1615534&r1=1615533&r2=1615534&view=diff
==============================================================================
--- jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java (original)
+++ jena/Experimental/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java Mon Aug  4 12:01:21 2014
@@ -52,7 +52,8 @@ import com.hp.hpl.jena.tdb.sys.SystemTDB
 
 public class FusekiServer
 {
-    /** Root of the Fuseki installation for fixed files. THis may be null (e.g. running inside a web application container) */ 
+    /** Root of the Fuseki installation for fixed files. 
+     * This may be null (e.g. running inside a web application container) */ 
     public static Path FUSEKI_HOME = null ;
     
     /** Root of the varying files in this deployment. Often $FUSEKI_HOME/run.
@@ -62,9 +63,13 @@ public class FusekiServer
     
     public static final boolean isWindows = SystemTDB.isWindows ;
         
-        
-    public static final String DFT_FUSEKI_HOME  = isWindows ? /*What's correct here?*/ "/usr/share/fuseki" : "/usr/share/fuseki" ;
-    public static final String DFT_FUSEKI_BASE  = isWindows ? /*What's correct here?*/ "/etc/fuseki"       : "/etc/fuseki" ;
+    
+    /** Unused */
+    //public static final String DFT_FUSEKI_HOME  = 
+    //    isWindows ? /*What's correct here?*/ "/usr/share/fuseki" : "/usr/share/fuseki" ;
+    public static final String DFT_FUSEKI_BASE  = 
+        isWindows ? /*What's correct here?*/ "/etc/fuseki"       : "/etc/fuseki" ;
+    
     // In FUSEKI_BASE
     public static final String DFT_CONFIG       = "config.ttl" ;