Refactor demo
authorMathieu Baudier <mbaudier@argeo.org>
Thu, 29 Mar 2012 12:14:20 +0000 (12:14 +0000)
committerMathieu Baudier <mbaudier@argeo.org>
Thu, 29 Mar 2012 12:14:20 +0000 (12:14 +0000)
git-svn-id: https://svn.argeo.org/slc/trunk@5273 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc

49 files changed:
demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.ant/conf/ant.xml [deleted file]
demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml [deleted file]
demo/site/org.argeo.slc.demo.ant/conf/imports.xml [deleted file]
demo/site/org.argeo.slc.demo.ant/conf/osgi.xml [deleted file]
demo/site/org.argeo.slc.demo.ant/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.basic/conf/basic.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/canonic.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/imports.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/main.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/namespace.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/osgi.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml [deleted file]
demo/site/org.argeo.slc.demo.basic/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.det/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.det/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.detached/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.detached/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.maven/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.maven/pom.xml [new file with mode: 0644]
demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
demo/site/org.argeo.slc.demo.minimal/pom.xml [new file with mode: 0644]
demo/site/pom.xml

index b3bcd3344a83a4c5417c5314fca92e9f4939bf87..2fa564335774e67182f941d323142c83228e1ee8 100644 (file)
@@ -1,8 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC Demo Ant
-Bundle-SymbolicName: org.argeo.slc.demo.ant
-Bundle-Version: 0.13.2.SNAPSHOT
-Spring-Context: conf/*,conf/testCases/*
-Import-Package: org.aopalliance.aop,org.argeo.slc.ant,org.argeo.slc.core.execution,org.argeo.slc.execution,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.framework,org.springframework.aop.scope,org.springframework.beans.factory.config,org.springframework.core.io
-Bundle-Description: Demonstrate Ant support
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023158098\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Ant\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.ant\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.ant,org.argeo.slc.core\r
+ .execution,org.argeo.slc.core.execution.tasks,org.argeo.slc.execution,o\r
+ rg.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.frame\r
+ work,org.springframework.aop.scope,org.springframework.beans.factory.co\r
+ nfig,org.springframework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/ant.xml
new file mode 100644 (file)
index 0000000..3cff3b4
--- /dev/null
@@ -0,0 +1,19 @@
+<?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="main" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean class="org.argeo.slc.ant.AntRun">\r
+                                       <property name="buildFile" value="osgibundle:/ant/hello/build.xml" />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/flowGenerator.xml
new file mode 100644 (file)
index 0000000..d25caf9
--- /dev/null
@@ -0,0 +1,18 @@
+<?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 class="org.argeo.slc.ant.AntFlowGenerator">\r
+               <property name="antFiles">\r
+                       <list>\r
+                               <value>osgibundle:/ant/hello/build.xml\r
+                               </value>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/imports.xml
new file mode 100644 (file)
index 0000000..3428e8b
--- /dev/null
@@ -0,0 +1,8 @@
+<?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/simple.xml" />
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml b/demo/site/org.argeo.slc.demo.ant/META-INF/spring/osgi.xml
new file mode 100644 (file)
index 0000000..f505229
--- /dev/null
@@ -0,0 +1,10 @@
+<?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
+       <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/ant.xml b/demo/site/org.argeo.slc.demo.ant/conf/ant.xml
deleted file mode 100644 (file)
index 3cff3b4..0000000
+++ /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
-       <bean id="main" class="org.argeo.slc.core.execution.DefaultExecutionFlow">\r
-               <property name="executables">\r
-                       <list>\r
-                               <bean class="org.argeo.slc.ant.AntRun">\r
-                                       <property name="buildFile" value="osgibundle:/ant/hello/build.xml" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml b/demo/site/org.argeo.slc.demo.ant/conf/flowGenerator.xml
deleted file mode 100644 (file)
index d25caf9..0000000
+++ /dev/null
@@ -1,18 +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 class="org.argeo.slc.ant.AntFlowGenerator">\r
-               <property name="antFiles">\r
-                       <list>\r
-                               <value>osgibundle:/ant/hello/build.xml\r
-                               </value>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/imports.xml b/demo/site/org.argeo.slc.demo.ant/conf/imports.xml
deleted file mode 100644 (file)
index 3428e8b..0000000
+++ /dev/null
@@ -1,8 +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/simple.xml" />
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml b/demo/site/org.argeo.slc.demo.ant/conf/osgi.xml
deleted file mode 100644 (file)
index f505229..0000000
+++ /dev/null
@@ -1,10 +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
-       <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
-</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.ant/pom.xml b/demo/site/org.argeo.slc.demo.ant/pom.xml
new file mode 100644 (file)
index 0000000..e6acbfb
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.ant</artifactId>
+       <name>SLC Demo Ant</name>
+</project>
\ No newline at end of file
index a7b301a36a38c2430e45548c3b0807384080a16a..696ce9a7c75b5c08ec0e3689a521b0bd17d20524 100644 (file)
@@ -1,28 +1,23 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.argeo.slc.demo.basic
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Basic
-Bundle-Description: Test of basic features
-Spring-Context: conf/*,conf/testCases/*
-Import-Package: net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- org.aopalliance.aop,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.context,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.execution,
- org.argeo.slc.jsch,
- org.argeo.slc.jsch.swing,
- org.argeo.slc.osgi,
- org.argeo.slc.structure,
- org.argeo.slc.test,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.core.io
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023158958\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Basic\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.basic\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.attachment,org.ar\r
+ geo.slc.core.execution,org.argeo.slc.core.execution.tasks,org.argeo.slc\r
+ .core.test,org.argeo.slc.core.test.tree,org.argeo.slc.execution,org.arg\r
+ eo.slc.jsch,org.argeo.slc.jsch.swing,org.argeo.slc.osgi,org.springframe\r
+ work.aop,org.springframework.aop.framework,org.springframework.aop.scop\r
+ e,org.springframework.beans.factory.config,org.springframework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/basic.xml
new file mode 100644 (file)
index 0000000..bc48b51
--- /dev/null
@@ -0,0 +1,127 @@
+<?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.spec" parent="slcTemplate.simpleSpec">\r
+               <property name="attributes">\r
+                       <map>\r
+                               <entry key="testedComponentId">\r
+                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
+                                               p:type="integer" />\r
+                               </entry>\r
+                               <entry key="testData1">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
+                               </entry>\r
+                               <entry key="testData2">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true" />\r
+                               </entry>\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <!--\r
+               <bean id="basic.ref" factory-bean="basic.spec"\r
+               factory-method="createRef" abstract="true" />\r
+       -->\r
+\r
+       <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
+               abstract="true">\r
+               <constructor-arg ref="basic.spec" />\r
+               <property name="path" value="/test/basic" />\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean parent="task.echo" scope="execution">\r
+                                       <property name="message" value="From basic @{testedComponentId}" />\r
+                                       <aop:scoped-proxy />\r
+                               </bean>\r
+                               <bean parent="basic.testRun">\r
+                                       <property name="testDefinition" ref="basic.testDef" />\r
+                                       <property name="testData">\r
+                                               <bean parent="parameterRef">\r
+                                                       <constructor-arg value="testData1" />\r
+                                               </bean>\r
+                                       </property>\r
+                               </bean>\r
+                               <bean parent="basic.testRun">\r
+                                       <property name="testDefinition" ref="basic.testDef" />\r
+                                       <property name="testData" ref="ref1" />\r
+                               </bean>\r
+\r
+                               <!-- Attachments -->\r
+                               <bean parent="task.echo">\r
+                                       <property name="message" value="DATA" />\r
+                                       <property name="writeTo" ref="basic.writeTo" />\r
+                               </bean>\r
+\r
+                               <bean parent="task.uploadAttachments">\r
+                                       <property name="attachmentUploader" ref="attachmentUploader" />\r
+                                       <property name="attachment">\r
+                                               <bean parent="taskArg.attachment">\r
+                                                       <property name="name" value="myAttachment.txt" />\r
+                                               </bean>\r
+                                       </property>\r
+                                       <property name="resource" ref="basic.writeTo" />\r
+                                       <property name="attachTo">\r
+                                               <list>\r
+                                                       <ref bean="basic.testResult" />\r
+                                               </list>\r
+                                       </property>\r
+                               </bean>\r
+\r
+                               <bean parent="task.closeTestResult" scope="execution">\r
+                                       <property name="testResult" ref="basic.testResult" />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="ref1" parent="parameterRef" scope="prototype">\r
+               <constructor-arg value="testData2" />\r
+       </bean>\r
+\r
+\r
+       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="tata" />\r
+       </bean>\r
+\r
+       <bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
+               scope="prototype" />\r
+\r
+       <bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"\r
+               scope="execution">\r
+               <property name="listeners" ref="resultListeners" />\r
+               <property name="attributes">\r
+                       <map>\r
+                               <entry key="testedComponentId" value="@{testedComponentId}" />\r
+                       </map>\r
+               </property>\r
+               <aop:scoped-proxy />\r
+       </bean>\r
+\r
+       <bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
+               abstract="true">\r
+               <property name="testResult" ref="basic.testResult" />\r
+       </bean>\r
+\r
+       <bean id="basic.writeTo" factory-bean="basic.resourcesManager"\r
+               factory-method="getWritableResource" scope="execution">\r
+               <constructor-arg value="subdir/writeTo" />\r
+               <aop:scoped-proxy />\r
+       </bean>\r
+\r
+       <bean id="basic.resourcesManager" parent="slcTemplate.fileResources">\r
+               <property name="executionContext" ref="executionContext" />\r
+       </bean>\r
+\r
+\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic-ns.xml
new file mode 100644 (file)
index 0000000..adf60c1
--- /dev/null
@@ -0,0 +1,57 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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
+       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
+\r
+       <flow:spec id="canonic-ns.spec">\r
+               <flow:primitive name="parameterAtInstantiation"\r
+                       isParameter="true" type="integer" />\r
+               <flow:primitive name="displayWithoutControl" value="100"\r
+                       isParameter="true" type="integer" isFrozen="true" />\r
+               <flow:primitive name="displayWithControl" value="200"\r
+                       isParameter="true" type="integer" />\r
+               <flow:primitive name="hide" value="300" isParameter="true"\r
+                       type="integer" isHidden="true" />\r
+               <flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                       isParameter="true" ref="testDataNok" />\r
+               <flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />\r
+               <flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                       isParameter="true" isFrozen="true">\r
+                       <flow:value>\r
+                               <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                       <aop:scoped-proxy />\r
+                                       <property name="expected" value="tata" />\r
+                                       <property name="reached" value="tata" />\r
+                               </bean>\r
+                       </flow:value>\r
+               </flow:ref>\r
+       </flow:spec>\r
+\r
+       <flow:flow id="canonic-ns.flowTemplate" abstract="true"\r
+               spec="canonic-ns.spec">\r
+               <bean parent="task.echo"\r
+                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
+                       scope="execution">\r
+                       <aop:scoped-proxy />\r
+               </bean>\r
+       </flow:flow>\r
+\r
+       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="tata" />\r
+       </bean>\r
+\r
+       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="toto" />\r
+       </bean>\r
+\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/canonic.xml
new file mode 100644 (file)
index 0000000..5d5f45e
--- /dev/null
@@ -0,0 +1,80 @@
+<?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="canonic.spec" parent="slcTemplate.simpleSpec">\r
+               <description>Covers various combinations of specs</description>\r
+               <property name="attributes">\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation">\r
+                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="displayWithoutControl">\r
+                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="false"\r
+                                               p:isFrozen="true" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="displayWithControl">\r
+                                       <bean parent="specAttr.primitive" p:value="200" p:isParameter="false"\r
+                                               p:isFrozen="false" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="hide">\r
+                                       <bean parent="specAttr.primitive" p:value="300" p:isParameter="true"\r
+                                               p:isFrozen="false" p:isHidden="true" p:type="integer" />\r
+                               </entry>\r
+                               <entry key="refWithValue">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />\r
+                               </entry>\r
+                               <entry key="refWithoutValue">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="false" p:isFrozen="false" />\r
+                               </entry>\r
+                               <entry key="refWithoutValueFrozen">\r
+                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
+                                               p:isParameter="true" p:isFrozen="true">\r
+                                               <property name="value">\r
+                                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
+                                                               <aop:scoped-proxy />\r
+                                                               <property name="expected" value="tata" />\r
+                                                               <property name="reached" value="tata" />\r
+                                                       </bean>\r
+                                               </property>\r
+                                       </bean>\r
+                               </entry>\r
+                       </map>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"\r
+               abstract="true">\r
+               <constructor-arg ref="canonic.spec" />\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean parent="task.echo"\r
+                                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
+                                       scope="execution">\r
+                                       <aop:scoped-proxy />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="tata" />\r
+       </bean>\r
+\r
+       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
+               <aop:scoped-proxy />\r
+               <property name="expected" value="tata" />\r
+               <property name="reached" value="toto" />\r
+       </bean>\r
+\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/imports.xml
new file mode 100644 (file)
index 0000000..dc44a31
--- /dev/null
@@ -0,0 +1,11 @@
+<?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" />
+
+       <import resource="classpath:/org/argeo/slc/core/test/spring.xml" />
+
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/main.xml
new file mode 100644 (file)
index 0000000..7c9785d
--- /dev/null
@@ -0,0 +1,49 @@
+<?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="main" parent="slcTemplate.simpleFlow">\r
+               <description>The Main Flow</description>\r
+               <constructor-arg>\r
+                       <bean parent="slcTemplate.simpleSpec">\r
+                               <property name="attributes">\r
+                                       <map>\r
+                                               <entry key="testKey">\r
+                                                       <bean parent="specAttr.primitive" p:value="660" />\r
+                                               </entry>\r
+                                       </map>\r
+                               </property>\r
+                       </bean>\r
+               </constructor-arg>\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
+                               <ref bean="canonic.001" />\r
+                               <ref bean="canonic.002" />\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="noArg" parent="slcTemplate.simpleFlow">\r
+               <property name="executables">\r
+                       <list>\r
+                               <bean parent="task.echo">\r
+                                       <property name="message" value="No rg!" />\r
+                               </bean>\r
+                       </list>\r
+               </property>\r
+       </bean>\r
+\r
+       <bean id="echo1" parent="task.echo" scope="execution">\r
+               <property name="message" value="From main! @{testKey}" />\r
+               <aop:scoped-proxy />\r
+       </bean>\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/namespace.xml
new file mode 100644 (file)
index 0000000..c0767ec
--- /dev/null
@@ -0,0 +1,40 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
+       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
+\r
+       <!-- Flow definition is simplified thanks to the 'flow:flow' element -->\r
+       <flow:flow id="flow" path="/namespace">\r
+               <bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />\r
+               <ref bean="referencedRunnable" />\r
+       </flow:flow>\r
+\r
+       <bean id="referencedRunnable" p:message="TEST in referenced Runnable"\r
+               class="org.argeo.slc.core.execution.tasks.Echo" />\r
+\r
+       <!--\r
+               Standalone beans implementing Runnable can be exposed as flows via the\r
+               'flow:as-flow' attribute\r
+       -->\r
+       <bean id="standaloneRunnable" flow:as-flow="implicitFlow"\r
+               p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />\r
+\r
+       <!-- Specs definition is also simplified -->\r
+       <flow:spec id="namespaceSpec">\r
+               <flow:primitive name="primitive" value="100"\r
+                       isParameter="true" type="integer" />\r
+       </flow:spec>\r
+\r
+       <flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">\r
+               <bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"\r
+                       scope="execution">\r
+                       <aop:scoped-proxy />\r
+               </bean>\r
+               <ref bean="referencedRunnable" />\r
+       </flow:flow>\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/osgi.xml
new file mode 100644 (file)
index 0000000..e7390c3
--- /dev/null
@@ -0,0 +1,17 @@
+<?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
+       <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
+\r
+       <reference id="attachmentUploader"\r
+               interface="org.argeo.slc.core.attachment.AttachmentUploader"\r
+               cardinality="0..1" />\r
+\r
+       <list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"\r
+               cardinality="0..N" />\r
+</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/systemCall.xml
new file mode 100644 (file)
index 0000000..bb5f79f
--- /dev/null
@@ -0,0 +1,46 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
+       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
+\r
+       <!-- Basic echo, should work on all OSs -->\r
+       <flow:flow name="os/systemCall">\r
+               <bean p:cmd="echo Hello World!" class="org.argeo.slc.core.execution.tasks.SystemCall" />\r
+       </flow:flow>\r
+\r
+       <!-- Must disable requiretty in sudoers file -->\r
+       <flow:flow name="os/sudo">\r
+               <bean p:cmd="sudo id" class="org.argeo.slc.core.execution.tasks.SystemCall">\r
+                       <property name="environmentVariables">\r
+                               <map>\r
+                                       <entry key="SUDO_ASKPASS" value="/usr/libexec/openssh/gnome-ssh-askpass" />\r
+                               </map>\r
+                       </property>\r
+               </bean>\r
+       </flow:flow>\r
+\r
+       <!-- SSH -->\r
+       <flow:flow name="os/ssh">\r
+               <bean p:cmd="ls /etc" class="org.argeo.slc.core.execution.tasks.SystemCall">\r
+                       <property name="executor" ref="sshExecutor" />\r
+               </bean>\r
+       </flow:flow>\r
+\r
+       <bean name="sshExecutor" class="org.argeo.slc.jsch.JschExecutor">\r
+               <property name="sshTarget">\r
+                       <bean p:host="localhost" p:port="22" p:user="${user.name}"\r
+                               p:localPrivateKey="${user.home}/.ssh/id_rsa" class="org.argeo.slc.jsch.SshTarget">\r
+                               <property name="userInfo">\r
+                                       <bean class="org.argeo.slc.jsch.swing.SwingUserInfo" />\r
+                               </property>\r
+                       </bean>\r
+               </property>\r
+       </bean>\r
+\r
+\r
+\r
+</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-001.xml
new file mode 100644 (file)
index 0000000..c68414a
--- /dev/null
@@ -0,0 +1,35 @@
+<?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.flowTemplate">\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@{testedComponentId}" />\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/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/basic-002.xml
new file mode 100644 (file)
index 0000000..5720d96
--- /dev/null
@@ -0,0 +1,25 @@
+<?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.flowTemplate">\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/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-001.xml
new file mode 100644 (file)
index 0000000..181e3e7
--- /dev/null
@@ -0,0 +1,18 @@
+<?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="canonic.001" parent="canonic.flowTemplate">\r
+               <description>Canonic 001</description>\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="1" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-002.xml
new file mode 100644 (file)
index 0000000..5916c08
--- /dev/null
@@ -0,0 +1,20 @@
+<?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="canonic.002" parent="canonic.flowTemplate">\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="2" />\r
+                               <entry key="displayWithoutControl" value="102" />\r
+                               <entry key="displayWithControl" value="202" />\r
+                               <entry key="hide" value="202" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-001.xml
new file mode 100644 (file)
index 0000000..5b1dbf6
--- /dev/null
@@ -0,0 +1,18 @@
+<?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="canonic-ns.001" parent="canonic-ns.flowTemplate">\r
+               <description>Canonic 001</description>\r
+               <constructor-arg>\r
+                       <map>\r
+                               <entry key="parameterAtInstantiation" value="1" />\r
+                       </map>\r
+               </constructor-arg>\r
+       </bean>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml b/demo/site/org.argeo.slc.demo.basic/META-INF/spring/testCases/canonic-ns-002.xml
new file mode 100644 (file)
index 0000000..991f67f
--- /dev/null
@@ -0,0 +1,16 @@
+<?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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
+       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
+\r
+       <flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">\r
+               <flow:arg name="parameterAtInstantiation" value="2" />\r
+               <flow:arg name="displayWithoutControl" value="102" />\r
+               <flow:arg name="displayWithControl" value="202" />\r
+               <flow:arg name="hide" value="202" />\r
+       </flow:flow>\r
+</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/basic.xml b/demo/site/org.argeo.slc.demo.basic/conf/basic.xml
deleted file mode 100644 (file)
index bc48b51..0000000
+++ /dev/null
@@ -1,127 +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.spec" parent="slcTemplate.simpleSpec">\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testedComponentId">\r
-                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="true"\r
-                                               p:type="integer" />\r
-                               </entry>\r
-                               <entry key="testData1">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="true" p:isFrozen="true" />\r
-                               </entry>\r
-                               <entry key="testData2">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="true" p:isFrozen="true" />\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <!--\r
-               <bean id="basic.ref" factory-bean="basic.spec"\r
-               factory-method="createRef" abstract="true" />\r
-       -->\r
-\r
-       <bean id="basic.flowTemplate" parent="slcTemplate.simpleFlow"\r
-               abstract="true">\r
-               <constructor-arg ref="basic.spec" />\r
-               <property name="path" value="/test/basic" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <bean parent="task.echo" scope="execution">\r
-                                       <property name="message" value="From basic @{testedComponentId}" />\r
-                                       <aop:scoped-proxy />\r
-                               </bean>\r
-                               <bean parent="basic.testRun">\r
-                                       <property name="testDefinition" ref="basic.testDef" />\r
-                                       <property name="testData">\r
-                                               <bean parent="parameterRef">\r
-                                                       <constructor-arg value="testData1" />\r
-                                               </bean>\r
-                                       </property>\r
-                               </bean>\r
-                               <bean parent="basic.testRun">\r
-                                       <property name="testDefinition" ref="basic.testDef" />\r
-                                       <property name="testData" ref="ref1" />\r
-                               </bean>\r
-\r
-                               <!-- Attachments -->\r
-                               <bean parent="task.echo">\r
-                                       <property name="message" value="DATA" />\r
-                                       <property name="writeTo" ref="basic.writeTo" />\r
-                               </bean>\r
-\r
-                               <bean parent="task.uploadAttachments">\r
-                                       <property name="attachmentUploader" ref="attachmentUploader" />\r
-                                       <property name="attachment">\r
-                                               <bean parent="taskArg.attachment">\r
-                                                       <property name="name" value="myAttachment.txt" />\r
-                                               </bean>\r
-                                       </property>\r
-                                       <property name="resource" ref="basic.writeTo" />\r
-                                       <property name="attachTo">\r
-                                               <list>\r
-                                                       <ref bean="basic.testResult" />\r
-                                               </list>\r
-                                       </property>\r
-                               </bean>\r
-\r
-                               <bean parent="task.closeTestResult" scope="execution">\r
-                                       <property name="testResult" ref="basic.testResult" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="ref1" parent="parameterRef" scope="prototype">\r
-               <constructor-arg value="testData2" />\r
-       </bean>\r
-\r
-\r
-       <bean id="basic.testData" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
-\r
-       <bean id="basic.testDef" class="org.argeo.slc.core.test.BasicTestDefinition"\r
-               scope="prototype" />\r
-\r
-       <bean id="basic.testResult" parent="slcDefault.test.basicTreeTestResult"\r
-               scope="execution">\r
-               <property name="listeners" ref="resultListeners" />\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="testedComponentId" value="@{testedComponentId}" />\r
-                       </map>\r
-               </property>\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-\r
-       <bean id="basic.testRun" class="org.argeo.slc.core.test.SimpleTestRun"\r
-               abstract="true">\r
-               <property name="testResult" ref="basic.testResult" />\r
-       </bean>\r
-\r
-       <bean id="basic.writeTo" factory-bean="basic.resourcesManager"\r
-               factory-method="getWritableResource" scope="execution">\r
-               <constructor-arg value="subdir/writeTo" />\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-\r
-       <bean id="basic.resourcesManager" parent="slcTemplate.fileResources">\r
-               <property name="executionContext" ref="executionContext" />\r
-       </bean>\r
-\r
-\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic-ns.xml
deleted file mode 100644 (file)
index adf60c1..0000000
+++ /dev/null
@@ -1,57 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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
-       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
-\r
-       <flow:spec id="canonic-ns.spec">\r
-               <flow:primitive name="parameterAtInstantiation"\r
-                       isParameter="true" type="integer" />\r
-               <flow:primitive name="displayWithoutControl" value="100"\r
-                       isParameter="true" type="integer" isFrozen="true" />\r
-               <flow:primitive name="displayWithControl" value="200"\r
-                       isParameter="true" type="integer" />\r
-               <flow:primitive name="hide" value="300" isParameter="true"\r
-                       type="integer" isHidden="true" />\r
-               <flow:ref name="refWithValue" targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                       isParameter="true" ref="testDataNok" />\r
-               <flow:ref name="refWithoutValue" targetClass="org.argeo.slc.core.test.BasicTestData" />\r
-               <flow:ref name="refWithoutValueFrozen" targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                       isParameter="true" isFrozen="true">\r
-                       <flow:value>\r
-                               <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                       <aop:scoped-proxy />\r
-                                       <property name="expected" value="tata" />\r
-                                       <property name="reached" value="tata" />\r
-                               </bean>\r
-                       </flow:value>\r
-               </flow:ref>\r
-       </flow:spec>\r
-\r
-       <flow:flow id="canonic-ns.flowTemplate" abstract="true"\r
-               spec="canonic-ns.spec">\r
-               <bean parent="task.echo"\r
-                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
-                       scope="execution">\r
-                       <aop:scoped-proxy />\r
-               </bean>\r
-       </flow:flow>\r
-\r
-       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
-\r
-       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="toto" />\r
-       </bean>\r
-\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml b/demo/site/org.argeo.slc.demo.basic/conf/canonic.xml
deleted file mode 100644 (file)
index 5d5f45e..0000000
+++ /dev/null
@@ -1,80 +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="canonic.spec" parent="slcTemplate.simpleSpec">\r
-               <description>Covers various combinations of specs</description>\r
-               <property name="attributes">\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation">\r
-                                       <bean parent="specAttr.primitive" p:isParameter="true" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="displayWithoutControl">\r
-                                       <bean parent="specAttr.primitive" p:value="100" p:isParameter="false"\r
-                                               p:isFrozen="true" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="displayWithControl">\r
-                                       <bean parent="specAttr.primitive" p:value="200" p:isParameter="false"\r
-                                               p:isFrozen="false" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="hide">\r
-                                       <bean parent="specAttr.primitive" p:value="300" p:isParameter="true"\r
-                                               p:isFrozen="false" p:isHidden="true" p:type="integer" />\r
-                               </entry>\r
-                               <entry key="refWithValue">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:value-ref="testDataNok" p:isParameter="true" p:isFrozen="false" />\r
-                               </entry>\r
-                               <entry key="refWithoutValue">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="false" p:isFrozen="false" />\r
-                               </entry>\r
-                               <entry key="refWithoutValueFrozen">\r
-                                       <bean parent="specAttr.ref" p:targetClass="org.argeo.slc.core.test.BasicTestData"\r
-                                               p:isParameter="true" p:isFrozen="true">\r
-                                               <property name="value">\r
-                                                       <bean class="org.argeo.slc.core.test.BasicTestData">\r
-                                                               <aop:scoped-proxy />\r
-                                                               <property name="expected" value="tata" />\r
-                                                               <property name="reached" value="tata" />\r
-                                                       </bean>\r
-                                               </property>\r
-                                       </bean>\r
-                               </entry>\r
-                       </map>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="canonic.flowTemplate" parent="slcTemplate.simpleFlow"\r
-               abstract="true">\r
-               <constructor-arg ref="canonic.spec" />\r
-               <property name="executables">\r
-                       <list>\r
-                               <bean parent="task.echo"\r
-                                       p:message="Canonical: displayWithControl=@{displayWithControl}, displayWithoutControl=@{displayWithoutControl}, hide=@{hide}"\r
-                                       scope="execution">\r
-                                       <aop:scoped-proxy />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="testDataOk" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="tata" />\r
-       </bean>\r
-\r
-       <bean id="testDataNok" class="org.argeo.slc.core.test.BasicTestData">\r
-               <aop:scoped-proxy />\r
-               <property name="expected" value="tata" />\r
-               <property name="reached" value="toto" />\r
-       </bean>\r
-\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/imports.xml b/demo/site/org.argeo.slc.demo.basic/conf/imports.xml
deleted file mode 100644 (file)
index dc44a31..0000000
+++ /dev/null
@@ -1,11 +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" />
-
-       <import resource="classpath:/org/argeo/slc/core/test/spring.xml" />
-
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/main.xml b/demo/site/org.argeo.slc.demo.basic/conf/main.xml
deleted file mode 100644 (file)
index 7c9785d..0000000
+++ /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
-       <bean id="main" parent="slcTemplate.simpleFlow">\r
-               <description>The Main Flow</description>\r
-               <constructor-arg>\r
-                       <bean parent="slcTemplate.simpleSpec">\r
-                               <property name="attributes">\r
-                                       <map>\r
-                                               <entry key="testKey">\r
-                                                       <bean parent="specAttr.primitive" p:value="660" />\r
-                                               </entry>\r
-                                       </map>\r
-                               </property>\r
-                       </bean>\r
-               </constructor-arg>\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
-                               <ref bean="canonic.001" />\r
-                               <ref bean="canonic.002" />\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="noArg" parent="slcTemplate.simpleFlow">\r
-               <property name="executables">\r
-                       <list>\r
-                               <bean parent="task.echo">\r
-                                       <property name="message" value="No rg!" />\r
-                               </bean>\r
-                       </list>\r
-               </property>\r
-       </bean>\r
-\r
-       <bean id="echo1" parent="task.echo" scope="execution">\r
-               <property name="message" value="From main! @{testKey}" />\r
-               <aop:scoped-proxy />\r
-       </bean>\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
deleted file mode 100644 (file)
index c0767ec..0000000
+++ /dev/null
@@ -1,40 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
-       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
-\r
-       <!-- Flow definition is simplified thanks to the 'flow:flow' element -->\r
-       <flow:flow id="flow" path="/namespace">\r
-               <bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />\r
-               <ref bean="referencedRunnable" />\r
-       </flow:flow>\r
-\r
-       <bean id="referencedRunnable" p:message="TEST in referenced Runnable"\r
-               class="org.argeo.slc.core.execution.tasks.Echo" />\r
-\r
-       <!--\r
-               Standalone beans implementing Runnable can be exposed as flows via the\r
-               'flow:as-flow' attribute\r
-       -->\r
-       <bean id="standaloneRunnable" flow:as-flow="implicitFlow"\r
-               p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />\r
-\r
-       <!-- Specs definition is also simplified -->\r
-       <flow:spec id="namespaceSpec">\r
-               <flow:primitive name="primitive" value="100"\r
-                       isParameter="true" type="integer" />\r
-       </flow:spec>\r
-\r
-       <flow:flow id="flowSpec" spec="namespaceSpec" path="/namespace">\r
-               <bean p:message="TEST in flow @{primitive}" class="org.argeo.slc.core.execution.tasks.Echo"\r
-                       scope="execution">\r
-                       <aop:scoped-proxy />\r
-               </bean>\r
-               <ref bean="referencedRunnable" />\r
-       </flow:flow>\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
deleted file mode 100644 (file)
index e7390c3..0000000
+++ /dev/null
@@ -1,17 +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
-       <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
-\r
-       <reference id="attachmentUploader"\r
-               interface="org.argeo.slc.core.attachment.AttachmentUploader"\r
-               cardinality="0..1" />\r
-\r
-       <list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"\r
-               cardinality="0..N" />\r
-</beans:beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml b/demo/site/org.argeo.slc.demo.basic/conf/systemCall.xml
deleted file mode 100644 (file)
index bb5f79f..0000000
+++ /dev/null
@@ -1,46 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
-       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
-\r
-       <!-- Basic echo, should work on all OSs -->\r
-       <flow:flow name="os/systemCall">\r
-               <bean p:cmd="echo Hello World!" class="org.argeo.slc.core.execution.tasks.SystemCall" />\r
-       </flow:flow>\r
-\r
-       <!-- Must disable requiretty in sudoers file -->\r
-       <flow:flow name="os/sudo">\r
-               <bean p:cmd="sudo id" class="org.argeo.slc.core.execution.tasks.SystemCall">\r
-                       <property name="environmentVariables">\r
-                               <map>\r
-                                       <entry key="SUDO_ASKPASS" value="/usr/libexec/openssh/gnome-ssh-askpass" />\r
-                               </map>\r
-                       </property>\r
-               </bean>\r
-       </flow:flow>\r
-\r
-       <!-- SSH -->\r
-       <flow:flow name="os/ssh">\r
-               <bean p:cmd="ls /etc" class="org.argeo.slc.core.execution.tasks.SystemCall">\r
-                       <property name="executor" ref="sshExecutor" />\r
-               </bean>\r
-       </flow:flow>\r
-\r
-       <bean name="sshExecutor" class="org.argeo.slc.jsch.JschExecutor">\r
-               <property name="sshTarget">\r
-                       <bean p:host="localhost" p:port="22" p:user="${user.name}"\r
-                               p:localPrivateKey="${user.home}/.ssh/id_rsa" class="org.argeo.slc.jsch.SshTarget">\r
-                               <property name="userInfo">\r
-                                       <bean class="org.argeo.slc.jsch.swing.SwingUserInfo" />\r
-                               </property>\r
-                       </bean>\r
-               </property>\r
-       </bean>\r
-\r
-\r
-\r
-</beans>
\ No newline at end of file
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-001.xml
deleted file mode 100644 (file)
index c68414a..0000000
+++ /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.flowTemplate">\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@{testedComponentId}" />\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/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/basic-002.xml
deleted file mode 100644 (file)
index 5720d96..0000000
+++ /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.flowTemplate">\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/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-001.xml
deleted file mode 100644 (file)
index 181e3e7..0000000
+++ /dev/null
@@ -1,18 +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="canonic.001" parent="canonic.flowTemplate">\r
-               <description>Canonic 001</description>\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="1" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-002.xml
deleted file mode 100644 (file)
index 5916c08..0000000
+++ /dev/null
@@ -1,20 +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="canonic.002" parent="canonic.flowTemplate">\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="2" />\r
-                               <entry key="displayWithoutControl" value="102" />\r
-                               <entry key="displayWithControl" value="202" />\r
-                               <entry key="hide" value="202" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-001.xml
deleted file mode 100644 (file)
index 5b1dbf6..0000000
+++ /dev/null
@@ -1,18 +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="canonic-ns.001" parent="canonic-ns.flowTemplate">\r
-               <description>Canonic 001</description>\r
-               <constructor-arg>\r
-                       <map>\r
-                               <entry key="parameterAtInstantiation" value="1" />\r
-                       </map>\r
-               </constructor-arg>\r
-       </bean>\r
-</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml b/demo/site/org.argeo.slc.demo.basic/conf/testCases/canonic-ns-002.xml
deleted file mode 100644 (file)
index 991f67f..0000000
+++ /dev/null
@@ -1,16 +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" xmlns:flow="http://www.argeo.org/schema/slc-flow"\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/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd\r
-       http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">\r
-\r
-       <flow:flow id="canonic-ns.002" parent="canonic-ns.flowTemplate">\r
-               <flow:arg name="parameterAtInstantiation" value="2" />\r
-               <flow:arg name="displayWithoutControl" value="102" />\r
-               <flow:arg name="displayWithControl" value="202" />\r
-               <flow:arg name="hide" value="202" />\r
-       </flow:flow>\r
-</beans>\r
diff --git a/demo/site/org.argeo.slc.demo.basic/pom.xml b/demo/site/org.argeo.slc.demo.basic/pom.xml
new file mode 100644 (file)
index 0000000..0c45539
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.basic</artifactId>
+       <name>SLC Demo Basic</name>
+</project>
\ No newline at end of file
index 3654d400af9e03460d342c5769833daca1c0dcfe..e6a00677f23bade5e6b27e978da10ee1dd16af12 100644 (file)
@@ -1,8 +1,22 @@
-Manifest-Version: 1.0
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Detached (Detached Bundle)
-Bundle-Description: Detached Bundle
-Import-Package: org.argeo.slc.detached,org.argeo.slc.detached.admin,or
- g.springframework.beans.factory.config,org.argeo.slc.detached.drivers
- ,org.apache.xerces.jaxp,org.w3c.dom;version="0.0.0"
-Bundle-SymbolicName: org.argeo.slc.demo.det
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023159410\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Det(ached)\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.det\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg\r
+ eo.slc.core.execution.tasks,org.argeo.slc.detached,org.argeo.slc.execut\r
+ ion,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.\r
+ framework,org.springframework.aop.scope,org.springframework.beans.facto\r
+ ry.config,org.springframework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.det/pom.xml b/demo/site/org.argeo.slc.demo.det/pom.xml
new file mode 100644 (file)
index 0000000..efbd30c
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.det</artifactId>
+       <name>SLC Demo Det(ached)</name>
+</project>
\ No newline at end of file
index 8634bca42d56411aa8a7eaf3f113f5794a72a7a4..8a9e574656d17c4b5072807965c63d9921e429f9 100644 (file)
@@ -1,28 +1,23 @@
-Manifest-Version: 1.0
-Bundle-SymbolicName: org.argeo.slc.demo.detached
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Detached (Test)
-Import-Package: net.sf.cglib.core,
- net.sf.cglib.proxy,
- net.sf.cglib.reflect,
- org.aopalliance.aop,
- org.argeo.slc.core.attachment,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.core.structure.tree,
- org.argeo.slc.core.test,
- org.argeo.slc.core.test.context,
- org.argeo.slc.core.test.tree,
- org.argeo.slc.detached,
- org.argeo.slc.detached.drivers,
- org.argeo.slc.execution,
- org.argeo.slc.lib.detached,
- org.argeo.slc.osgi,
- org.argeo.slc.structure,
- org.argeo.slc.test,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.core.io,
- org.springframework.oxm.castor
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023159802\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Detached\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.detached\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg\r
+ eo.slc.core.execution.tasks,org.argeo.slc.core.test,org.argeo.slc.core.\r
+ test.tree,org.argeo.slc.detached.drivers,org.argeo.slc.execution,org.ar\r
+ geo.slc.lib.detached,org.argeo.slc.osgi,org.springframework.aop,org.spr\r
+ ingframework.aop.framework,org.springframework.aop.scope,org.springfram\r
+ ework.beans.factory.config,org.springframework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.detached/pom.xml b/demo/site/org.argeo.slc.demo.detached/pom.xml
new file mode 100644 (file)
index 0000000..a61b8b6
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.detached</artifactId>
+       <name>SLC Demo Detached</name>
+</project>
\ No newline at end of file
index e2bd67bf0d1c285bea1513fe7329ba76869ae5a1..803c62842e000b50fff1c07ff83821ede9cb380b 100644 (file)
@@ -1,16 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-Name: SLC Demo Maven
-Bundle-SymbolicName: org.argeo.slc.demo.maven
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Description: Demonstrate Maven support
-Import-Package: org.aopalliance.aop,
- org.argeo.slc.core.execution,
- org.argeo.slc.execution,
- org.argeo.slc.maven,
- org.argeo.slc.osgi,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config,
- org.springframework.osgi.util
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023160185\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Maven\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.maven\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg\r
+ eo.slc.core.execution.tasks,org.argeo.slc.execution,org.argeo.slc.maven\r
+ ,org.argeo.slc.osgi,org.springframework.aop,org.springframework.aop.fra\r
+ mework,org.springframework.aop.scope,org.springframework.beans.factory.\r
+ config,org.springframework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.maven/pom.xml b/demo/site/org.argeo.slc.demo.maven/pom.xml
new file mode 100644 (file)
index 0000000..97357d1
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.maven</artifactId>
+       <name>SLC Demo Maven</name>
+</project>
\ No newline at end of file
index 214ba0f88d8e4a1318bc5e87ebd890acae93a054..c3d3aa6dd8c63f86c1bdf201dc3a9ca4602f7593 100644 (file)
@@ -1,15 +1,22 @@
-Manifest-Version: 1.0
-Bundle-ManifestVersion: 2
-Bundle-SymbolicName: org.argeo.slc.demo.minimal
-Bundle-Version: 0.13.2.SNAPSHOT
-Bundle-Name: SLC Demo Minimal
-Bundle-Description: Minimal execution module to be used as a template
-Import-Package: org.aopalliance.aop,
- org.argeo.slc.core.execution,
- org.argeo.slc.core.execution.tasks,
- org.argeo.slc.execution,
- org.argeo.slc.osgi,
- org.springframework.aop,
- org.springframework.aop.framework,
- org.springframework.aop.scope,
- org.springframework.beans.factory.config
+Manifest-Version: 1.0\r
+Bnd-LastModified: 1333023160612\r
+Build-Jdk: 1.6.0_22\r
+Built-By: mbaudier\r
+Bundle-Description: Generic layers integrating free / open source techno\r
+ logies in order to quickly develop custom enterprise systems: security,\r
+  JCR, user interface, monitoring\r
+Bundle-DocURL: http://www.argeo.org\r
+Bundle-License: http://www.apache.org/licenses/LICENSE-2.0.txt\r
+Bundle-ManifestVersion: 2\r
+Bundle-Name: SLC Demo Minimal\r
+Bundle-RequiredExecutionEnvironment: JavaSE-1.6\r
+Bundle-SymbolicName: org.argeo.slc.demo.minimal\r
+Bundle-Vendor: Argeo\r
+Bundle-Version: 0.13.2.SNAPSHOT-r120329_1412\r
+Created-By: Apache Maven Bundle Plugin\r
+Import-Package: org.aopalliance.aop,org.argeo.slc.core.execution,org.arg\r
+ eo.slc.core.execution.tasks,org.argeo.slc.execution,org.argeo.slc.osgi,\r
+ org.springframework.aop,org.springframework.aop.framework,org.springfra\r
+ mework.aop.scope,org.springframework.beans.factory.config,org.springfra\r
+ mework.core.io\r
+Tool: Bnd-1.50.0\r
diff --git a/demo/site/org.argeo.slc.demo.minimal/pom.xml b/demo/site/org.argeo.slc.demo.minimal/pom.xml
new file mode 100644 (file)
index 0000000..f59a64b
--- /dev/null
@@ -0,0 +1,12 @@
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+       <modelVersion>4.0.0</modelVersion>
+       <parent>
+               <groupId>org.argeo.slc.demo</groupId>
+               <artifactId>modules</artifactId>
+               <version>0.13.2-SNAPSHOT</version>
+               <relativePath>..</relativePath>
+       </parent>
+       <artifactId>org.argeo.slc.demo.minimal</artifactId>
+       <name>SLC Demo Minimal</name>
+</project>
\ No newline at end of file
index a4c5e499e1f7f3b37d7ba95eaa69350cfd7c3fa5..a25e3035df0fa9ed4e6ee4bb2582287e586b65cc 100644 (file)
@@ -1,23 +1,76 @@
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+       xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
        <modelVersion>4.0.0</modelVersion>
        <parent>
-       <groupId>org.argeo.slc</groupId>
-       <artifactId>demo</artifactId>
+               <groupId>org.argeo.slc</groupId>
+               <artifactId>demo</artifactId>
                <version>0.13.2-SNAPSHOT</version>
                <relativePath>..</relativePath>
        </parent>
        <groupId>org.argeo.slc.demo</groupId>
-       <artifactId>org.argeo.slc.demo.bundles</artifactId>
-       <packaging>bundles</packaging>
-       <name>SLC Demo Bundles</name>
+       <artifactId>modules</artifactId>
+       <packaging>pom</packaging>
+       <name>SLC Demo Modules</name>
+       <modules>
+               <module>org.argeo.slc.demo.ant</module>
+               <module>org.argeo.slc.demo.basic</module>
+               <module>org.argeo.slc.demo.det</module>
+               <module>org.argeo.slc.demo.detached</module>
+               <module>org.argeo.slc.demo.maven</module>
+               <module>org.argeo.slc.demo.minimal</module>
+       </modules>
        <build>
+               <resources>
+                       <resource>
+                               <directory>.</directory>
+                               <includes>
+                                       <include>**</include>
+                               </includes>
+                               <excludes>
+                                       <exclude>.*</exclude>
+                                       <exclude>pom.xml</exclude>
+                                       <exclude>build.properties</exclude>
+                               </excludes>
+                       </resource>
+               </resources>
                <plugins>
                        <plugin>
-                               <groupId>org.argeo.maven.plugins</groupId>
-                               <artifactId>maven-argeo-osgi-plugin</artifactId>
-                               <extensions>true</extensions>
+                               <artifactId>maven-clean-plugin</artifactId>
                                <configuration>
-                                       <buildNumber>${timestamp}</buildNumber>
+                                       <filesets>
+                                               <fileset>
+                                                       <directory>META-INF</directory>
+                                                       <includes>
+                                                               <include>MANIFEST.MF</include>
+                                                       </includes>
+                                               </fileset>
+                                       </filesets>
+                               </configuration>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.maven.plugins</groupId>
+                               <artifactId>maven-jar-plugin</artifactId>
+                       </plugin>
+                       <plugin>
+                               <groupId>org.apache.felix</groupId>
+                               <artifactId>maven-bundle-plugin</artifactId>
+                               <configuration>
+                                       <instructions>
+                                               <!-- Minimal imports -->
+                                               <Import-Package>
+                                                       *,
+                                                       org.aopalliance.aop,
+                                                       org.argeo.slc.core.execution,
+                                                       org.argeo.slc.core.execution.tasks,
+                                                       org.argeo.slc.execution,
+                                                       org.argeo.slc.osgi,
+                                                       org.springframework.aop,
+                                                       org.springframework.aop.framework,
+                                                       org.springframework.aop.scope,
+                                                       org.springframework.beans.factory.config,
+                                                       org.springframework.core.io,                                            
+                                               </Import-Package>
+                                       </instructions>
                                </configuration>
                        </plugin>
                </plugins>