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

diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath
index 16f01e2ee7b671c44c26c453773dab706e98da1e..2bc0b0bd8d5168204f70dd5c0f10b72ec28440af 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/.classpath
+++ b/demo/org.argeo.slc.demo.basic/.classpath
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <classpath>
-       <classpathentry kind="src" output="target/classes" path="src/main/java"/>
+       <classpathentry kind="src" path="src/main/resources"/>
+       <classpathentry kind="src" path="src/slc"/>
        <classpathentry kind="con" path="org.eclipse.jdt.launching.JRE_CONTAINER/org.eclipse.jdt.internal.debug.ui.launcher.StandardVMType/J2SE-1.5"/>
        <classpathentry kind="con" path="org.maven.ide.eclipse.MAVEN2_CLASSPATH_CONTAINER"/>
        <classpathentry kind="output" path="target/classes"/>

diff --git a/demo/org.argeo.slc.demo.basic/.project b/demo/org.argeo.slc.demo.basic/.project
index 63e0d74086440933e6a39d17233e9dbc87326a56..6a65410fd33956be21564a62c188950e9b00e064 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/.project
+++ b/demo/org.argeo.slc.demo.basic/.project
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <projectDescription>
-       <name>argeo.slc.executionflow</name>
+       <name>org.argeo.slc.demo.basic</name>
        <comment></comment>
        <projects>
        </projects>

diff --git a/demo/org.argeo.slc.demo.basic/.springBeans b/demo/org.argeo.slc.demo.basic/.springBeans
index 07dddcb5821c6f5f83c854b364361808abb12967..72eabe66e1e6962a05768a24b6ed0a200272f525 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/.springBeans
+++ b/demo/org.argeo.slc.demo.basic/.springBeans
@@ -8,11 +8,6 @@
        <enableImports><![CDATA[true]]></enableImports>
        <configs>
                <config>src/slc/conf/main.xml</config>
-               <config>src/slc/conf/testCases/basic-001.xml</config>
-               <config>src/slc/conf/testCases/basic-002.xml</config>
-               <config>src/slc/conf/basic.xml</config>
-               <config>src/slc/conf/common.xml</config>
-               <config>src/slc/conf/test.xml</config>
        </configs>
        <configSets>
        </configSets>

diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml
index 1025a48ce4c87aeeceb2093748b18a1dd7946185..3bab63176122d6a60059c7247c67ec98d0808de4 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/pom.xml
+++ b/demo/org.argeo.slc.demo.basic/pom.xml
@@ -7,9 +7,9 @@
                <version>0.11.3-SNAPSHOT</version>
                <relativePath>../../org.argeo.slc</relativePath>
        </parent>
-       <groupId>org.argeo.slc.sandbox</groupId>
-       <artifactId>org.argeo.slc.sandbox.executionflow</artifactId>
-       <name>SLC Sandbox Execution Flow</name>
+       <groupId>org.argeo.slc.demo</groupId>
+       <artifactId>org.argeo.slc.demo.basic</artifactId>
+       <name>SLC Demo Basic Test Module</name>
        <packaging>jar</packaging>
        <properties></properties>
        <build>
@@ -17,6 +17,19 @@
                        <plugin>
                                <artifactId>maven-jar-plugin</artifactId>
                        </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <version>${version.maven-bundle-plugin}</version>
+                               <configuration>
+                                       <instructions>
+                                               <Export-Package>
+                                                       org.argeo.slc.*
+                                               </Export-Package>
+                                               <Require-Bundle>org.argeo.slc.execution,org.argeo.slc.specs,org.argeo.slc.support.simple,org.springframework.aop,com.springsource.net.sf.cglib,com.springsource.org.aopalliance</Require-Bundle>
+                                       </instructions>
+                               </configuration>
+                       </plugin>
                </plugins>
        </build>
        <dependencies>
@@ -24,33 +37,26 @@
 
                <dependency>
                        <groupId>org.argeo.slc.runtime</groupId>
-                       <artifactId>org.argeo.slc.support.simple</artifactId>
-               </dependency>
-
-               <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>com.springsource.org.aspectj.runtime</artifactId>
-                       <version>1.6.2.RELEASE</version>
+                       <artifactId>org.argeo.slc.execution</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.aspectj</groupId>
-                       <artifactId>com.springsource.org.aspectj.weaver</artifactId>
-                       <version>1.6.2.RELEASE</version>
+                       <groupId>org.argeo.slc.runtime</groupId>
+                       <artifactId>org.argeo.slc.support.simple</artifactId>
                </dependency>
                <dependency>
-                       <groupId>org.codehaus.groovy</groupId>
-                       <artifactId>com.springsource.org.codehaus.groovy</artifactId>
-                       <version>1.5.7</version>
+                       <groupId>org.argeo.slc</groupId>
+                       <artifactId>org.argeo.slc.detached.launcher</artifactId>
+                       <version>${project.version}</version>
                </dependency>
+
                <dependency>
-                       <groupId>org.beanshell</groupId>
-                       <artifactId>com.springsource.bsh</artifactId>
-                       <version>2.0.0.b4</version>
+                       <groupId>org.eclipse.osgi</groupId>
+                       <artifactId>org.eclipse.osgi</artifactId>
                </dependency>
+
                <dependency>
