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/12/15 17:32:16 UTC
jena git commit: Look for FUSEKI_HOME in system properties (embedded
use)
Repository: jena
Updated Branches:
refs/heads/master b7d814ac4 -> 17a1948dd
Look for FUSEKI_HOME in system properties (embedded use)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/17a1948d
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/17a1948d
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/17a1948d
Branch: refs/heads/master
Commit: 17a1948dd6c52622a2b73968d295231b6eded0d1
Parents: b7d814a
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Dec 15 16:32:07 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Dec 15 16:32:07 2014 +0000
----------------------------------------------------------------------
.../main/java/org/apache/jena/fuseki/FusekiLib.java | 9 ++++++++-
.../org/apache/jena/fuseki/jetty/JettyFuseki.java | 14 ++++++++++----
.../org/apache/jena/fuseki/server/FusekiServer.java | 14 +++++---------
3 files changed, 23 insertions(+), 14 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/17a1948d/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
index 0a9979a..9015935 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLib.java
@@ -255,5 +255,12 @@ public class FusekiLib {
}
return "<" + uri + ">" ;
}
-
+
+ /** Get environment variable value (maybe in system properties) */
+ public static String getenv(String name) {
+ String x = System.getenv(name) ;
+ if ( x == null )
+ x = System.getProperty(name) ;
+ return x ;
+ }
}
http://git-wip-us.apache.org/repos/asf/jena/blob/17a1948d/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
index e082551..c852fa7 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/jetty/JettyFuseki.java
@@ -26,6 +26,7 @@ import java.io.FileInputStream ;
import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
+import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.mgt.MgtJMX ;
import org.eclipse.jetty.security.* ;
import org.eclipse.jetty.security.authentication.BasicAuthenticator ;
@@ -179,9 +180,11 @@ public class JettyFuseki {
String resourceBase3 = null ;
String resourceBase4 = null ;
- if ( System.getenv("FUSEKI_HOME") != null ) {
- resourceBase3 = System.getenv("FUSEKI_HOME")+"/"+resourceBase1 ;
- resourceBase3 = System.getenv("FUSEKI_HOME")+"/"+resourceBase2 ;
+ // FusekiServer.FUSEKI_HOME is not set at this point (it is set in webapp initialization)
+ String HOME = FusekiLib.getenv("FUSEKI_HOME") ;
+ if ( HOME != null ) {
+ resourceBase3 = HOME+"/"+resourceBase1 ;
+ resourceBase4 = HOME+"/"+resourceBase2 ;
}
String resourceBase = tryResourceBase(resourceBase1, null) ;
@@ -190,7 +193,10 @@ public class JettyFuseki {
resourceBase = tryResourceBase(resourceBase4, resourceBase) ;
if ( resourceBase == null ) {
- Fuseki.serverLog.error("Can't find resourceBase (tried "+resourceBase1+", "+resourceBase2+" and "+resourceBase3+")") ;
+ if ( resourceBase3 == null )
+ Fuseki.serverLog.error("Can't find resourceBase (tried "+resourceBase1+" and "+resourceBase2+")") ;
+ else
+ Fuseki.serverLog.error("Can't find resourceBase (tried "+resourceBase1+", "+resourceBase2+", "+resourceBase3+" and "+resourceBase4+")") ;
Fuseki.serverLog.error("Failed to start") ;
throw new FusekiException("Failed to start") ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/17a1948d/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
index 9188b05..9e84df2 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServer.java
@@ -35,6 +35,7 @@ import org.apache.jena.atlas.lib.InternalErrorException ;
import org.apache.jena.atlas.lib.Lib ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiConfigException ;
+import org.apache.jena.fuseki.FusekiLib ;
import org.apache.jena.fuseki.build.Builder ;
import org.apache.jena.fuseki.build.FusekiConfig ;
import org.apache.jena.fuseki.build.Template ;
@@ -126,13 +127,13 @@ public class FusekiServer
if ( FUSEKI_HOME == null ) {
// Make absolute
- String x1 = getenv("FUSEKI_HOME") ;
+ String x1 = FusekiLib.getenv("FUSEKI_HOME") ;
if ( x1 != null )
FUSEKI_HOME = Paths.get(x1) ;
}
if ( FUSEKI_BASE == null ) {
- String x2 = getenv("FUSEKI_BASE") ;
+ String x2 = FusekiLib.getenv("FUSEKI_BASE") ;
if ( x2 != null )
FUSEKI_BASE = Paths.get(x2) ;
else {
@@ -178,7 +179,8 @@ public class FusekiServer
dirLogs = writeableDirectory(FUSEKI_BASE, logsNameBase) ;
dirSystemDatabase = writeableDirectory(FUSEKI_BASE, systemDatabaseNameBase) ;
dirFileArea = writeableDirectory(FUSEKI_BASE, systemFileAreaBase) ;
-
+ //Possible intercept poiint
+
// ---- Initialize with files.
if ( Files.isRegularFile(FUSEKI_BASE) )
@@ -194,12 +196,6 @@ public class FusekiServer
serverInitialized = true ;
}
- /** Get environment variable value. */
- private static String getenv(String name) {
- //Possible intercept poiint
- return System.getenv(name) ;
- }
-
private static boolean emptyDir(Path dir) {
return dir.toFile().list().length <= 2 ;
}