Improve command line client

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

diff --git a/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml b/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
index e59aad7d80efaf7a945510b6fcede87b8a59e526..0130d2df66c66195ba3dcd8f135bdfe97eb6452e 100644 (file)
--- a/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
+++ b/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld-raw.xml
@@ -8,7 +8,7 @@
        >\r
 \r
        <!-- Hello world without namespace (for reference, do not use) -->\r
-       <bean name="hello/raw/HelloWorld" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
+       <bean name="HelloWorld/Raw" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
                <description>Print Hello World!</description>\r
                <property name="executables">\r
                        <list>\r
@@ -17,7 +17,7 @@
                </property>\r
        </bean>\r
 \r
-       <bean name="hello/raw/HelloWorldWithVar" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
+       <bean name="HelloWorld/RawWithVar" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
                <description>Print Hello World! with variable</description>\r
                <constructor-arg>\r
                        <bean class="org.argeo.slc.core.execution.DefaultExecutionSpec">\r

diff --git a/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld.xml b/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld.xml
index 3af2dcd0165427f25ed7bde24002ea88d9a28deb..605dd087a66cb34c0005418516cb9afd8aa28b4c 100644 (file)
--- a/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld.xml
+++ b/demo/site/org.argeo.slc.demo.minimal/META-INF/spring/helloworld.xml
@@ -15,7 +15,7 @@
                <flow:primitive name="testKey" value="777" isParameter="false" />\r
        </flow:spec>\r
 \r
-       <flow:flow name="hello/HelloWorldWithVar" spec="helloSpec">\r
+       <flow:flow name="HelloWorld/WithVar" spec="helloSpec">\r
                <description>Print Hello World! with variable</description>\r
                <bean p:message="Hello World! @{testKey}" class="org.argeo.slc.core.execution.tasks.Echo">\r
                        <flow:variable proxy-target-class="false" />\r

