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 2011/09/03 23:27:24 UTC
svn commit: r1164934 - in
/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki:
FusekiCmd.java server/FusekiConfig.java server/FusekiVocab.java
server/SPARQLServer.java server/ServiceDesc.java
Author: andy
Date: Sat Sep 3 21:27:24 2011
New Revision: 1164934
URL: http://svn.apache.org/viewvc?rev=1164934&view=rev
Log:
Put configuration code with server code.
Added:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java (contents, props changed)
- copied, changed from r1164926, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java (contents, props changed)
- copied, changed from r1164890, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiVocab.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java (with props)
Modified:
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java?rev=1164934&r1=1164933&r2=1164934&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/FusekiCmd.java Sat Sep 3 21:27:24 2011
@@ -19,17 +19,17 @@
package org.openjena.fuseki;
import java.io.InputStream ;
-import java.net.InetAddress;
-import java.net.UnknownHostException;
+import java.net.InetAddress ;
+import java.net.UnknownHostException ;
import java.util.Arrays ;
import java.util.List ;
import org.openjena.atlas.io.IO ;
import org.openjena.atlas.lib.FileOps ;
import org.openjena.atlas.lib.Sink ;
-import org.openjena.fuseki.config.FusekiConfig ;
-import org.openjena.fuseki.config.FusekiConfig.ServiceDesc ;
+import org.openjena.fuseki.server.FusekiConfig ;
import org.openjena.fuseki.server.SPARQLServer ;
+import org.openjena.fuseki.server.ServiceDesc ;
import org.openjena.riot.Lang ;
import org.openjena.riot.RiotLoader ;
import org.openjena.riot.lang.SinkQuadsToDataset ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java (from r1164926, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java&r1=1164926&r2=1164934&rev=1164934&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiConfig.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java Sat Sep 3 21:27:24 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.config;
+package org.openjena.fuseki.server;
import java.util.ArrayList ;
import java.util.List ;
@@ -26,7 +26,6 @@ import org.openjena.atlas.logging.Log ;
import org.openjena.fuseki.Fuseki ;
import org.openjena.fuseki.FusekiConfigException ;
import org.openjena.fuseki.HttpNames ;
-import org.openjena.fuseki.server.SPARQLServer ;
import org.slf4j.Logger ;
import com.hp.hpl.jena.assembler.Assembler ;
@@ -67,18 +66,6 @@ public class FusekiConfig
server.start() ;
}
- public static class ServiceDesc
- {
- public String name = null ;
- public List<String> queryEP = new ArrayList<String>() ;
- public List<String> updateEP = new ArrayList<String>() ;
- public List<String> uploadEP = new ArrayList<String>() ;
- public List<String> readGraphStoreEP = new ArrayList<String>() ;
- public List<String> readWriteGraphStoreEP = new ArrayList<String>() ;
- public DatasetGraph dataset = null ;
-
- }
-
public static ServiceDesc defaultConfiguration(String datasetPath, DatasetGraph dsg, boolean allowUpdate)
{
ServiceDesc sDesc = new ServiceDesc() ;
@@ -127,9 +114,7 @@ public class FusekiConfig
private static ServiceDesc processService(Resource svc)
{
ServiceDesc sDesc = new ServiceDesc() ;
-
- String x = svc.getLocalName() ;
- log.info("Service: "+x) ;
+ log.info("Service: "+nodeLabel(svc)) ;
sDesc.name = ((Literal)getOne(svc, "fu:name")).getLexicalForm() ;
log.info(" name = "+sDesc.name) ;
@@ -157,10 +142,10 @@ public class FusekiConfig
String ln = property.substring(property.indexOf(':')+1) ;
ResultSet rs = query("SELECT * { ?svc "+property+" ?x}", svc.getModel(), "svc", svc) ;
if ( ! rs.hasNext() )
- throw new FusekiConfigException("No "+ln+" for service "+svc) ;
+ throw new FusekiConfigException("No "+ln+" for service "+nodeLabel(svc)) ;
RDFNode x = rs.next().get("x") ;
if ( rs.hasNext() )
- throw new FusekiConfigException("Multiple "+ln+" for service "+svc) ;
+ throw new FusekiConfigException("Multiple "+ln+" for service "+nodeLabel(svc)) ;
return x ;
}
@@ -229,7 +214,7 @@ public class FusekiConfig
}
// Node presentation
- public static String nodeLabel(RDFNode n)
+ private static String nodeLabel(RDFNode n)
{
if ( n == null )
return "<null>" ;
@@ -240,7 +225,7 @@ public class FusekiConfig
return lit.getLexicalForm() ;
}
- public static String strForResource(Resource r) { return strForResource(r, r.getModel()) ; }
+ private static String strForResource(Resource r) { return strForResource(r, r.getModel()) ; }
private static String strForResource(Resource r, PrefixMapping pm)
{
@@ -262,7 +247,7 @@ public class FusekiConfig
return strForURI(r.getURI(), pm ) ;
}
- public static String strForURI(String uri, PrefixMapping pm)
+ private static String strForURI(String uri, PrefixMapping pm)
{
if ( pm != null )
{
Propchange: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiConfig.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java (from r1164890, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiVocab.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiVocab.java&r1=1164890&r2=1164934&rev=1164934&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/config/FusekiVocab.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java Sat Sep 3 21:27:24 2011
@@ -16,7 +16,7 @@
* limitations under the License.
*/
-package org.openjena.fuseki.config;
+package org.openjena.fuseki.server;
import org.openjena.fuseki.FusekiException ;
import org.openjena.riot.system.IRIResolver ;
Propchange: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/FusekiVocab.java
------------------------------------------------------------------------------
svn:mime-type = text/plain
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java?rev=1164934&r1=1164933&r2=1164934&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/SPARQLServer.java Sat Sep 3 21:27:24 2011
@@ -36,7 +36,6 @@ import org.eclipse.jetty.servlet.Servlet
import org.eclipse.jetty.xml.XmlConfiguration ;
import org.openjena.fuseki.Fuseki ;
import org.openjena.fuseki.FusekiException ;
-import org.openjena.fuseki.config.FusekiConfig.ServiceDesc ;
import org.openjena.fuseki.mgt.ActionDataset ;
import org.openjena.fuseki.servlets.DumpServlet ;
import org.openjena.fuseki.servlets.SPARQL_QueryDataset ;
Added: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java?rev=1164934&view=auto
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java (added)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java Sat Sep 3 21:27:24 2011
@@ -0,0 +1,35 @@
+/**
+ * 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.openjena.fuseki.server;
+
+import java.util.ArrayList ;
+import java.util.List ;
+
+import com.hp.hpl.jena.sparql.core.DatasetGraph ;
+
+public class ServiceDesc
+{
+ public String name = null ;
+ public List<String> queryEP = new ArrayList<String>() ;
+ public List<String> updateEP = new ArrayList<String>() ;
+ public List<String> uploadEP = new ArrayList<String>() ;
+ public List<String> readGraphStoreEP = new ArrayList<String>() ;
+ public List<String> readWriteGraphStoreEP = new ArrayList<String>() ;
+ public DatasetGraph dataset = null ;
+}
Propchange: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/openjena/fuseki/server/ServiceDesc.java
------------------------------------------------------------------------------
svn:mime-type = text/plain