-                       <groupId>net.sourceforge.cglib</groupId>
-                       <artifactId>com.springsource.net.sf.cglib</artifactId>
-                       <version>2.1.3</version>
+                       <groupId>org.springframework.osgi</groupId>
+                       <artifactId>org.springframework.osgi.extender</artifactId>
                </dependency>
        </dependencies>
-</project>
\ No newline at end of file
+</project>

diff --git a/demo/org.argeo.slc.demo.basic/src/main/resources/META-INF/MANIFEST.MF b/demo/org.argeo.slc.demo.basic/src/main/resources/META-INF/MANIFEST.MF
new file mode 100644 (file)
index 0000000..d0c3f3d
--- /dev/null
+++ b/demo/org.argeo.slc.demo.basic/src/main/resources/META-INF/MANIFEST.MF
@@ -0,0 +1,20 @@
+Manifest-Version: 1.0\r
+Private-Package: conf;version="0.11.3-SNAPSHOT",conf.testCases;version\r
+ ="0.11.3-SNAPSHOT"\r
+Tool: Bnd-0.0.255\r
+Bundle-Name: SLC Sandbox Execution Flow\r
+Created-By: 1.6.0_0 (Sun Microsystems Inc.)\r
+Require-Bundle: org.argeo.slc.execution,org.argeo.slc.specs,org.argeo.\r
+ slc.support.simple,org.springframework.aop,com.springsource.net.sf.cg\r
+ lib,com.springsource.org.aopalliance\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.11.3.SNAPSHOT\r
+Spring-Context: conf/main.xml\r
+Bundle-ManifestVersion: 2\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Import-Package: org.apache.commons.logging;version="1.1",org.springfra\r
+ mework.beans.factory.config\r
+Bundle-SymbolicName: org.argeo.slc.sandbox.executionflow\r
+Bundle-DocURL: http://www.argeo.org\r
+Originally-Created-By: 1.6.0_0 (Sun Microsystems Inc.)\r
+\r

diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
index 5e1c46e4fc399bd504768cfdadbac883ef0145f4..c2077f50f448c5bdfe65eadc2ccfdc40969e39ca 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
+++ b/demo/org.argeo.slc.demo.basic/src/slc/conf/basic.xml
@@ -7,8 +7,6 @@
        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 resource="common.xml" />\r
-\r
        <bean id="basic.executionSpec" class="org.argeo.slc.execution.SimpleExecutionSpec">\r
                <property name="attributes">\r
                        <map>\r
@@ -54,6 +52,15 @@
                <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

diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
index 829e6ee5bdf0061ec6d730af61bc973f6aa1005c..aab3785e2eb6ebc5f1f2caa6a07308550487bace 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
+++ b/demo/org.argeo.slc.demo.basic/src/slc/conf/main.xml
@@ -8,9 +8,15 @@
        http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context-2.5.xsd\r
        http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd">\r
 \r
+       <import resource="common.xml" />\r
+\r
+       <import resource="basic.xml" />\r
        <import resource="testCases/basic-001.xml" />\r
        <import resource="testCases/basic-002.xml" />\r
 \r
+       <bean id="testLaunch" class="org.argeo.slc.execution.TestLaunch"\r
+               p:flowName="main" init-method="launch"/>\r
+\r
        <bean id="main" class="org.argeo.slc.execution.SimpleExecutionFlow">\r
                <property name="executionSpec">\r
                        <bean class="org.argeo.slc.execution.SimpleExecutionSpec">\r
@@ -34,7 +40,8 @@
        </bean>\r
 \r
        <bean id="echo1" parent="echoTemplate" scope="execution">\r
-               <property name="message" value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
+               <property name="message"\r
+                       value="From main! @{testKey}, slc.flows=@{slc.flows}" />\r
                <aop:scoped-proxy />\r
        </bean>\r
 \r

diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
index 0131cc273148585feca92fd8b6dadbbe93e86e9a..a5426649eb623b7d0185b708325a0547ce852f3b 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
+++ b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-001.xml
@@ -7,10 +7,8 @@
        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 resource="../basic.xml" />\r
-\r
        <bean id="basic.001" parent="basic.executionFlowTemplate">\r
-               <property name="parameters">\r
+               <constructor-arg>\r
                        <map>\r
                                <entry key="testData1" value-ref="basic.001.testData" />\r
                                <entry key="testData2">\r
@@ -21,7 +19,7 @@
                                        </bean>\r
                                </entry>\r
                        </map>\r
-               </property>\r
+               </constructor-arg>\r
        </bean>\r
 \r
        <bean id="basic.001.testData" class="org.argeo.slc.core.test.BasicTestData"\r

diff --git a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
index fc52a03f10d740aca4c054c1ea22d69778d9380f..c2946fdfb9ade6f51093ac812ddb3cea78f8cdfd 100644 (file)
--- a/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
+++ b/demo/org.argeo.slc.demo.basic/src/slc/conf/testCases/basic-002.xml
@@ -4,10 +4,8 @@
 \r
        xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd">\r
 \r
-       <import resource="../basic.xml" />\r
-\r
        <bean id="basic.002" parent="basic.executionFlowTemplate">\r
-               <property name="parameters">\r
+               <constructor-arg>\r
                        <map>\r
                                <entry key="testData1">\r
                                        <bean class="org.argeo.slc.core.test.BasicTestData">\r
@@ -22,6 +20,6 @@
                                        </bean>\r
                                </entry>\r
                        </map>\r
-               </property>\r
+               </constructor-arg>\r
        </bean>\r
 </beans>
\ No newline at end of file