diff --git a/dep/org.argeo.slc.dep.rap/org.argeo.slc.dep.rap-maven.target b/dep/org.argeo.slc.dep.rap/org.argeo.slc.dep.rap-maven.target
index 602855c4e010c8bd0b596374d9b741adb2983487..8ca55d4585bbc678821cc5b7da53730887bc3cb0 100644 (file)
--- a/dep/org.argeo.slc.dep.rap/org.argeo.slc.dep.rap-maven.target
+++ b/dep/org.argeo.slc.dep.rap/org.argeo.slc.dep.rap-maven.target
@@ -53,8 +53,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/bsf/com.springsource.org.apache.bsf.source/2.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.activemq/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.activemq.source/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms/2.5.6.SEC01" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms.source/2.5.6.SEC01" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/ws/org.springframework.oxm/1.5.9.A" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/ws/org.springframework.oxm.source/1.5.9.A" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/javax/jms/com.springsource.javax.jms/1.1.0" type="Directory"/>
@@ -193,6 +191,30 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/bcel/com.springsource.org.apache.bcel.source/5.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/regexp/com.springsource.org.apache.regexp/1.5.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/regexp/com.springsource.org.apache.regexp.source/1.5.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap/1.3.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap.source/1.3.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation/1.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation.source/1.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation.source/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws/2.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws.source/2.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind/2.1.7" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind.source/2.1.7" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/mail/com.springsource.javax.mail/1.4.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/mail/com.springsource.javax.mail.source/1.4.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.vfs/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.vfs.source/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.exec/1.0.0.0002" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.exec.source/1.0.0.0002" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.cli/1.1.0.0002" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.cli.source/1.1.0.0002" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp.source/1.2.2.osgi" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.context.support/2.5.6.SEC01" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.context.support.source/2.5.6.SEC01" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms/2.5.6.SEC01" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms.source/2.5.6.SEC01" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/osgi/org.springframework.osgi.extender/1.2.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/osgi/org.springframework.osgi.extender.source/1.2.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.jackrabbit/0.3.4-SNAPSHOT" type="Directory"/>
@@ -203,8 +225,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.httpclient.source/3.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.compress/1.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.compress.source/1.1.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp.source/1.2.2.osgi" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent/1.3.4" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent.source/1.3.4" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.tika/0.8.0.0002" type="Directory"/>
@@ -232,20 +252,8 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.activemq/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.activemq.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.activemq.broker/0.3.4-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap/1.3.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap.source/1.3.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation/1.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation.source/1.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation.source/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws/2.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws.source/2.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind/2.1.7" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind.source/2.1.7" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.vfs/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.vfs.source/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.exec/1.0.0.0002" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.exec.source/1.0.0.0002" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/com/opensymphony/quartz/com.springsource.org.quartz/1.6.2" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/com/opensymphony/quartz/com.springsource.org.quartz.source/1.6.2" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.dao.ldap/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ldap/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ldap.source/0.3.4-SNAPSHOT" type="Directory"/>
@@ -362,12 +370,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.simple.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/jcraft/jsch/com.springsource.com.jcraft.jsch/0.1.41" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/jcraft/jsch/com.springsource.com.jcraft.jsch.source/0.1.41" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/com/opensymphony/quartz/com.springsource.org.quartz/1.6.2" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/com/opensymphony/quartz/com.springsource.org.quartz.source/1.6.2" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.context.support/2.5.6.SEC01" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.context.support.source/2.5.6.SEC01" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/mail/com.springsource.javax.mail/1.4.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/mail/com.springsource.javax.mail.source/1.4.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/svnkit/com.springsource.org.tmatesoft.svn/1.3.1.6109" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/svnkit/com.springsource.org.tmatesoft.svn.source/1.3.1.6109" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.redline_rpm/1.1.8.0001" type="Directory"/>
@@ -393,8 +395,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/springframework/osgi/org.springframework.osgi.io/1.2.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/osgi/org.springframework.osgi.io.source/1.2.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.launcher/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.cli/1.1.0.0002" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.commons.cli.source/1.1.0.0002" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/slf4j/com.springsource.slf4j.org.apache.commons.logging/1.5.10" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/slf4j/com.springsource.slf4j.org.apache.commons.logging.source/1.5.10" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/slf4j/com.springsource.slf4j.api/1.5.10" type="Directory"/>
@@ -456,8 +456,6 @@
 <plugin id="com.springsource.org.apache.bsf.source"/>
 <plugin id="org.argeo.slc.support.activemq"/>
 <plugin id="org.argeo.slc.support.activemq.source"/>
-<plugin id="org.springframework.jms"/>
-<plugin id="org.springframework.jms.source"/>
 <plugin id="org.springframework.oxm"/>
 <plugin id="org.springframework.oxm.source"/>
 <plugin id="com.springsource.javax.jms"/>
@@ -596,6 +594,30 @@
 <plugin id="com.springsource.org.apache.bcel.source"/>
 <plugin id="com.springsource.org.apache.regexp"/>
 <plugin id="com.springsource.org.apache.regexp.source"/>
+<plugin id="com.springsource.javax.xml.soap"/>
+<plugin id="com.springsource.javax.xml.soap.source"/>
+<plugin id="com.springsource.javax.activation"/>
+<plugin id="com.springsource.javax.activation.source"/>
+<plugin id="com.springsource.javax.annotation"/>
+<plugin id="com.springsource.javax.annotation.source"/>
+<plugin id="com.springsource.javax.xml.ws"/>
+<plugin id="com.springsource.javax.xml.ws.source"/>
+<plugin id="com.springsource.javax.xml.bind"/>
+<plugin id="com.springsource.javax.xml.bind.source"/>
+<plugin id="com.springsource.javax.mail"/>
+<plugin id="com.springsource.javax.mail.source"/>
+<plugin id="com.springsource.org.apache.commons.vfs"/>
+<plugin id="com.springsource.org.apache.commons.vfs.source"/>
+<plugin id="org.argeo.dep.osgi.commons.exec"/>
+<plugin id="org.argeo.dep.osgi.commons.exec.source"/>
+<plugin id="org.argeo.dep.osgi.commons.cli"/>
+<plugin id="org.argeo.dep.osgi.commons.cli.source"/>
+<plugin id="com.springsource.org.apache.commons.dbcp"/>
+<plugin id="com.springsource.org.apache.commons.dbcp.source"/>
+<plugin id="org.springframework.context.support"/>
+<plugin id="org.springframework.context.support.source"/>
+<plugin id="org.springframework.jms"/>
+<plugin id="org.springframework.jms.source"/>
 <plugin id="org.springframework.osgi.extender"/>
 <plugin id="org.springframework.osgi.extender.source"/>
 <plugin id="org.argeo.server.jackrabbit"/>
