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/23 16:54:31 UTC
svn commit: r1292833 - in /incubator/jena/Jena2/Fuseki/trunk: ./
src-dev/dev/ src/main/java/org/apache/jena/fuseki/
src/main/java/org/apache/jena/fuseki/server/
src/main/java/org/apache/jena/fuseki/servlets/
Author: andy
Date: Thu Feb 23 15:54:30 2012
New Revision: 1292833
URL: http://svn.apache.org/viewvc?rev=1292833&view=rev
Log:
Fix handling of velocity resources when starting from a different directory.
Modified:
incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml
incubator/jena/Jena2/Fuseki/trunk/fuseki
incubator/jena/Jena2/Fuseki/trunk/run_cp
incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
Modified: incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml (original)
+++ incubator/jena/Jena2/Fuseki/trunk/assembly-dist.xml Thu Feb 23 15:54:30 2012
@@ -68,8 +68,7 @@ Assumes jar made and onejar has been ass
<include>fuseki-server</include>
<include>config*.ttl</include>
<include>s-*</include>
- <include>pages-update/*</include>
- <include>pages-publish/*</include>
+ <include>pages/*</include>
</includes>
</fileSet>
</fileSets>
Modified: incubator/jena/Jena2/Fuseki/trunk/fuseki
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/fuseki?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/fuseki (original)
+++ incubator/jena/Jena2/Fuseki/trunk/fuseki Thu Feb 23 15:54:30 2012
@@ -1,6 +1,6 @@
#!/bin/bash
-## Run Fuseki, include development code if it looks liek it's available.
+## Run Fuseki, include development code if it looks like it's available.
## Or --pages=
export FUSEKI_HOME=${FUSEKI_HOME:-$HOME/Projects/Fuseki}
Modified: incubator/jena/Jena2/Fuseki/trunk/run_cp
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/run_cp?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/run_cp (original)
+++ incubator/jena/Jena2/Fuseki/trunk/run_cp Thu Feb 23 15:54:30 2012
@@ -1,6 +1,7 @@
#!/bin/bash
M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
-CP="$M2_REPO/ant/ant/1.6.5/ant-1.6.5.jar:$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-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.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-SNAPSHOT.jar:$M2_REPO/org/eclipse/jdt/core/compiler/ecj/3.5.1/ecj-3.5.1.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-jsp-2.1/7.5.4.v20111024/jetty-jsp-2.1-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-webapp/7.5.4.v20111024/jetty-webapp-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/hamcrest-core/1.1/hamcrest-core-1.1.jar:$M2_REPO/org/mortbay/jetty/jsp-2.1-glassfish/2.1.v20100127/jsp-2.1-glassfish-2.1.v20100127.jar:$M2_REPO/org/mortbay/jetty/jsp-api-2.1-glassfish/2.1.v20100127/jsp-api-2.1-glassfish-2.1.v20100127.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-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"
echo "$CP"
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=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java Thu Feb 23 15:54:30 2012
@@ -55,13 +55,14 @@ public class RunFuseki
FusekiCmd.main(
//"-v",
//"--debug",
- "--update",
+ //"--update",
//"--timeout=1000,5000",
//"--set=arq:queryTimeout=1000",
//"--port=3030",
//"--mgtPort=3031",
//"--host=localhost",
"--mem",
+ //"--home=/home/afs/Projects/Fuseki",
//"--loc=DB",
//"--file=D.ttl",
//"--gzip=no",
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Thu Feb 23 15:54:30 2012
@@ -341,10 +341,14 @@ public class FusekiCmd extends CmdARQ
}
homeDir = sort_out_dir(homeDir) ;
+ if ( ! FileOps.exists(homeDir) )
+ Fuseki.configLog.warn("No such directory for Fuseki home: "+homeDir) ;
String staticContentDir = pagesDir ;
if ( staticContentDir == null )
staticContentDir = homeDir+Fuseki.PagesStatic ;
+
+ Fuseki.configLog.debug("Static content: "+staticContentDir) ;
if ( ! FileOps.exists(staticContentDir) )
Fuseki.configLog.warn("No such directory for static content: "+staticContentDir) ;
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/server/FusekiConfig.java Thu Feb 23 15:54:30 2012
@@ -157,7 +157,7 @@ public class FusekiConfig
config.mgtPort = 3031 ;
config.pagesPort = config.port ;
config.jettyConfigFile = null ;
- config.pages = "Pages-Update" ;
+ config.pages = Fuseki.PagesStatic ;
config.enableCompression = true ;
return config ;
}
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java?rev=1292833&r1=1292832&r2=1292833&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/servlets/SimpleVelocityServlet.java Thu Feb 23 15:54:30 2012
@@ -51,11 +51,15 @@ public class SimpleVelocityServlet exten
public SimpleVelocityServlet(String base, Map<String, Object> datamodel)
{
- setDocBase(base) ;
+ this.docbase = base ;
this.datamodel = datamodel ;
velocity = new VelocityEngine();
// Just plain set the logger. No initialize phaff around reflection calls and newInstance()
velocity.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM, new SimpleSLF4JLogChute(log)) ;
+ velocity.setProperty( RuntimeConstants.INPUT_ENCODING, "UTF-8" ) ;
+
+ velocity.setProperty( RuntimeConstants.FILE_RESOURCE_LOADER_PATH, base) ;
+// velocity.setProperty( RuntimeConstants.FILE_RESOURCE_LOADER_CACHE, "true") ;
// velocity.setProperty( RuntimeConstants.RUNTIME_LOG_LOGSYSTEM_CLASS,
// SimpleSLF4JLogChute.class.getName() );
// velocity.setProperty("runtime.log.logsystem.log4j.logger",
@@ -68,15 +72,17 @@ public class SimpleVelocityServlet exten
return functions ;
}
- public String getDocBase()
- {
- return docbase ;
- }
-
- public void setDocBase(String docbase)
- {
- this.docbase = docbase ;
- }
+ // Don't allow it to chnage after we're started.
+// public String getDocBase()
+// {
+// return docbase ;
+// }
+//
+// public void setDocBase(String docbase)
+// {
+// velocity.setProperty( RuntimeConstants.FILE_RESOURCE_LOADER_PATH, docbase) ;
+// this.docbase = docbase ;
+// }
// See also
@Override
@@ -95,9 +101,7 @@ public class SimpleVelocityServlet exten
{
try {
VelocityContext context = new VelocityContext(datamodel) ;
- // TODO - better?
String path = path(req) ;
- path = docbase+path ;
Template temp = velocity.getTemplate(path) ;
context.put("request", req) ;
resp.setCharacterEncoding("UTF-8") ;