svn commit: r1495769 - in /jena/trunk/jena-fuseki: config-tdb-text.ttl run_fuseki

[an...@apache.org]

Author: andy
Date: Sat Jun 22 18:46:28 2013
New Revision: 1495769

URL: http://svn.apache.org/r1495769
Log:
Upgrade TDB+text example

Modified:
    jena/trunk/jena-fuseki/config-tdb-text.ttl
    jena/trunk/jena-fuseki/run_fuseki

Modified: jena/trunk/jena-fuseki/config-tdb-text.ttl
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/config-tdb-text.ttl?rev=1495769&r1=1495768&r2=1495769&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/config-tdb-text.ttl (original)
+++ jena/trunk/jena-fuseki/config-tdb-text.ttl Sat Jun 22 18:46:28 2013
@@ -70,7 +70,8 @@ text:TextIndexLucene  rdfs:subClassOf   
 
 <#entMap> a text:EntityMap ;
     text:entityField      "uri" ;
-    text:defaultField     "text" ; ## Must be defined in the text:maps
+    text:defaultField       "text" ;        ## Can be defined in the text:map if 
+    # text:defaultPredicate   rdfs:label ;   ## or define here.
     text:map (
          # rdfs:label            
          [ text:field "text" ; text:predicate rdfs:label ]

Modified: jena/trunk/jena-fuseki/run_fuseki
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_fuseki?rev=1495769&r1=1495768&r2=1495769&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_fuseki (original)
+++ jena/trunk/jena-fuseki/run_fuseki Sat Jun 22 18:46:28 2013
@@ -42,18 +42,15 @@ then
 fi
 
 # Prepend any development directories here
-CP1="$FUSEKI_HOME/../jena-tdb/classes"
-CP2="$FUSEKI_HOME/../jena-arq/classes"
-
-if [ -e "$CP1" ]
-then
-    CP="$CP1:$CP"
-fi
-if [ -e "$CP2" ]
-then
-    CP="$CP2:$CP"
-fi
-
+DEVDIRS="jena-core jena-tdb jena-arq jena-text"
+for X in $DEVDIRS
+do
+    CPX="$FUSEKI_HOME/../$X/classes"
+    if [ -e "$CPX" ]
+    then
+	CP="$CPX:$CP"
+    fi
+done
 
 FUSEKI_LOG=${FUSEKI_LOG:-} # "-D-Dlog4j.configuration=file:$FUSEKI_HOME/log4j.properties"
 JVM_ARGS="${JVM_ARGS:--Xmx1200M}"