Update demo

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

diff --git a/demo/site/org.argeo.slc.demo.ant/.project b/demo/site/org.argeo.slc.demo.ant/.project
new file mode 100644 (file)
index 0000000..5a20f60
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.ant</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/demo/site/org.argeo.slc.demo.ant/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.ant/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..fd871b4
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Wed Jan 06 20:27:20 CET 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
index eb9d912b34072d8b41af36184a76a994e665a7e0..f49bab9ba656d4bc52587ffdb9bd70b6a3cc23c5 100644 (file)
--- a/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.ant/META-INF/MANIFEST.MF
@@ -1,11 +1,8 @@
 Manifest-Version: 1.0
-Bundle-Version: 0.12.1.SNAPSHOT
+Bundle-ManifestVersion: 2
+Bundle-Name: Ant
+Bundle-SymbolicName: org.argeo.slc.demo.ant
+Bundle-Version: 1.0.0.qualifier
 Spring-Context: conf/*,conf/testCases/*
-Bundle-Name: SLC Demo Ant
+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
-Import-Package: org.aopalliance.aop,org.argeo.slc.ant,org.argeo.slc.co
- re.execution,org.argeo.slc.execution,org.argeo.slc.osgi,org.springfra
- mework.aop,org.springframework.aop.framework,org.springframework.aop.
- scope,org.springframework.beans.factory.config,org.springframework.co
- re.io
-Bundle-SymbolicName: org.argeo.slc.demo.ant

diff --git a/demo/site/org.argeo.slc.demo.ant/build.properties b/demo/site/org.argeo.slc.demo.ant/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.ant/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/

diff --git a/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
new file mode 100644 (file)
index 0000000..48ab910
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
@@ -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
+       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
+</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
index 8cc7a38622c406adced19ec9c2c686ad636989c8..e7390c31249f7b13cca222fb1261781fb50dd0e8 100644 (file)
--- a/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
+++ b/demo/site/org.argeo.slc.demo.basic/conf/osgi.xml
@@ -9,7 +9,9 @@
        <beans:import resource="classpath:org/argeo/slc/osgi/execution.xml" />\r
 \r
        <reference id="attachmentUploader"\r
-               interface="org.argeo.slc.core.attachment.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
+       <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.minimal/.project b/demo/site/org.argeo.slc.demo.minimal/.project
new file mode 100644 (file)
index 0000000..ba8b1b5
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.minimal/.project
@@ -0,0 +1,22 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<projectDescription>
+       <name>org.argeo.slc.demo.minimal</name>
+       <comment></comment>
+       <projects>
+       </projects>
+       <buildSpec>
+               <buildCommand>
+                       <name>org.eclipse.pde.ManifestBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+               <buildCommand>
+                       <name>org.eclipse.pde.SchemaBuilder</name>
+                       <arguments>
+                       </arguments>
+               </buildCommand>
+       </buildSpec>
+       <natures>
+               <nature>org.eclipse.pde.PluginNature</nature>
+       </natures>
+</projectDescription>

diff --git a/demo/site/org.argeo.slc.demo.minimal/.settings/org.eclipse.pde.core.prefs b/demo/site/org.argeo.slc.demo.minimal/.settings/org.eclipse.pde.core.prefs
new file mode 100644 (file)
index 0000000..5886cbf
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.minimal/.settings/org.eclipse.pde.core.prefs
@@ -0,0 +1,4 @@
+#Wed Jan 06 20:27:49 CET 2010
+eclipse.preferences.version=1
+pluginProject.extensions=false
+resolve.requirebundle=false

diff --git a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
index 63c16a94e33bd08e45e4c7b0fb371ae788304e27..2171b0666bb25cded8b3138d329b19a09912eebf 100644 (file)
--- a/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
+++ b/demo/site/org.argeo.slc.demo.minimal/META-INF/MANIFEST.MF
@@ -1,15 +1,8 @@
 Manifest-Version: 1.0
+Bundle-ManifestVersion: 2
+Bundle-Name: Minimal
 Bundle-SymbolicName: org.argeo.slc.demo.minimal
-Bundle-Version: 0.12.1.SNAPSHOT
-Bundle-Name: SLC Demo Minimal Module
-Bundle-Description: Minimal functioning execution module
+Bundle-Version: 1.0.0.qualifier
 Spring-Context: slc/*
-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
+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
+Bundle-Description: Minimal functioning execution module

diff --git a/demo/site/org.argeo.slc.demo.minimal/build.properties b/demo/site/org.argeo.slc.demo.minimal/build.properties
new file mode 100644 (file)
index 0000000..5f22cdd
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.minimal/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/