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/19 23:46:23 UTC
[2/2] jena git commit: FUSEKI_HOME and FUSEKI_BASE to FusekiEnv (set
pre logging)
FUSEKI_HOME and FUSEKI_BASE to FusekiEnv (set pre logging)
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/f1689a03
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/f1689a03
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/f1689a03
Branch: refs/heads/master
Commit: f1689a0379fd4632add8f0fad3e3c45241196e1e
Parents: eceff8d
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Dec 19 19:10:18 2014 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Dec 19 19:10:18 2014 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/Fuseki.java | 2 +-
.../org/apache/jena/fuseki/FusekiLogging.java | 8 +-
.../org/apache/jena/fuseki/build/Template.java | 4 +-
.../apache/jena/fuseki/jetty/JettyFuseki.java | 8 +-
.../apache/jena/fuseki/server/FusekiEnv.java | 114 +++++++++++++++++++
.../jena/fuseki/server/FusekiEnvInit.java | 114 -------------------
.../apache/jena/fuseki/server/FusekiServer.java | 16 +--
.../server/FusekiServerEnvironmentInit.java | 2 +-
.../fuseki/server/FusekiServerListener.java | 2 +-
.../fuseki/server/ShiroEnvironmentLoader.java | 7 +-
.../java/org/apache/jena/fuseki/ServerTest.java | 4 +-
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 6 +-
12 files changed, 144 insertions(+), 143 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
index 139b3d7..0f42219 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/Fuseki.java
@@ -189,7 +189,6 @@ public class Fuseki {
return startDateTime ;
}
-
/**
* Initialize an instance of the Fuseki server stack.
*/
@@ -197,6 +196,7 @@ public class Fuseki {
if ( initialized )
return ;
initialized = true ;
+ // FusekiEnv.setEnvironment() ;
FusekiLogging.setLogging() ;
ARQ.init() ;
SystemInfo sysInfo = new SystemInfo(FusekiIRI, PATH, VERSION, BUILD_DATE) ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
index b78360d..1add2b2 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/FusekiLogging.java
@@ -23,7 +23,7 @@ import java.net.URL ;
import org.apache.jena.atlas.lib.StrUtils ;
import org.apache.jena.atlas.logging.LogCtl ;
-import org.apache.jena.fuseki.server.FusekiEnvInit ;
+import org.apache.jena.fuseki.server.FusekiEnv ;
import org.apache.jena.riot.SysRIOT ;
import org.apache.log4j.PropertyConfigurator ;
import org.apache.log4j.helpers.Loader ;
@@ -55,7 +55,7 @@ public class FusekiLogging
if ( loggingInitialized )
return ;
loggingInitialized = true ;
- FusekiEnvInit.setEnvironment() ;
+ FusekiEnv.setEnvironment() ;
logLogging("Fuseki logging") ;
// No loggers have been created but configuration may have been set up.
@@ -75,8 +75,8 @@ public class FusekiLogging
String fn1 = "log4j.properties" ;
String fn2 = null ;
- if ( FusekiEnvInit.ENV_FUSEKI_BASE != null )
- fn2 = FusekiEnvInit.ENV_FUSEKI_BASE.toString()+"/log4j.properties" ;
+ if ( FusekiEnv.FUSEKI_BASE != null )
+ fn2 = FusekiEnv.FUSEKI_BASE.toString()+"/log4j.properties" ;
if ( attempt(fn1) ) return ;
if ( attempt(fn2) ) return ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Template.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Template.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Template.java
index f0b6ede..55a449e 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Template.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/build/Template.java
@@ -20,12 +20,12 @@ package org.apache.jena.fuseki.build;
import java.nio.file.Path ;
-import org.apache.jena.fuseki.server.FusekiServer ;
+import org.apache.jena.fuseki.server.FusekiEnv ;
public class Template
{
public static Path getPath(String templateName) {
- return FusekiServer.FUSEKI_BASE.resolve(templateName) ;
+ return FusekiEnv.FUSEKI_BASE.resolve(templateName) ;
}
public static final String templateDir = "templates" ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/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 e559bca..8d9046c 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
@@ -27,7 +27,7 @@ import org.apache.jena.atlas.lib.FileOps ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.mgt.MgtJMX ;
-import org.apache.jena.fuseki.server.FusekiServer ;
+import org.apache.jena.fuseki.server.FusekiEnv ;
import org.eclipse.jetty.security.* ;
import org.eclipse.jetty.security.authentication.BasicAuthenticator ;
import org.eclipse.jetty.server.* ;
@@ -171,7 +171,7 @@ public class JettyFuseki {
}
public static WebAppContext createWebApp(String contextPath) {
- FusekiServer.init();
+ FusekiEnv.setEnvironment();
WebAppContext webapp = new WebAppContext();
webapp.getServletContext().getContextHandler().setMaxFormContentSize(10 * 1000 * 1000) ;
@@ -181,8 +181,8 @@ public class JettyFuseki {
String resourceBase3 = null ;
String resourceBase4 = null ;
- if ( FusekiServer.FUSEKI_HOME != null ) {
- String HOME = FusekiServer.FUSEKI_HOME.toString() ;
+ if ( FusekiEnv.FUSEKI_HOME != null ) {
+ String HOME = FusekiEnv.FUSEKI_HOME.toString() ;
resourceBase3 = HOME+"/"+resourceBase1 ;
resourceBase4 = HOME+"/"+resourceBase2 ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
new file mode 100644
index 0000000..a76be11
--- /dev/null
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnv.java
@@ -0,0 +1,114 @@
+/**
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.jena.fuseki.server;
+
+import java.nio.file.Path ;
+import java.nio.file.Paths ;
+
+/**
+ * Separate initialization for FUSEKI_HOME and FUSEKI_BASE so that
+ * Fusekilogging can use these values.
+ * This code must not touch Jena.
+ *
+ * @See FusekiServer
+ */
+public class FusekiEnv {
+ /** 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.
+ * This is not null - it may be /etc/fuseki, which must be writable.
+ */
+ public static Path FUSEKI_BASE = null ;
+
+ static final boolean isWindows = determineIfWindows() ;
+
+ // Copied from SystemTDB to avoid dependency.
+ // This code must not touch Jena.
+ private static boolean determineIfWindows() {
+ String s = System.getProperty("os.name") ;
+ if ( s == null )
+ return false ;
+ return s.startsWith("Windows ") ;
+ }
+
+ /** Unused */
+ // public static final String DFT_FUSEKI_HOME = isWindows
+ // ? /*What's correct here?*/ "/usr/share/fuseki"
+ // : "/usr/share/fuseki" ;
+ static final String DFT_FUSEKI_BASE = isWindows ? /* What's correct here? */"/etc/fuseki" : "/etc/fuseki" ;
+
+ public static final String ENV_runArea = "run" ;
+
+ private static boolean initialized = false ;
+ private static final boolean LogInit = false ;
+
+ public static synchronized void setEnvironment() {
+ if ( initialized )
+ return ;
+ initialized = true ;
+ logInit("FusekiInitEnv") ;
+ logInit("Start: ENV_FUSEKI_HOME = %s : ENV_FUSEKI_BASE = %s", FUSEKI_HOME, FUSEKI_BASE) ;
+
+ if ( FUSEKI_HOME == null ) {
+ // Make absolute
+ String x1 = getenv("FUSEKI_HOME") ;
+ if ( x1 != null )
+ FUSEKI_HOME = Paths.get(x1) ;
+ }
+
+ if ( FUSEKI_BASE == null ) {
+ String x2 = getenv("FUSEKI_BASE") ;
+ if ( x2 != null )
+ FUSEKI_BASE = Paths.get(x2) ;
+ else {
+ if ( FUSEKI_HOME != null )
+ FUSEKI_BASE = FUSEKI_HOME.resolve(ENV_runArea) ;
+ else
+ // Neither FUSEKI_HOME nor FUSEKI_BASE set.
+ FUSEKI_BASE = Paths.get(DFT_FUSEKI_BASE) ;
+ }
+ }
+
+ if ( FUSEKI_HOME != null )
+ FUSEKI_HOME = FUSEKI_HOME.toAbsolutePath() ;
+
+ FUSEKI_BASE = FUSEKI_BASE.toAbsolutePath() ;
+
+ logInit("Finish: ENV_FUSEKI_HOME = %s : ENV_FUSEKI_BASE = %s", FUSEKI_HOME, FUSEKI_BASE) ;
+ }
+
+ private static void logInit(String fmt, Object ... args) {
+ if ( LogInit ) {
+ System.out.printf(fmt, args) ;
+ System.out.println() ;
+ }
+ }
+
+ /** 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/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnvInit.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnvInit.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnvInit.java
deleted file mode 100644
index 801d206..0000000
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiEnvInit.java
+++ /dev/null
@@ -1,114 +0,0 @@
-/**
- * Licensed to the Apache Software Foundation (ASF) under one
- * or more contributor license agreements. See the NOTICE file
- * distributed with this work for additional information
- * regarding copyright ownership. The ASF licenses this file
- * to you under the Apache License, Version 2.0 (the
- * "License"); you may not use this file except in compliance
- * with the License. You may obtain a copy of the License at
- *
- * http://www.apache.org/licenses/LICENSE-2.0
- *
- * Unless required by applicable law or agreed to in writing, software
- * distributed under the License is distributed on an "AS IS" BASIS,
- * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
- * See the License for the specific language governing permissions and
- * limitations under the License.
- */
-
-package org.apache.jena.fuseki.server;
-
-import java.nio.file.Path ;
-import java.nio.file.Paths ;
-
-/**
- * Separate initialization for FUSEKI_HOME and FUSEKI_BASE so that
- * Fusekilogging can use these values.
- * This code must not touch Jena.
- *
- * @See FusekiServer
- */
-public class FusekiEnvInit {
- /** Root of the Fuseki installation for fixed files.
- * This may be null (e.g. running inside a web application container) */
- public static Path ENV_FUSEKI_HOME = null ;
-
- /** Root of the varying files in this deployment. Often $FUSEKI_HOME/run.
- * This is not null - it may be /etc/fuseki, which must be writable.
- */
- public static Path ENV_FUSEKI_BASE = null ;
-
- static final boolean isWindows = determineIfWindows() ;
-
- // Copied from SystemTDB to avoid dependency.
- // This code must not touch Jena.
- private static boolean determineIfWindows() {
- String s = System.getProperty("os.name") ;
- if ( s == null )
- return false ;
- return s.startsWith("Windows ") ;
- }
-
- /** Unused */
- // public static final String DFT_FUSEKI_HOME = isWindows
- // ? /*What's correct here?*/ "/usr/share/fuseki"
- // : "/usr/share/fuseki" ;
- static final String DFT_FUSEKI_BASE = isWindows ? /* What's correct here? */"/etc/fuseki" : "/etc/fuseki" ;
-
- public static final String ENV_runArea = "run" ;
-
- private static boolean initialized = false ;
- private static final boolean LogInit = false ;
-
- public static synchronized void setEnvironment() {
- if ( initialized )
- return ;
- initialized = true ;
- logInit("FusekiInitEnv") ;
- logInit("Start: ENV_FUSEKI_HOME = %s : ENV_FUSEKI_BASE = %s", ENV_FUSEKI_HOME, ENV_FUSEKI_BASE) ;
-
- if ( ENV_FUSEKI_HOME == null ) {
- // Make absolute
- String x1 = getenv("FUSEKI_HOME") ;
- if ( x1 != null )
- ENV_FUSEKI_HOME = Paths.get(x1) ;
- }
-
- if ( ENV_FUSEKI_BASE == null ) {
- String x2 = getenv("FUSEKI_BASE") ;
- if ( x2 != null )
- ENV_FUSEKI_BASE = Paths.get(x2) ;
- else {
- if ( ENV_FUSEKI_HOME != null )
- ENV_FUSEKI_BASE = ENV_FUSEKI_HOME.resolve(ENV_runArea) ;
- else
- // Neither FUSEKI_HOME nor FUSEKI_BASE set.
- ENV_FUSEKI_BASE = Paths.get(DFT_FUSEKI_BASE) ;
- }
- }
-
- if ( ENV_FUSEKI_HOME != null )
- ENV_FUSEKI_HOME = ENV_FUSEKI_HOME.toAbsolutePath() ;
-
- ENV_FUSEKI_BASE = ENV_FUSEKI_BASE.toAbsolutePath() ;
-
- logInit("Finish: ENV_FUSEKI_HOME = %s : ENV_FUSEKI_BASE = %s", ENV_FUSEKI_HOME, ENV_FUSEKI_BASE) ;
- }
-
- private static void logInit(String fmt, Object ... args) {
- if ( LogInit ) {
- System.out.printf(fmt, args) ;
- System.out.println() ;
- }
- }
-
- /** 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/f1689a03/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 d681abf..83d5523 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
@@ -59,15 +59,15 @@ public class FusekiServer
/** 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 ;
+ //public static Path FUSEKI_HOME = null ;
/** Root of the varying files in this deployment. Often $FUSEKI_HOME/run.
* This is not null - it may be /etc/fuseki, which must be writable.
*/
- public static Path FUSEKI_BASE = null ;
+ //public static Path FUSEKI_BASE = null ;
// Relative names of directories in the FUSEKI_BASE area.
- public static final String runArea = FusekiEnvInit.ENV_runArea ;
+ public static final String runArea = FusekiEnv.ENV_runArea ;
public static final String databasesLocationBase = "databases" ;
// Place to put Lucene text and spatial indexes.
//private static final String databaseIndexesDir = "indexes" ;
@@ -118,9 +118,9 @@ public class FusekiServer
return ;
initialized = true ;
try {
- FusekiEnvInit.setEnvironment() ;
- FUSEKI_HOME = FusekiEnvInit.ENV_FUSEKI_HOME ;
- FUSEKI_BASE = FusekiEnvInit.ENV_FUSEKI_BASE ;
+ FusekiEnv.setEnvironment() ;
+ Path FUSEKI_HOME = FusekiEnv.FUSEKI_HOME ;
+ Path FUSEKI_BASE = FusekiEnv.FUSEKI_BASE ;
Fuseki.init() ;
Fuseki.configLog.info("FUSEKI_HOME="+ ((FUSEKI_HOME==null) ? "unset" : FUSEKI_HOME.toString())) ;
@@ -319,9 +319,9 @@ public class FusekiServer
}
if ( ! params.containsKey("FUSEKI_BASE") )
- params.put("FUSEKI_BASE", pathStringOrElse(FUSEKI_BASE, "unset")) ;
+ params.put("FUSEKI_BASE", pathStringOrElse(FusekiEnv.FUSEKI_BASE, "unset")) ;
if ( ! params.containsKey("FUSEKI_HOME") )
- params.put("FUSEKI_HOME", pathStringOrElse(FUSEKI_HOME, "unset")) ;
+ params.put("FUSEKI_HOME", pathStringOrElse(FusekiEnv.FUSEKI_HOME, "unset")) ;
}
private static String pathStringOrElse(Path path, String dft) {
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerEnvironmentInit.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerEnvironmentInit.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerEnvironmentInit.java
index e6a088c..356dc82 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerEnvironmentInit.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerEnvironmentInit.java
@@ -32,7 +32,7 @@ public class FusekiServerEnvironmentInit implements ServletContextListener {
@Override
public void contextInitialized(ServletContextEvent sce) {
- FusekiEnvInit.setEnvironment();
+ FusekiEnv.setEnvironment();
FusekiLogging.setLogging();
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
index 83c88d4..334fc73 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/FusekiServerListener.java
@@ -62,7 +62,7 @@ public class FusekiServerListener implements ServletContextListener {
if ( initialSetup == null ) {
initialSetup = new ServerInitialConfig() ;
- String cfg = FusekiServer.FUSEKI_BASE.resolve(FusekiServer.DFT_CONFIG).toAbsolutePath().toString() ;
+ String cfg = FusekiEnv.FUSEKI_BASE.resolve(FusekiServer.DFT_CONFIG).toAbsolutePath().toString() ;
initialSetup.fusekiConfigFile = cfg ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
index 52604b2..f4a6dfc 100644
--- a/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
+++ b/jena-fuseki2/src/main/java/org/apache/jena/fuseki/server/ShiroEnvironmentLoader.java
@@ -37,6 +37,7 @@ import org.apache.shiro.web.env.WebEnvironment ;
import com.hp.hpl.jena.util.FileUtils ;
/** A place to perform Fuseki-specific initialization of Apache Shiro.
+ * Runs after listener FusekiServerEnvironmentInit and before FusekiServerListener
* This means finding shiro.ini in multiple possible places, based on
* different deployment setups.
*/
@@ -90,7 +91,7 @@ public class ShiroEnvironmentLoader extends EnvironmentLoader implements Servlet
/** Look for a Shiro ini file, or return null */
private static String huntForShiroIni(String[] locations) {
- FusekiEnvInit.setEnvironment() ;
+ FusekiEnv.setEnvironment() ;
Fuseki.init();
for ( String loc : locations ) {
// If file:, look for that file.
@@ -112,10 +113,10 @@ public class ShiroEnvironmentLoader extends EnvironmentLoader implements Servlet
// No scheme .
Path p = Paths.get(loc) ;
- String fn = resolve(FusekiServer.FUSEKI_BASE, p) ;
+ String fn = resolve(FusekiEnv.FUSEKI_BASE, p) ;
if ( fn != null )
return "file://"+fn ;
- fn = resolve(FusekiServer.FUSEKI_HOME, p) ;
+ fn = resolve(FusekiEnv.FUSEKI_HOME, p) ;
if ( fn != null )
return "file://"+fn ;
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/test/java/org/apache/jena/fuseki/ServerTest.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/ServerTest.java
index 389df52..1a70869 100644
--- a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/ServerTest.java
+++ b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/ServerTest.java
@@ -100,11 +100,11 @@ public class ServerTest {
}
protected static void setupServer() {
- FusekiServer.FUSEKI_HOME = Paths.get(TS_Fuseki.FusekiTestHome).toAbsolutePath() ;
+ FusekiEnv.FUSEKI_HOME = Paths.get(TS_Fuseki.FusekiTestHome).toAbsolutePath() ;
FileOps.ensureDir("target");
FileOps.ensureDir(TS_Fuseki.FusekiTestHome);
FileOps.ensureDir(TS_Fuseki.FusekiTestBase) ;
- FusekiServer.FUSEKI_BASE = Paths.get(TS_Fuseki.FusekiTestBase).toAbsolutePath() ;
+ FusekiEnv.FUSEKI_BASE = Paths.get(TS_Fuseki.FusekiTestBase).toAbsolutePath() ;
setupServer(null) ;
}
http://git-wip-us.apache.org/repos/asf/jena/blob/f1689a03/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
index cae27b5..db8a4aa 100644
--- a/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
+++ b/jena-fuseki2/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
@@ -23,7 +23,7 @@ import org.apache.jena.atlas.logging.LogCtl ;
import org.apache.jena.fuseki.http.TestDatasetAccessorHTTP ;
import org.apache.jena.fuseki.http.TestDatasetGraphAccessorHTTP ;
import org.apache.jena.fuseki.http.TestHttpOp ;
-import org.apache.jena.fuseki.server.FusekiEnvInit ;
+import org.apache.jena.fuseki.server.FusekiEnv ;
import org.junit.BeforeClass ;
import org.junit.runner.RunWith ;
import org.junit.runners.Suite ;
@@ -50,11 +50,11 @@ public class TS_Fuseki extends ServerTest
public static final String FusekiTestHome = "target/FusekiHome" ;
public static final String FusekiTestBase = FusekiTestHome+"/run" ;
- @BeforeClass public static void setQuietLogging() {
+ @BeforeClass public static void setupForFusekiServer() {
FileOps.ensureDir(FusekiTestHome);
FileOps.clearDirectory(FusekiTestHome);
System.setProperty("FUSEKI_HOME", FusekiTestHome) ;
- FusekiEnvInit.setEnvironment() ;
+ FusekiEnv.setEnvironment() ;
FusekiLogging.setLogging();
org.apache.log4j.Level WARN1 = org.apache.log4j.Level.WARN ;