@@ -606,8 +628,6 @@
 <plugin id="com.springsource.org.apache.commons.httpclient.source"/>
 <plugin id="com.springsource.org.apache.commons.compress"/>
 <plugin id="com.springsource.org.apache.commons.compress.source"/>
-<plugin id="com.springsource.org.apache.commons.dbcp"/>
-<plugin id="com.springsource.org.apache.commons.dbcp.source"/>
 <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
 <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent.source"/>
 <plugin id="org.argeo.dep.osgi.tika"/>
@@ -635,20 +655,8 @@
 <plugin id="org.argeo.security.activemq"/>
 <plugin id="org.argeo.security.activemq.source"/>
 <plugin id="org.argeo.server.activemq.broker"/>
-<plugin id="com.springsource.javax.xml.soap"/>
-<plugin id="com.springsource.javax.xml.soap.source"/>
-<plugin id="com.springsource.javax.activation"/>
-<plugin id="com.springsource.javax.activation.source"/>
-<plugin id="com.springsource.javax.annotation"/>
-<plugin id="com.springsource.javax.annotation.source"/>
-<plugin id="com.springsource.javax.xml.ws"/>
-<plugin id="com.springsource.javax.xml.ws.source"/>
-<plugin id="com.springsource.javax.xml.bind"/>
-<plugin id="com.springsource.javax.xml.bind.source"/>
-<plugin id="com.springsource.org.apache.commons.vfs"/>
-<plugin id="com.springsource.org.apache.commons.vfs.source"/>
-<plugin id="org.argeo.dep.osgi.commons.exec"/>
-<plugin id="org.argeo.dep.osgi.commons.exec.source"/>
+<plugin id="com.springsource.org.quartz"/>
+<plugin id="com.springsource.org.quartz.source"/>
 <plugin id="org.argeo.security.dao.ldap"/>
 <plugin id="org.argeo.security.ldap"/>
 <plugin id="org.argeo.security.ldap.source"/>
@@ -765,12 +773,6 @@
 <plugin id="org.argeo.slc.support.simple.source"/>
 <plugin id="com.springsource.com.jcraft.jsch"/>
 <plugin id="com.springsource.com.jcraft.jsch.source"/>
-<plugin id="com.springsource.org.quartz"/>
-<plugin id="com.springsource.org.quartz.source"/>
-<plugin id="org.springframework.context.support"/>
-<plugin id="org.springframework.context.support.source"/>
-<plugin id="com.springsource.javax.mail"/>
-<plugin id="com.springsource.javax.mail.source"/>
 <plugin id="com.springsource.org.tmatesoft.svn"/>
 <plugin id="com.springsource.org.tmatesoft.svn.source"/>
 <plugin id="org.redline_rpm"/>
@@ -796,8 +798,6 @@
 <plugin id="org.springframework.osgi.io"/>
 <plugin id="org.springframework.osgi.io.source"/>
 <plugin id="org.argeo.slc.launcher"/>
-<plugin id="org.argeo.dep.osgi.commons.cli"/>
-<plugin id="org.argeo.dep.osgi.commons.cli.source"/>
 <plugin id="com.springsource.slf4j.org.apache.commons.logging"/>
 <plugin id="com.springsource.slf4j.org.apache.commons.logging.source"/>
 <plugin id="com.springsource.slf4j.api"/>

