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 2014/01/21 22:43:12 UTC
svn commit: r1560209 - in /jena/branches/jena-fuseki-new-ui:
docs/fuseki-security.md run-fuseki run_cp run_fuseki
src/main/java/org/apache/jena/fuseki/FusekiCmd.java
Author: andy
Date: Tue Jan 21 21:43:11 2014
New Revision: 1560209
URL: http://svn.apache.org/r1560209
Log:
Add --mgt flag, which enables the admin functions.\nPlaceholder for security doc.\nSort out cmd line dev script.
Added:
jena/branches/jena-fuseki-new-ui/docs/fuseki-security.md
jena/branches/jena-fuseki-new-ui/run-fuseki (with props)
Removed:
jena/branches/jena-fuseki-new-ui/run_fuseki
Modified:
jena/branches/jena-fuseki-new-ui/run_cp
jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
Added: jena/branches/jena-fuseki-new-ui/docs/fuseki-security.md
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/docs/fuseki-security.md?rev=1560209&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/docs/fuseki-security.md (added)
+++ jena/branches/jena-fuseki-new-ui/docs/fuseki-security.md Tue Jan 21 21:43:11 2014
@@ -0,0 +1,12 @@
+## SPARQL etc from Java
+
+> _@@_ Placeholder.
+
+Provided by [Apache Shiro](http://shiro.apache.org/).
+
+Defaults:
+
+Datsets are open
+
+Admin functions that require security use, by default, user 'admin', password 'pw'.
+
Added: jena/branches/jena-fuseki-new-ui/run-fuseki
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/run-fuseki?rev=1560209&view=auto
==============================================================================
--- jena/branches/jena-fuseki-new-ui/run-fuseki (added)
+++ jena/branches/jena-fuseki-new-ui/run-fuseki Tue Jan 21 21:43:11 2014
@@ -0,0 +1,62 @@
+#!/usr/bin/env bash
+
+# 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.
+
+## Run Fuseki, include development code if it looks like it's available.
+## Or --pages=
+
+export FUSEKI_HOME=$PWD
+if [ ! -e $FUSEKI_HOME ]
+then
+ echo "$FUSEKI_HOME does not exist" 1>&2
+ exit 1
+ fi
+if [ ! -d $FUSEKI_HOME ]
+then
+ echo "$FUSEKI_HOME exists but is not a directory" 1>&2
+ exit 1
+ fi
+
+CP="$(. $FUSEKI_HOME/run_cp)"
+
+if [ -e "$FUSEKI_HOME/classes" ]
+then
+ CP="$FUSEKI_HOME/classes:$CP"
+elif [ -e "$FUSEKI_HOME/target/classes" ]
+then
+ CP="$FUSEKI_HOME/target/classes:$CP"
+fi
+
+# Prepend any development directories here
+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:-}
+JVM_ARGS="${JVM_ARGS:--Xmx1200M}"
+#JVM_ARGS="$JVM_ARGS -XX:MaxDirectMemorySize=1G"
+
+# echo $CP
+
+exec java -cp "$CP" $JVM_ARGS $FUSEKI_LOG org.apache.jena.fuseki.FusekiCmd \
+ --home="$FUSEKI_HOME" "$@"
Propchange: jena/branches/jena-fuseki-new-ui/run-fuseki
------------------------------------------------------------------------------
svn:executable = *
Modified: jena/branches/jena-fuseki-new-ui/run_cp
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/run_cp?rev=1560209&r1=1560208&r2=1560209&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/run_cp (original)
+++ jena/branches/jena-fuseki-new-ui/run_cp Tue Jan 21 21:43:11 2014
@@ -1,6 +1,6 @@
#!/bin/bash
-XCP="/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.1-SNAPSHOT/jena-arq-2.11.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.1-SNAPSHOT/jena-arq-2.11.1-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.11.1-SNAPSHOT/jena-core-2.11.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/1.0.1-SNAPSHOT/jena-iri-1.0.1-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/1.0.1-SNAPSHOT/jena-tdb-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-text/1.0.1-SNAPSHOT/jena-text-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/apache-jena-libs/2.11.1-SNAPSHOT/apache-jena-libs-2.11.1-SNAPSHOT.pom:/home/afs/.m2/repo/org/apache/lucene/lucene-core/4.3.1/lucene-core-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-analyzers-common/4.3.1/lucene-analyzers-common-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/luce
ne-queryparser/4.3.1/lucene-queryparser-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-queries/4.3.1/lucene-queries-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-sandbox/4.3.1/lucene-sandbox-4.3.1.jar:/home/afs/.m2/repo/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar:/home/afs/.m2/repo/org/apache/solr/solr-solrj/4.3.1/solr-solrj-4.3.1.jar:/home/afs/.m2/repo/org/apache/zookeeper/zookeeper/3.4.5/zookeeper-3.4.5.jar:/home/afs/.m2/repo/commons-io/commons-io/2.1/commons-io-2.1.jar:/home/afs/.m2/repo/org/noggit/noggit/0.5/noggit-0.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar:/home/afs/.m2/repo/org/codehaus/woodstox/wstx-asl/3.2.7/wstx-asl-3.2.7.jar:/home/afs/.m2/repo/org/apache/jena/jena-spatial/1.0.1-SNAPSHOT/jena-spatial-1.0.1-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-spatial/4.3.1/lucene-spatial-4.3.1.jar:/home/afs/.m2/repo/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar:/home/afs/.m2/repo/junit/junit/4.11/jun
it-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.11.v20130520/jetty-server-8.1.11.v20130520.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.11.v20130520/jetty-continuation-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520
/jetty-servlet-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlets/8.1.11.v20130520/jetty-servlets-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.11.v20130520/jetty-client-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/8.1.11.v20130520/jetty-security-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.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.11.2-SNAPSHOT/jena-arq-2.11.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-arq/2.11.2-SNAPSHOT/jena-arq-2.11.2-SNAPSHOT-tests.jar:/home/afs/.m2/repo/org/apache/jena/jena-core/2.11.2-SNAPSHOT/jena-core-2.11.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-iri/1.0.2-SNAPSHOT/jena-iri-1.0.2-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/1.0.2-SNAPSHOT/jena-tdb-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/jena-text/1.0.2-SNAPSHOT/jena-text-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/jena/apache-jena-libs/2.11.2-SNAPSHOT/apache-jena-libs-2.11.2-SNAPSHOT.pom:/home/afs/.m2/repo/org/apache/lucene/lucene-core/4.3.1/lucene-core-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-analyzers-common/4.3.1/lucene-analyzers-common-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/luce
ne-queryparser/4.3.1/lucene-queryparser-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-queries/4.3.1/lucene-queries-4.3.1.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-sandbox/4.3.1/lucene-sandbox-4.3.1.jar:/home/afs/.m2/repo/jakarta-regexp/jakarta-regexp/1.4/jakarta-regexp-1.4.jar:/home/afs/.m2/repo/org/apache/solr/solr-solrj/4.3.1/solr-solrj-4.3.1.jar:/home/afs/.m2/repo/org/apache/zookeeper/zookeeper/3.4.5/zookeeper-3.4.5.jar:/home/afs/.m2/repo/commons-io/commons-io/2.1/commons-io-2.1.jar:/home/afs/.m2/repo/org/noggit/noggit/0.5/noggit-0.5.jar:/home/afs/.m2/repo/org/apache/httpcomponents/httpmime/4.2.3/httpmime-4.2.3.jar:/home/afs/.m2/repo/org/codehaus/woodstox/wstx-asl/3.2.7/wstx-asl-3.2.7.jar:/home/afs/.m2/repo/org/apache/jena/jena-spatial/1.0.2-SNAPSHOT/jena-spatial-1.0.2-SNAPSHOT.jar:/home/afs/.m2/repo/org/apache/lucene/lucene-spatial/4.3.1/lucene-spatial-4.3.1.jar:/home/afs/.m2/repo/com/spatial4j/spatial4j/0.3/spatial4j-0.3.jar:/home/afs/.m2/repo/org/apache/shiro/shi
ro-core/1.2.2/shiro-core-1.2.2.jar:/home/afs/.m2/repo/commons-beanutils/commons-beanutils/1.8.3/commons-beanutils-1.8.3.jar:/home/afs/.m2/repo/org/apache/shiro/shiro-web/1.2.2/shiro-web-1.2.2.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-webapp/8.1.11.v20130520/jetty-webapp-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-xml/8.1.11.v20130520/jetty-xml-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-servlet/8.1.11.v20130520/jetty-servlet-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-security/
8.1.11.v20130520/jetty-security-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-server/8.1.11.v20130520/jetty-server-8.1.11.v20130520.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-servlets/8.1.11.v20130520/jetty-servlets-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-continuation/8.1.11.v20130520/jetty-continuation-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-client/8.1.11.v20130520/jetty-client-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-http/8.1.11.v20130520/jetty-http-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-io/8.1.11.v20130520/jetty-io-8.1.11.v20130520.jar:/home/afs/.m2/repo/org/eclipse/jetty/jetty-util/8.1.11.v20130520/jetty-util-8.1.11.v20130520.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-lo
g4j12-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"
if [ "$CP" != '' ]
then
Modified: jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java
URL: http://svn.apache.org/viewvc/jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java?rev=1560209&r1=1560208&r2=1560209&view=diff
==============================================================================
--- jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java (original)
+++ jena/branches/jena-fuseki-new-ui/src/main/java/org/apache/jena/fuseki/FusekiCmd.java Tue Jan 21 21:43:11 2014
@@ -134,6 +134,7 @@ public class FusekiCmd extends CmdARQ {
// pages/control/
// pages/query/ or /pages/sparql/
+ private static ArgDecl argMgt = new ArgDecl(ArgDecl.NoValue, "mgt") ;
private static ArgDecl argMgtPort = new ArgDecl(ArgDecl.HasValue, "mgtPort", "mgtport") ;
private static ArgDecl argMem = new ArgDecl(ArgDecl.NoValue, "mem") ;
private static ArgDecl argAllowUpdate = new ArgDecl(ArgDecl.NoValue, "update", "allowUpdate") ;
@@ -227,7 +228,8 @@ public class FusekiCmd extends CmdARQ {
add(argJettyConfig, "--jetty-config=FILE", "Set up the server (not services) with a Jetty XML file") ;
add(argBasicAuth, "--basic-auth=FILE",
"Configure basic auth using provided Jetty realm file, ignored if --jetty-config is used") ;
- add(argMgtPort, "--mgtPort=port", "Enable the management commands on the given port") ;
+ add(argMgt, "--mgt", "Enable the management commands") ;
+ add(argMgtPort, "--mgtPort=port", "Port for management optations") ;
add(argHome, "--home=DIR", "Root of Fuseki installation (overrides environment variable FUSEKI_HOME)") ;
add(argGZip, "--gzip=on|off", "Enable GZip compression (HTTP Accept-Encoding) if request header set") ;
@@ -350,12 +352,18 @@ public class FusekiCmd extends CmdARQ {
}
}
- if ( contains(argMgtPort) ) {
- String mgtPortStr = getValue(argMgtPort) ;
- try {
- jettyServerConfig.mgtPort = Integer.parseInt(mgtPortStr) ;
- } catch (NumberFormatException ex) {
- throw new CmdException(argMgtPort.getKeyName() + " : bad port number: " + mgtPortStr) ;
+ if ( ! contains(argMgt) && contains(argMgtPort) )
+ Fuseki.configLog.warn("Management port specified by admin fucntions not enabled with --"+argMgt.getKeyName()) ;
+
+ if ( contains(argMgt) ) {
+ jettyServerConfig.mgtPort = 0 ;
+ if ( contains(argMgtPort) ) {
+ String mgtPortStr = getValue(argMgtPort) ;
+ try {
+ jettyServerConfig.mgtPort = Integer.parseInt(mgtPortStr) ;
+ } catch (NumberFormatException ex) {
+ throw new CmdException("--"+argMgtPort.getKeyName() + " : bad port number: " + mgtPortStr) ;
+ }
}
}