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 2016/10/10 16:39:08 UTC
jena git commit: Rename to keep apart from the preferred Fusek2
embedded server.
Repository: jena
Updated Branches:
refs/heads/master 1bcb9d20d -> a2f51efa5
Rename to keep apart from the preferred Fusek2 embedded server.
Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/a2f51efa
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/a2f51efa
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/a2f51efa
Branch: refs/heads/master
Commit: a2f51efa5f27dc4d116586ed3e3204918512d051
Parents: 1bcb9d2
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Oct 10 12:43:19 2016 +0100
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Oct 10 12:43:19 2016 +0100
----------------------------------------------------------------------
.../jena/fuseki/EmbeddedFusekiServer.java | 85 -------------------
.../jena/fuseki/EmbeddedFusekiServer1.java | 88 ++++++++++++++++++++
.../java/org/apache/jena/fuseki/ServerTest.java | 4 +-
3 files changed, 90 insertions(+), 87 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/jena/blob/a2f51efa/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer.java
deleted file mode 100644
index af8fa86..0000000
--- a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer.java
+++ /dev/null
@@ -1,85 +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.fuseki.server.FusekiConfig ;
-import org.apache.jena.fuseki.server.SPARQLServer ;
-import org.apache.jena.fuseki.server.ServerConfig ;
-import org.apache.jena.sparql.core.DatasetGraph ;
-import org.apache.jena.sparql.core.DatasetGraphFactory ;
-import org.apache.jena.tdb.TDBFactory ;
-
-/** Embedded (same JVM) server.
- * <p>Example for one server per test suite:
- * <pre>
- private static EmbeddedFusekiServer server = null ;
- \@BeforeClass public static void beforeClass() {
- server = EmbeddedFusekiServer.createMemByPath(3030, "/test") ;
- server.start() ;
- \@AfterClass public static void afterClass() {
- server.stop() ;
- }
- </pre>
- */
-public class EmbeddedFusekiServer
-{
-
- public static EmbeddedFusekiServer mem(int port, String datasetPath) {
- DatasetGraph dsg = DatasetGraphFactory.create() ;
- return EmbeddedFusekiServer.create(port, dsg, datasetPath) ;
- }
-
- public static EmbeddedFusekiServer memTDB(int port, String datasetPath) {
- DatasetGraph dsg = TDBFactory.createDatasetGraph() ;
- return EmbeddedFusekiServer.create(port, dsg, datasetPath) ;
- }
-
- public static EmbeddedFusekiServer create(int port, DatasetGraph dsg, String datasetPath) {
- ServerConfig conf = FusekiConfig.defaultConfiguration(datasetPath, dsg, true, true) ;
- conf.port = port ;
- conf.pagesPort = port ;
- if ( ! FileOps.exists(conf.pages) )
- conf.pages = null ;
- return new EmbeddedFusekiServer(conf) ;
- }
-
- public static EmbeddedFusekiServer configure(int port, String fileConfig) {
- ServerConfig conf = FusekiConfig.configure(fileConfig) ;
- conf.port = port ;
- conf.pagesPort = port ;
- if ( ! FileOps.exists(conf.pages) )
- conf.pages = null ;
- return new EmbeddedFusekiServer(conf) ;
- }
-
- private SPARQLServer server = null ;
-
- public EmbeddedFusekiServer(ServerConfig conf) {
- server = new SPARQLServer(conf) ;
- }
-
- public void start() {
- server.start() ;
- }
-
- public void stop() {
- server.stop() ;
- }
-}
http://git-wip-us.apache.org/repos/asf/jena/blob/a2f51efa/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer1.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer1.java b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer1.java
new file mode 100644
index 0000000..73769b2
--- /dev/null
+++ b/jena-fuseki1/src/main/java/org/apache/jena/fuseki/EmbeddedFusekiServer1.java
@@ -0,0 +1,88 @@
+/*
+ * 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.fuseki.server.FusekiConfig ;
+import org.apache.jena.fuseki.server.SPARQLServer ;
+import org.apache.jena.fuseki.server.ServerConfig ;
+import org.apache.jena.sparql.core.DatasetGraph ;
+import org.apache.jena.sparql.core.DatasetGraphFactory ;
+import org.apache.jena.tdb.TDBFactory ;
+
+/** Embedded (same JVM) server.
+ * <p>Example for one server per test suite:
+ * <pre>
+ private static EmbeddedFusekiServer server = null ;
+ \@BeforeClass public static void beforeClass() {
+ server = EmbeddedFusekiServer.createMemByPath(3030, "/test") ;
+ server.start() ;
+ \@AfterClass public static void afterClass() {
+ server.stop() ;
+ }
+ </pre>
+
+ @deprecated Use the Embedded Fusek2 server.
+ */
+@Deprecated
+public class EmbeddedFusekiServer1
+{
+
+ public static EmbeddedFusekiServer1 mem(int port, String datasetPath) {
+ DatasetGraph dsg = DatasetGraphFactory.create() ;
+ return EmbeddedFusekiServer1.create(port, dsg, datasetPath) ;
+ }
+
+ public static EmbeddedFusekiServer1 memTDB(int port, String datasetPath) {
+ DatasetGraph dsg = TDBFactory.createDatasetGraph() ;
+ return EmbeddedFusekiServer1.create(port, dsg, datasetPath) ;
+ }
+
+ public static EmbeddedFusekiServer1 create(int port, DatasetGraph dsg, String datasetPath) {
+ ServerConfig conf = FusekiConfig.defaultConfiguration(datasetPath, dsg, true, true) ;
+ conf.port = port ;
+ conf.pagesPort = port ;
+ if ( ! FileOps.exists(conf.pages) )
+ conf.pages = null ;
+ return new EmbeddedFusekiServer1(conf) ;
+ }
+
+ public static EmbeddedFusekiServer1 configure(int port, String fileConfig) {
+ ServerConfig conf = FusekiConfig.configure(fileConfig) ;
+ conf.port = port ;
+ conf.pagesPort = port ;
+ if ( ! FileOps.exists(conf.pages) )
+ conf.pages = null ;
+ return new EmbeddedFusekiServer1(conf) ;
+ }
+
+ private SPARQLServer server = null ;
+
+ public EmbeddedFusekiServer1(ServerConfig conf) {
+ server = new SPARQLServer(conf) ;
+ }
+
+ public void start() {
+ server.start() ;
+ }
+
+ public void stop() {
+ server.stop() ;
+ }
+}
http://git-wip-us.apache.org/repos/asf/jena/blob/a2f51efa/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
----------------------------------------------------------------------
diff --git a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
index 0807797..5608421 100644
--- a/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
+++ b/jena-fuseki1/src/test/java/org/apache/jena/fuseki/ServerTest.java
@@ -70,7 +70,7 @@ public class ServerTest
public static final Model model1 = ModelFactory.createModelForGraph(graph1) ;
public static final Model model2 = ModelFactory.createModelForGraph(graph2) ;
- private static EmbeddedFusekiServer server = null ;
+ private static EmbeddedFusekiServer1 server = null ;
// reference count of start/stop server
private static int countServer = 0 ;
@@ -98,7 +98,7 @@ public class ServerTest
protected static void setupServer()
{
DatasetGraph dsg = DatasetGraphFactory.create() ;
- server = EmbeddedFusekiServer.create(port, dsg, datasetPath) ;
+ server = EmbeddedFusekiServer1.create(port, dsg, datasetPath) ;
server.start() ;
}