diff --git a/dep/org.argeo.slc.dep.rcp/org.argeo.slc.dep.rcp-maven.target b/dep/org.argeo.slc.dep.rcp/org.argeo.slc.dep.rcp-maven.target
index 6ea422e94aa5e530cdc5f18d276bfb663303439d..012c58239b99ea59abc5e1cff3c0b316ce471035 100644 (file)
--- a/dep/org.argeo.slc.dep.rcp/org.argeo.slc.dep.rcp-maven.target
+++ b/dep/org.argeo.slc.dep.rcp/org.argeo.slc.dep.rcp-maven.target
@@ -6,11 +6,9 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/eclipse/org.argeo.slc.client.ui/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/eclipse/org.argeo.slc.client.ui.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.jcr/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.jcr.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.jcr/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.jcr.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.server/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.server.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.core/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.core.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.web.servlet/2.5.6.SEC01" type="Directory"/>
@@ -36,9 +34,7 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/eclipse/org.argeo.slc.client.ui.dist/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/eclipse/org.argeo.slc.client.ui.dist.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.repo/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.repo.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.aether/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.aether.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.aether/1.11.0.0001" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.aether.source/1.11.0.0001" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/modules/org.argeo.slc.server.repo/0.13.1-SNAPSHOT" type="Directory"/>
@@ -46,7 +42,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.bnd.source/0.0.384.0002" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/dep/org.argeo.slc.dep.backend/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.ant/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.ant.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/ant/com.springsource.org.apache.tools.ant/1.7.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/ant/com.springsource.org.apache.tools.ant.source/1.7.1" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/ant/com.springsource.org.apache.tools.ant.launch/1.7.1" type="Directory"/>
@@ -58,7 +53,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/bsf/com.springsource.org.apache.bsf/2.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/bsf/com.springsource.org.apache.bsf.source/2.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.activemq/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.activemq.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms/2.5.6.SEC01" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/org.springframework.jms.source/2.5.6.SEC01" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/springframework/ws/org.springframework.oxm/1.5.9.A" type="Directory"/>
@@ -85,9 +79,7 @@
 <location path="${system_property:user.home}/.m2/repository/javax/ejb/com.springsource.javax.ejb.source/3.0.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/javax/xml/rpc/com.springsource.javax.xml.rpc/1.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.equinox/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.equinox.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.osgi/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.osgi.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs/2.2.3" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm.attrs.source/2.2.3" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/objectweb/asm/com.springsource.org.objectweb.asm/2.2.3" type="Directory"/>
@@ -113,6 +105,18 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/bcel/com.springsource.org.apache.bcel.source/5.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/regexp/com.springsource.org.apache.regexp/1.5.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/regexp/com.springsource.org.apache.regexp.source/1.5.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap/1.3.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap.source/1.3.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation/1.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation.source/1.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation.source/1.0.0" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws/2.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws.source/2.1.1" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind/2.1.7" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind.source/2.1.7" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi" type="Directory"/>
+<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp.source/1.2.2.osgi" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.jackrabbit/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.jackrabbit.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/lucene/com.springsource.org.apache.lucene/2.4.1" type="Directory"/>
@@ -121,8 +125,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.httpclient.source/3.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.compress/1.1.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.compress.source/1.1.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp/1.2.2.osgi" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.dbcp.source/1.2.2.osgi" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent/1.3.4" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/edu/oswego/cs/concurrent/com.springsource.edu.oswego.cs.dl.util.concurrent.source/1.3.4" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/dep/osgi/org.argeo.dep.osgi.tika/0.8.0.0002" type="Directory"/>
@@ -140,16 +142,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.activemq/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.activemq.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/server/org.argeo.server.activemq.broker/0.3.4-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap/1.3.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/soap/com.springsource.javax.xml.soap.source/1.3.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation/1.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/activation/com.springsource.javax.activation.source/1.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/annotation/com.springsource.javax.annotation.source/1.0.0" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws/2.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/ws/com.springsource.javax.xml.ws.source/2.1.1" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind/2.1.7" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/javax/xml/bind/com.springsource.javax.xml.bind.source/2.1.7" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.dao.ldap/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ldap/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ldap.source/0.3.4-SNAPSHOT" type="Directory"/>
@@ -323,11 +315,8 @@
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ui.admin/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/commons/security/org.argeo.security.ui.admin.source/0.3.4-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.unit/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.unit.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.core/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.core.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.specs/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.specs.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/aspectj/com.springsource.org.aspectj.runtime/1.6.3.RELEASE" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/aspectj/com.springsource.org.aspectj.runtime.source/1.6.3.RELEASE" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/aspectj/com.springsource.org.aspectj.weaver/1.6.3.RELEASE" type="Directory"/>
@@ -343,7 +332,6 @@
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.codec/1.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/apache/commons/com.springsource.org.apache.commons.codec.source/1.4.0" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.simple/0.13.1-SNAPSHOT" type="Directory"/>
-<location path="${system_property:user.home}/.m2/repository/org/argeo/slc/runtime/org.argeo.slc.support.simple.source/0.13.1-SNAPSHOT" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/jcraft/jsch/com.springsource.com.jcraft.jsch/0.1.41" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/jcraft/jsch/com.springsource.com.jcraft.jsch.source/0.1.41" type="Directory"/>
 <location path="${system_property:user.home}/.m2/repository/com/opensymphony/quartz/com.springsource.org.quartz/1.6.2" type="Directory"/>
