jena git commit: Better running Fuseki in development mode

[an...@apache.org]

Repository: jena
Updated Branches:
  refs/heads/master c1ab03279 -> b81b98155


Better running Fuseki in development mode


Project: http://git-wip-us.apache.org/repos/asf/jena/repo
Commit: http://git-wip-us.apache.org/repos/asf/jena/commit/b81b9815
Tree: http://git-wip-us.apache.org/repos/asf/jena/tree/b81b9815
Diff: http://git-wip-us.apache.org/repos/asf/jena/diff/b81b9815

Branch: refs/heads/master
Commit: b81b98155aca1d32b08014113d62dee8f0ba9c04
Parents: c1ab032
Author: Andy Seaborne <an...@apache.org>
Authored: Mon Mar 2 12:21:47 2015 +0000
Committer: Andy Seaborne <an...@apache.org>
Committed: Mon Mar 2 12:21:47 2015 +0000

----------------------------------------------------------------------
 jena-fuseki2/jena-fuseki-core/fuseki-dev  |  6 ++--
 jena-fuseki2/jena-fuseki-core/make_cp_mvn | 50 --------------------------
 2 files changed, 3 insertions(+), 53 deletions(-)
----------------------------------------------------------------------


http://git-wip-us.apache.org/repos/asf/jena/blob/b81b9815/jena-fuseki2/jena-fuseki-core/fuseki-dev
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/fuseki-dev b/jena-fuseki2/jena-fuseki-core/fuseki-dev
index d82c726..efc9e7e 100755
--- a/jena-fuseki2/jena-fuseki-core/fuseki-dev
+++ b/jena-fuseki2/jena-fuseki-core/fuseki-dev
@@ -40,13 +40,13 @@ export FUSEKI_BASE="${FUSEKI_BASE:-$FUSEKI_HOME/run}"
 check_dir "FUSEKI_BASE" "$FUSEKI_BASE"
 
 CPF="$FUSEKI_HOME/fuseki.classpath"
-
 if [ ! -e "$CPF" ]; then
     echo "Need to create Fuseki classpath file"
+    echo "Ensure maven is upto date with the lest snapshots and then run"
+    echo -e "cd $FUSEKI_HOME ; \nmvn dependency:build-classpath -Dmdep.outputFile=fuseki.classpath"
     exit 1
 fi
-
-CP="$(. $CPF)"
+CP="$(cat $CPF)"
 
 # Add development directories.
 if [ -e "$FUSEKI_HOME/classes" ]

http://git-wip-us.apache.org/repos/asf/jena/blob/b81b9815/jena-fuseki2/jena-fuseki-core/make_cp_mvn
----------------------------------------------------------------------
diff --git a/jena-fuseki2/jena-fuseki-core/make_cp_mvn b/jena-fuseki2/jena-fuseki-core/make_cp_mvn
deleted file mode 100755
index 193876b..0000000
--- a/jena-fuseki2/jena-fuseki-core/make_cp_mvn
+++ /dev/null
@@ -1,50 +0,0 @@
-#!/usr/bin/env perl
-# Licensed to the Apache Software Foundation (ASF) under one
-# or more contributor license agreements.  See the NOTICE file
-# distributed with this work for additional information
-# regarding copyright ownership.  The ASF licenses this file
-# to you under the Apache License, Version 2.0 (the
-# "License"); you may not use this file except in compliance
-# with the License.  You may obtain a copy of the License at
-#
-#     http://www.apache.org/licenses/LICENSE-2.0
-#
-# Unless required by applicable law or agreed to in writing, software
-# distributed under the License is distributed on an "AS IS" BASIS,
-# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-# See the License for the specific language governing permissions and
-# limitations under the License.
-
-# Make the maven classpath
-
-$POM="pom.xml" ;
-$POM = @ARGV[0] if ( defined(@ARGV[0]) ) ;
-
-if ( ! -e "$POM" )
-{
-    print STDERR "No POM file: $POM\n" ;
-    exit 1 ;
-}
-$M2=$ENV{'M2_REPO'} ;
-print "#!/bin/bash\n" ;
-print "\n" ;
-print 'XCP="' ;
-
-open(X, "mvn -f $POM dependency:build-classpath -DincludeScope=runtime |") ;
-while(<X>)
-{
-    next if /\[INFO\]/ ;
-    next if /^Download/ ;
-    chop ;
-    #s!$M2/org/apache/jena/jena-[^/]*/[^/]*/[^/]*.jar:!!g ;
-    print "$_" ;
-}
-print "\"\n" ;
-print "\n" ;
-
-print "if [ \"\$CP\" != \'\' ]\n" ;
-print "then\n" ;
-print "   XCP=\"\$CP:\$XCP\"\n" ;
-print "fi\n" ;
-print "\n" ;
-print "echo \"\$XCP\"\n"