Fixed RPMs.

Release candidate for command line

git-svn-id: https://svn.argeo.org/slc/trunk@6134 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

diff --git a/dep/org.argeo.slc.dep.backend/pom.xml b/dep/org.argeo.slc.dep.backend/pom.xml
index 1f3626588a3d1dbc0f28440eaafc65a1fcdc4b48..36ad10770f67fb8e3725ab7a719d970d0cc21e50 100644 (file)
--- a/dep/org.argeo.slc.dep.backend/pom.xml
+++ b/dep/org.argeo.slc.dep.backend/pom.xml
@@ -37,47 +37,35 @@
                </plugins>
        </build>
        <dependencies>
-               <!-- SLC Agent -->
+               <!-- Base -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.core</artifactId>
-                       <version>1.1.12-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.simple</artifactId>
-                       <version>1.1.12-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.ant</artifactId>
+                       <artifactId>org.argeo.slc.dep.minimal</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
+                       <type>pom</type>
                </dependency>
+
+               <!-- SLC Libs -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.jcr</artifactId>
+                       <artifactId>org.argeo.slc.lib.repo</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <artifactId>org.argeo.slc.lib.jcr</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
                </dependency>
 
-               <!-- SLC Agent Modules -->
+               <!-- Extensions -->
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.agent</artifactId>
-                       <version>1.1.12-SNAPSHOT</version>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.agent.jcr</artifactId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
                </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.node.jackrabbit</artifactId>
+                       <artifactId>org.argeo.slc.support.ant</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
                </dependency>
 
@@ -226,6 +214,7 @@
                                                                                                        <!-- Core -->
                                                                                                        <include>org.argeo.tp:org.aspectj.runtime</include>
                                                                                                        <include>org.argeo.tp:org.aspectj.weaver</include>
+                                                                                                       <include>org.argeo.tp:net.sf.cglib</include>
                                                                                                        <!-- Simple -->
                                                                                                        <include>org.argeo.tp:org.tmatesoft.svn</include>
                                                                                                        <include>org.argeo.tp:org.redline_rpm</include>

diff --git a/dep/org.argeo.slc.dep.minimal/pom.xml b/dep/org.argeo.slc.dep.minimal/pom.xml
index 37118dbd6f7c568eecc4e8d114c54fa34e4eca4a..d225b894a18124661706b6aaee5d52b7c13a8cf1 100644 (file)
--- a/dep/org.argeo.slc.dep.minimal/pom.xml
+++ b/dep/org.argeo.slc.dep.minimal/pom.xml
@@ -52,6 +52,11 @@
                        <artifactId>org.argeo.slc.support.osgi</artifactId>
                        <version>1.1.12-SNAPSHOT</version>
                </dependency>
+               <dependency>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.support.equinox</artifactId>
+                       <version>1.1.12-SNAPSHOT</version>
+               </dependency>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.agent</artifactId>

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 c08abd3946ad3c50d6b7574c2145f0be522119b0..616d504d939116e5d1660acd7e4ff1a44ad11535 100644 (file)
--- 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 406e625c35a33d4f860a4c294f52a4e85cd462cf..928d37fb6cfdd9d5753b57b5b76b09d962a57a4a 100644 (file)
--- 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 9487c63771fe7191e94c2917e9748d1292bdf863..06bfe5462782369e45b74a59ad315db6c7196318 100644 (file)
--- 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 77f1cf6c8bac7f1c5ca5a755f0fb76f88da41bc5..80aba22f3a7dc20f834a73476850d83504b52ed7 100644 (file)
--- a/lib/pom.xml
+++ b/lib/pom.xml
@@ -73,12 +73,5 @@
                        <version>1.1.12-SNAPSHOT</version>
                        <type>pom</type>
                </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc</groupId>
-                       <artifactId>org.argeo.slc.dep.backend</artifactId>
-                       <version>1.1.12-SNAPSHOT</version>
-                       <type>pom</type>
-                       <optional>true</optional>
-               </dependency>
        </dependencies>
 </project>

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 61d2d6b5cecf8cda8984ca031d7cda56bbe51feb..ad4281624951c92a6e1ac2104853b31da0cd4eaf 100644 (file)
--- 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 @@
 \r
        <!-- SERVICES -->\r
        <service ref="modulesManager" interface="org.argeo.slc.execution.ExecutionModulesManager" />\r
+\r
+       <!-- LABEL -->\r
+       <beans:bean class="org.argeo.slc.osgi.deploy.OsgiModuleLabel">\r
+               <beans:property name="bundleContext" ref="bundleContext" />\r
+       </beans:bean>\r
 </beans:beans>
\ 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 e0d89d2d2822550e1f7aefa2a1ee493e74937956..cc3cbdbf3029c0021e89b38f6c6addbfd2aff9ec 100644 (file)
--- 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 @@
        </service>\r
 \r
        <service ref="mavenProxyService" interface="org.argeo.slc.repo.maven.proxy.MavenProxyService" />\r
+\r
+       <!-- LABEL -->\r
+       <beans:bean class="org.argeo.slc.osgi.deploy.OsgiModuleLabel">\r
+               <beans:property name="bundleContext" ref="bundleContext" />\r
+       </beans:bean>\r
 </beans:beans>\r
 \r
 <!-- <reference id="mavenRepositorySystem" interface="org.sonatype.aether.RepositorySystem" -->\r

diff --git a/modules/org.argeo.slc.server.repo/pom.xml b/modules/org.argeo.slc.server.repo/pom.xml
index bce787873c2aaf594b4bf5773bbd90e5703a1c19..983f0f9d33c5a082443f0457174d6d309843612f 100644 (file)
--- a/modules/org.argeo.slc.server.repo/pom.xml
+++ b/modules/org.argeo.slc.server.repo/pom.xml
@@ -1,4 +1,5 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
@@ -7,7 +8,7 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.server.repo</artifactId>
-       <name>SLC Repo Services</name>
+       <name>SLC Repo</name>
        <build>
                <plugins>
                        <plugin>

diff --git a/pom.xml b/pom.xml
index 807c3ff065158a1065d4fa34d978f025519fcc4e..2396fdbd40c47794bd80aaa2cbdbcb6291d1fd37 100644 (file)
--- a/pom.xml
+++ b/pom.xml
@@ -19,8 +19,8 @@
                <module>runtime</module>
                <module>modules</module>
                <module>plugins</module>
-               <module>dep</module>
                <module>lib</module>
+               <module>dep</module>
                <module>archetypes</module>
                <module>dist</module>
                <module>demo</module>

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 3890feefc674b814196a316b9d981fae645934a9..14b4c52a8af3f241170ed9521b872bf956436232 100644 (file)
--- 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<String> {
         */
        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 223810e13a5faa86225d3e0d5506b12173e76b41..84fd46942a8c9b0afbe7dc3acc54d03feaf71e48 100644 (file)
--- a/runtime/org.argeo.slc.repo/pom.xml
+++ b/runtime/org.argeo.slc.repo/pom.xml
@@ -9,7 +9,7 @@
                <relativePath>..</relativePath>
        </parent>
        <artifactId>org.argeo.slc.repo</artifactId>
-       <name>SLC Repository</name>
+       <name>SLC Repo Runtime</name>
        <build>
                <plugins>
                        <plugin>

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 (file)
index 0000000..5da8b96
--- /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 + ")";
+       }
+}