Return-Path: X-Original-To: apmail-jena-commits-archive@www.apache.org Delivered-To: apmail-jena-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id BCBCAF1C0 for ; Thu, 11 Apr 2013 16:29:02 +0000 (UTC) Received: (qmail 39924 invoked by uid 500); 11 Apr 2013 16:29:02 -0000 Delivered-To: apmail-jena-commits-archive@jena.apache.org Received: (qmail 39906 invoked by uid 500); 11 Apr 2013 16:29:02 -0000 Mailing-List: contact commits-help@jena.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@jena.apache.org Delivered-To: mailing list commits@jena.apache.org Received: (qmail 39887 invoked by uid 99); 11 Apr 2013 16:29:02 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 16:29:02 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Thu, 11 Apr 2013 16:28:52 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 32A4423888E4; Thu, 11 Apr 2013 16:28:32 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1466950 - in /jena/trunk/jena-fuseki: make_cp_mvn run_cp run_fuseki Date: Thu, 11 Apr 2013 16:28:32 -0000 To: commits@jena.apache.org From: andy@apache.org X-Mailer: svnmailer-1.0.8-patched Message-Id: <20130411162832.32A4423888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: andy Date: Thu Apr 11 16:28:31 2013 New Revision: 1466950 URL: http://svn.apache.org/r1466950 Log: Allow for environment variable CP to add to the classpath Modified: jena/trunk/jena-fuseki/make_cp_mvn jena/trunk/jena-fuseki/run_cp 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=1466950&r1=1466949&r2=1466950&view=diff ============================================================================== --- jena/trunk/jena-fuseki/make_cp_mvn (original) +++ jena/trunk/jena-fuseki/make_cp_mvn Thu Apr 11 16:28:31 2013 @@ -12,7 +12,7 @@ if ( ! -e "$POM" ) $M2=$ENV{'M2_REPO'} ; print "#!/bin/bash\n" ; print "\n" ; -print 'CP="' ; +print 'XCP="' ; open(X, "mvn -f $POM dependency:build-classpath |") ; while() @@ -25,5 +25,11 @@ while() } print "\"\n" ; print "\n" ; -print "echo \"\$CP\"\n" + +print "if [ \"\$CP\" != \'\' ]\n" ; +print "then\n" ; +print " XCP=\"\$CP:\$XCP\"\n" ; +print "fi\n" ; +print "\n" ; +print "echo \"\$XCP\"\n" Modified: jena/trunk/jena-fuseki/run_cp URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_cp?rev=1466950&r1=1466949&r2=1466950&view=diff ============================================================================== --- jena/trunk/jena-fuseki/run_cp (original) +++ jena/trunk/jena-fuseki/run_cp Thu Apr 11 16:28:31 2013 @@ -1,5 +1,10 @@ #!/bin/bash -CP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.10.1-SNAPSHOT/jena-arq-2.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.10.1-SNAPSHOT/jena-arq-2.10.1-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.10.1-SNAPSHOT/jena-core-2.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-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.10.1-SNAPSHOT/jena-tdb-0.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.11/junit-4.11.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.6/commons-codec-1.6.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/8.1.8.v20121106/jetty-server-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/8.1.8.v20121106/jetty-continuation-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.8.v20121106/jetty-http-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.8.v20121106/jetty-io-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.8.v20121106/jetty-servlet-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/8.1.8.v20121106/jetty-security-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/8.1.8.v20121106/jetty-servlets-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.8.v20121106/jetty-client-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/ecl ipse/jetty/jetty-util/8.1.8.v20121106/jetty-util-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.8.v20121106/jetty-xml-8.1.8.v20121106.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" +XCP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.10.1-SNAPSHOT/jena-arq-2.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.10.1-SNAPSHOT/jena-arq-2.10.1-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.10.1-SNAPSHOT/jena-core-2.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/0.9.6-SNAPSHOT/jena-iri-0.9.6-SNAPSHOT.jar:/home/afs/.m2/repo/xerces/xercesImpl/2.11.0/xercesImpl-2.11.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.10.1-SNAPSHOT/jena-tdb-0.10.1-SNAPSHOT.jar:/home/afs/.m2/repo/junit/junit/4.11/junit-4.11.jar:/home/afs/.m2/repo/org/hamcrest/hamcrest-core/1.3/hamcrest-core-1.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpclient/4.2.3/httpclient-4.2.3.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpcore/4.2.2/httpcore-4.2.2.jar:/home/afs/.m2/repo/commons-codec/commons-codec/1.6/commons-codec-1.6.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/8.1.8.v20121106/jetty-server-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/orbit/javax.servlet/3.0.0.v201112011016/javax.servlet-3.0.0.v201112011016.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/8.1.8.v20121106/jetty-continuation-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.8.v20121106/jetty-http-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.8.v20121106/jetty-io-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.8.v20121106/jetty-servlet-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/8.1.8.v20121106/jetty-security-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/8.1.8.v20121106/jetty-servlets-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.8.v20121106/jetty-client-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/ec lipse/jetty/jetty-util/8.1.8.v20121106/jetty-util-8.1.8.v20121106.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.8.v20121106/jetty-xml-8.1.8.v20121106.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" +if [ "$CP" != '' ] +then + XCP="$CP:$XCP" +fi + +echo "$XCP" Modified: jena/trunk/jena-fuseki/run_fuseki URL: http://svn.apache.org/viewvc/jena/trunk/jena-fuseki/run_fuseki?rev=1466950&r1=1466949&r2=1466950&view=diff ============================================================================== --- jena/trunk/jena-fuseki/run_fuseki (original) +++ jena/trunk/jena-fuseki/run_fuseki Thu Apr 11 16:28:31 2013 @@ -32,6 +32,7 @@ then fi CP="$(. $FUSEKI_HOME/run_cp)" + if [ -e "$FUSEKI_HOME/classes" ] then CP="$FUSEKI_HOME/classes:$CP"