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/12/14 12:38:26 UTC
[3/3] jena git commit: Rename as TS_FusekiWebapp to be clearer what's
running
Rename as TS_FusekiWebapp to be clearer what's running
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/2f224de7
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/2f224de7
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/2f224de7
Branch: refs/heads/master
Commit: 2f224de729e3f32260e10dda61dbdef67ba5ca58
Parents: f93fdba
Author: Andy Seaborne <an...@apache.org>
Authored: Fri Dec 14 12:38:14 2018 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Fri Dec 14 12:38:14 2018 +0000
----------------------------------------------------------------------
.../java/org/apache/jena/fuseki/ServerCtl.java | 8 +-
.../java/org/apache/jena/fuseki/TS_Fuseki.java | 81 --------------------
.../org/apache/jena/fuseki/TS_FusekiWebapp.java | 81 ++++++++++++++++++++
3 files changed, 85 insertions(+), 85 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/2f224de7/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
index 568b342..887dd46 100644
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/ServerCtl.java
@@ -223,11 +223,11 @@ public class ServerCtl {
}
protected static void setupServer(boolean updateable) {
- FusekiEnv.FUSEKI_HOME = Paths.get(TS_Fuseki.FusekiTestHome).toAbsolutePath() ;
+ FusekiEnv.FUSEKI_HOME = Paths.get(TS_FusekiWebapp.FusekiTestHome).toAbsolutePath() ;
FileOps.ensureDir("target");
- FileOps.ensureDir(TS_Fuseki.FusekiTestHome);
- FileOps.ensureDir(TS_Fuseki.FusekiTestBase) ;
- FusekiEnv.FUSEKI_BASE = Paths.get(TS_Fuseki.FusekiTestBase).toAbsolutePath() ;
+ FileOps.ensureDir(TS_FusekiWebapp.FusekiTestHome);
+ FileOps.ensureDir(TS_FusekiWebapp.FusekiTestBase) ;
+ FusekiEnv.FUSEKI_BASE = Paths.get(TS_FusekiWebapp.FusekiTestBase).toAbsolutePath() ;
// Must have shiro.ini.
// This fakes the state after FusekiSystem initialization
// in the case of starting in the same location. FusekiSystem has statics.
http://git-wip-us.apache.org/repos/asf/jena/blob/2f224de7/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
deleted file mode 100644
index 42e33df..0000000
--- a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_Fuseki.java
+++ /dev/null
@@ -1,81 +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;
-
-import org.apache.jena.atlas.lib.FileOps ;
-import org.apache.jena.atlas.logging.LogCtl ;
-import org.apache.jena.fuseki.system.FusekiLogging;
-import org.apache.jena.fuseki.webapp.FusekiEnv;
-import org.junit.AfterClass ;
-import org.junit.BeforeClass ;
-import org.junit.runner.RunWith ;
-import org.junit.runners.Suite ;
-
-
-@RunWith(Suite.class)
-@Suite.SuiteClasses( {
- TestHttpOp.class
- , TestSPARQLProtocol.class
- , TestHttpOperations.class
- , TestHttpOptions.class
- , TestDatasetGraphAccessorHTTP.class
- , TestDatasetAccessorHTTP.class
- , TestQuery.class
- , TestAuth.class
- , TestDatasetOps.class
- , TestFileUpload.class
- , TestAdmin.class
- , TestAdminAPI.class
- , TestServerReadOnly.class
- , TestBuilder.class
-})
-
-public class TS_Fuseki extends ServerTest
-{
- public static final String FusekiTestHome = "target/FusekiHome" ;
- public static final String FusekiTestBase = FusekiTestHome+"/run" ;
-
- @BeforeClass public static void setupForFusekiServer() {
- FileOps.ensureDir(FusekiTestHome);
- FileOps.clearDirectory(FusekiTestHome);
- System.setProperty("FUSEKI_HOME", FusekiTestHome) ;
- FusekiEnv.setEnvironment() ;
- FusekiLogging.setLogging();
- // To avoid confusion with log4j.properties in the main part of the server,
- // we modify in place the logging, not try to set it with another
- // Log4j properties file from the classpath.
- LogCtl.setLevel("org.apache.shiro", "WARN") ;
- LogCtl.setLevel("org.eclipse.jetty", "WARN");
-
- LogCtl.setLevel(Fuseki.serverLogName, "WARN");
- LogCtl.setLevel(Fuseki.configLogName, "WARN");
- LogCtl.setLevel(Fuseki.adminLogName, "WARN");
- LogCtl.setLevel(Fuseki.builderLogName, "WARN");
- LogCtl.setLevel(Fuseki.actionLogName, "WARN");
- LogCtl.setLevel(Fuseki.requestLogName, "WARN");
- LogCtl.setLevel(Fuseki.servletRequestLogName,"WARN");
-
- ServerCtl.ctlBeforeTestSuite();
- }
-
- @AfterClass
- static public void afterSuiteClass() {
- ServerCtl.ctlAfterTestSuite() ;
- }
-}
\ No newline at end of file
http://git-wip-us.apache.org/repos/asf/jena/blob/2f224de7/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
new file mode 100644
index 0000000..a6b7e29
--- /dev/null
+++ b/jena-fuseki2/jena-fuseki-webapp/src/test/java/org/apache/jena/fuseki/TS_FusekiWebapp.java
@@ -0,0 +1,81 @@
+/*
+ * 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;
+
+import org.apache.jena.atlas.lib.FileOps ;
+import org.apache.jena.atlas.logging.LogCtl ;
+import org.apache.jena.fuseki.system.FusekiLogging;
+import org.apache.jena.fuseki.webapp.FusekiEnv;
+import org.junit.AfterClass ;
+import org.junit.BeforeClass ;
+import org.junit.runner.RunWith ;
+import org.junit.runners.Suite ;
+
+
+@RunWith(Suite.class)
+@Suite.SuiteClasses( {
+ TestHttpOp.class
+ , TestSPARQLProtocol.class
+ , TestHttpOperations.class
+ , TestHttpOptions.class
+ , TestDatasetGraphAccessorHTTP.class
+ , TestDatasetAccessorHTTP.class
+ , TestQuery.class
+ , TestAuth.class
+ , TestDatasetOps.class
+ , TestFileUpload.class
+ , TestAdmin.class
+ , TestAdminAPI.class
+ , TestServerReadOnly.class
+ , TestBuilder.class
+})
+
+public class TS_FusekiWebapp extends ServerTest
+{
+ public static final String FusekiTestHome = "target/FusekiHome" ;
+ public static final String FusekiTestBase = FusekiTestHome+"/run" ;
+
+ @BeforeClass public static void setupForFusekiServer() {
+ FileOps.ensureDir(FusekiTestHome);
+ FileOps.clearDirectory(FusekiTestHome);
+ System.setProperty("FUSEKI_HOME", FusekiTestHome) ;
+ FusekiEnv.setEnvironment() ;
+ FusekiLogging.setLogging();
+ // To avoid confusion with log4j.properties in the main part of the server,
+ // we modify in place the logging, not try to set it with another
+ // Log4j properties file from the classpath.
+ LogCtl.setLevel("org.apache.shiro", "WARN") ;
+ LogCtl.setLevel("org.eclipse.jetty", "WARN");
+
+ LogCtl.setLevel(Fuseki.serverLogName, "WARN");
+ LogCtl.setLevel(Fuseki.configLogName, "WARN");
+ LogCtl.setLevel(Fuseki.adminLogName, "WARN");
+ LogCtl.setLevel(Fuseki.builderLogName, "WARN");
+ LogCtl.setLevel(Fuseki.actionLogName, "WARN");
+ LogCtl.setLevel(Fuseki.requestLogName, "WARN");
+ LogCtl.setLevel(Fuseki.servletRequestLogName,"WARN");
+
+ ServerCtl.ctlBeforeTestSuite();
+ }
+
+ @AfterClass
+ static public void afterSuiteClass() {
+ ServerCtl.ctlAfterTestSuite() ;
+ }
+}
\ No newline at end of file