X-Git-Url: http://git.argeo.org/?a=blobdiff_plain;ds=sidebyside;f=runtime%2Forg.argeo.slc.core%2Fsrc%2Fmain%2Fresources%2Forg%2Fargeo%2Fslc%2Fcore%2Fexecution%2Fxml%2Fslc-flow-0.12.xsd;h=7af852fe95258497a7819a71d52b7e818adb507f;hb=30463809ad9db9e57ea3ffce5b2b22e10ec0bf1c;hp=884faaa2125de08634a3a7c879fa04eb12ac9d84;hpb=b9336fb77b251c886f7bc09ffafeb9818a50eb94;p=gpl%2Fargeo-slc.git

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 884faaa21..7af852fe9 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
@@ -26,7 +26,7 @@
 			<xsd:complexContent>
 				<xsd:extension base="beans:identifiedType">
 					<xsd:sequence>
-						<xsd:element ref="beans:description" minOccurs="0"/>
+						<xsd:element ref="beans:description" minOccurs="0" />
 						<xsd:sequence>
 							<xsd:element name="arg" minOccurs="0" maxOccurs="unbounded"
 								type="flow:argType">
@@ -96,7 +96,7 @@
 			<xsd:complexContent>
 				<xsd:extension base="beans:identifiedType">
 					<xsd:sequence>
-						<xsd:element ref="beans:description" minOccurs="0"/>
+						<xsd:element ref="beans:description" minOccurs="0" />
 						<xsd:choice minOccurs="0" maxOccurs="unbounded">
 							<xsd:element name="primitive" type="flow:primitiveSpecAttributeType"
 								minOccurs="0" maxOccurs="unbounded">
@@ -134,6 +134,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:choice>
 				</xsd:complexType>
 			</xsd:element>
@@ -270,6 +274,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:choice>
 		<xsd:attribute name="name" use="required" type="xsd:string">
 			<xsd:annotation>
@@ -302,15 +310,35 @@
 			]]></xsd:documentation>
 		</xsd:annotation>
 	</xsd:attribute>
-<!--
-	<xsd:attribute name="var" type="xsd:boolean">
-		<xsd:annotation>
-			<xsd:documentation><![CDATA[
-	If true, the decorated bean is set to scope execution and proxied.
+	<!--
+		<xsd:attribute name="var" type="xsd:boolean"> <xsd:annotation>
+		<xsd:documentation><![CDATA[ If true, the decorated bean is set to
+		scope execution and proxied. ]]></xsd:documentation> </xsd:annotation>
+		</xsd:attribute>
+	-->
+
+	<xsd:element name="variable">
+		<xsd:complexType>
+			<xsd:annotation>
+				<xsd:documentation><![CDATA[
+	Marks a bean definition as being variable, i.e. a scoped proxy of scope execution 
 			]]></xsd:documentation>
-		</xsd:annotation>
-	</xsd:attribute>
--->
+			</xsd:annotation>
+			<xsd:attribute name="proxy-target-class" type="xsd:boolean"
+				default="true">
+				<xsd:annotation>
+					<xsd:documentation><![CDATA[
+						Are class-based (CGLIB) proxies to be created?
+						This is the default;
+						in order to switch to standard Java
+						interface-based proxies, turn this flag to
+						"false".
+					]]></xsd:documentation>
+				</xsd:annotation>
+			</xsd:attribute>
+		</xsd:complexType>
+	</xsd:element>
+	
 	<xsd:element name="param">
 		<xsd:annotation>
 			<xsd:documentation><![CDATA[
@@ -339,6 +367,6 @@
 	</xsd:element>
 
 	<!-- for description tags, beans or current namespace are valid -->
-	<xsd:element name="description" substitutionGroup="beans:description"/>
+	<xsd:element name="description" substitutionGroup="beans:description" />
 
 </xsd:schema>
\ No newline at end of file