commons: improve maven, new RPM structure

[lgpl/argeo-commons.git] / osgi / dist / osgi-boot / src / main / rpm / usr / sbin / osgi-service

diff --git a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
index 27f6824b92a16ba959577eb96b9d0c2fc6b93348..5c37f9c82f028dd9137559fc03a7fa6b111559ec 100644 (file)
--- a/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
+++ b/osgi/dist/osgi-boot/src/main/rpm/usr/sbin/osgi-service
@@ -24,7 +24,7 @@ RUN_DIR=/var/run/$APP
 PID_FILE=$RUN_DIR/$APP.pid
 SHUTDOWN_FILE=$RUN_DIR/$APP.shutdown
 
-OSGI_INSTALL_AREA=/usr/share/osgiboot/lib
+OSGI_INSTALL_AREA=/usr/share/osgi/boot
 OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar
 
 RETVAL=0
@@ -48,8 +48,6 @@ start() {
        touch $SHUTDOWN_FILE
        cd $EXEC_DIR
        $JVM \
-               -Dosgi.bundles="org.argeo.osgi.boot.jar@start" \
-               -Dargeo.osgi.bundles="$CONF_DIR/modules;in=*,$LIB_DIR;in=*" \
                -Dargeo.osgi.shutdownFile="$SHUTDOWN_FILE" \
                -Dlog4j.configuration="file:$CONF_DIR/log4j.properties" \
                $JAVA_OPTS -jar $OSGI_FRAMEWORK \