X-Git-Url: https://git.argeo.org/?a=blobdiff_plain;f=dist%2Fargeo-node%2Fbase%2Fbin%2Fargeo-cms;h=bf3afa21642151748cd651e86f8a47bf56ed6267;hb=beb9503cba27396ab60a27316f2909613973bf70;hp=d93d89984bb9c84b8073e2be4b8e4ad8092d9156;hpb=dd543bb5e3fd7b3489776e136f8cd1a1716869ad;p=lgpl%2Fargeo-commons.git diff --git a/dist/argeo-node/base/bin/argeo-cms b/dist/argeo-node/base/bin/argeo-cms index d93d89984..bf3afa216 100755 --- a/dist/argeo-node/base/bin/argeo-cms +++ b/dist/argeo-node/base/bin/argeo-cms @@ -4,7 +4,8 @@ APP=argeo JVM=java BIN_DIR=`dirname "$0"` -BASE_DIR=$BIN_DIR/.. +BASE_DIR="$(cd "$(dirname "$0")/.."; pwd -P)" +#BASE_DIR=$BIN_DIR/.. # Directories and files CONF_DIR=$BASE_DIR/etc/$APP @@ -16,6 +17,7 @@ DATA_DIR=$EXEC_DIR/data CONF_RW=$EXEC_DIR/state CONFIG_INI=$CONF_RW/config.ini +A2_SOURCES=a2://$BASE_DIR/share/osgi OSGI_INSTALL_AREA=$BASE_DIR/share/osgi/boot OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar @@ -44,6 +46,7 @@ start() { $JVM \ -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \ $JAVA_OPTS -jar $OSGI_FRAMEWORK \ + -Dargeo.osgi.sources=$A2_SOURCES \ -configuration "$CONF_RW" \ -data "$DATA_DIR" }