From 9274f558a78cccc62501d59b292b1866f9d4eb07 Mon Sep 17 00:00:00 2001
From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 9 Jan 2010 13:36:18 +0000
Subject: [PATCH] Update demo

git-svn-id: https://svn.argeo.org/slc/trunk@3259 4cfe0d0a-d680-48aa-b62c-e0a02a3f76cc
---
 demo/site/org.argeo.slc.demo.ant/.project     | 22 ++++++++++++++++
 .../.settings/org.eclipse.pde.core.prefs      |  4 +++
 .../META-INF/MANIFEST.MF                      | 13 ++++------
 .../org.argeo.slc.demo.ant/build.properties   |  1 +
 .../conf/namespace.xml                        | 25 +++++++++++++++++++
 .../org.argeo.slc.demo.basic/conf/osgi.xml    |  6 +++--
 demo/site/org.argeo.slc.demo.minimal/.project | 22 ++++++++++++++++
 .../.settings/org.eclipse.pde.core.prefs      |  4 +++
 .../META-INF/MANIFEST.MF                      | 17 ++++---------
 .../build.properties                          |  1 +
 10 files changed, 93 insertions(+), 22 deletions(-)
 create mode 100644 demo/site/org.argeo.slc.demo.ant/.project
 create mode 100644 demo/site/org.argeo.slc.demo.ant/.settings/org.eclipse.pde.core.prefs
 create mode 100644 demo/site/org.argeo.slc.demo.ant/build.properties
 create mode 100644 demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
 create mode 100644 demo/site/org.argeo.slc.demo.minimal/.project
 create mode 100644 demo/site/org.argeo.slc.demo.minimal/.settings/org.eclipse.pde.core.prefs
 create mode 100644 demo/site/org.argeo.slc.demo.minimal/build.properties

diff --git a/demo/site/org.argeo.slc.demo.ant/.project b/demo/site/org.argeo.slc.demo.ant/.project
new file mode 100644
index 000000000..5a20f60c4
--- /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
index 000000000..fd871b4a7
--- /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 eb9d912b3..f49bab9ba 100644
--- 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
index 000000000..5f22cdd44
--- /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
index 000000000..48ab91054
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.basic/conf/namespace.xml
@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<beans xmlns="http://www.springframework.org/schema/beans"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:p="http://www.springframework.org/schema/p"
+	xmlns:aop="http://www.springframework.org/schema/aop" xmlns:flow="http://www.argeo.org/schema/slc-flow"
+	xsi:schemaLocation="
+	http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-2.5.xsd
+	http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-2.5.xsd
+	http://www.argeo.org/schema/slc-flow http://www.argeo.org/schema/slc-flow-0.12.xsd">
+
+	<!-- Flow definition is simplified thanks to the 'flow:flow' element -->
+	<flow:flow id="flow" path="/namespace">
+		<bean p:message="TEST in flow" class="org.argeo.slc.core.execution.tasks.Echo" />
+		<ref bean="referencedRunnable" />
+	</flow:flow>
+
+	<bean id="referencedRunnable" p:message="TEST in referenced Runnable"
+		class="org.argeo.slc.core.execution.tasks.Echo" />
+
+	<!--
+		Standalone beans implementing Runnable can be exposed as flows via the
+		'flow:as-flow' attribute
+	-->
+	<bean id="standaloneRunnable" flow:as-flow="implicitFlow"
+		p:message="TEST in implicit flow" class="org.argeo.slc.core.execution.tasks.Echo" />
+</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 8cc7a3862..e7390c312 100644
--- 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" />
 
 	<reference id="attachmentUploader"
-		interface="org.argeo.slc.core.attachment.AttachmentUploader" />
+		interface="org.argeo.slc.core.attachment.AttachmentUploader"
+		cardinality="0..1" />
 
-	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener" />
+	<list id="resultListeners" interface="org.argeo.slc.core.test.tree.TreeTestResultListener"
+		cardinality="0..N" />
 </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
index 000000000..ba8b1b5a6
--- /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
index 000000000..5886cbfbe
--- /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 63c16a94e..2171b0666 100644
--- 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
index 000000000..5f22cdd44
--- /dev/null
+++ b/demo/site/org.argeo.slc.demo.minimal/build.properties
@@ -0,0 +1 @@
+bin.includes = META-INF/
-- 
2.39.2