From: Mathieu Baudier <mbaudier@argeo.org>
Date: Sat, 22 May 2010 19:15:05 +0000 (+0000)
Subject: Remove alias since it is not working with Java 5
X-Git-Tag: argeo-slc-2.1.7~1294
X-Git-Url: http://git.argeo.org/?a=commitdiff_plain;ds=sidebyside;h=37c970e1cd66fc1b51fbfae7093a019693b0acb3;p=gpl%2Fargeo-slc.git

Remove alias since it is not working with Java 5

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

diff --git a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/xml/slc-flow-0.12.xsd b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/xml/slc-flow-0.12.xsd
index 7af852fe9..8b31a60bf 100644
--- a/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/xml/slc-flow-0.12.xsd
+++ b/runtime/org.argeo.slc.core/src/main/resources/org/argeo/slc/core/execution/xml/slc-flow-0.12.xsd
@@ -4,7 +4,8 @@
 	targetNamespace="http://www.argeo.org/schema/slc-flow"
 	elementFormDefault="qualified" attributeFormDefault="unqualified">
 
-	<xsd:import namespace="http://www.springframework.org/schema/beans" />
+	<xsd:import namespace="http://www.springframework.org/schema/beans"
+		schemaLocation="http://www.springframework.org/schema/beans/spring-beans-2.5.xsd" />
 
 	<xsd:annotation>
 		<xsd:documentation><![CDATA[
@@ -50,6 +51,20 @@
 							-->
 						</xsd:sequence>
 					</xsd:sequence>
+					<xsd:attribute name="name" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Name of the flow (alternative to ID).
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
+					<xsd:attribute name="class" type="xsd:string">
+						<xsd:annotation>
+							<xsd:documentation><![CDATA[
+	Another implementation of execution flow.
+							]]></xsd:documentation>
+						</xsd:annotation>
+					</xsd:attribute>
 					<xsd:attribute name="path" type="xsd:string">
 						<xsd:annotation>
 							<xsd:documentation><![CDATA[
@@ -134,10 +149,10 @@
 					<xsd:choice minOccurs="1" maxOccurs="1">
 						<xsd:element ref="beans:bean" />
 						<xsd:element ref="beans:ref" />
-						<xsd:element ref="beans:list"/>
-						<xsd:element ref="beans:set"/>
-						<xsd:element ref="beans:map"/>
-						<xsd:element ref="beans:props"/>							
+						<xsd:element ref="beans:list" />
+						<xsd:element ref="beans:set" />
+						<xsd:element ref="beans:map" />
+						<xsd:element ref="beans:props" />
 					</xsd:choice>
 				</xsd:complexType>
 			</xsd:element>
@@ -274,10 +289,10 @@
 			<xsd:element ref="beans:bean" />
 			<xsd:element ref="beans:ref" />
 			<xsd:element ref="flow:param" />
-			<xsd:element ref="beans:list"/>
-			<xsd:element ref="beans:set"/>
-			<xsd:element ref="beans:map"/>
-			<xsd:element ref="beans:props"/>			
+			<xsd:element ref="beans:list" />
+			<xsd:element ref="beans:set" />
+			<xsd:element ref="beans:map" />
+			<xsd:element ref="beans:props" />
 		</xsd:choice>
 		<xsd:attribute name="name" use="required" type="xsd:string">
 			<xsd:annotation>
@@ -338,7 +353,7 @@
 			</xsd:attribute>
 		</xsd:complexType>
 	</xsd:element>
-	
+
 	<xsd:element name="param">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -366,7 +381,4 @@
 		</xsd:complexType>
 	</xsd:element>
 
-	<!-- for description tags, beans or current namespace are valid -->
-	<xsd:element name="description" substitutionGroup="beans:description" />
-
 </xsd:schema>
\ No newline at end of file