From: Mathieu Baudier Date: Mon, 17 Apr 2017 15:53:52 +0000 (+0200) Subject: Improve packaging X-Git-Tag: argeo-slc-2.1.8~4 X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;h=3afd1b5cdeb8985f7253ca52552bdabce5e6847d;p=gpl%2Fargeo-slc.git Improve packaging --- diff --git a/demo/slc_localrepo.properties b/demo/slc_localrepo.properties index bf1314eef..9e34647a0 100644 --- a/demo/slc_localrepo.properties +++ b/demo/slc_localrepo.properties @@ -23,8 +23,10 @@ org.argeo.tp.factory.extras,\ org.argeo.tp.factory.rcp argeo.node.repo.type=localfs +argeo.node.useradmin.uris=ipa:/// -org.osgi.framework.security=osgi +#org.osgi.framework.security=osgi +java.security.manager= java.security.policy=file:../../all.policy org.osgi.service.http.port=7080 diff --git a/dist/slc/pom.xml b/dist/slc/pom.xml index b96cf8124..938b3503e 100644 --- a/dist/slc/pom.xml +++ b/dist/slc/pom.xml @@ -136,10 +136,34 @@ false - src/main/rpm/usr/bin + rpm/usr/bin + + + + + + + + + + + + + + + + + + + + + + + + /etc/init.d root @@ -148,7 +172,7 @@ false - src/main/rpm/etc/init.d + rpm/etc/init.d @@ -161,7 +185,7 @@ false - src/main/rpm/etc/slc + rpm/etc/slc @@ -173,7 +197,7 @@ false - src/main/rpm/etc/slc-cl + rpm/etc/slc-cl @@ -193,33 +217,32 @@ - - /var/lib/slc/.m2 - slc - slc - 600 - false - - - src/main/rpm/var/lib/slc/.m2 - - - + + + + + + + + + + + + - src/main/scripts/preinstall + rpm/scripts/preinstall - src/main/scripts/postinstall + rpm/scripts/postinstall - src/main/scripts/preremove + rpm/scripts/preremove slc-platform osgi-boot - diff --git a/dist/slc/rpm/etc/init.d/slc b/dist/slc/rpm/etc/init.d/slc new file mode 100644 index 000000000..ef7534ec5 --- /dev/null +++ b/dist/slc/rpm/etc/init.d/slc @@ -0,0 +1,35 @@ +#!/bin/bash +# +# slc Argeo SLC +# +# chkconfig: 3 92 92 +# description: Argeo SLC (http://www.argeo.org) + +# Source function library. +. /etc/osgiboot/osgi-service-init-functions.sh + +# Application id (must be in line with header) +APP=slc + +# main +case "$1" in + start) + osgi_service_start $APP + ;; + stop) + osgi_service_stop $APP + ;; + restart) + osgi_service_stop $APP + osgi_service_start $APP + RETVAL=$? + ;; + status) + osgi_service_status $APP + ;; + *) + echo $"Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/dist/slc/rpm/etc/slc-cl/config.ini b/dist/slc/rpm/etc/slc-cl/config.ini new file mode 100644 index 000000000..31e805ae1 --- /dev/null +++ b/dist/slc/rpm/etc/slc-cl/config.ini @@ -0,0 +1,16 @@ +argeo.osgi.start=\ +org.eclipse.equinox.cm,\ +org.argeo.cms,\ +org.eclipse.gemini.blueprint.extender,\ +org.argeo.slc.agent,\ +org.argeo.slc.agent.jcr,\ + +argeo.node.repo.type=localfs + +# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING + +argeo.osgi.bundles=\ +${user.home}/.slc/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\ +/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\ +/usr/local/share/osgi;in=**/*.jar,\ +/usr/share/osgi;in=**/*.jar diff --git a/dist/slc/rpm/etc/slc-cl/log4j.properties b/dist/slc/rpm/etc/slc-cl/log4j.properties new file mode 100644 index 000000000..42b203845 --- /dev/null +++ b/dist/slc/rpm/etc/slc-cl/log4j.properties @@ -0,0 +1,15 @@ +#log4j.rootLogger=WARN, file +log4j.rootLogger=WARN, console + +## Levels +log4j.logger.org.argeo=INFO + +## Appenders +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n - %t + +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=/var/log/slc/slc.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n diff --git a/dist/slc/rpm/etc/slc/config.ini b/dist/slc/rpm/etc/slc/config.ini new file mode 100644 index 000000000..5ee853630 --- /dev/null +++ b/dist/slc/rpm/etc/slc/config.ini @@ -0,0 +1,55 @@ +argeo.osgi.start.2.http=\ +org.eclipse.equinox.http.servlet,\ +org.eclipse.equinox.http.jetty,\ +org.eclipse.equinox.cm,\ +org.eclipse.rap.rwt.osgi + +argeo.osgi.start.3.node=\ +org.argeo.cms + +argeo.osgi.start.4.apps=\ +org.eclipse.gemini.blueprint.extender + +argeo.osgi.start.4.workbench=\ +org.eclipse.equinox.http.registry,\ + +argeo.osgi.start.5.slc=\ +org.argeo.slc.node.jackrabbit,\ +org.argeo.slc.agent,\ +org.argeo.slc.agent.jcr,\ +org.argeo.slc.server.repo,\ + +argeo.node.repo.type=localfs + +org.osgi.service.http.port=8080 +org.eclipse.equinox.http.jetty.log.stderr.threshold=info + +slc.executionModules=org.argeo.slc.demo.ant,\ +org.argeo.slc.demo.basic,\ +org.argeo.slc.demo.minimal,\ + +org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective + +# OSGi MANAGEMENT +osgi.console=2323 + +# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING +osgi.bundles=org.argeo.osgi.boot.jar@start +argeo.osgi.baseUrl=file:///usr/share/osgi/ +argeo.osgi.distributionUrl=org/argeo/slc/org.argeo.slc.dep.backend/2.1.*/org.argeo.slc.dep.backend-2.1.*.jar +argeo.osgi.bundles=\ +/etc/slc/modules;in=*,\ +/usr/local/share/osgi;in=**/*.jar +#/usr/share/osgi;in=**/*.jar,\ + +org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ +com.sun.jndi.ldap.sasl,\ +com.sun.security.jgss,\ +com.sun.jndi.dns,\ +com.sun.nio.file,\ +com.sun.nio.sctp + +eclipse.ignoreApp=true +osgi.noShutdown=true +org.eclipse.equinox.http.jetty.autostart=false +org.eclipse.rap.workbenchAutostart=false diff --git a/dist/slc/rpm/etc/slc/log4j.properties b/dist/slc/rpm/etc/slc/log4j.properties new file mode 100644 index 000000000..2c130cb5b --- /dev/null +++ b/dist/slc/rpm/etc/slc/log4j.properties @@ -0,0 +1,25 @@ +log4j.rootLogger=WARN, file +#log4j.rootLogger=WARN, console + +## Levels +log4j.logger.org.argeo=INFO +log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR +log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR +log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN + +log4j.logger.org.apache.coyote=INFO +log4j.logger.org.apache.catalina.core.ContainerBase=INFO +log4j.logger.org.apache.directory.server=ERROR +log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR +log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR +log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL + +## Appenders +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n - %t + +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=/var/log/slc/slc.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n diff --git a/dist/slc/rpm/scripts/postinstall b/dist/slc/rpm/scripts/postinstall new file mode 100644 index 000000000..29e582271 --- /dev/null +++ b/dist/slc/rpm/scripts/postinstall @@ -0,0 +1,8 @@ +if [ $1 = "1" ];then + APP=%{name} + /sbin/chkconfig --add $APP + /sbin/chkconfig --level 3 $APP on +fi + +# Workaround until we find a way to do it in the spec file +chown -f slc.slc /var/lib/slc/.m2 diff --git a/dist/slc/rpm/scripts/preinstall b/dist/slc/rpm/scripts/preinstall new file mode 100644 index 000000000..9aa846434 --- /dev/null +++ b/dist/slc/rpm/scripts/preinstall @@ -0,0 +1,16 @@ +if [ $1 = "1" ];then + APP=%{name} + + # check if user exists + /bin/id $APP 2>/dev/null + if [ $? -ne 0 ];then + # create application user (EL6) + echo Create user $APP... + useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP + fi + + # give read access to group on home + chmod g+r /var/lib/$APP + mkdir -p /var/lib/$APP/{conf,data} + chown $APP.$APP /var/lib/$APP/{conf,data} +fi \ No newline at end of file diff --git a/dist/slc/rpm/scripts/preremove b/dist/slc/rpm/scripts/preremove new file mode 100644 index 000000000..b79d26175 --- /dev/null +++ b/dist/slc/rpm/scripts/preremove @@ -0,0 +1,10 @@ +if [ $1 = "0" ];then + #APP=%{name} => doesn't work + APP=slc + /sbin/chkconfig --del $APP + + # Maven + rm -rf /var/lib/$APP/.m2/repository + + #userdel $APP +fi diff --git a/dist/slc/rpm/usr/bin/slc b/dist/slc/rpm/usr/bin/slc new file mode 100644 index 000000000..706b4fa4b --- /dev/null +++ b/dist/slc/rpm/usr/bin/slc @@ -0,0 +1,26 @@ +#!/bin/sh + +JAVA_CMD=java +JAVA_OPTS="-client -Xmx128m" + +SLC_HOME_DIR=${HOME}/.local/share/slc/ +if [ -f $SLC_HOME_DIR/settings.sh ];then + . $SLC_HOME_DIR/settings.sh +fi + +OSGI_INSTALL_AREA=/usr/share/osgi/boot + +ARGEO_OSGI_BUNDLES="$SLC_HOME_DIR/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/usr/share/osgi;in=*.jar" + +for i in "${OSGI_INSTALL_AREA}"/*.jar + do + CLASSPATH="$CLASSPATH:$i" + done + +$JAVA_CMD $JAVA_OPTS \ + "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \ + -Djava.security.manager= \ + -Djava.security.policy="file:/etc/osgiboot/all.policy" \ + -cp "$CLASSPATH" \ + org.argeo.slc.cli.SlcMain "$@" + \ No newline at end of file diff --git a/dist/slc/rpm/usr/lib/systemd/system/slcd.service b/dist/slc/rpm/usr/lib/systemd/system/slcd.service new file mode 100644 index 000000000..e74808956 --- /dev/null +++ b/dist/slc/rpm/usr/lib/systemd/system/slcd.service @@ -0,0 +1,12 @@ +[Unit] +Description=Argeo SLC daemon +After=network.target + +[Service] +ExecStart=/usr/sbin/slcd start +ExecStop=/usr/sbin/slcd stop +Type=forking +PIDFile=/var/run/slcd.pid + +[Install] +WantedBy=default.target \ No newline at end of file diff --git a/dist/slc/rpm/usr/sbin/slcd b/dist/slc/rpm/usr/sbin/slcd new file mode 100644 index 000000000..d9561083b --- /dev/null +++ b/dist/slc/rpm/usr/sbin/slcd @@ -0,0 +1,27 @@ +#!/bin/bash + +. /etc/osgiboot/osgi-service-init-functions.sh + +APP=slc + +case "$1" in + start) + osgi_service_start $APP + ;; + stop) + osgi_service_stop $APP + ;; + restart) + osgi_service_stop $APP + osgi_service_start $APP + RETVAL=$? + ;; + status) + osgi_service_status $APP + ;; + *) + echo $"Usage: $0 {start|stop|restart|status}" + exit 1 +esac + +exit $RETVAL diff --git a/dist/slc/src/main/rpm/etc/init.d/slc b/dist/slc/src/main/rpm/etc/init.d/slc deleted file mode 100644 index ef7534ec5..000000000 --- a/dist/slc/src/main/rpm/etc/init.d/slc +++ /dev/null @@ -1,35 +0,0 @@ -#!/bin/bash -# -# slc Argeo SLC -# -# chkconfig: 3 92 92 -# description: Argeo SLC (http://www.argeo.org) - -# Source function library. -. /etc/osgiboot/osgi-service-init-functions.sh - -# Application id (must be in line with header) -APP=slc - -# main -case "$1" in - start) - osgi_service_start $APP - ;; - stop) - osgi_service_stop $APP - ;; - restart) - osgi_service_stop $APP - osgi_service_start $APP - RETVAL=$? - ;; - status) - osgi_service_status $APP - ;; - *) - echo $"Usage: $0 {start|stop|restart|status}" - exit 1 -esac - -exit $RETVAL diff --git a/dist/slc/src/main/rpm/etc/slc-cl/config.ini b/dist/slc/src/main/rpm/etc/slc-cl/config.ini deleted file mode 100644 index 31e805ae1..000000000 --- a/dist/slc/src/main/rpm/etc/slc-cl/config.ini +++ /dev/null @@ -1,16 +0,0 @@ -argeo.osgi.start=\ -org.eclipse.equinox.cm,\ -org.argeo.cms,\ -org.eclipse.gemini.blueprint.extender,\ -org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr,\ - -argeo.node.repo.type=localfs - -# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING - -argeo.osgi.bundles=\ -${user.home}/.slc/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\ -/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\ -/usr/local/share/osgi;in=**/*.jar,\ -/usr/share/osgi;in=**/*.jar diff --git a/dist/slc/src/main/rpm/etc/slc-cl/log4j.properties b/dist/slc/src/main/rpm/etc/slc-cl/log4j.properties deleted file mode 100644 index 42b203845..000000000 --- a/dist/slc/src/main/rpm/etc/slc-cl/log4j.properties +++ /dev/null @@ -1,15 +0,0 @@ -#log4j.rootLogger=WARN, file -log4j.rootLogger=WARN, console - -## Levels -log4j.logger.org.argeo=INFO - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n - %t - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=/var/log/slc/slc.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n diff --git a/dist/slc/src/main/rpm/etc/slc/config.ini b/dist/slc/src/main/rpm/etc/slc/config.ini deleted file mode 100644 index 5ee853630..000000000 --- a/dist/slc/src/main/rpm/etc/slc/config.ini +++ /dev/null @@ -1,55 +0,0 @@ -argeo.osgi.start.2.http=\ -org.eclipse.equinox.http.servlet,\ -org.eclipse.equinox.http.jetty,\ -org.eclipse.equinox.cm,\ -org.eclipse.rap.rwt.osgi - -argeo.osgi.start.3.node=\ -org.argeo.cms - -argeo.osgi.start.4.apps=\ -org.eclipse.gemini.blueprint.extender - -argeo.osgi.start.4.workbench=\ -org.eclipse.equinox.http.registry,\ - -argeo.osgi.start.5.slc=\ -org.argeo.slc.node.jackrabbit,\ -org.argeo.slc.agent,\ -org.argeo.slc.agent.jcr,\ -org.argeo.slc.server.repo,\ - -argeo.node.repo.type=localfs - -org.osgi.service.http.port=8080 -org.eclipse.equinox.http.jetty.log.stderr.threshold=info - -slc.executionModules=org.argeo.slc.demo.ant,\ -org.argeo.slc.demo.basic,\ -org.argeo.slc.demo.minimal,\ - -org.argeo.security.ui.initialPerspective=org.argeo.slc.client.ui.dist.distributionPerspective - -# OSGi MANAGEMENT -osgi.console=2323 - -# DO NOT CHANGE BELOW UNLESS YOU KNOW WHAT YOU ARE DOING -osgi.bundles=org.argeo.osgi.boot.jar@start -argeo.osgi.baseUrl=file:///usr/share/osgi/ -argeo.osgi.distributionUrl=org/argeo/slc/org.argeo.slc.dep.backend/2.1.*/org.argeo.slc.dep.backend-2.1.*.jar -argeo.osgi.bundles=\ -/etc/slc/modules;in=*,\ -/usr/local/share/osgi;in=**/*.jar -#/usr/share/osgi;in=**/*.jar,\ - -org.osgi.framework.bootdelegation=com.sun.jndi.ldap,\ -com.sun.jndi.ldap.sasl,\ -com.sun.security.jgss,\ -com.sun.jndi.dns,\ -com.sun.nio.file,\ -com.sun.nio.sctp - -eclipse.ignoreApp=true -osgi.noShutdown=true -org.eclipse.equinox.http.jetty.autostart=false -org.eclipse.rap.workbenchAutostart=false diff --git a/dist/slc/src/main/rpm/etc/slc/log4j.properties b/dist/slc/src/main/rpm/etc/slc/log4j.properties deleted file mode 100644 index 2c130cb5b..000000000 --- a/dist/slc/src/main/rpm/etc/slc/log4j.properties +++ /dev/null @@ -1,25 +0,0 @@ -log4j.rootLogger=WARN, file -#log4j.rootLogger=WARN, console - -## Levels -log4j.logger.org.argeo=INFO -log4j.logger.org.argeo.jackrabbit.remote.ExtendedDispatcherServlet=ERROR -log4j.logger.org.springframework.web.servlet.PageNotFound=ERROR -log4j.logger.org.argeo.server.webextender.TomcatDeployer=WARN - -log4j.logger.org.apache.coyote=INFO -log4j.logger.org.apache.catalina.core.ContainerBase=INFO -log4j.logger.org.apache.directory.server=ERROR -log4j.logger.org.apache.jackrabbit.core.query.lucene=ERROR -log4j.logger.org.apache.jackrabbit.core.config.ConfigurationErrorHandler=ERROR -log4j.logger.org.apache.jackrabbit.core.util.db.DbUtility=FATAL - -## Appenders -log4j.appender.console=org.apache.log4j.ConsoleAppender -log4j.appender.console.layout=org.apache.log4j.PatternLayout -log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n - %t - -log4j.appender.file=org.apache.log4j.RollingFileAppender -log4j.appender.file.File=/var/log/slc/slc.log -log4j.appender.file.layout=org.apache.log4j.PatternLayout -log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} [%15.15t] %m - %c%n diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc deleted file mode 100644 index 2ffee589f..000000000 --- a/dist/slc/src/main/rpm/usr/bin/slc +++ /dev/null @@ -1,26 +0,0 @@ -#!/bin/sh - -JAVA_CMD=/usr/lib/jvm/java-1.8.0/bin/java -JAVA_OPTS="-client -Xmx256m" - -SLC_HOME_DIR=${HOME}/.local/share/slc/ -if [ -f $SLC_HOME_DIR/settings.sh ];then - . $SLC_HOME_DIR/settings.sh -fi - -OSGI_INSTALL_AREA=/usr/share/osgi/boot - -ARGEO_OSGI_BUNDLES="$SLC_HOME_DIR/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,/usr/share/osgi;in=*.jar" - -for i in "${OSGI_INSTALL_AREA}"/*.jar - do - CLASSPATH="$CLASSPATH:$i" - done - -$JAVA_CMD $JAVA_OPTS \ - "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \ - -Dorg.osgi.framework.security=osgi \ - -Djava.security.policy="file:/etc/osgiboot/all.policy" \ - -cp "$CLASSPATH" \ - org.argeo.slc.cli.SlcMain "$@" - \ No newline at end of file diff --git a/dist/slc/src/main/rpm/var/lib/slc/.m2/settings.xml b/dist/slc/src/main/rpm/var/lib/slc/.m2/settings.xml deleted file mode 100644 index 270f6239b..000000000 --- a/dist/slc/src/main/rpm/var/lib/slc/.m2/settings.xml +++ /dev/null @@ -1,47 +0,0 @@ - - - - - slc-repo - SLC Repository - http://localhost:7080/org.argeo.slc.repo.webapp/maven - * - - - - - slc-repo - root - demo - - - localrepo - root - demo - - - localrepo.snapshots - root - demo - - - - diff --git a/dist/slc/src/main/scripts/postinstall b/dist/slc/src/main/scripts/postinstall deleted file mode 100644 index 29e582271..000000000 --- a/dist/slc/src/main/scripts/postinstall +++ /dev/null @@ -1,8 +0,0 @@ -if [ $1 = "1" ];then - APP=%{name} - /sbin/chkconfig --add $APP - /sbin/chkconfig --level 3 $APP on -fi - -# Workaround until we find a way to do it in the spec file -chown -f slc.slc /var/lib/slc/.m2 diff --git a/dist/slc/src/main/scripts/preinstall b/dist/slc/src/main/scripts/preinstall deleted file mode 100644 index 9aa846434..000000000 --- a/dist/slc/src/main/scripts/preinstall +++ /dev/null @@ -1,16 +0,0 @@ -if [ $1 = "1" ];then - APP=%{name} - - # check if user exists - /bin/id $APP 2>/dev/null - if [ $? -ne 0 ];then - # create application user (EL6) - echo Create user $APP... - useradd --system --home-dir /var/lib/$APP --shell /sbin/nologin --user-group --create-home $APP - fi - - # give read access to group on home - chmod g+r /var/lib/$APP - mkdir -p /var/lib/$APP/{conf,data} - chown $APP.$APP /var/lib/$APP/{conf,data} -fi \ No newline at end of file diff --git a/dist/slc/src/main/scripts/preremove b/dist/slc/src/main/scripts/preremove deleted file mode 100644 index b79d26175..000000000 --- a/dist/slc/src/main/scripts/preremove +++ /dev/null @@ -1,10 +0,0 @@ -if [ $1 = "0" ];then - #APP=%{name} => doesn't work - APP=slc - /sbin/chkconfig --del $APP - - # Maven - rm -rf /var/lib/$APP/.m2/repository - - #userdel $APP -fi diff --git a/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java b/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java index d7bd977f7..a4bf3cd65 100644 --- a/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java +++ b/org.argeo.slc.launcher/src/org/argeo/slc/cli/SlcMain.java @@ -72,14 +72,21 @@ public class SlcMain implements PrivilegedAction { this.confDir = confDir; this.dataDir = dataDir; this.modulesDir = modulesDir; - bundlesToStart.add("org.springframework.osgi.extender"); - bundlesToStart.add("org.argeo.node.repo.jackrabbit"); - bundlesToStart.add("org.argeo.security.dao.os"); - bundlesToStart.add("org.argeo.slc.node.jackrabbit"); + + bundlesToStart.add("org.eclipse.equinox.cm"); + bundlesToStart.add("org.argeo.cms"); + bundlesToStart.add("org.eclipse.gemini.blueprint.extender"); bundlesToStart.add("org.argeo.slc.agent"); bundlesToStart.add("org.argeo.slc.agent.jcr"); - if (args.length == 0) - bundlesToStart.add("org.argeo.slc.support.equinox"); + + // bundlesToStart.add("org.springframework.osgi.extender"); + // bundlesToStart.add("org.argeo.node.repo.jackrabbit"); + // bundlesToStart.add("org.argeo.security.dao.os"); + // bundlesToStart.add("org.argeo.slc.node.jackrabbit"); + // bundlesToStart.add("org.argeo.slc.agent"); + // bundlesToStart.add("org.argeo.slc.agent.jcr"); + // if (args.length == 0) + // bundlesToStart.add("org.argeo.slc.support.equinox"); // bundlesToStart.add("org.argeo.slc.agent.cli"); } @@ -92,12 +99,10 @@ public class SlcMain implements PrivilegedAction { info("## Data : " + dataDir.getCanonicalPath()); // Start Equinox - ServiceLoader ff = ServiceLoader - .load(FrameworkFactory.class); + ServiceLoader ff = ServiceLoader.load(FrameworkFactory.class); FrameworkFactory frameworkFactory = ff.iterator().next(); Map configuration = new HashMap(); - configuration.put("osgi.configuration.area", - confDir.getCanonicalPath()); + configuration.put("osgi.configuration.area", confDir.getCanonicalPath()); configuration.put("osgi.instance.area", dataDir.getCanonicalPath()); // Do clean configuration.put("osgi.clean", "true"); @@ -117,16 +122,13 @@ public class SlcMain implements PrivilegedAction { // working copy modules if (modulesDir.exists()) - osgiBoot.installUrls(osgiBoot.getBundlesUrls(modulesDir - .getCanonicalPath() + ";in=*;ex=.gitignore")); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(modulesDir.getCanonicalPath() + ";in=*;ex=.gitignore")); // system modules if (System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BUNDLES) != null) - osgiBoot.installUrls(osgiBoot.getBundlesUrls(System - .getProperty(OsgiBoot.PROP_ARGEO_OSGI_BUNDLES))); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(System.getProperty(OsgiBoot.PROP_ARGEO_OSGI_BUNDLES))); else - osgiBoot.installUrls(osgiBoot.getBundlesUrls(System - .getProperty("user.home") + "/.slc/modules/;in=**")); + osgiBoot.installUrls(osgiBoot.getBundlesUrls(System.getProperty("user.home") + "/.slc/modules/;in=**")); // Start runtime osgiBoot.startBundles(bundlesToStart); @@ -134,8 +136,7 @@ public class SlcMain implements PrivilegedAction { // Find SLC Agent ServiceReference sr = null; while (sr == null) { - sr = bundleContext - .getServiceReference("org.argeo.slc.execution.SlcAgentCli"); + sr = bundleContext.getServiceReference("org.argeo.slc.execution.SlcAgentCli"); if (System.currentTimeMillis() - begin > timeout) throw new RuntimeException("Cannot find SLC agent CLI"); Thread.sleep(100); @@ -144,8 +145,7 @@ public class SlcMain implements PrivilegedAction { // Initialization completed long duration = System.currentTimeMillis() - begin; - info("[[ Initialized in " + (duration / 1000) + "s " - + (duration % 1000) + "ms ]]"); + info("[[ Initialized in " + (duration / 1000) + "s " + (duration % 1000) + "ms ]]"); if (args.length == 0) return null;// console mode @@ -153,8 +153,7 @@ public class SlcMain implements PrivilegedAction { // Subject.doAs(Subject.getSubject(AccessController.getContext()), // new AgentCliCall(agentCli)); Class[] parameterTypes = { String[].class }; - Method method = agentCli.getClass().getMethod("process", - parameterTypes); + Method method = agentCli.getClass().getMethod("process", parameterTypes); Object[] methodArgs = { args }; Object ret = method.invoke(agentCli, methodArgs); @@ -184,13 +183,10 @@ public class SlcMain implements PrivilegedAction { File slcDir; Boolean isTransient = false; if (isTransient) { - File tempDir = new File(System.getProperty("java.io.tmpdir") - + "/" + System.getProperty("user.name")); - slcDir = new File(tempDir, "slc-" - + UUID.randomUUID().toString()); + File tempDir = new File(System.getProperty("java.io.tmpdir") + "/" + System.getProperty("user.name")); + slcDir = new File(tempDir, "slc-" + UUID.randomUUID().toString()); slcDir.mkdirs(); - System.setProperty("argeo.node.repo.configuration", - "osgibundle:repository-memory.xml"); + System.setProperty("argeo.node.repo.configuration", "osgibundle:repository-memory.xml"); } else { slcDir = findSlcDir(executionDir); if (slcDir == null) { @@ -211,28 +207,27 @@ public class SlcMain implements PrivilegedAction { File modulesDir = new File(slcDir, "modules"); // JAAS -// File jaasFile = new File(confDir, "jaas.config"); -// if (!jaasFile.exists()) -// copyResource("/org/argeo/slc/cli/jaas.config", jaasFile); -// System.setProperty("java.security.auth.login.config", -// jaasFile.getCanonicalPath()); + // File jaasFile = new File(confDir, "jaas.config"); + // if (!jaasFile.exists()) + // copyResource("/org/argeo/slc/cli/jaas.config", jaasFile); + // System.setProperty("java.security.auth.login.config", + // jaasFile.getCanonicalPath()); // log4j File log4jFile = new File(confDir, "log4j.properties"); if (!log4jFile.exists()) copyResource("/org/argeo/slc/cli/log4j.properties", log4jFile); - System.setProperty("log4j.configuration", - "file://" + log4jFile.getCanonicalPath()); + System.setProperty("log4j.configuration", "file://" + log4jFile.getCanonicalPath()); // Run as a privileged action -// LoginContext lc = new LoginContext(os); -// lc.login(); -// -// Subject subject = Subject.getSubject(AccessController.getContext()); -// Subject.doAs(subject, new SlcMain(args, confDir, dataDir, -// modulesDir)); -SlcMain slcMain = new SlcMain(args, confDir, dataDir, - modulesDir); -slcMain.run(); + // LoginContext lc = new LoginContext(os); + // lc.login(); + // + // Subject subject = + // Subject.getSubject(AccessController.getContext()); + // Subject.doAs(subject, new SlcMain(args, confDir, dataDir, + // modulesDir)); + SlcMain slcMain = new SlcMain(args, confDir, dataDir, modulesDir); + slcMain.run(); if (args.length != 0) System.exit(0); } catch (Exception e) { @@ -277,8 +272,7 @@ slcMain.run(); output.write(buf, 0, length); } } catch (Exception e) { - throw new RuntimeException("Cannot write " + resource + " file to " - + targetFile, e); + throw new RuntimeException("Cannot write " + resource + " file to " + targetFile, e); } finally { try { input.close(); @@ -342,4 +336,3 @@ slcMain.run(); // } // // } - diff --git a/pom.xml b/pom.xml index 1a61a0576..1c1e23b69 100644 --- a/pom.xml +++ b/pom.xml @@ -3,7 +3,7 @@ org.argeo.commons argeo-commons - 2.1.69-SNAPSHOT + 2.1.69 org.argeo.slc argeo-slc