Facilitate OSGi deployment

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

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 81f29a762a9a64fcec72e00cb48102059cfc06ff..fc6367884d746e985b7012d33c8cfdf6cc39c40f 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -3,13 +3,13 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>

-               <artifactId>argeo-slc</artifactId>
+               <artifactId>argeo-slc-demo</artifactId>

                <version>0.11.3-SNAPSHOT</version>
                <version>0.11.3-SNAPSHOT</version>

-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>

        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.basic</artifactId>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.basic</artifactId>

-       <name>SLC Demo Basic Test Module</name>
+       <name>Argeo SLC Demo Basic Test Module</name>

        <packaging>jar</packaging>
        <properties></properties>
        <build>
        <packaging>jar</packaging>
        <properties></properties>
        <build>

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy
deleted file mode 100644 (file)
index da3926e..0000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/BasicExecutionFlow.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-import org.argeo.slc.test.*;
-
-public class BasicExecutionFlow implements org.argeo.slc.executionflow.ExecutionFlow {
-
-       ExecutableTestRun firstSubTest = null;
-       ExecutableTestRun secondSubTest = null;
-
-       void execute(){
-               firstSubTest?.execute();
-               secondSubTest?.execute();
-       }
-}

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/slc.properties b/demo/org.argeo.slc.demo.basic/src/main/resources/slc.properties
deleted file mode 100644 (file)
index b18dce1..0000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/slc.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.executionflow.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.executionflow.ExecutionContext=TRACE
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
-testCase=002
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml b/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml
deleted file mode 100644 (file)
index 6cc40e8..0000000
--- a/demo/org.argeo.slc.demo.basic/src/main/resources/test.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:lang="http://www.springframework.org/schema/lang"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       ">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">\r
-               <meta key="meta1" value="mata1Value" />\r
-               <qualifier>\r
-                       <attribute key="qual1" value="qual1value" />\r
-               </qualifier>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="testGroovyImpl" />\r
-                               <ref local="testBshImpl" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">\r
-               <lang:property name="firstSubTest">\r
-                       <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                               p:testData-ref="testData-${testCase}" />\r
-               </lang:property>\r
-       </lang:groovy>\r
-\r
-       <bean id="testGroovyImpl" parent="testGroovy">\r
-               <property name="message" value="Hello World! Groovy" />\r
-       </bean>\r
-       <bean id="testBshImpl" parent="testBsh">\r
-               <property name="message" value="Hello World! Beanshell" />\r
-       </bean>\r
-\r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">\r
-       </bean>\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <lang:groovy id="testGroovyBean">\r
-               <lang:inline-script><![CDATA[\r
-               class Message {\r
-               String message = 'test'\r
-               \r
-               public String getMessage(){\r
-                       return message;\r
-               }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:groovy id="testGroovy">\r
-               <lang:inline-script><![CDATA[\r
-               class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-       \r
-               String message = 'test'\r
-       \r
-                       void execute(){\r
-                               println(message);\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">\r
-               <lang:inline-script><![CDATA[\r
-               setStrictJava(true);\r
-\r
-               class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-\r
-                       String message = "test";\r
-\r
-                       public void execute(){\r
-                               System.out.println(message);\r
-                       }\r
-                       \r
-                       public void setMessage(String message){\r
-                               this.message = message;\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:bsh>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/.project b/demo/org.argeo.slc.demo.log4j/.project
index 6a65410fd33956be21564a62c188950e9b00e064..7101391d2a6d635a53555ccd8f5cdd94c7878445 100644 (file)
--- a/demo/org.argeo.slc.demo.log4j/.project
+++ b/demo/org.argeo.slc.demo.log4j/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>

-       <name>org.argeo.slc.demo.basic</name>
+       <name>org.argeo.slc.demo.log4j</name>

        <comment></comment>
        <projects>
        </projects>
        <comment></comment>
        <projects>
        </projects>


@@ -15,14 +15,8 @@
                        <arguments>
                        </arguments>
                </buildCommand>
                        <arguments>
                        </arguments>
                </buildCommand>

-               <buildCommand>
-                       <name>org.springframework.ide.eclipse.core.springbuilder</name>
-                       <arguments>
-                       </arguments>
-               </buildCommand>

        </buildSpec>
        <natures>
        </buildSpec>
        <natures>

-               <nature>org.springframework.ide.eclipse.core.springnature</nature>

                <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>
                <nature>org.maven.ide.eclipse.maven2Nature</nature>
                <nature>org.eclipse.jdt.core.javanature</nature>
        </natures>

diff --git a/demo/org.argeo.slc.demo.log4j/.springBeans b/demo/org.argeo.slc.demo.log4j/.springBeans
deleted file mode 100644 (file)
index c11d814..0000000
--- a/demo/org.argeo.slc.demo.log4j/.springBeans
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beansProjectDescription>
-       <version>1</version>
-       <pluginVersion><![CDATA[2.2.1.v200811281800]]></pluginVersion>
-       <configSuffixes>
-               <configSuffix><![CDATA[xml]]></configSuffix>
-       </configSuffixes>
-       <enableImports><![CDATA[true]]></enableImports>
-       <configs>
-       </configs>
-       <configSets>
-       </configSets>
-</beansProjectDescription>

diff --git a/demo/org.argeo.slc.demo.log4j/pom.xml b/demo/org.argeo.slc.demo.log4j/pom.xml
index 81f29a762a9a64fcec72e00cb48102059cfc06ff..d6babe9add27f74e7f4187d16eb20ff598e46d2d 100644 (file)
--- a/demo/org.argeo.slc.demo.log4j/pom.xml
+++ b/demo/org.argeo.slc.demo.log4j/pom.xml
@@ -3,13 +3,13 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>

-               <artifactId>argeo-slc</artifactId>
+               <artifactId>argeo-slc-demo</artifactId>

                <version>0.11.3-SNAPSHOT</version>
                <version>0.11.3-SNAPSHOT</version>

-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>

        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>

-       <artifactId>org.argeo.slc.demo.basic</artifactId>
-       <name>SLC Demo Basic Test Module</name>
+       <artifactId>org.argeo.slc.demo.log4j</artifactId>
+       <name>Argeo SLC Demo Logging</name>

        <packaging>jar</packaging>
        <properties></properties>
        <build>
        <packaging>jar</packaging>
        <properties></properties>
        <build>


@@ -23,9 +23,7 @@
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>
                                <version>${version.maven-bundle-plugin}</version>
                                <configuration>
                                        <instructions>

-                                               <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
-                                               <Require-Bundle>org.argeo.slc.support.equinox,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
-                                               <Spring-Context>conf/*,conf/testCases/*</Spring-Context>
+                                               <Fragment-Host>com.springsource.org.apache.log4j</Fragment-Host>

                                        </instructions>
                                </configuration>
                                <executions>
                                        </instructions>
                                </configuration>
                                <executions>


@@ -42,12 +40,8 @@
        <dependencies>
 
                <dependency>
        <dependencies>
 
                <dependency>

-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.equinox</artifactId>
-               </dependency>
-               <dependency>
-                       <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.simple</artifactId>
+                       <groupId>org.apache.log4j</groupId>
+                       <artifactId>com.springsource.org.apache.log4j</artifactId>

                </dependency>
        </dependencies>
 </project>
                </dependency>
        </dependencies>
 </project>

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy b/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy
deleted file mode 100644 (file)
index da3926e..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/BasicExecutionFlow.groovy
+++ /dev/null
@@ -1,12 +0,0 @@
-import org.argeo.slc.test.*;
-
-public class BasicExecutionFlow implements org.argeo.slc.executionflow.ExecutionFlow {
-
-       ExecutableTestRun firstSubTest = null;
-       ExecutableTestRun secondSubTest = null;
-
-       void execute(){
-               firstSubTest?.execute();
-               secondSubTest?.execute();
-       }
-}

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml
deleted file mode 100644 (file)
index 168a56c..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/basic.xml
+++ /dev/null
@@ -1,85 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="basic.executionSpec" class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testedComponentId">\r
-                                       <bean parent="specAttribute" p:value="100" p:isParameter="true"/>\r
-                               </entry>\r
-                               <entry key="testData1">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean parent="refAttribute" p:targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="basic.ref" factory-bean="basic.executionSpec"\r
-               factory-method="createRef" abstract="true" />\r
-\r
-       <bean id="basic.executionFlowTemplate" class="org.argeo.slc.core.execution.SimpleExecutionFlow"\r
-               abstract="true">\r
-               <property name="executionSpec" ref="basic.executionSpec" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref bean="echo1" />\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData">\r
-                                               <bean parent="basic.ref">\r
-                                                       <constructor-arg value="testData1" />\r
-                                               </bean>\r
-                                       </property>\r
-                               </bean>\r
-                               <bean parent="testRun">\r
-                                       <property name="testDefinition" ref="testDef" />\r
-                                       <property name="testData" ref="ref1" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="ref1" parent="basic.ref" scope="prototype">\r
-               <constructor-arg value="testData2" />\r
-       </bean>\r
-\r
- \r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               >\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
- \r
- \r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult" />\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <!--\r
-               <bean class="org.springframework.aop.framework.ProxyFactoryBean">\r
-               <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> <property\r
-               name="targetSource"> <bean\r
-               class="org.argeo.slc.executionflow.ExecutionTargetSource"> <property\r
-               name="name" value="testData" /> <property name="targetClass"\r
-               value="org.argeo.slc.core.test.BasicTestData" /> </bean> </property>\r
-               <property name="proxyTargetClass" value="true" /> </bean>\r
-       -->\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml
deleted file mode 100644 (file)
index 4ed1362..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/common.xml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <bean id="specAttribute" class="org.argeo.slc.core.execution.SimpleSpecAttribute"\r
-               abstract="true" />\r
-\r
-       <bean id="refAttribute" class="org.argeo.slc.core.execution.RefSpecAttribute"\r
-               abstract="true" />\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml
deleted file mode 100644 (file)
index 68316a1..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/imports.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<beans xmlns="http://www.springframework.org/schema/beans"
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-       xsi:schemaLocation="
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">
-
-       <import resource="classpath:org/argeo/slc/core/execution/spring.xml" />
-
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml
deleted file mode 100644 (file)
index 6b943dc..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/main.xml
+++ /dev/null
@@ -1,49 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-<!-- \r
-       <bean id="testLaunch" class="org.argeo.slc.execution.old.TestLaunch"\r
-               p:flowName="main" init-method="launch" />\r
--->\r
-\r
-       <bean id="executionModule" class="org.argeo.slc.osgi.OsgiExecutionModule" />\r
-\r
-       <bean id="main" class="org.argeo.slc.core.execution.SimpleExecutionFlow">\r
-               <property name="executionSpec">\r
-                       <bean class="org.argeo.slc.core.execution.SimpleExecutionSpec">\r
-                               <property name="attributes">\r
-                                       <map>\r
-                                               <entry key="testKey">\r
-                                                       <bean parent="specAttribute" p:value="660" />\r
-                                               </entry>\r
-                                       </map>\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="echo1" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.001" />\r
-                               <ref bean="basic.002" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="echo1" parent="echoTemplate" scope="execution">\r
-               <property name="message"\r
-                       value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-\r
-       <bean id="echoTemplate" class="org.argeo.slc.core.execution.tasks.Echo"\r
-               abstract="true">\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml
deleted file mode 100644 (file)
index ebc3364..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/osgi.xml
+++ /dev/null
@@ -1,11 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans:beans xmlns="http://www.springframework.org/schema/osgi"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans"\r
-       xsi:schemaLocation="http://www.springframework.org/schema/osgi  \r
-       http://www.springframework.org/schema/osgi/spring-osgi-1.1.xsd\r
-       http://www.springframework.org/schema/beans   \r
-       http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <service interface="org.argeo.slc.execution.ExecutionModule"\r
-               ref="executionModule" />\r
-</beans:beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-001.xml
deleted file mode 100644 (file)
index a542664..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-001.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:aop="http://www.springframework.org/schema/aop"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
-\r
-       <bean id="basic.001" parent="basic.executionFlowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="testData1" value-ref="basic.001.testData" />\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData" scope="execution">\r
-                                               <aop:scoped-proxy />\r
-                                               <property name="expected" value="tata101" />\r
-                                               <property name="reached" value="tata@{testKey}" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r
-               scope="execution">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata100" />\r
-               <property name="reached" value="tata@{testedComponentId}" />\r
-       </bean>\r
-\r
-       <bean id="basic.001.testData2" class="org.argeo.slc.core.test.context.DefaultContextTestData">\r
-       </bean>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-002.xml
deleted file mode 100644 (file)
index c2946fd..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/conf/testCases/basic-002.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-\r
-       xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
-\r
-       <bean id="basic.002" parent="basic.executionFlowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="testData1">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="toto" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                               <property name="expected" value="tata" />\r
-                                               <property name="reached" value="toto" />\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties b/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
new file mode 100644 (file)
index 0000000..6abb490
--- /dev/null
+++ b/demo/org.argeo.slc.demo.log4j/src/main/resources/log4j.properties
@@ -0,0 +1,19 @@
+log4j.rootLogger=WARN, console
+
+## Levels
+log4j.logger.org.argeo=DEBUG
+log4j.logger.org.argeo.slc.execution.ExecutionParameterPostProcessor=TRACE
+log4j.logger.org.argeo.slc.execution.ExecutionContext=DEBUG
+log4j.logger.org.argeo.slc.execution.SimpleExecutionSpec=DEBUG
+
+log4j.logger.org.springframework.osgi=WARN
+
+## Appenders
+# console is set to be a ConsoleAppender.
+log4j.appender.console=org.apache.log4j.ConsoleAppender
+
+# console uses PatternLayout.
+log4j.appender.console.layout=org.apache.log4j.PatternLayout
+log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
+
+testCase=002
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties b/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties
deleted file mode 100644 (file)
index b18dce1..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/slc.properties
+++ /dev/null
@@ -1,16 +0,0 @@
-log4j.rootLogger=WARN, console
-
-## Levels
-log4j.logger.org.argeo=DEBUG
-log4j.logger.org.argeo.slc.executionflow.ExecutionParameterPostProcessor=TRACE
-log4j.logger.org.argeo.slc.executionflow.ExecutionContext=TRACE
-
-## Appenders
-# console is set to be a ConsoleAppender.
-log4j.appender.console=org.apache.log4j.ConsoleAppender
-
-# console uses PatternLayout.
-log4j.appender.console.layout=org.apache.log4j.PatternLayout
-log4j.appender.console.layout.ConversionPattern= %-5p %d{ISO8601} %m - %c%n
-
-testCase=002
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml b/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml
deleted file mode 100644 (file)
index 6cc40e8..0000000
--- a/demo/org.argeo.slc.demo.log4j/src/main/resources/test.xml
+++ /dev/null
@@ -1,105 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>\r
-<beans xmlns="http://www.springframework.org/schema/beans"\r
-       xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"\r
-       xmlns:lang="http://www.springframework.org/schema/lang"\r
-       xsi:schemaLocation="\r
-       http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd\r
-       http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-2.5.xsd\r
-       ">\r
-\r
-       <import\r
-               resource="classpath:/org/argeo/slc/core/test/spring/applicationContext.xml" />\r
-\r
-       <import resource="testCases/basic-001.xml" />\r
-       <import resource="testCases/basic-002.xml" />\r
-\r
-       <bean id="executionFlow.basic1" class="org.argeo.slc.executionflow.SimpleExecutionFlow">\r
-               <meta key="meta1" value="mata1Value" />\r
-               <qualifier>\r
-                       <attribute key="qual1" value="qual1value" />\r
-               </qualifier>\r
-               <property name="executables">\r
-                       <list>\r
-                               <ref local="testGroovyImpl" />\r
-                               <ref local="testBshImpl" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                               <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                                       p:testData-ref="testData-${testCase}" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <lang:groovy id="executionFlow.groovy1" script-source="src/slc/conf/BasicExecutionFlow.groovy">\r
-               <lang:property name="firstSubTest">\r
-                       <bean parent="testRun" p:testDefinition-ref="testDef"\r
-                               p:testData-ref="testData-${testCase}" />\r
-               </lang:property>\r
-       </lang:groovy>\r
-\r
-       <bean id="testGroovyImpl" parent="testGroovy">\r
-               <property name="message" value="Hello World! Groovy" />\r
-       </bean>\r
-       <bean id="testBshImpl" parent="testBsh">\r
-               <property name="message" value="Hello World! Beanshell" />\r
-       </bean>\r
-\r
-       <bean id="testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean\r
-               class="org.springframework.beans.factory.config.PropertyPlaceholderConfigurer" />\r
-\r
-       <bean id="testResult" parent="slcDefault.test.basicSimpleTestResult">\r
-       </bean>\r
-\r
-       <bean id="testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="testResult" />\r
-       </bean>\r
-\r
-       <lang:groovy id="testGroovyBean">\r
-               <lang:inline-script><![CDATA[\r
-               class Message {\r
-               String message = 'test'\r
-               \r
-               public String getMessage(){\r
-                       return message;\r
-               }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:groovy id="testGroovy">\r
-               <lang:inline-script><![CDATA[\r
-               class GroovyMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-       \r
-               String message = 'test'\r
-       \r
-                       void execute(){\r
-                               println(message);\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:groovy>\r
-\r
-       <lang:bsh id="testBsh" script-interfaces="org.argeo.slc.test.ExecutableTestRun">\r
-               <lang:inline-script><![CDATA[\r
-               setStrictJava(true);\r
-\r
-               class BshMessenger extends org.argeo.slc.core.test.SimpleTestRun {\r
-\r
-                       String message = "test";\r
-\r
-                       public void execute(){\r
-                               System.out.println(message);\r
-                       }\r
-                       \r
-                       public void setMessage(String message){\r
-                               this.message = message;\r
-                       }\r
-               }\r
-               ]]></lang:inline-script>\r
-       </lang:bsh>\r
-\r
-</beans>
\ No newline at end of file

diff --git a/demo/org.argeo.slc.demo.manager/.springBeans b/demo/org.argeo.slc.demo.manager/.springBeans
index 2732929fee7c5d771fbc81da7241251b1197deef..15edcfdb85a9dc2bcf0ca2018b9b8fa2ea519e91 100644 (file)
--- a/demo/org.argeo.slc.demo.manager/.springBeans
+++ b/demo/org.argeo.slc.demo.manager/.springBeans
@@ -9,6 +9,7 @@
        <configs>
                <config>src/main/resources/conf/manager-osgi.xml</config>
                <config>src/main/resources/conf/manager.xml</config>
        <configs>
                <config>src/main/resources/conf/manager-osgi.xml</config>
                <config>src/main/resources/conf/manager.xml</config>

+               <config>src/main/resources/conf/jms.xml</config>

        </configs>
        <configSets>
        </configSets>
        </configs>
        <configSets>
        </configSets>

diff --git a/demo/org.argeo.slc.demo.manager/pom.xml b/demo/org.argeo.slc.demo.manager/pom.xml
index 3254fbf1edcbe7283203cb20bb980b70158b1fbb..62b0cd2d43f46652c1cb32fa350eadc9045e7dfa 100644 (file)
--- a/demo/org.argeo.slc.demo.manager/pom.xml
+++ b/demo/org.argeo.slc.demo.manager/pom.xml
@@ -3,14 +3,14 @@
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>
        <modelVersion>4.0.0</modelVersion>
        <parent>
                <groupId>org.argeo.slc</groupId>

-               <artifactId>argeo-slc</artifactId>
+               <artifactId>argeo-slc-demo</artifactId>

                <version>0.11.3-SNAPSHOT</version>
                <version>0.11.3-SNAPSHOT</version>

-               <relativePath>../../org.argeo.slc</relativePath>
+               <relativePath>..</relativePath>

        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.manager</artifactId>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
        <artifactId>org.argeo.slc.demo.manager</artifactId>

-       <name>SLC Demo Manager</name>
-       <packaging>bundle</packaging>
+       <name>Argeo SLC Demo Manager</name>
+       <packaging>jar</packaging>

        <properties></properties>
        <build>
                <plugins>
        <properties></properties>
        <build>
                <plugins>


@@ -23,28 +23,35 @@
                                                <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
                                                <Require-Bundle>org.springframework.jms,com.springsource.org.castor,com.springsource.org.apache.xbean.spring,com.springsource.org.apache.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
                                                <Spring-Context>conf/*</Spring-Context>
                                                <Import-Package>org.apache.commons.logging,org.springframework.beans.factory.config</Import-Package>
                                                <Require-Bundle>org.springframework.jms,com.springsource.org.castor,com.springsource.org.apache.xbean.spring,com.springsource.org.apache.activemq,org.argeo.slc.support.equinox,org.argeo.slc.support.activemq,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,org.springframework.oxm,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
                                                <Spring-Context>conf/*</Spring-Context>

-                                               <!-- 
-                                               <Embed-Dependency>com.springsource.org.castor</Embed-Dependency>
-                                               <Embed-Transitive>true</Embed-Transitive>
-                                               <Import-Package>*,javax.xml.parsers;resolution:=optional,
-                                                       javax.xml.transform;resolution:=optional,
-                                                       javax.xml.transform.dom;resolution:=optional,
-                                                       javax.xml.transform.stream;resolution:=optional,
-                                                       org.w3c.dom;resolution:=optional,
-                                                       org.xml.sax;resolution:=optional,
-                                                       org.xml.sax.helpers;resolution:=optional,
-                                                       netscape.ldap;resolution:=optional,
-                                                       org.apache.oro.text.regex;resolution:=optional,
-                                                       org.apache.xerces.utils.regex;resolution:=optional,
-                                                       weblogic.apache.xml.serialize;resolution:=optional,
-                                                       com.sun.org.apache.xml.internal.serialize;resolution:=optional
-                                               </Import-Package>
-                                               <Eclipse-RegisterBuddy>com.springsource.org.castor</Eclipse-RegisterBuddy>
-                                                -->
-

                                        </instructions>
                                </configuration>
                        </plugin>
                                        </instructions>
                                </configuration>
                        </plugin>

+                       <plugin>
+                               <groupId>org.codehaus.mojo</groupId>
+                               <artifactId>exec-maven-plugin</artifactId>
+                               <version>1.1-beta-1</version>
+                               <!--
+                                       <configuration>
+                                       <mainClass>org.argeo.slc.detached.launcher.Main</mainClass>
+                                       <systemProperties> <systemProperty>
+                                       <key>slc.osgi.scanClasspath</key> <value>true</value>
+                                       </systemProperty> <systemProperty> <key>slc.osgi.start</key>
+                                       <value>*</value> </systemProperty> </systemProperties>
+                                       <classpathScope>test</classpathScope> </configuration>
+                               -->
+                               <configuration>
+                                       <executable>${java.home}/bin/java</executable>
+                                       <arguments>
+                                               <argument>-Xbootclasspath/p:${settings.localRepository}/org/apache/xerces/com.springsource.org.apache.xerces/2.8.1/com.springsource.org.apache.xerces-2.8.1.jar:${settings.localRepository}/org/apache/xmlcommons/com.springsource.org.apache.xmlcommons/1.3.3/com.springsource.org.apache.xmlcommons-1.3.3.jar</argument>
+                                               <argument>-Dslc.osgi.scanClasspath=true</argument>
+                                               <argument>-Dslc.osgi.start=*</argument>
+                                               <argument>-classpath</argument>
+                                               <classpath />
+                                               <argument>org.argeo.slc.detached.launcher.Main</argument>
+                                       </arguments>
+                                       <workingDirectory>target</workingDirectory>
+                               </configuration>
+                       </plugin>

                </plugins>
        </build>
        <dependencies>
                </plugins>
        </build>
        <dependencies>


@@ -62,11 +69,6 @@
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                </dependency>
 
                        <artifactId>org.argeo.slc.support.castor</artifactId>
                </dependency>
 

-               <dependency>
-                       <groupId>org.codehaus.castor</groupId>
-                       <artifactId>com.springsource.org.castor</artifactId>
-               </dependency>
-

                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>
                <dependency>
                        <groupId>org.argeo.slc</groupId>
                        <artifactId>org.argeo.slc.detached.launcher</artifactId>


@@ -74,13 +76,14 @@
                </dependency>
 
                <dependency>
                </dependency>
 
                <dependency>

-                       <groupId>org.eclipse.osgi</groupId>
-                       <artifactId>org.eclipse.osgi</artifactId>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.basic</artifactId>
+                       <version>${project.version}</version>

                </dependency>
                </dependency>

-

                <dependency>
                <dependency>

-                       <groupId>org.springframework.osgi</groupId>
-                       <artifactId>org.springframework.osgi.extender</artifactId>
+                       <groupId>org.argeo.slc.demo</groupId>
+                       <artifactId>org.argeo.slc.demo.log4j</artifactId>
+                       <version>${project.version}</version>

                </dependency>
 
        </dependencies>
                </dependency>
 
        </dependencies>

diff --git a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
index 96703a1165ae7ad4211a412663402b2c82d7fe6c..d7da1e673910b880aca9da684317a3d50111f180 100644 (file)
--- a/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
+++ b/org.argeo.slc.detached.launcher/src/main/java/org/argeo/slc/detached/launcher/Main.java
@@ -4,6 +4,7 @@ import java.io.File;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;
 import java.io.FileInputStream;
 import java.io.InputStream;
 import java.lang.reflect.Method;

+import java.util.ArrayList;

 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;
 import java.util.Hashtable;
 import java.util.Iterator;
 import java.util.List;


@@ -95,6 +96,8 @@ public class Main {
 
                BundleContext context = EclipseStarter.startup(equinoxArgs, null);
 
 
                BundleContext context = EclipseStarter.startup(equinoxArgs, null);
 

+               List installBundleNames = new ArrayList();
+

                // Load from class path (dev environment, maven)
                if (config.getProperty(PROP_SLC_OSGI_SCAN_CLASSPATH, "false").equals(
                                "true")) {
                // Load from class path (dev environment, maven)
                if (config.getProperty(PROP_SLC_OSGI_SCAN_CLASSPATH, "false").equals(
                                "true")) {


@@ -105,7 +108,8 @@ public class Main {
                                        String path = st.nextToken();
                                        String url = "reference:file:"
                                                        + new File(path).getCanonicalPath();
                                        String path = st.nextToken();
                                        String url = "reference:file:"
                                                        + new File(path).getCanonicalPath();

-                                       context.installBundle(url);
+                                       Bundle bundle = context.installBundle(url);
+                                       installBundleNames.add(bundle.getSymbolicName());

                                        info("Installed from classpath " + url);
                                } catch (Exception e) {
                                        bundleInstallWarn(e.getMessage());
                                        info("Installed from classpath " + url);
                                } catch (Exception e) {
                                        bundleInstallWarn(e.getMessage());


@@ -120,7 +124,8 @@ public class Main {
                        try {
                                String bundleName = (String) devBundles.next();
                                String url = (String) devBundleUrls.get(bundleName);
                        try {
                                String bundleName = (String) devBundles.next();
                                String url = (String) devBundleUrls.get(bundleName);

-                               context.installBundle(url);
+                               Bundle bundle = context.installBundle(url);
+                               installBundleNames.add(bundle.getSymbolicName());

                                info("Installed as dev bundle " + url);
                        } catch (Exception e) {
                                bundleInstallWarn(e.getMessage());
                                info("Installed as dev bundle " + url);
                        } catch (Exception e) {
                                bundleInstallWarn(e.getMessage());


@@ -136,7 +141,8 @@ public class Main {
                                try {
                                        String url = "reference:file:"
                                                        + bundleFiles[i].getCanonicalPath();
                                try {
                                        String url = "reference:file:"
                                                        + bundleFiles[i].getCanonicalPath();

-                                       context.installBundle(url);
+                                       Bundle bundle = context.installBundle(url);
+                                       installBundleNames.add(bundle.getSymbolicName());

                                        info("INFO: Installed from SLC home " + url);
                                } catch (Exception e) {
                                        bundleInstallWarn(e.getMessage());
                                        info("INFO: Installed from SLC home " + url);
                                } catch (Exception e) {
                                        bundleInstallWarn(e.getMessage());


@@ -148,10 +154,24 @@ public class Main {
                // Start bundles
                String bundleStart = config.getProperty(PROP_SLC_OSGI_START,
                                "org.springframework.osgi.extender,org.argeo.slc.detached");
                // Start bundles
                String bundleStart = config.getProperty(PROP_SLC_OSGI_START,
                                "org.springframework.osgi.extender,org.argeo.slc.detached");

-               StringTokenizer stBundleStart = new StringTokenizer(bundleStart, ",");
-               while (stBundleStart.hasMoreTokens()) {
-                       String bundleSymbolicName = stBundleStart.nextToken();
-                       startBundle(context, bundleSymbolicName);
+
+               if (bundleStart.trim().equals("*")) {
+                       for (int i = 0; i < installBundleNames.size(); i++) {
+                               String bundleSymbolicName = installBundleNames.get(i)
+                                               .toString();
+                               try {
+                                       startBundle(context, bundleSymbolicName);
+                               } catch (Exception e) {
+                                       bundleInstallWarn(e.getMessage());
+                               }
+                       }
+               } else {
+                       StringTokenizer stBundleStart = new StringTokenizer(bundleStart,
+                                       ",");
+                       while (stBundleStart.hasMoreTokens()) {
+                               String bundleSymbolicName = stBundleStart.nextToken();
+                               startBundle(context, bundleSymbolicName);
+                       }

                }
        }
 
                }
        }
 

diff --git a/org.argeo.slc/pom.xml b/org.argeo.slc/pom.xml
index ec509c840601b8521b0e09962b0306bb19227e3d..095d848bdfe55fb1af998e0b3bb3595c0f13613d 100644 (file)
--- a/org.argeo.slc/pom.xml
+++ b/org.argeo.slc/pom.xml
@@ -490,6 +490,16 @@ limitations under the License.
                                <artifactId>com.springsource.org.aspectj.weaver</artifactId>
                                <version>1.6.2.RELEASE</version>
                        </dependency>
                                <artifactId>com.springsource.org.aspectj.weaver</artifactId>
                                <version>1.6.2.RELEASE</version>
                        </dependency>

+                       <dependency>
+                               <groupId>net.sourceforge.cglib</groupId>
+                               <artifactId>com.springsource.net.sf.cglib</artifactId>
+                               <version>2.1.3</version>
+                       </dependency>
+                       <dependency>
+                               <groupId>org.objectweb.asm</groupId>
+                               <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
+                               <version>2.2.0</version>
+                       </dependency>

 
                        <!-- Ant -->
                        <dependency>
 
                        <!-- Ant -->
                        <dependency>

diff --git a/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
new file mode 100644 (file)
index 0000000..b4180a1
--- /dev/null
+++ b/runtime/org.argeo.slc.support.equinox/.settings/org.eclipse.jdt.core.prefs
@@ -0,0 +1,12 @@
+#Wed Feb 25 15:37:16 CET 2009
+eclipse.preferences.version=1
+org.eclipse.jdt.core.compiler.codegen.inlineJsrBytecode=enabled
+org.eclipse.jdt.core.compiler.codegen.targetPlatform=1.5
+org.eclipse.jdt.core.compiler.codegen.unusedLocal=preserve
+org.eclipse.jdt.core.compiler.compliance=1.5
+org.eclipse.jdt.core.compiler.debug.lineNumber=generate
+org.eclipse.jdt.core.compiler.debug.localVariable=generate
+org.eclipse.jdt.core.compiler.debug.sourceFile=generate
+org.eclipse.jdt.core.compiler.problem.assertIdentifier=error
+org.eclipse.jdt.core.compiler.problem.enumIdentifier=error
+org.eclipse.jdt.core.compiler.source=1.5

diff --git a/runtime/org.argeo.slc.support.equinox/pom.xml b/runtime/org.argeo.slc.support.equinox/pom.xml
index e089ee05d92c20a75df7d3ff206184b75b03f466..cf6170b4598096f995eb8758188f18eeb4a59497 100644 (file)
--- a/runtime/org.argeo.slc.support.equinox/pom.xml
+++ b/runtime/org.argeo.slc.support.equinox/pom.xml
@@ -9,7 +9,7 @@
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.equinox</artifactId>
        </parent>
        <groupId>org.argeo.slc.runtime</groupId>
        <artifactId>org.argeo.slc.support.equinox</artifactId>

-       <name>SLC Equinox OSGi Support</name>
+       <name>Argeo SLC Support Equinox OSGi</name>

        <packaging>jar</packaging>
        <properties></properties>
        <build>
        <packaging>jar</packaging>
        <properties></properties>
        <build>


@@ -48,22 +48,23 @@
                        <artifactId>org.springframework.osgi.core</artifactId>
                </dependency>
 
                        <artifactId>org.springframework.osgi.core</artifactId>
                </dependency>
 

-<!-- 

                <dependency>
                <dependency>

-                       <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>com.springsource.org.codehaus.groovy</artifactId>
-                       <version>1.5.7</version>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>

                </dependency>
                </dependency>

-                -->
+
+               <dependency>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
+               </dependency>
+

                <dependency>
                        <groupId>net.sourceforge.cglib</groupId>
                        <artifactId>com.springsource.net.sf.cglib</artifactId>
                <dependency>
                        <groupId>net.sourceforge.cglib</groupId>
                        <artifactId>com.springsource.net.sf.cglib</artifactId>

-                       <version>2.1.3</version>

                </dependency>
                <dependency>
                        <groupId>org.objectweb.asm</groupId>
                        <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>
                </dependency>
                <dependency>
                        <groupId>org.objectweb.asm</groupId>
                        <artifactId>com.springsource.org.objectweb.asm.attrs</artifactId>

-                       <version>2.2.0</version>

                </dependency>
        </dependencies>
 </project>
                </dependency>
        </dependencies>
 </project>