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/14 12:45:20 UTC
svn commit: r1243884 - in /incubator/jena/Jena2/Fuseki/trunk: DEPENDENCIES
DemoServer/ DemoServer/README DemoServer/runserver fuseki fuseki-server
src-dev/dev/RunFuseki.java
src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
Author: andy
Date: Tue Feb 14 11:45:20 2012
New Revision: 1243884
URL: http://svn.apache.org/viewvc?rev=1243884&view=rev
Log:
Fix data loading in general SPARQL processor (default to RDF/XML).
Clean up demo app for running on sparql.org.
Modified:
incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES
incubator/jena/Jena2/Fuseki/trunk/DemoServer/ (props changed)
incubator/jena/Jena2/Fuseki/trunk/DemoServer/README
incubator/jena/Jena2/Fuseki/trunk/DemoServer/runserver
incubator/jena/Jena2/Fuseki/trunk/fuseki
incubator/jena/Jena2/Fuseki/trunk/fuseki-server
incubator/jena/Jena2/Fuseki/trunk/src-dev/dev/RunFuseki.java
incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
Modified: incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES (original)
+++ incubator/jena/Jena2/Fuseki/trunk/DEPENDENCIES Tue Feb 14 11:45:20 2012
@@ -1,4 +1,4 @@
-This file lists the dependences for ARQ.
+This file lists the dependences for Apache Jena Fuseki.
Version numbers are given in the POM file for a particular distribution.
Apache Projects: Apache Software License
Propchange: incubator/jena/Jena2/Fuseki/trunk/DemoServer/
------------------------------------------------------------------------------
--- svn:ignore (added)
+++ svn:ignore Tue Feb 14 11:45:20 2012
@@ -0,0 +1 @@
+log.fuseki
Modified: incubator/jena/Jena2/Fuseki/trunk/DemoServer/README
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/DemoServer/README?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/DemoServer/README (original)
+++ incubator/jena/Jena2/Fuseki/trunk/DemoServer/README Tue Feb 14 11:45:20 2012
@@ -1,4 +1,10 @@
Run:
+
+export FUSEKI_HOME=installation directory
+cd Demo directory
+
+Setup fuseki.
+cd to this directory.
runserver
[
Modified: incubator/jena/Jena2/Fuseki/trunk/DemoServer/runserver
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/DemoServer/runserver?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/DemoServer/runserver (original)
+++ incubator/jena/Jena2/Fuseki/trunk/DemoServer/runserver Tue Feb 14 11:45:20 2012
@@ -1,6 +1,32 @@
#!/bin/bash
-export FUSEKIROOT="$PWD"
+[ "$FUSEKI_HOME" = "" ] && { echo "\$FUSEKI_HOME not set" 1>&2 ; exit 1 ; }
+
+if [ ! -d "$FUSEKI_HOME" ]
+then
+ echo "$FUSEKI_HOME: Not a directory" 1>&2
+ exit 1
+ fi
+
+CMD1="$FUSEKI_HOME/fuseki-server"
+CMD2="$FUSEKI_HOME/fuseki"
+FUSEKI_CMD=
+
+if [ -e "$CMD1" ]
+then
+ FUSEKI_CMD="$CMD1"
+fi
+
+if [ -e "$FUSEKI_HOME/classes" ]
+then
+ FUSEKI_CMD="$CMD2"
+fi
+
+if [ ! -e "$FUSEKI_CMD" ]
+then
+ echo "Can't find a server script to run" 1>&2
+ exit 1
+fi
BACKGROUND=${BACKGROUND:-1}
if [ "$BACKGROUND" = 0 ]
@@ -11,18 +37,22 @@ else
fi
LOG1="-Dlog4j.configuration=${LOGCONFIG}"
-LOG2="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger"
-export FUSEKI_LOG="$LOG1 $LOG2"
+
+#LOG2="-Dorg.apache.commons.logging.Log=org.apache.commons.logging.impl.Log4JLogger"
+#export FUSEKI_LOG="$LOG1 $LOG2"
+
+export FUSEKI_LOG="$LOG1"
+export JVM_ARGS="-Xmx1200M $FUSEKI_LOG"
if [ "$BACKGROUND" = 0 ]
then
# Run in the foreground
- exec fuseki --pages=demo-pages --config config.ttl
+ exec $FUSEKI_CMD --pages=demo-pages --config config.ttl
else
# Run in the background
# Linux / nohup
- nohup fuseki --pages=demo-pages --config config.ttl > nohup.log 2>&1 &
+ nohup $FUSEKI_CMD --pages=demo-pages --config config.ttl > nohup.log 2>&1 &
# Process ID ... of the script.
- ## PROC=$!
- ## echo "Server process = $PROC"
+ PROC=$!
+ echo "Server process = $PROC"
fi
Modified: incubator/jena/Jena2/Fuseki/trunk/fuseki
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/fuseki?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/fuseki (original)
+++ incubator/jena/Jena2/Fuseki/trunk/fuseki Tue Feb 14 11:45:20 2012
@@ -1,8 +1,6 @@
#!/bin/bash
-## Run in development area.
-## Look for file names and make absolute before doing a cd.
-## Or use --fuseki_home= to find the HTML files
+## Run Fuseki, include development code if it looks liek it's available.
## Or --pages=
export FUSEKI_HOME=${FUSEKI_HOME:-$HOME/Projects/Fuseki}
@@ -37,10 +35,9 @@ then
CP="$FUSEKI_HOME/classes:$CP"
fi
-FUSEKI_LOG=${FUSEKI_LOG:-} # -D-Dlog4j.configuration=file:log4j.properties
+FUSEKI_LOG=${FUSEKI_LOG:-} # "-D-Dlog4j.configuration=file:$FUSEKI_HOME/log4j.properties"
JVM_ARGS="-Xmx1200M"
#JVM_ARGS="$JVM_ARGS -XX:MaxDirectMemorySize=1G"
-
-# Cope with the
-exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.FusekiCmd --home="$FUSEKI_HOME" "$@"
+exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.FusekiCmd \
+ --home="$FUSEKI_HOME" "$@"
Modified: incubator/jena/Jena2/Fuseki/trunk/fuseki-server
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/fuseki-server?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/fuseki-server (original)
+++ incubator/jena/Jena2/Fuseki/trunk/fuseki-server Tue Feb 14 11:45:20 2012
@@ -1,7 +1,15 @@
#!/bin/bash
-JAR1="fuseki-server.jar"
-JAR2="target/jena-fuseki-*-server.jar"
+export FUSEKI_HOME=${FUSEKI_HOME:-$PWD}
+
+if [ ! -e $FUSEKI_HOME ]
+then
+ echo "$FUSEKI_HOME does not exist" 1>&2
+ exit 1
+ fi
+
+JAR1="$FUSEKI_HOME/fuseki-server.jar"
+JAR2="$FUSEKI_HOME/jena-fuseki-*-server.jar"
JAR=""
for J in "$JAR1" "$JAR2"
@@ -21,4 +29,6 @@ then
exit 1
fi
-exec java -Xmx1200M -jar "$JAR" "$@"
+JVM_ARGS=${JVM_ARGS:--Xmx1200M}
+
+exec java $JVM_ARGS -jar "$JAR" "$@"
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=1243884&r1=1243883&r2=1243884&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 14 11:45:20 2012
@@ -22,13 +22,35 @@ import org.apache.jena.fuseki.FusekiCmd
public class RunFuseki
{
- public static void main(String[] args) throws Exception
+ public static void main(String[] args)
{
+ demo() ;
FusekiCmd.main("--config=config.ttl") ; System.exit(0) ;
main1() ;
}
- private static void main1() throws Exception
+ public static void demo()
+ {
+ String DIR="DemoServer" ;
+ FusekiCmd.main("--config="+name(DIR,"config.ttl"), "--pages="+name(DIR, "demo-pages")) ;
+ System.exit(0) ;
+ }
+
+ public static String name(String DIR, String filename)
+ {
+ StringBuilder sb = new StringBuilder() ;
+ if ( ! filename.startsWith("/") )
+ {
+ sb.append(DIR) ;
+ if ( ! DIR.endsWith("/") )
+ sb.append("/") ;
+ }
+ sb.append(filename) ;
+ return sb.toString() ;
+ }
+
+
+ private static void main1()
{
FusekiCmd.main(
//"-v",
Modified: incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java
URL: http://svn.apache.org/viewvc/incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java?rev=1243884&r1=1243883&r2=1243884&view=diff
==============================================================================
--- incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java (original)
+++ incubator/jena/Jena2/Fuseki/trunk/src/main/java/org/apache/jena/fuseki/migrate/GraphLoadUtils.java Tue Feb 14 11:45:20 2012
@@ -75,12 +75,12 @@ public class GraphLoadUtils
// ** Worker.
private static void readUtil(Graph graph, String uri, int limit)
{
- Lang lang = Lang.guess(uri) ;
+ Lang lang = Lang.guess(uri, Lang.RDFXML) ;
Sink<Triple> sink = new SinkTriplesToGraph(graph) ;
sink = new SinkLimited<Triple>(sink, limit) ;
- // TODO Conneg
+ // TODO Conneg - awiting RIOT code upgrade.
// WebReader.
InputStream input = Fuseki.webFileManager.open(uri) ;