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/02/21 22:13:15 UTC
svn commit: r1292029 - in /incubator/jena/Jena2/Fuseki/trunk: ./ dist/
pages-update/ src-dev/dev/ src/main/java/org/apache/jena/fuseki/mgt/
src/main/java/org/apache/jena/fuseki/server/
src/main/java/org/apache/jena/fuseki/servlets/
Author: andy
Date: Tue Feb 21 21:13:14 2012
New Revision: 1292029
URL: http://svn.apache.org/viewvc?rev=1292029&view=rev
Log:
Switch to Freemarker from JSPs.
Adjust distribution NOTICE and LICENSE.
Added:
incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl
incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java
- copied, changed from r1291428, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleFreeMarkerServlet.java
Removed:
incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.jsp
incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.jsp
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java
Modified:
incubator/jena/Jena2/Fuseki/trunk/.classpath
incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist
incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist
incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html
incubator/jena/Jena2/Fuseki/trunk/pom.xml
incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
Modified: incubator/jena/Jena2/Fuseki/trunk/.classpath
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/.classpath?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/.classpath (original)
+++ incubator/jena/Jena2/Fuseki/trunk/.classpath Tue Feb 21 21:13:14 2012
@@ -1,42 +1,42 @@
<?xml version="1.0" encoding="UTF-8"?>
<classpath>
- <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
- <classpathentry kind="src" path="src-dev"/>
- <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
- <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
- <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar" sourcepath="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.5.4.v20111024/jetty-jsp-2.1-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-jsp-2.1/7.5.4.v20111024/jetty-jsp-2.1-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-webapp/7.5.4.v20111024/jetty-webapp-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-webapp/7.5.4.v20111024/jetty-webapp-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-2.1-glassfish/2.1.v20100127/jsp-2.1-glassfish-2.1.v20100127.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/mortbay/jetty/jsp-api-2.1-glassfish/2.1.v20100127/jsp-api-2.1-glassfish-2.1.v20100127.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar"/>
- <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
- <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
- <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
- <classpathentry kind="output" path="classes"/>
+ <classpathentry including="**/*.java" kind="src" path="src/main/java"/>
+ <classpathentry kind="src" path="src-dev"/>
+ <classpathentry including="**/*.java" kind="src" path="src/test/java"/>
+ <classpathentry excluding="**/*.java" kind="src" path="src/main/resources"/>
+ <classpathentry kind="var" path="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar" sourcepath="M2_REPO/javax/servlet/servlet-api/2.5/servlet-api-2.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar" sourcepath="M2_REPO/ant/ant/1.6.5/ant-1.6.5-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4.jar" sourcepath="M2_REPO/commons-codec/commons-codec/1.4/commons-codec-1.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar" sourcepath="M2_REPO/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.jar" sourcepath="M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar" sourcepath="M2_REPO/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2.jar" sourcepath="M2_REPO/org/apache/httpcomponents/httpcore/4.1.2/httpcore-4.1.2-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4.jar" sourcepath="M2_REPO/com/ibm/icu/icu4j/3.4.4/icu4j-3.4.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-arq/2.9.0-incubating/jena-arq-2.9.0-incubating-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-core/2.7.0-incubating/jena-core-2.7.0-incubating-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating.jar" sourcepath="M2_REPO/org/apache/jena/jena-iri/0.9.0-incubating/jena-iri-0.9.0-incubating-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT.jar" sourcepath="M2_REPO/org/apache/jena/jena-tdb/0.9.0-incubating-SNAPSHOT/jena-tdb-0.9.0-incubating-SNAPSHOT-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-server/7.5.4.v20111024/jetty-server-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024.jar" sourcepath="M2_REPO/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v20111024-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/org/freemarker/freemarker/2.3.18/freemarker-2.3.18.jar" sourcepath="M2_REPO/org/freemarker/freemarker/2.3.18/freemarker-2.3.18-sources.jar"/>
+
+ <classpathentry kind="var" path="M2_REPO/junit/junit/4.9/junit-4.9.jar" sourcepath="M2_REPO/junit/junit/4.9/junit-4.9-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16.jar" sourcepath="M2_REPO/log4j/log4j/1.2.16/log4j-1.2.16-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar" sourcepath="M2_REPO/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar" sourcepath="M2_REPO/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0-sources.jar"/>
+ <classpathentry kind="var" path="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar" sourcepath="M2_REPO/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01-sources.jar"/>
+ <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/JavaSE-1.6"/>
+ <classpathentry kind="output" path="classes"/>
</classpath>
Modified: incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist (original)
+++ incubator/jena/Jena2/Fuseki/trunk/dist/LICENSE-dist Tue Feb 21 21:13:14 2012
@@ -325,3 +325,40 @@ for non-commercial or commercial purpose
granted provided that the copyright notice appears in all copies.
- - - - - - - - - - - - - - - - - - - - - - -
+
+Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
+
+Redistribution and use in source and binary forms, with or without
+modification, are permitted provided that the following conditions are met:
+
+1. Redistributions of source code must retain the above copyright notice,
+ this list of conditions and the following disclaimer.
+
+2. The end-user documentation included with the redistribution, if any, must
+ include the following acknowlegement:
+ "This product includes software developed by the
+ Visigoth Software Society (http://www.visigoths.org/)."
+ Alternately, this acknowlegement may appear in the software itself, if and
+ wherever such third-party acknowlegements normally appear.
+
+3. Neither the name "FreeMarker", "Visigoth", nor any of the names of the
+ project contributors may be used to endorse or promote products derived
+ from this software without prior written permission. For written
+ permission, please contact visigoths@visigoths.org.
+
+4. Products derived from this software may not be called "FreeMarker" or
+ "Visigoth" nor may "FreeMarker" or "Visigoth" appear in their names
+ without prior written permission of the Visigoth Software Society.
+
+THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED WARRANTIES,
+INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND
+FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
+VISIGOTH SOFTWARE SOCIETY OR ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT,
+INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING,
+BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY
+OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING
+NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE,
+EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
+
+- - - - - - - - - - - - - - - - - - - - - - -
Modified: incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist (original)
+++ incubator/jena/Jena2/Fuseki/trunk/dist/NOTICE-dist Tue Feb 21 21:13:14 2012
@@ -37,10 +37,16 @@ PluggedIn Software under a BSD license.
under the Apache 2.0 License.
-The Jetty Web Container includes
+The Jetty Web Container includes:
UnixCrypt.java
Copyright 1996 Aki Yoshida,
modified April 2001 by Iris Van den Broeke, Daniel Deville.
- - - - - - - - - - - - - - - - - - - - - - -
+
+FreeMarker:(http://freemarker.org/).
+
+Copyright (c) 2003 The Visigoth Software Society. All rights reserved.
+
+- - - - - - - - - - - - - - - - - - - - - - -
Added: incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl?rev=1292029&view=auto
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl (added)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/control-panel.tpl Tue Feb 21 21:13:14 2012
@@ -0,0 +1,20 @@
+<html>
+ <head>
+ <title>Fuseki - A SPARQL 1.1 Server</title>
+ <link rel="stylesheet" type="text/css" href="/fuseki.css" />
+ </head>
+
+ <body>
+ <h1>Fuseki Control Panel</h1>
+
+ <div class="moreindent">
+ <form action="dataset" method="post">
+ Dataset: <select name="dataset">
+ ${mgt.datasetsAsSelectOptions(request)}
+ <div>
+ <input type="submit" value="Select">
+ </div>
+ </form>
+ </div>
+ </body>
+</html>
\ No newline at end of file
Modified: incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/fuseki.html Tue Feb 21 21:13:14 2012
@@ -8,7 +8,7 @@
<h1>Fuseki</h1>
<h2>Server Management</h2>
- <p><a href="control-panel.jsp">Control Panel</a></p>
+ <p><a href="control-panel.tpl">Control Panel</a></p>
<h2>Documentation</h2>
<p><a href="http://incubator.apache.org/jena/documentation/serving_data/index.html">Fuseki documentation</a></p>
Added: incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl?rev=1292029&view=auto
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl (added)
+++ incubator/jena/Jena2/Fuseki/trunk/pages-update/sparql.tpl Tue Feb 21 21:13:14 2012
@@ -0,0 +1,58 @@
+<html>
+ <head>
+ <title>Fuseki</title>
+ <link rel="stylesheet" type="text/css" href="fuseki.css" />
+ </head>
+ <body>
+ <h1>Fuseki Query</h1>
+ Dataset: ${mgt.dataset(request, "No Session")}
+ <hr/>
+
+ <#assign ds = mgt.dataset(request) >
+
+ <p><b>SPARQL Query</b></p>
+ <div class="moreindent">
+ <form action="${ds}/sparql" method="post" accept-charset="UTF-8">
+ <textarea style="background-color: #F0F0F0;" name="query" cols="70" rows="10"></textarea>
+ <br/>
+
+ Output: <select name="output">
+ <option value="json">JSON</option>
+ <option value="xml">XML</option>
+ <option value="text">Text</option>
+ <option value="csv">CSV</option>
+ <option value="tsv">TSV</option>
+ </select>
+ <br/>
+ XSLT style sheet (blank for none):
+ <input name="stylesheet" size="20" value="/xml-to-html.xsl" />
+ <br/>
+ <input type="checkbox" name="force-accept" value="text/plain"/>
+ Force the accept header to <tt>text/plain</tt> regardless
+ <br/>
+ <input type="submit" value="Get Results" />
+ </form>
+ </div>
+ <hr/>
+
+ <p><b>SPARQL Update</b></p>
+ <div class="moreindent">
+ <form action="${ds}/update" 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" />
+ </form>
+ </div>
+ <hr/>
+ <p><b>File upload</b></p>
+ <div class="moreindent">
+ <form action="${ds}/upload" 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">
+ </form>
+ </div>
+ <hr/>
+ </body>
+</html>
+
Modified: incubator/jena/Jena2/Fuseki/trunk/pom.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/pom.xml?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/pom.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/pom.xml Tue Feb 21 21:13:14 2012
@@ -66,7 +66,7 @@
<ver.tdb>0.9.0-incubating-SNAPSHOT</ver.tdb>
<ver.jetty>7.5.4.v20111024</ver.jetty>
- <ver.servlet-jsp>2.1.v20100127</ver.servlet-jsp>
+ <ver.freemarker>2.3.18</ver.freemarker>
<ver.httpclient>4.1.2</ver.httpclient>
<ver.httpcore>4.1.3</ver.httpcore>
@@ -145,23 +145,13 @@
<version>${ver.jetty}</version>
</dependency>
- <dependency>
- <groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp-2.1</artifactId>
- <version>${ver.jetty}</version>
- </dependency>
-
- <dependency>
- <groupId>org.mortbay.jetty</groupId>
- <artifactId>jsp-2.1-glassfish</artifactId>
- <version>${ver.servlet-jsp}</version>
- </dependency>
-
+ <!-- used ? - ->
<dependency>
<groupId>org.eclipse.jetty</groupId>
<artifactId>jetty-webapp</artifactId>
<version>${ver.jetty}</version>
</dependency>
+ -->
<dependency>
<groupId>org.eclipse.jetty</groupId>
@@ -169,13 +159,19 @@
<version>${ver.jetty}</version>
</dependency>
- <!--
- <dependency>
+ <dependency>
<groupId>org.eclipse.jetty</groupId>
- <artifactId>jetty-jsp-2.1</artifactId>
+ <artifactId>jetty-xml</artifactId>
<version>${ver.jetty}</version>
+ </dependency>
+
+ <dependency>
+ <groupId>org.freemarker</groupId>
+ <artifactId>freemarker</artifactId>
+ <!-- Latest 2.3.x (not 2.4.x), at least 2.3.18 -->
+ <version>${ver.freemarker}</version>
</dependency>
- -->
+
<dependency>
<groupId>org.slf4j</groupId>
<artifactId>slf4j-api</artifactId>
Modified: incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java Tue Feb 21 21:13:14 2012
@@ -24,8 +24,8 @@ public class RunFuseki
{
public static void main(String[] args)
{
- demo() ;
- FusekiCmd.main("--config=config.ttl") ; System.exit(0) ;
+ //demo() ;
+ //FusekiCmd.main("--config=config.ttl") ; System.exit(0) ;
main1() ;
}
@@ -55,18 +55,19 @@ public class RunFuseki
FusekiCmd.main(
//"-v",
//"--debug",
- //"--update",
+ "--update",
//"--timeout=1000,5000",
//"--set=arq:queryTimeout=1000",
//"--port=3030",
//"--mgtPort=3031",
//"--host=localhost",
- //"--mem",
+ "--mem",
//"--loc=DB",
- "--file=D.ttl",
+ //"--file=D.ttl",
//"--gzip=no",
//"--desc=desc.ttl",
//--pages=
+ "--jetty-config=jetty-fuseki.xml",
"/ds"
) ;
System.exit(0) ;
Copied: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java (from r1291428, incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java)
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java?p2=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java&p1=incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java&r1=1291428&r2=1292029&rev=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/Functions.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/MgtFunctions.java Tue Feb 21 21:13:14 2012
@@ -34,7 +34,7 @@ import com.hp.hpl.jena.sparql.serializer
import com.hp.hpl.jena.tdb.store.DatasetGraphTDB ;
/** Avoid code in JSPs */
-public class Functions
+public class MgtFunctions
{
/** Return the name of the current dataset */
public static String dataset(HttpServletRequest request, String dftValue)
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/mgt/PageNames.java Tue Feb 21 21:13:14 2012
@@ -21,6 +21,6 @@ package org.apache.jena.fuseki.mgt;
public class PageNames
{
static final String pageDataset = "dataset.html" ;
- static final String pageControlPanel = "control-panel.jsp" ;
- static final String pageAfterLogin = "sparql.jsp" ;
+ static final String pageControlPanel = "control-panel.tpl" ;
+ static final String pageAfterLogin = "sparql.tpl" ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java?rev=1292029&r1=1292028&r2=1292029&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/SPARQLServer.java Tue Feb 21 21:13:14 2012
@@ -23,20 +23,17 @@ import static org.apache.jena.fuseki.Fus
import java.io.FileInputStream ;
import java.util.EnumSet ;
+import java.util.HashMap ;
import java.util.List ;
+import java.util.Map ;
import javax.servlet.http.HttpServlet ;
import org.apache.jena.fuseki.Fuseki ;
import org.apache.jena.fuseki.FusekiException ;
import org.apache.jena.fuseki.mgt.ActionDataset ;
-import org.apache.jena.fuseki.servlets.DumpServlet ;
-import org.apache.jena.fuseki.servlets.SPARQL_QueryDataset ;
-import org.apache.jena.fuseki.servlets.SPARQL_QueryGeneral ;
-import org.apache.jena.fuseki.servlets.SPARQL_REST_R ;
-import org.apache.jena.fuseki.servlets.SPARQL_REST_RW ;
-import org.apache.jena.fuseki.servlets.SPARQL_Update ;
-import org.apache.jena.fuseki.servlets.SPARQL_Upload ;
+import org.apache.jena.fuseki.mgt.MgtFunctions ;
+import org.apache.jena.fuseki.servlets.* ;
import org.apache.jena.fuseki.validation.DataValidator ;
import org.apache.jena.fuseki.validation.IRIValidator ;
import org.apache.jena.fuseki.validation.QueryValidator ;
@@ -64,11 +61,7 @@ public class SPARQLServer
private ServerConfig serverConfig ;
private Server server = null ;
-// private int port ;
private boolean verbose = false ;
-// private List<DatasetRef> datasetRefs ;
-// private String pagesDir ;
-
//private static int ThreadPoolSize = 100 ;
public SPARQLServer(ServerConfig config)
@@ -146,7 +139,8 @@ public class SPARQLServer
mt.addMimeMapping("nq", WebContent.contentTypeNQuads+";charset=ascii") ;
mt.addMimeMapping("trig", WebContent.contentTypeTriG+";charset=utf-8") ;
context.setMimeTypes(mt) ;
-
+ server.setHandler(context);
+
serverLog.debug("Pages = "+serverConfig.pages) ;
boolean installManager = true ;
@@ -163,16 +157,13 @@ public class SPARQLServer
if ( serverConfig.pagesPort != serverConfig.port )
serverLog.warn("Not supported yet - pages on a different port to services") ;
- server.setHandler(context);
-
- HttpServlet jspServlet = new org.apache.jasper.servlet.JspServlet() ;
- ServletHolder jspContent = new ServletHolder(jspServlet) ;
- //?? Need separate context for admin stuff??
- context.setResourceBase(serverConfig.pages) ;
- addServlet(context, jspContent, "*.jsp", false) ;
+ String base = serverConfig.pages ;
+ Map<String, Object> data = new HashMap<String, Object>() ;
+ data.put("mgt", new MgtFunctions()) ;
+ SimpleFreeMarkerServlet templateEngine = new SimpleFreeMarkerServlet(base, data) ;
+ addServlet(context, templateEngine, "*.tpl", false) ;
}
-
if ( installManager )
{
// Action when control panel selects a dataset.
Added: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleFreeMarkerServlet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleFreeMarkerServlet.java?rev=1292029&view=auto
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleFreeMarkerServlet.java (added)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleFreeMarkerServlet.java Tue Feb 21 21:13:14 2012
@@ -0,0 +1,127 @@
+/**
+ * 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.servlets;
+
+import java.io.Writer ;
+import java.util.HashMap ;
+import java.util.Map ;
+
+import javax.servlet.http.HttpServlet ;
+import javax.servlet.http.HttpServletRequest ;
+import javax.servlet.http.HttpServletResponse ;
+
+import freemarker.template.Configuration ;
+import freemarker.template.Template ;
+
+/** Simple servlet that uses <a href="http://freemarker.sf.net/">FreeMarker</a>
+ * to format pages.
+ * Use with a servlet mapping of "*.ftl" or socme such extension.
+ * Has a single object for methods and statics - in the template, it's calls
+ *
+ */
+public class SimpleFreeMarkerServlet extends HttpServlet
+{
+ private String docbase ;
+ private Configuration cfg = new Configuration();
+
+ private Object functions = null ;
+ private String functionsName = null ;
+
+ private Map<String, Object> datamodel = new HashMap<String, Object>();
+
+
+ public SimpleFreeMarkerServlet(String base, Map<String, Object> datamodel)
+ {
+ setDocBase(base) ;
+ setDataModel(datamodel) ;
+ }
+
+ public Object getFunctions()
+ {
+ return functions ;
+ }
+
+ private void setDataModel(Map<String, Object> datamodel)
+ {
+ this.datamodel = datamodel ;
+ }
+
+ public Configuration getConfiguration()
+ {
+ return cfg ;
+ }
+
+ public String getDocBase()
+ {
+ return docbase ;
+ }
+
+ public void setDocBase(String docbase)
+ {
+ this.docbase = docbase ;
+ }
+
+ // See also
+ @Override
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ {
+ process(req, resp) ;
+ }
+
+ @Override
+ public void doPost(HttpServletRequest req, HttpServletResponse resp)
+ {
+ process(req, resp) ;
+ }
+
+ private void process(HttpServletRequest req, HttpServletResponse resp)
+ {
+ try {
+ // TODO - better?
+ String path = path(req) ;
+ path = docbase+path ;
+ Template temp = cfg.getTemplate(path);
+ resp.setCharacterEncoding("UTF-8") ;
+ Writer out = resp.getWriter() ;
+ if ( datamodel != null )
+ datamodel.put("request", req) ;
+ temp.process(datamodel, out);
+ out.flush();
+ } catch (Exception ex)
+ {
+ ex.printStackTrace(System.err) ;
+ }
+ }
+
+ private String path(HttpServletRequest request)
+ {
+ String path = request.getPathInfo();
+ if (path != null) return path;
+ path = request.getServletPath();
+ if (path != null) return path;
+ return null ;
+ }
+
+ @Override
+ public String getServletInfo()
+ {
+ return "Lightweight FreeMarker Servlet";
+ }
+}
+