svn commit: r1438923 - in /jena/trunk/jena-fuseki: make_cp_mvn run_fuseki

[an...@apache.org]

Author: andy
Date: Sat Jan 26 17:42:37 2013
New Revision: 1438923

URL: http://svn.apache.org/viewvc?rev=1438923&view=rev
Log:
Minor improvement to the development-only run script

Modified:
    jena/trunk/jena-fuseki/make_cp_mvn
    jena/trunk/jena-fuseki/run_fuseki

Modified: jena/trunk/jena-fuseki/make_cp_mvn
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/make_cp_mvn?rev=1438923&r1=1438922&r2=1438923&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/make_cp_mvn (original)
+++ jena/trunk/jena-fuseki/make_cp_mvn Sat Jan 26 17:42:37 2013
@@ -1,9 +1,6 @@
 #!/usr/bin/perl
 # Write a run script.
 
-
-
-
 $POM="pom.xml" ;
 $POM = @ARGV[0] if ( defined(@ARGV[0]) ) ;
 
@@ -12,13 +9,10 @@ if ( ! -e "$POM" )
     print STDERR "No POM file: $POM\n" ;
     exit 1 ;
 }
-
+$M2=$ENV{'M2_REPO'} ;
 print "#!/bin/bash\n" ;
-print 'M2_REPO="${M2_REPO:-$HOME/.m2/repository}"' ;
-print "\n" ;
 print "\n" ;
 print 'CP="' ;
-$first = 1 ;
 
 open(X, "mvn -f $POM dependency:build-classpath |") ;
 while(<X>)
@@ -26,19 +20,9 @@ while(<X>)
     next if /\[INFO\]/ ;
     next if /^Download/ ;
     chop ;
+    #s!$M2/org/apache/jena/jena-[^/]*/[^/]*/[^/]*.jar:!!g ;
     print "$_" ;
 }
-## open(X, "mvn dependency:list|") ;
-## 
-## while(<X>)
-## {
-##     next unless /:compile/ ;
-##     ($g,$a,$v) = m/(\S*):(.*):jar:(.*):compile/ ;
-##     $g =~ s!\.!/!g ;
-##     print ":" if ( ! $first ) ;
-##     print "\$M2_REPO/$g/$a/$v/$a-$v.jar" ;
-##     $first = 0 ;
-## }
 print "\"\n" ;
 print "\n" ;
 print "echo \"\$CP\"\n"

Modified: jena/trunk/jena-fuseki/run_fuseki
URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_fuseki?rev=1438923&r1=1438922&r2=1438923&view=diff
==============================================================================
--- jena/trunk/jena-fuseki/run_fuseki (original)
+++ jena/trunk/jena-fuseki/run_fuseki Sat Jan 26 17:42:37 2013
@@ -40,6 +40,10 @@ then
     CP="$FUSEKI_HOME/target/classes:$CP"
 fi
 
+# Prepend any development directories here
+# CP="$FUSEKI_HOME/../jena-tdb/classes:$CP"
+# CP="$FUSEKI_HOME/../jena-arq/classes:$CP"
+
 FUSEKI_LOG=${FUSEKI_LOG:-} # "-D-Dlog4j.configuration=file:$FUSEKI_HOME/log4j.properties"
 JVM_ARGS="${JVM_ARGS:--Xmx1200M}"
 #JVM_ARGS="$JVM_ARGS -XX:MaxDirectMemorySize=1G"