@@ -396,11 +384,9 @@
 <plugin id="org.argeo.slc.client.ui"/>
 <plugin id="org.argeo.slc.client.ui.source"/>
 <plugin id="org.argeo.slc.support.jcr"/>
-<plugin id="org.argeo.slc.support.jcr.source"/>
 <plugin id="org.argeo.server.jcr"/>
 <plugin id="org.argeo.server.jcr.source"/>
 <plugin id="org.argeo.slc.server"/>
-<plugin id="org.argeo.slc.server.source"/>
 <plugin id="org.argeo.security.core"/>
 <plugin id="org.argeo.security.core.source"/>
 <plugin id="org.springframework.web.servlet"/>
@@ -426,9 +412,7 @@
 <plugin id="org.argeo.slc.client.ui.dist"/>
 <plugin id="org.argeo.slc.client.ui.dist.source"/>
 <plugin id="org.argeo.slc.repo"/>
-<plugin id="org.argeo.slc.repo.source"/>
 <plugin id="org.argeo.slc.support.aether"/>
-<plugin id="org.argeo.slc.support.aether.source"/>
 <plugin id="org.argeo.dep.osgi.aether"/>
 <plugin id="org.argeo.dep.osgi.aether.source"/>
 <plugin id="org.argeo.slc.server.repo"/>
@@ -436,7 +420,6 @@
 <plugin id="biz.aQute.bnd.source"/>
 <plugin id="org.argeo.slc.dep.backend"/>
 <plugin id="org.argeo.slc.support.ant"/>
-<plugin id="org.argeo.slc.support.ant.source"/>
 <plugin id="com.springsource.org.apache.tools.ant"/>
 <plugin id="com.springsource.org.apache.tools.ant.source"/>
 <plugin id="com.springsource.org.apache.tools.ant.launch"/>
@@ -448,7 +431,6 @@
 <plugin id="com.springsource.org.apache.bsf"/>
 <plugin id="com.springsource.org.apache.bsf.source"/>
 <plugin id="org.argeo.slc.support.activemq"/>
-<plugin id="org.argeo.slc.support.activemq.source"/>
 <plugin id="org.springframework.jms"/>
 <plugin id="org.springframework.jms.source"/>
 <plugin id="org.springframework.oxm"/>
@@ -475,9 +457,7 @@
 <plugin id="com.springsource.javax.ejb.source"/>
 <plugin id="com.springsource.javax.xml.rpc"/>
 <plugin id="org.argeo.slc.support.equinox"/>
-<plugin id="org.argeo.slc.support.equinox.source"/>
 <plugin id="org.argeo.slc.support.osgi"/>
-<plugin id="org.argeo.slc.support.osgi.source"/>
 <plugin id="com.springsource.org.objectweb.asm.attrs"/>
 <plugin id="com.springsource.org.objectweb.asm.attrs.source"/>
 <plugin id="com.springsource.org.objectweb.asm"/>
@@ -503,6 +483,18 @@
 <plugin id="com.springsource.org.apache.bcel.source"/>
 <plugin id="com.springsource.org.apache.regexp"/>
 <plugin id="com.springsource.org.apache.regexp.source"/>
