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/01/07 20:57:52 UTC

svn commit: r1556335 - in /jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki: DEF.java server/FusekiConfig.java

Author: andy
Date: Tue Jan  7 19:57:52 2014
New Revision: 1556335

URL: http://svn.apache.org/r1556335
Log:
Constants

Modified:
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/DEF.java
    jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/DEF.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/DEF.java?rev=1556335&r1=1556334&r2=1556335&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/DEF.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/DEF.java Tue Jan  7 19:57:52 2014
@@ -51,4 +51,12 @@ public class DEF
                                                                           contentTypeResultsXML,
                                                                           contentTypeTextPlain
                                                                           ) ;
+    
+    // Names for services in the default configuration
+    public static final String ServiceQuery         = "query" ;
+    public static final String ServiceQueryAlt      = "sparql" ;
+    public static final String ServiceUpdate        = "update" ;
+    public static final String ServiceData          = "data" ;
+    public static final String ServiceUpload        = "upload" ;
+    public static final String ServiceGeneralQuery  = "/sparql" ;
 }

Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1556335&r1=1556334&r2=1556335&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Tue Jan  7 19:57:52 2014
@@ -32,9 +32,9 @@ import java.util.List ;
 
 import org.apache.jena.atlas.iterator.Iter ;
 import org.apache.jena.atlas.lib.StrUtils ;
+import org.apache.jena.fuseki.DEF ;
 import org.apache.jena.fuseki.Fuseki ;
 import org.apache.jena.fuseki.FusekiConfigException ;
-import org.apache.jena.riot.web.HttpNames ;
 import org.apache.jena.riot.RDFDataMgr ;
 import org.slf4j.Logger ;
 
@@ -82,8 +82,8 @@ public class FusekiConfig {
     private static DatasetGraph dummyDSG  = new DatasetGraphReadOnly(DatasetGraphFactory.createMemFixed()) ;
     static {
         noDataset.setDataset(dummyDSG) ; 
-        noDataset.query.endpoints.add(HttpNames.ServiceQuery) ;
-        noDataset.query.endpoints.add(HttpNames.ServiceQueryAlt) ;
+        noDataset.query.endpoints.add(DEF.ServiceQuery) ;
+        noDataset.query.endpoints.add(DEF.ServiceQueryAlt) ;
         noDataset.allowDatasetUpdate = false ;
         noDataset.activate() ;
         // Don't register it.
@@ -109,16 +109,16 @@ public class FusekiConfig {
         
         DatasetRef dbDesc = new DatasetRef(params.datasetPath) ;
         dbDesc.setDataset(params.dsg) ;
-        dbDesc.query.endpoints.add(HttpNames.ServiceQuery) ;
-        dbDesc.query.endpoints.add(HttpNames.ServiceQueryAlt) ;
+        dbDesc.query.endpoints.add(DEF.ServiceQuery) ;
+        dbDesc.query.endpoints.add(DEF.ServiceQueryAlt) ;
 
         if ( params.allowUpdate ) {
-            dbDesc.update.endpoints.add(HttpNames.ServiceUpdate) ;
-            dbDesc.upload.endpoints.add(HttpNames.ServiceUpload) ;
-            dbDesc.readWriteGraphStore.endpoints.add(HttpNames.ServiceData) ;
+            dbDesc.update.endpoints.add(DEF.ServiceUpdate) ;
+            dbDesc.upload.endpoints.add(DEF.ServiceUpload) ;
+            dbDesc.readWriteGraphStore.endpoints.add(DEF.ServiceData) ;
             dbDesc.allowDatasetUpdate = true ;
         } else
-            dbDesc.readGraphStore.endpoints.add(HttpNames.ServiceData) ;
+            dbDesc.readGraphStore.endpoints.add(DEF.ServiceData) ;
         return Arrays.asList(dbDesc) ; 
     }