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/10/03 15:46:56 UTC
svn commit: r1393487 - in /jena/trunk/jena-fuseki: run_cp run_fuseki
src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
Author: andy
Date: Wed Oct 3 13:46:56 2012
New Revision: 1393487
URL: http://svn.apache.org/viewvc?rev=1393487&view=rev
Log:
Weird version errors.
Modified:
jena/trunk/jena-fuseki/run_cp
jena/trunk/jena-fuseki/run_fuseki
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
Modified: jena/trunk/jena-fuseki/run_cp
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_cp?rev=1393487&r1=1393486&r2=1393487&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_cp (original)
+++ jena/trunk/jena-fuseki/run_cp Wed Oct 3 13:46:56 2012
@@ -1,6 +1,6 @@
#!/bin/bash
M2_REPO="${M2_REPO:-$HOME/.m2/repository}"
-CP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.7.4-SNAPSHOT/jena-core-2.7.4-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.4-SNAPSHOT/jena-iri-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:/home/afs/.m2/repo/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/0.9.4-SNAPSHOT/jena-tdb-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.9/junit-4.9.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/7.5.4.v
20111024/jetty-server-7.5.4.v20111024.jar:/home/afs/.m2/repo/javax/servlet/servlet-api/2.5/servlet-api-2.5.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/7.5.4.v20111024/jetty-continuation-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/7.5.4.v20111024/jetty-http-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/7.5.4.v20111024/jetty-io-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/7.5.4.v20111024/jetty-servlet-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/7.5.4.v20111024/jetty-security-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/7.5.4.v20111024/jetty-servlets-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/7.5.4.v20111024/jetty-client-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/7.5.4.v20111024/jetty-util-7.5.4.v20111024.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/7.5.4.v20111024/jetty-xml-7.5.4.v
20111024.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
+CP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.9.4-SNAPSHOT/jena-arq-2.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.5/commons-codec-1.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.1.3/httpcore-4.1.3.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.7.4-SNAPSHOT/jena-core-2.7.4-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.4-SNAPSHOT/jena-iri-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.10.0/xercesImpl-2.10.0.jar:/home/afs/.m2/repo/xml-apis/xml-apis/1.4.01/xml-apis-1.4.01.jar:/home/afs/.m2/repo/org/apache/jena/jena-tdb/0.9.4-SNAPSHOT/jena-tdb-0.9.4-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.9/junit-4.9.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.1/hamcrest-core-1.1.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.1.2/httpclient-4.1.2.jar:/home/afs/.m2/repo/commons-fileupload/commons-fileupload/1.2.2/commons-fileupload-1.2.2.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/7.6.5.v
20120716/jetty-server-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/orbit/javax.servlet/2.5.0.v201103041518/javax.servlet-2.5.0.v201103041518.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/7.6.5.v20120716/jetty-continuation-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/7.6.5.v20120716/jetty-http-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/7.6.5.v20120716/jetty-io-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/7.6.5.v20120716/jetty-servlet-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/7.6.5.v20120716/jetty-security-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/7.6.5.v20120716/jetty-servlets-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/7.6.5.v20120716/jetty-client-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/7.6.5.v20120716/jetty-util-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/eclipse/jet
ty/jetty-xml/7.6.5.v20120716/jetty-xml-7.6.5.v20120716.jar:/home/afs/.m2/repo/org/apache/velocity/velocity/1.7/velocity-1.7.jar:/home/afs/.m2/repo/commons-collections/commons-collections/3.2.1/commons-collections-3.2.1.jar:/home/afs/.m2/repo/commons-lang/commons-lang/2.4/commons-lang-2.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-api/1.6.4/slf4j-api-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/slf4j-log4j12/1.6.4/slf4j-log4j12-1.6.4.jar:/home/afs/.m2/repo/org/slf4j/jcl-over-slf4j/1.6.4/jcl-over-slf4j-1.6.4.jar:/home/afs/.m2/repo/log4j/log4j/1.2.16/log4j-1.2.16.jar"
echo "$CP"
Modified: jena/trunk/jena-fuseki/run_fuseki
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_fuseki?rev=1393487&r1=1393486&r2=1393487&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_fuseki (original)
+++ jena/trunk/jena-fuseki/run_fuseki Wed Oct 3 13:46:56 2012
@@ -4,7 +4,7 @@
## Run Fuseki, include development code if it looks like it's available.
## Or --pages=
-export FUSEKI_HOME=${FUSEKI_HOME:-$HOME/Projects/Fuseki}
+export FUSEKI_HOME=${FUSEKI_HOME:-$HOME/Jena/jena-fuseki}
if [ ! -e $FUSEKI_HOME ]
then
echo "$FUSEKI_HOME does not exist" 1>&2
@@ -16,25 +16,14 @@ then
exit 1
fi
-## M2_REPO="/home/afs/.m2/repo" ;
-## X=$(perl -ne 'next unless /\spath="M2_REPO([^"]*)"/ ; print "$1","\n"' .classpath)
-##
-## CP=
-## for x in $X
-## do
-## CP="$CP:$M2_REPO$x"
-## done
-## CP="classes$CP"
-
CP="$(. $FUSEKI_HOME/run_cp)"
-if [ -e "$FUSEKI_HOME/target/classes" ]
-then
- CP="$FUSEKI_HOME/target/classes:$CP"
- fi
if [ -e "$FUSEKI_HOME/classes" ]
then
CP="$FUSEKI_HOME/classes:$CP"
- fi
+elif [ -e "$FUSEKI_HOME/target/classes" ]
+then
+ CP="$FUSEKI_HOME/target/classes:$CP"
+fi
FUSEKI_LOG=${FUSEKI_LOG:-} # "-D-Dlog4j.configuration=file:$FUSEKI_HOME/log4j.properties"
JVM_ARGS="${JVM_ARGS:--Xmx1200M}"
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java?rev=1393487&r1=1393486&r2=1393487&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/SPARQL_Query.java Wed Oct 3 13:46:56 2012
@@ -360,10 +360,6 @@ public abstract class SPARQL_Query exten
return out.asString() ;
}
- /**
- * @param queryURI
- * @return
- */
private String getRemoteString(String queryURI)
{
return WebIO.exec_get(queryURI) ;
Modified: jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java?rev=1393487&r1=1393486&r2=1393487&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java (original)
+++ jena/trunk/jena-fuseki/src/main/java/org/apache/jena/fuseki/servlets/ServletBase.java Wed Oct 3 13:46:56 2012
@@ -47,6 +47,7 @@ public abstract class ServletBase extend
{
try { response.sendError(statusCode, message) ; }
catch (IOException ex) { errorOccurred(ex) ; }
+ catch (IllegalStateException ex) { }
}
protected void responseSendError(HttpServletResponse response, int statusCode)