+<plugin id="com.springsource.javax.xml.soap"/>
+<plugin id="com.springsource.javax.xml.soap.source"/>
+<plugin id="com.springsource.javax.activation"/>
+<plugin id="com.springsource.javax.activation.source"/>
+<plugin id="com.springsource.javax.annotation"/>
+<plugin id="com.springsource.javax.annotation.source"/>
+<plugin id="com.springsource.javax.xml.ws"/>
+<plugin id="com.springsource.javax.xml.ws.source"/>
+<plugin id="com.springsource.javax.xml.bind"/>
+<plugin id="com.springsource.javax.xml.bind.source"/>
+<plugin id="com.springsource.org.apache.commons.dbcp"/>
+<plugin id="com.springsource.org.apache.commons.dbcp.source"/>
 <plugin id="org.argeo.server.jackrabbit"/>
 <plugin id="org.argeo.server.jackrabbit.source"/>
 <plugin id="com.springsource.org.apache.lucene"/>
@@ -511,8 +503,6 @@
 <plugin id="com.springsource.org.apache.commons.httpclient.source"/>
 <plugin id="com.springsource.org.apache.commons.compress"/>
 <plugin id="com.springsource.org.apache.commons.compress.source"/>
-<plugin id="com.springsource.org.apache.commons.dbcp"/>
-<plugin id="com.springsource.org.apache.commons.dbcp.source"/>
 <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent"/>
 <plugin id="com.springsource.edu.oswego.cs.dl.util.concurrent.source"/>
 <plugin id="org.argeo.dep.osgi.tika"/>
@@ -530,16 +520,6 @@
 <plugin id="org.argeo.security.activemq"/>
 <plugin id="org.argeo.security.activemq.source"/>
 <plugin id="org.argeo.server.activemq.broker"/>
-<plugin id="com.springsource.javax.xml.soap"/>
-<plugin id="com.springsource.javax.xml.soap.source"/>
-<plugin id="com.springsource.javax.activation"/>
-<plugin id="com.springsource.javax.activation.source"/>
-<plugin id="com.springsource.javax.annotation"/>
-<plugin id="com.springsource.javax.annotation.source"/>
-<plugin id="com.springsource.javax.xml.ws"/>
-<plugin id="com.springsource.javax.xml.ws.source"/>
-<plugin id="com.springsource.javax.xml.bind"/>
-<plugin id="com.springsource.javax.xml.bind.source"/>
 <plugin id="org.argeo.security.dao.ldap"/>
 <plugin id="org.argeo.security.ldap"/>
 <plugin id="org.argeo.security.ldap.source"/>
@@ -713,11 +693,8 @@
 <plugin id="org.argeo.security.ui.admin"/>
 <plugin id="org.argeo.security.ui.admin.source"/>
 <plugin id="org.argeo.slc.unit"/>
-<plugin id="org.argeo.slc.unit.source"/>
 <plugin id="org.argeo.slc.core"/>
-<plugin id="org.argeo.slc.core.source"/>
 <plugin id="org.argeo.slc.specs"/>
-<plugin id="org.argeo.slc.specs.source"/>
 <plugin id="com.springsource.org.aspectj.runtime"/>
 <plugin id="com.springsource.org.aspectj.runtime.source"/>
 <plugin id="com.springsource.org.aspectj.weaver"/>
@@ -733,7 +710,6 @@
 <plugin id="com.springsource.org.apache.commons.codec"/>
 <plugin id="com.springsource.org.apache.commons.codec.source"/>
 <plugin id="org.argeo.slc.support.simple"/>
-<plugin id="org.argeo.slc.support.simple.source"/>
 <plugin id="com.springsource.com.jcraft.jsch"/>
 <plugin id="com.springsource.com.jcraft.jsch.source"/>
 <plugin id="com.springsource.org.quartz"/>

