From 4bb6ba88f17acc74495a8d07d11117498be699c6 Mon Sep 17 00:00:00 2001 From: Mathieu Baudier Date: Mon, 23 Feb 2009 12:29:06 +0000 Subject: [PATCH] git-svn-id: https://svn.argeo.org/slc/trunk@2167 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc --- demo/org.argeo.slc.demo.basic/.classpath | 3 +- demo/org.argeo.slc.demo.basic/.project | 2 +- demo/org.argeo.slc.demo.basic/.springBeans | 5 -- demo/org.argeo.slc.demo.basic/pom.xml | 52 +++++++++++-------- .../src/main/resources/META-INF/MANIFEST.MF | 20 +++++++ .../src/slc/conf/basic.xml | 11 +++- .../src/slc/conf/main.xml | 9 +++- .../src/slc/conf/testCases/basic-001.xml | 6 +-- .../src/slc/conf/testCases/basic-002.xml | 6 +-- 9 files changed, 73 insertions(+), 41 deletions(-) create mode 100644 demo/org.argeo.slc.demo.basic/src/main/resources/META-INF/MANIFEST.MF diff --git a/demo/org.argeo.slc.demo.basic/.classpath b/demo/org.argeo.slc.demo.basic/.classpath index 16f01e2ee..2bc0b0bd8 100644 --- a/demo/org.argeo.slc.demo.basic/.classpath +++ b/demo/org.argeo.slc.demo.basic/.classpath @@ -1,6 +1,7 @@ - + + diff --git a/demo/org.argeo.slc.demo.basic/.project b/demo/org.argeo.slc.demo.basic/.project index 63e0d7408..6a65410fd 100644 --- a/demo/org.argeo.slc.demo.basic/.project +++ b/demo/org.argeo.slc.demo.basic/.project @@ -1,6 +1,6 @@ - argeo.slc.executionflow + org.argeo.slc.demo.basic diff --git a/demo/org.argeo.slc.demo.basic/.springBeans b/demo/org.argeo.slc.demo.basic/.springBeans index 07dddcb58..72eabe66e 100644 --- a/demo/org.argeo.slc.demo.basic/.springBeans +++ b/demo/org.argeo.slc.demo.basic/.springBeans @@ -8,11 +8,6 @@ src/slc/conf/main.xml - src/slc/conf/testCases/basic-001.xml - src/slc/conf/testCases/basic-002.xml - src/slc/conf/basic.xml - src/slc/conf/common.xml - src/slc/conf/test.xml diff --git a/demo/org.argeo.slc.demo.basic/pom.xml b/demo/org.argeo.slc.demo.basic/pom.xml index 1025a48ce..3bab63176 100644 --- a/demo/org.argeo.slc.demo.basic/pom.xml +++ b/demo/org.argeo.slc.demo.basic/pom.xml @@ -7,9 +7,9 @@ 0.11.3-SNAPSHOT ../../org.argeo.slc - org.argeo.slc.sandbox - org.argeo.slc.sandbox.executionflow - SLC Sandbox Execution Flow + org.argeo.slc.demo + org.argeo.slc.demo.basic + SLC Demo Basic Test Module jar @@ -17,6 +17,19 @@ maven-jar-plugin + + org.apache.felix + maven-bundle-plugin + ${version.maven-bundle-plugin} + + + + org.argeo.slc.* + + 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 + + + @@ -24,33 +37,26 @@ org.argeo.slc.runtime - org.argeo.slc.support.simple - - - - org.aspectj - com.springsource.org.aspectj.runtime - 1.6.2.RELEASE + org.argeo.slc.execution - org.aspectj - com.springsource.org.aspectj.weaver - 1.6.2.RELEASE + org.argeo.slc.runtime + org.argeo.slc.support.simple - org.codehaus.groovy - com.springsource.org.codehaus.groovy - 1.5.7 + org.argeo.slc + org.argeo.slc.detached.launcher + ${project.version} + - org.beanshell - com.springsource.bsh - 2.0.0.b4 + org.eclipse.osgi + org.eclipse.osgi + - net.sourceforge.cglib - com.springsource.net.sf.cglib - 2.1.3 + org.springframework.osgi + org.springframework.osgi.extender - \ No newline at end of file + 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 index 000000000..d0c3f3df7 --- /dev/null +++ b/demo/org.argeo.slc.demo.basic/src/main/resources/META-INF/MANIFEST.MF @@ -0,0 +1,20 @@ +Manifest-Version: 1.0 +Private-Package: conf;version="0.11.3-SNAPSHOT",conf.testCases;version + ="0.11.3-SNAPSHOT" +Tool: Bnd-0.0.255 +Bundle-Name: SLC Sandbox Execution Flow +Created-By: 1.6.0_0 (Sun Microsystems Inc.) +Require-Bundle: org.argeo.slc.execution,org.argeo.slc.specs,org.argeo. + slc.support.simple,org.springframework.aop,com.springsource.net.sf.cg + lib,com.springsource.org.aopalliance +Bundle-Vendor: Argeo +Bundle-Version: 0.11.3.SNAPSHOT +Spring-Context: conf/main.xml +Bundle-ManifestVersion: 2 +Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt +Import-Package: org.apache.commons.logging;version="1.1",org.springfra + mework.beans.factory.config +Bundle-SymbolicName: org.argeo.slc.sandbox.executionflow +Bundle-DocURL: http://www.argeo.org +Originally-Created-By: 1.6.0_0 (Sun Microsystems Inc.) + 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 5e1c46e4f..c2077f50f 100644 --- 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 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - - @@ -54,6 +52,15 @@ + + + + + + + + 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 829e6ee5b..aab3785e2 100644 --- 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 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> + + + + + @@ -34,7 +40,8 @@ - + 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 0131cc273..a5426649e 100644 --- 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 http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd"> - - - + @@ -21,7 +19,7 @@ - + - - - + @@ -22,6 +20,6 @@ - + \ No newline at end of file -- 2.39.2