From bc9addc1d4f22b11cbd1ba7641d5f1d978c483ba Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Fri, 16 Apr 2010 08:34:47 +0000 Subject: [PATCH 1/1] Introduce RPM git-svn-id: https://svn.argeo.org/slc/trunk@3462 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/agent.properties | 2 + dist/org.argeo.slc.sdk/pom.xml | 198 ++++++++++++++++++ .../src/main/rpm/etc/init.d/slc-agent | 56 +++++ .../src/main/rpm/etc/init.d/slc-server | 56 +++++ .../src/main/rpm/etc/slc-agent/config.ini | 11 + .../main/rpm/etc/slc-agent/log4j.properties | 16 ++ .../src/main/rpm/etc/slc-server/config.ini | 15 ++ .../main/rpm/etc/slc-server/log4j.properties | 21 ++ .../src/main/rpm/usr/bin/slc | 14 ++ .../src/main/scripts/postinstall | 23 ++ .../src/main/scripts/preremove | 16 ++ 11 files changed, 428 insertions(+) create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties create mode 100644 dist/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc create mode 100644 dist/org.argeo.slc.sdk/src/main/scripts/postinstall create mode 100644 dist/org.argeo.slc.sdk/src/main/scripts/preremove diff --git a/demo/agent.properties b/demo/agent.properties index 7bc17a29f..1b05a55cb 100644 --- a/demo/agent.properties +++ b/demo/agent.properties @@ -5,3 +5,5 @@ org.argeo.slc.agent,\ org.argeo.slc.agent.jms #org.argeo.slc.agent.jmx #com.sun.management.jmxremote= + +#log4j.configuration=file:/home/mbaudier/dev/src/slc/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/bundles/org.argeo.slc.app.agent.log4j/log4j.properties diff --git a/dist/org.argeo.slc.sdk/pom.xml b/dist/org.argeo.slc.sdk/pom.xml index d9cda3b5b..f984fd214 100644 --- a/dist/org.argeo.slc.sdk/pom.xml +++ b/dist/org.argeo.slc.sdk/pom.xml @@ -74,6 +74,7 @@ maven-resources-plugin + filter-base validate copy-resources @@ -88,6 +89,14 @@ + @@ -221,5 +230,194 @@ + + rpmbuild + ${project.version} + argeo + + + + + org.codehaus.mojo + rpm-maven-plugin + 2.0.1 + true + + + rpm + package + + rpm + + + + + ${package.version} + r${buildNumber}.${distribution.label} + 2010 Argeo + ${distribution.label} + mbaudier@argeo.org + Applications/System + /usr + + + /usr/bin + root + root + 755 + false + + + src/main/rpm/usr/bin + + * + + + + + + /etc/init.d + root + root + 755 + false + + + src/main/rpm/etc/init.d + + * + + + + + + /etc/slc-agent + root + root + 644 + true + + + src/main/rpm/etc/slc-agent + + * + + + + + + /etc/slc-server + root + root + 644 + true + + + src/main/rpm/etc/slc-server + + * + + + + + + /usr/share/osgi + root + root + 644 + false + + + target + + *.jar + + + + + + /usr/src/osgi/pde + root + root + 644 + false + + + target/libsrc + + *.jar + + + + + + + src/main/scripts/postinstall + + + src/main/scripts/preremove + + + java-1.6.0-openjdk + + + + + + + org.apache.maven.plugins + maven-antrun-plugin + + + rpm-copyToRepo + deploy + + run + + + + + + + + + + + + + + + + + + + + + + \ No newline at end of file diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent b/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent new file mode 100644 index 000000000..416b27818 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-agent @@ -0,0 +1,56 @@ +#!/bin/bash +# +# slc-agent SLC Agent +# +# chkconfig: 3 92 92 +# description: SLC Agent + +# Source function library. +. /etc/rc.d/init.d/functions + +RETVAL=0 + +start() { + EXECDIR=/var/lib/slc-agent + cd $EXECDIR + export JAVA_OPTS=-Xmx128m + /usr/bin/slc -console 3030 & + action $"Start SLC agent" /bin/true + return $RETVAL +} + +stop() { + telnet localhost 3030 << EOF +close +EOF + action $"Stop SLC agent" /bin/true + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + RETVAL=$? + ;; + condrestart) + echo Not implemented + exit 1 + ;; + status) + echo Not implemented + exit 1 + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $RETVAL diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server b/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server new file mode 100644 index 000000000..6835212f9 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/init.d/slc-server @@ -0,0 +1,56 @@ +#!/bin/bash +# +# slc-server SLC Server +# +# chkconfig: 3 92 92 +# description: SLC Server + +# Source function library. +. /etc/rc.d/init.d/functions + +RETVAL=0 + +start() { + EXECDIR=/var/lib/slc-server + cd $EXECDIR + export JAVA_OPTS=-Xmx256m + /usr/bin/slc -console 3040 & + action $"Start SLC server" /bin/true + return $RETVAL +} + +stop() { + telnet localhost 3040 << EOF +close +EOF + action $"Stop SLC server" /bin/true + return $RETVAL +} + +# See how we were called. +case "$1" in + start) + start + ;; + stop) + stop + ;; + restart|reload) + stop + start + RETVAL=$? + ;; + condrestart) + echo Not implemented + exit 1 + ;; + status) + echo Not implemented + exit 1 + ;; + *) + echo $"Usage: $0 {start|stop|restart}" + exit 1 +esac + +exit $RETVAL diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini new file mode 100644 index 000000000..ad38c4945 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/config.ini @@ -0,0 +1,11 @@ +argeo.osgi.start=org.springframework.osgi.extender,\ + org.argeo.slc.agent,\ + org.argeo.slc.agent.jms,\ + org.argeo.slc.support.equinox + +log4j.configuration=file:/etc/slc-agent/log4j.properties + +# ADVANCED PROPERTIES +# should not be changed in general +osgi.bundles=org.argeo.osgi.boot.jar@start +argeo.osgi.bundles=${osgi.install.area};in=* diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties new file mode 100644 index 000000000..5e2db1e5e --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-agent/log4j.properties @@ -0,0 +1,16 @@ +log4j.rootLogger=WARN, file +#log4j.rootLogger=WARN, console + +## Levels +log4j.logger.org.argeo=INFO +#log4j.logger.org.springframework=DEBUG + +## Appenders +log4j.appender.console=org.apache.log4j.ConsoleAppender +log4j.appender.console.layout=org.apache.log4j.PatternLayout +log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n + +log4j.appender.file=org.apache.log4j.RollingFileAppender +log4j.appender.file.File=/var/log/slc-agent.log +log4j.appender.file.layout=org.apache.log4j.PatternLayout +log4j.appender.file.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini new file mode 100644 index 000000000..45d4ed95a --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/config.ini @@ -0,0 +1,15 @@ +argeo.osgi.start=org.springframework.osgi.extender,\ + org.argeo.server.ads.server,\ + org.argeo.slc.server.hsqldb,\ + org.argeo.slc.server.main,\ + org.argeo.slc.ria + +log4j.configuration=file:/etc/slc-server/log4j.properties + +org.osgi.framework.bootdelegation=com.sun.jndi.ldap + +# ADVANCED PROPERTIES +# should not be changed in general +osgi.bundles=org.argeo.osgi.boot.jar@start +argeo.osgi.bundles=${osgi.install.area};in=* + \ No newline at end of file diff --git a/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties new file mode 100644 index 000000000..5646e20d5 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/etc/slc-server/log4j.properties @@ -0,0 +1,21 @@ +log4j.rootLogger=WARN, file +#log4j.rootLogger=WARN, console + +## Levels +log4j.logger.org.argeo=INFO +#log4j.logger.org.springframework=DEBUG +#log4j.logger.org.hibernate=DEBUG +#log4j.logger.org.apache.activemq=DEBUG + +log4j.logger.org.apache.directory.server.core.partition=ERROR +log4j.logger.org.apache.directory.server.core.schema.bootstrap.BootstrapAttributeTypeRegistry=ERROR + +## 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-server.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/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc b/dist/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc new file mode 100644 index 000000000..5f72472f3 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/rpm/usr/bin/slc @@ -0,0 +1,14 @@ +#!/bin/sh + +if [ -d ./lib ];then + OSGI_INSTALL_AREA=`pwd`/lib +else + OSGI_INSTALL_AREA=/usr/share/osgi +fi + + +java $JAVA_OPTS -jar $OSGI_INSTALL_AREA/org.eclipse.osgi.jar \ + -clean \ + -configuration conf \ + -data data \ + "$@" diff --git a/dist/org.argeo.slc.sdk/src/main/scripts/postinstall b/dist/org.argeo.slc.sdk/src/main/scripts/postinstall new file mode 100644 index 000000000..9d9f30628 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/scripts/postinstall @@ -0,0 +1,23 @@ +if [ ! -L /usr/share/osgi/org.eclipse.osgi.jar ];then + ln -s /usr/share/osgi/org.eclipse.osgi-*.jar /usr/share/osgi/org.eclipse.osgi.jar +fi + +if [ ! -L /usr/share/osgi/org.argeo.osgi.boot.jar ];then + ln -s /usr/share/osgi/org.argeo.osgi.boot-*.jar /usr/share/osgi/org.argeo.osgi.boot.jar +fi + +if [ $1 = "1" ];then + APP=slc-agent + mkdir -p /var/lib/$APP/{conf,data} + ln -s /etc/$APP/config.ini /var/lib/$APP/conf + mkdir -p /var/lib/$APP/lib + ln -s /usr/share/osgi/* /var/lib/$APP/lib + /sbin/chkconfig --add $APP + + APP=slc-server + mkdir -p /var/lib/$APP/{conf,data} + ln -s /etc/$APP/config.ini /var/lib/$APP/conf + mkdir -p /var/lib/$APP/lib + ln -s /usr/share/osgi/* /var/lib/$APP/lib + /sbin/chkconfig --add $APP +fi \ No newline at end of file diff --git a/dist/org.argeo.slc.sdk/src/main/scripts/preremove b/dist/org.argeo.slc.sdk/src/main/scripts/preremove new file mode 100644 index 000000000..175e693d9 --- /dev/null +++ b/dist/org.argeo.slc.sdk/src/main/scripts/preremove @@ -0,0 +1,16 @@ +echo Remove symbolic links +rm -f /usr/share/osgi/org.argeo.osgi.boot.jar +rm -f /usr/share/osgi/org.eclipse.osgi.jar + +if [ $1 = "0" ];then + APP=slc-agent + /sbin/chkconfig --del $APP + rm -f /var/lib/$APP/conf/config.ini + rm -rf /var/lib/$APP/lib + + APP=slc-server + /sbin/chkconfig --del $APP + rm -f /var/lib/$APP/conf/config.ini + rm -rf /var/lib/$APP/lib + +fi -- 2.39.2