diff --git a/dist/slc/src/main/rpm/etc/slc-cl/config.ini b/dist/slc/src/main/rpm/etc/slc-cl/config.ini
index 56d0dd95e2ce8a51c5c8a5806182314ae5fa6d8b..6d3358faf2b6731e66b997511bad6ef012e41b6c 100644 (file)
--- a/dist/slc/src/main/rpm/etc/slc-cl/config.ini
+++ b/dist/slc/src/main/rpm/etc/slc-cl/config.ini
@@ -3,11 +3,12 @@ org.springframework.osgi.extender,\
 org.argeo.node.repofactory.jackrabbit,\
 org.argeo.node.repo.jackrabbit,\
 org.argeo.security.dao.os,\
-org.argeo.slc.node.jackrabbit,\
 org.argeo.security.equinox,\
+org.argeo.slc.node.jackrabbit,\
 org.argeo.slc.agent,\
-org.argeo.slc.agent.jcr,\
-org.argeo.slc.support.equinox,\
+org.argeo.slc.agent.jcr
+
+argeo.node.repo.configuration=osgibundle:repository-memory.xml
 
 ## LOGGING
 log4j.configuration=file:/etc/slc-cl/log4j.properties
@@ -16,7 +17,6 @@ log4j.configuration=file:/etc/slc-cl/log4j.properties
 osgi.bundles=org.argeo.osgi.boot.jar@start
 
 argeo.osgi.bundles=\
