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 2012/03/10 18:48:19 UTC
svn commit: r1299240 - in /incubator/jena/Jena2/Fuseki/trunk: config.ttl
pages/sparql.tpl run_cp
src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
Author: andy
Date: Sat Mar 10 17:48:19 2012
New Revision: 1299240
URL: http://svn.apache.org/viewvc?rev=1299240&view=rev
Log:
JENA-113
Modified:
incubator/jena/Jena2/Fuseki/trunk/config.ttl
incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl
incubator/jena/Jena2/Fuseki/trunk/run_cp
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
Modified: incubator/jena/Jena2/Fuseki/trunk/config.ttl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/config.ttl?rev=1299240&r1=1299239&r2=1299240&view=diff
==============================================================================
Binary files - no diff available.
Modified: incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl?rev=1299240&r1=1299239&r2=1299240&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages/sparql.tpl Sat Mar 10 17:48:19 2012
@@ -22,6 +22,12 @@
</head>
<body>
#set( $ds = $mgt.dataset($request, "") )
+#set( $srvQuery = $mgt.serviceQuery($ds) )
+#set( $srvUpdate = $mgt.serviceQuery($ds) )
+#set( $srvUpload= $mgt.serviceQuery($ds) )
+#set( $srvGraphR = $mgt.serviceQuery($ds) )
+#set( $srvGraphRW = $mgt.serviceQuery($ds) )
+
<!-- error case ... -->
<h1>Fuseki Query</h1>
@@ -30,7 +36,7 @@
<p><b>SPARQL Query</b></p>
<div class="moreindent">
- <form action="${ds}/sparql" method="post" accept-charset="UTF-8">
+ <form action="${ds}/${srvQuery}" method="post" accept-charset="UTF-8">
<textarea style="background-color: #F0F0F0;" name="query" cols="70" rows="10"></textarea>
<br/>
@@ -55,7 +61,7 @@
<p><b>SPARQL Update</b></p>
<div class="moreindent">
- <form action="${ds}/update" method="post" accept-charset="UTF-8">
+ <form action="${ds}/${srvUpdate}" method="post" accept-charset="UTF-8">
<textarea style="background-color: #F0F0F0;" name="update" cols="70" rows="10"></textarea>
<br/>
<input type="submit" value="Perform update" />
@@ -64,7 +70,7 @@
<hr/>
<p><b>File upload</b></p>
<div class="moreindent">
- <form action="${ds}/upload" enctype="multipart/form-data" method="post">
+ <form action="${ds}/${srvUpload}" enctype="multipart/form-data" method="post">
File: <input type="file" name="UNSET FILE NAME" size="40"><br/>
Graph: <input name="graph" size="20" value="default"/><br/>
<input type="submit" value="Upload">
@@ -73,4 +79,3 @@
<hr/>
</body>
</html>
-
Modified: incubator/jena/Jena2/Fuseki/trunk/run_cp
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/run_cp?rev=1299240&r1=1299239&r2=1299240&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/run_cp (original)
+++ incubator/jena/Jena2/Fuseki/trunk/run_cp Sat Mar 10 17:48:19 2012
@@ -2,6 +2,6 @@
M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
-CP="${M2_REPO}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar:${M2_REPO}/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:${M2_REPO}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:${M2_REPO}/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:${M2_REPO}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:${M2_REPO}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:${M2_REPO}/junit/junit/4.9/junit-4.9.jar:${M2_REPO}/log4j/log4j/1.2.16/log4j-1.2.16.jar:${M2_REPO}/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:${M2_REPO}/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:${M2_REPO}/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SN
APSHOT.jar:${M2_REPO}/org/apache/velocity/velocity/1.7/velocity-1.7.jar:${M2_REPO}/org/eclipse/jetty/jetty-client/7.5.4.v20111024/jetty-client-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024.jar:${M2_RE
PO}/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:${M2_REPO}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:${M2_REPO}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:${M2_REPO}/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:${M2_REPO}/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:${M2_REPO}/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
+CP="${M2_REPO}/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar:${M2_REPO}/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:${M2_REPO}/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:${M2_REPO}/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:${M2_REPO}/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:${M2_REPO}/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:${M2_REPO}/junit/junit/4.9/junit-4.9.jar:${M2_REPO}/log4j/log4j/1.2.16/log4j-1.2.16.jar:${M2_REPO}/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:${M2_REPO}/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:${M2_REPO}/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar:${M2_REPO}/org/apache/jena/jena-tdb/0.9.0-incubating/jena-tdb-0.9.0-incubating.jar:${M2_RE
PO}/org/apache/velocity/velocity/1.7/velocity-1.7.jar:${M2_REPO}/org/eclipse/jetty/jetty-client/7.5.4.v20111024/jetty-client-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar:${M2_REPO}/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024.jar:${M2_REPO}/org/hamcrest/h
amcrest-core/1.1/hamcrest-core-1.1.jar:${M2_REPO}/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:${M2_REPO}/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:${M2_REPO}/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:${M2_REPO}/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:${M2_REPO}/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar"
echo "$CP"
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java?rev=1299240&r1=1299239&r2=1299240&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java Sat Mar 10 17:48:19 2012
@@ -73,6 +73,47 @@ public class MgtFunctions
return Iter.toList(DatasetRegistry.get().keys()) ;
}
+ // Service name getters ...
+
+ /** Return a SPARQL query service name for the dataset */
+ public static String serviceQuery(String dataset)
+ {
+ DatasetRef ref = DatasetRegistry.get().get(dataset) ;
+ return serviceNameOrDefault(ref.queryEP, "sparql") ;
+ }
+
+ /** Return a SPARQL update service name for the dataset */
+ public static String serviceUpdate(String dataset)
+ {
+ DatasetRef ref = DatasetRegistry.get().get(dataset) ;
+ return serviceNameOrDefault(ref.updateEP, "update") ;
+ }
+
+ /** Return a SPARQL upload service name for the dataset */
+ public static String serviceUpload(String dataset)
+ {
+ DatasetRef ref = DatasetRegistry.get().get(dataset) ;
+ return serviceNameOrDefault(ref.uploadEP, "upload") ;
+ }
+
+ /** Return a SPARQL Graph Store Protocol (Read) service name for the dataset */
+ public static String serviceGraphRead(String dataset)
+ {
+ DatasetRef ref = DatasetRegistry.get().get(dataset) ;
+ return serviceNameOrDefault(ref.readGraphStoreEP, "get") ;
+ }
+
+ /** Return a SPARQL Graph Store Protocol (Read-Write) service name for the dataset */
+ public static String serviceGraphReadWrite(String dataset)
+ {
+ DatasetRef ref = DatasetRegistry.get().get(dataset) ;
+ return serviceNameOrDefault(ref.readWriteGraphStoreEP, "data") ;
+ }
+
+ private static String serviceNameOrDefault(List<String> services, String defaultValue)
+ {
+ return ( services.isEmpty() ) ? defaultValue : services.get(0) ;
+ }
/* remove soon - simply for backwards compatibility with Fuseki+JSP */
@Deprecated