From dc95cc0fdc36c88e778cdfd52d443d0a0b8d926c Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Thu, 14 Mar 2013 15:45:48 +0000 Subject: [PATCH] Fixed RPMs. Release candidate for command line git-svn-id: https://svn.argeo.org/slc/trunk@6134 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- dep/org.argeo.slc.dep.backend/pom.xml | 33 ++++++---------- dep/org.argeo.slc.dep.minimal/pom.xml | 5 +++ .../src/main/rpm/etc/slc-rcp/config.ini | 4 +- .../src/main/rpm/usr/bin/slc-rcp | 16 ++++++-- dist/slc/src/main/rpm/usr/bin/slc | 16 ++++---- lib/pom.xml | 7 ---- .../META-INF/spring/osgi.xml | 5 +++ .../META-INF/spring/repo-osgi.xml | 5 +++ modules/org.argeo.slc.server.repo/pom.xml | 5 ++- pom.xml | 2 +- .../main/java/org/argeo/slc/cli/SlcMain.java | 2 +- runtime/org.argeo.slc.repo/pom.xml | 2 +- .../slc/osgi/deploy/OsgiModuleLabel.java | 38 +++++++++++++++++++ 13 files changed, 93 insertions(+), 47 deletions(-) create mode 100644 runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/deploy/OsgiModuleLabel.java diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml index 1f3626588..36ad10770 100644 --- a/dep/org.argeo.slc.dep.backend/pom.xml +++ b/dep/org.argeo.slc.dep.backend/pom.xml @@ -37,47 +37,35 @@ - + org.argeo.slc - org.argeo.slc.core - 1.1.12-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.support.simple - 1.1.12-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.support.ant + org.argeo.slc.dep.minimal 1.1.12-SNAPSHOT + pom + + org.argeo.slc - org.argeo.slc.support.jcr + org.argeo.slc.lib.repo 1.1.12-SNAPSHOT org.argeo.slc - org.argeo.slc.support.equinox + org.argeo.slc.lib.jcr 1.1.12-SNAPSHOT - + org.argeo.slc - org.argeo.slc.agent - 1.1.12-SNAPSHOT - - - org.argeo.slc - org.argeo.slc.agent.jcr + org.argeo.slc.support.simple 1.1.12-SNAPSHOT org.argeo.slc - org.argeo.slc.node.jackrabbit + org.argeo.slc.support.ant 1.1.12-SNAPSHOT @@ -226,6 +214,7 @@ org.argeo.tp:org.aspectj.runtime org.argeo.tp:org.aspectj.weaver + org.argeo.tp:net.sf.cglib org.argeo.tp:org.tmatesoft.svn org.argeo.tp:org.redline_rpm diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml index 37118dbd6..d225b894a 100644 --- a/dep/org.argeo.slc.dep.minimal/pom.xml +++ b/dep/org.argeo.slc.dep.minimal/pom.xml @@ -52,6 +52,11 @@ org.argeo.slc.support.osgi 1.1.12-SNAPSHOT + + org.argeo.slc + org.argeo.slc.support.equinox + 1.1.12-SNAPSHOT + org.argeo.slc org.argeo.slc.agent diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini index c08abd394..616d504d9 100644 --- a/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini +++ b/dep/org.argeo.slc.dep.rcp/src/main/rpm/etc/slc-rcp/config.ini @@ -48,8 +48,8 @@ org.eclipse.ui.forms,\ org.eclipse.ui.workbench argeo.osgi.bundles=\ -${user.home}/.slc/modules;in=*/*,\ -/etc/slc-rcp/modules;in=*,\ +${user.home}/.slc/modules;in=**,\ +/etc/slc-rcp/modules;in=**,\ /usr/share/slc/lib;in=*.jar,\ /usr/share/osgi;in=*.jar,\ /usr/share/osgi/eclipse;in=*.jar,\ diff --git a/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp b/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp index 406e625c3..928d37fb6 100644 --- a/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp +++ b/dep/org.argeo.slc.dep.rcp/src/main/rpm/usr/bin/slc-rcp @@ -1,5 +1,13 @@ #!/bin/sh +JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java +JAVA_OPTS="-client -Xmx256m" + +SLC_HOME_DIR=${HOME}/.slc/ +if [ -f $SLC_HOME_DIR/settings.sh ];then + . $SLC_HOME_DIR/settings.sh +fi + if [ -d /usr/lib64 ]; then LIB_BASE=/usr/lib64 @@ -10,11 +18,11 @@ OSGI_FRAMEWORK=$LIB_BASE/eclipse/plugins/org.eclipse.osgi_3.6.1.R36x_v20100806.j ECLIPSE_LAUNCHER=$LIB_BASE/eclipse/plugins/org.eclipse.equinox.launcher_1.1.0.v20100507.jar INSTALL_DIR=/usr/share/osgi/rcp -UI_DIR=~/.slc/rcp -DATA_DIR=$UI_DIR/data -CONF_DIR=$UI_DIR/conf +SLC_HOME_DIR=~/.slc +DATA_DIR=$SLC_HOME_DIR/data +CONF_DIR=$SLC_HOME_DIR/conf -mkdir -p $UI_DIR/modules +mkdir -p $SLC_HOME_DIR/modules if [ ! -f $CONF_DIR/config.ini ]; then diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc index 9487c6377..06bfe5462 100644 --- a/dist/slc/src/main/rpm/usr/bin/slc +++ b/dist/slc/src/main/rpm/usr/bin/slc @@ -1,6 +1,6 @@ #!/bin/sh -JAVA_CMD=/usr/lib/jvm/java-1.6.0/bin/java +JAVA_CMD=/usr/lib/jvm/jre-1.6.0/bin/java JAVA_OPTS="-client -Xmx256m" SLC_HOME_DIR=${HOME}/.slc/ @@ -9,14 +9,16 @@ if [ -f $SLC_HOME_DIR/settings.sh ];then fi OSGI_INSTALL_AREA=/usr/share/osgi/boot -OSGI_FRAMEWORK=$OSGI_INSTALL_AREA/org.eclipse.osgi.jar -OSGI_BOOT=$OSGI_INSTALL_AREA/org.argeo.osgi.boot.jar -SLC_LAUNCHER=$OSGI_INSTALL_AREA/org.argeo.slc.launcher.jar 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.bundle=$ARGEO_OSGI_BUNDLES" \ - -cp $OSGI_FRAMEWORK:$OSGI_BOOT \ - -jar $SLC_LAUNCHER "$@" + "-Dargeo.osgi.bundles=$ARGEO_OSGI_BUNDLES" \ + -cp "$CLASSPATH" \ + org.argeo.slc.cli.SlcMain "$@" \ No newline at end of file diff --git a/lib/pom.xml b/lib/pom.xml index 77f1cf6c8..80aba22f3 100644 --- a/lib/pom.xml +++ b/lib/pom.xml @@ -73,12 +73,5 @@ 1.1.12-SNAPSHOT pom - - org.argeo.slc - org.argeo.slc.dep.backend - 1.1.12-SNAPSHOT - pom - true - diff --git a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml index 61d2d6b5c..ad4281624 100644 --- a/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml +++ b/modules/org.argeo.slc.agent/META-INF/spring/osgi.xml @@ -35,4 +35,9 @@ + + + + + \ No newline at end of file diff --git a/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml b/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml index e0d89d2d2..cc3cbdbf3 100644 --- a/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml +++ b/modules/org.argeo.slc.server.repo/META-INF/spring/repo-osgi.xml @@ -35,6 +35,11 @@ + + + + + diff --git a/modules/org.argeo.slc.server.repo/pom.xml b/modules/org.argeo.slc.server.repo/pom.xml index bce787873..983f0f9d3 100644 --- a/modules/org.argeo.slc.server.repo/pom.xml +++ b/modules/org.argeo.slc.server.repo/pom.xml @@ -1,4 +1,5 @@ - + 4.0.0 org.argeo.slc @@ -7,7 +8,7 @@ .. org.argeo.slc.server.repo - SLC Repo Services + SLC Repo diff --git a/pom.xml b/pom.xml index 807c3ff06..2396fdbd4 100644 --- a/pom.xml +++ b/pom.xml @@ -19,8 +19,8 @@ runtime modules plugins - dep lib + dep archetypes dist demo diff --git a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java index 3890feefc..14b4c52a8 100644 --- a/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java +++ b/runtime/org.argeo.slc.launcher/src/main/java/org/argeo/slc/cli/SlcMain.java @@ -35,7 +35,6 @@ import javax.security.auth.login.LoginContext; import org.argeo.osgi.boot.OsgiBoot; import org.osgi.framework.BundleContext; -import org.osgi.framework.BundleException; import org.osgi.framework.ServiceReference; import org.osgi.framework.launch.Framework; import org.osgi.framework.launch.FrameworkFactory; @@ -245,6 +244,7 @@ public class SlcMain implements PrivilegedAction { */ protected static File findSlcDir(File currentDir) { File slcDir = new File(currentDir, slcDirName); + // covers the use case of running from the home directory if (slcDir.exists() && slcDir.isDirectory()) return slcDir; File parentDir = currentDir.getParentFile(); diff --git a/runtime/org.argeo.slc.repo/pom.xml b/runtime/org.argeo.slc.repo/pom.xml index 223810e13..84fd46942 100644 --- a/runtime/org.argeo.slc.repo/pom.xml +++ b/runtime/org.argeo.slc.repo/pom.xml @@ -9,7 +9,7 @@ .. org.argeo.slc.repo - SLC Repository + SLC Repo Runtime diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/deploy/OsgiModuleLabel.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/deploy/OsgiModuleLabel.java new file mode 100644 index 000000000..5da8b96c8 --- /dev/null +++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/deploy/OsgiModuleLabel.java @@ -0,0 +1,38 @@ +package org.argeo.slc.osgi.deploy; + +import org.apache.commons.logging.Log; +import org.apache.commons.logging.LogFactory; +import org.osgi.framework.Bundle; +import org.osgi.framework.BundleContext; +import org.osgi.framework.Constants; + +/** Logs the version of an OSGi bundle. */ +public class OsgiModuleLabel { + private final static Log log = LogFactory.getLog(OsgiModuleLabel.class); + + private Bundle bundle; + + public OsgiModuleLabel() { + } + + /** Sets without logging. */ + public OsgiModuleLabel(Bundle bundle) { + this.bundle = bundle; + } + + /** + * Retrieved bundle from a bundle context and logs it. Typically to be set + * as a Spring bean. + */ + public void setBundleContext(BundleContext bundleContext) { + this.bundle = bundleContext.getBundle(); + log.info(msg()); + } + + public String msg() { + String name = bundle.getHeaders().get(Constants.BUNDLE_NAME).toString(); + String symbolicName = bundle.getSymbolicName(); + String version = bundle.getVersion().toString(); + return name + " v" + version + " (" + symbolicName + ")"; + } +} -- 2.39.2