-${user.home}/.slc/modules;in=*,\
-/etc/slc-cl/modules;in=*,\
-/usr/share/slc/lib;in=*.jar,\
-/usr/share/osgi;in=*.jar,\
+${user.home}/.slc/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\
+/etc/slc-cl/modules;in=**;ex=**/.git/**;ex=**/.svn/**,\
+/usr/share/osgi;in=*.jar

diff --git a/dist/slc/src/main/rpm/usr/bin/slc b/dist/slc/src/main/rpm/usr/bin/slc
index 3efd3bc67250a041e891f952cf2678f20820c900..3411c9534f56772329e1c28219b8b8fe181d140b 100644 (file)
--- a/dist/slc/src/main/rpm/usr/bin/slc
+++ b/dist/slc/src/main/rpm/usr/bin/slc
@@ -16,10 +16,12 @@ then
     cp /etc/slc-cl/config.ini $CONF_DIR
 fi
 
-java -jar $OSGI_FRAMEWORK \
+java \
+ -Dslc.launch.module="$MODULE" \
+ -Dslc.launch.flow="$FLOW" \
+ -jar $OSGI_FRAMEWORK \
  -configuration $CONF_DIR \
  -data $DATA_DIR \
- -Dslc.launch.module=$MODULE \
- -Dslc.launch.flow=$FLOW \
  -console \
  -clean
+ 
\ No newline at end of file

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
index 3d6510d147bb051e0348bf631b8117f7d60d222a..c7c4cc1c138439a80d8853a4557390ecdf0c2297 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/BundlesManager.java
@@ -304,15 +304,20 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
                return (T) bundleContext.getService(sfs[0]);
        }
 
-       public <T> T getSingleServiceStrict(Class<T> clss, String filter) {
-               T service = getSingleService(clss, filter, true);
+       public <T> T getSingleServiceStrict(Class<T> clss, String filter,
+                       Boolean synchronous) {
+               T service = getSingleService(clss, filter, synchronous);
                if (service == null)
                        throw new SlcException("No execution flow found for " + filter);
                else
                        return service;
        }
 
-       /** @return the related bundle or null if not found */
+       /**
+        * @param osgiBundle
+        *            cannot be null
+        * @return the related bundle or null if not found
+        */
        public Bundle findRelatedBundle(OsgiBundle osgiBundle) {
                Bundle bundle = null;
                if (osgiBundle.getInternalBundleId() != null) {
@@ -387,8 +392,11 @@ public class BundlesManager implements BundleContextAware, FrameworkListener,
                this.defaultTimeout = defaultTimeout;
        }
 
-       /** Temporary internal access for {@link OsgiExecutionModulesManager} */
-       BundleContext getBundleContext() {
+       /**
+        * Use with caution since it may interfer with some cached information
+        * within this object
+        */
+       public BundleContext getBundleContext() {
                return bundleContext;
        }
 

diff --git a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
index c5d23589ef03ee09c5a53429359a7e36a412567d..8cdb682b531e7106d505988b18225b3c2f54acbe 100644 (file)
--- a/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
+++ b/runtime/org.argeo.slc.support.osgi/src/main/java/org/argeo/slc/osgi/OsgiExecutionModulesManager.java
@@ -48,6 +48,7 @@ import org.argeo.slc.process.RealizedFlow;
 import org.osgi.framework.Bundle;
 import org.osgi.framework.BundleException;
 import org.osgi.framework.Constants;
+import org.osgi.framework.launch.Framework;
 import org.springframework.osgi.service.importer.OsgiServiceLifecycleListener;
 
 /** Execution modules manager implementation based on an OSGi runtime. */
@@ -75,26 +76,37 @@ public class OsgiExecutionModulesManager extends
                        new Thread("Unique Flow") {
                                @Override
                                public void run() {
+                                       if (log.isDebugEnabled())
+                                               log.debug("Launch unique flow " + flow
+                                                               + " from module " + module);
                                        try {
-                                               bundlesManager.startSynchronous(bundlesManager
-                                                               .findRelatedBundle(bundlesManager
-                                                                               .findFromPattern(module)));
+                                               OsgiBundle osgiBundle = bundlesManager
+                                                               .findFromPattern(module);
+                                               Bundle moduleBundle = bundlesManager
+                                                               .findRelatedBundle(osgiBundle);
+                                               bundlesManager.startSynchronous(moduleBundle);
                                                RealizedFlow lastLaunch = findRealizedFlow(module, flow);
                                                if (lastLaunch == null)
                                                        throw new SlcException("Cannot find launch for "
                                                                        + module + " " + flow);
                                                execute(lastLaunch);
                                        } catch (Exception e) {
-                                               throw new SlcException(
-                                                               "Error when executing unique flow " + flow
-                                                                               + " on " + module, e);
+                                               log.error("Error in unique flow " + flow
+                                                               + " from module " + module, e);
                                        } finally {
+                                               if (log.isDebugEnabled())
+                                                       log.debug("Shutdown OSGi runtime...");
+                                               Framework framework = (Framework) bundlesManager
+                                                               .getBundleContext().getBundle(0);
                                                try {
-                                                       bundlesManager.getBundleContext().getBundle(0)
-                                                                       .stop();
+                                                       // shutdown framework
+                                                       framework.stop();
+                                                       // wait 1 min for shutdown
+                                                       framework.waitForStop(60 * 1000);
+                                                       // close VM
                                                        System.exit(0);
                                                } catch (Exception e) {
-                                                       log.error("Cannot shutdown equinox.", e);
+                                                       e.printStackTrace();
                                                        System.exit(1);
                                                }
                                        }
@@ -170,7 +182,7 @@ public class OsgiExecutionModulesManager extends
                String filter = "(&(Bundle-SymbolicName=" + moduleName
                                + ")(org.springframework.osgi.bean.name=" + flowName + "))";
                return bundlesManager.getSingleServiceStrict(ExecutionFlow.class,
-                               filter);
+                               filter, true);
        }
 
        protected ExecutionContext findExecutionContext(String moduleName,
@@ -178,7 +190,7 @@ public class OsgiExecutionModulesManager extends
                String filter = "(&(Bundle-SymbolicName=" + moduleName
                                + ")(Bundle-Version=" + moduleVersion + "))";
                return bundlesManager.getSingleServiceStrict(ExecutionContext.class,
-                               filter);
+                               filter, true);
        }
 
        protected ExecutionFlowDescriptorConverter findExecutionFlowDescriptorConverter(

diff --git a/runtime/pom.xml b/runtime/pom.xml
index e9c86033587ddea532bc3841a58086e4ac112d4a..6e75e85245cecb79854200e105106a274de7d5a7 100644 (file)
--- a/runtime/pom.xml
+++ b/runtime/pom.xml
@@ -43,7 +43,11 @@
                                <directory>.</directory>
                                <includes>
                                        <include>META-INF/**</include>
+                                       <include>*.properties</include>
                                </includes>
+                               <excludes>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
                        </resource>
                </resources>
                <plugins>