1 files changed, 81 insertions, 3 deletions
diff --git a/sandbox/event/modules/assembly-xsd/src/main/resources/sca-core.xsd b/sandbox/event/modules/assembly-xsd/src/main/resources/sca-core.xsd
index b0d94102af..6e4a63d09c 100644
--- a/sandbox/event/modules/assembly-xsd/src/main/resources/sca-core.xsd
+++ b/sandbox/event/modules/assembly-xsd/src/main/resources/sca-core.xsd
@@ -15,7 +15,9 @@
         	<choice minOccurs="0" maxOccurs="unbounded">
             	<element name="service" type="sca:ComponentService" />
             	<element name="reference" type="sca:ComponentReference"/>
-            	<element name="property" type="sca:Property"/>
+            	<element name="property" type="sca:Property"/>           	          	
+            	<element name="producer" type="sca:ComponentProducer"/>
+            	<element name="consumer" type="sca:ComponentConsumer"/>
         	</choice>
         	<!-- 
         	<any namespace="##other" processContents="lax" minOccurs="0" 
@@ -34,7 +36,9 @@
                  <element name="service" type="sca:Service"/>
                  <element name="property" type="sca:Property"/>
                  <element name="component" type="sca:Component"/>
-                 <element name="reference" type="sca:Reference"/>
+                 <element name="reference" type="sca:Reference"/>                              
+            	 <element name="producer" type="sca:Producer"/>
+            	 <element name="consumer" type="sca:Consumer"/>
                  <element name="wire" type="sca:Wire"/>
                  <!-- <any namespace="##other" processContents="lax"  minOccurs="0" maxOccurs="unbounded"/>  -->  
              </choice>
@@ -147,6 +151,41 @@
        </complexContent> 
     </complexType>
 
+    
+    <complexType name="Producer">
+    	<sequence>
+    		<element name="operation" type="sca:Operation" minOccurs="0" 
+    			maxOccurs="unbounded" />
+    		<choice minOccurs="0" maxOccurs="unbounded">
+    			<element ref="sca:binding" />
+    			<any namespace="##other" processContents="lax"/>
+    		</choice>
+    	</sequence>
+    	<attribute name="name" type="NCName" use="required" />
+    	<attribute name="promote" type="anyURI" use="required" />
+    	<attribute name="target" type="sca:listOfAnyURIs" use="optional" />
+    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
+    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+    	<anyAttribute namespace="##any" processContents="lax" />
+    </complexType>
+    
+    <complexType name="Consumer">
+    	<sequence>
+    		<element name="operation" type="sca:Operation" minOccurs="0" 
+    			maxOccurs="unbounded" />
+    		<choice minOccurs="0" maxOccurs="unbounded">
+    			<element ref="sca:binding" />
+    			<any namespace="##other" processContents="lax"/>
+    		</choice>
+    	</sequence>
+    	<attribute name="name" type="NCName" use="required" />
+    	<attribute name="promote" type="anyURI" use="required" />
+    	<attribute name="source" type="sca:listOfAnyURIs" use="optional" />
+    	<attribute name="requires" type="sca:listOfQNames" use="optional" />
+    	<attribute name="policySets" type="sca:listOfQNames" use="optional"/>
+    	<anyAttribute namespace="##any" processContents="lax" />
+    </complexType>
+
     <element name="binding" type="sca:Binding" abstract="true"/>
     <complexType name="Binding" abstract="true">
     	<sequence>
@@ -190,7 +229,9 @@
              <choice minOccurs="0" maxOccurs="unbounded">
              	<element name="service" type="sca:ComponentService"/>
                 <element name="reference" type="sca:ComponentReference"/>
-                <element name="property" type="sca:PropertyValue" />
+                <element name="property" type="sca:PropertyValue" />                             
+            	<element name="producer" type="sca:ComponentProducer"/>
+            	<element name="consumer" type="sca:ComponentConsumer"/>
              </choice>
              <!-- 
              <any namespace="##other" processContents="lax" minOccurs="0" 
@@ -252,6 +293,43 @@
    			use="optional"/>
 		<anyAttribute namespace="##any" processContents="lax" />
     </complexType>
+    
+        <complexType name="ComponentProducer">
+        <sequence>
+        	 <element name="operation" type="sca:Operation" minOccurs="0" 
+  					maxOccurs="unbounded" />
+    		<choice minOccurs="0" maxOccurs="unbounded">
+    			<element ref="sca:binding" />
+    			<any namespace="##other" processContents="lax"/>
+    		</choice>
+        </sequence>
+        <attribute name="name" type="NCName" use="required"/>       
+    	<attribute name="target" type="sca:listOfAnyURIs" use="optional" />
+        <attribute name="requires" type="sca:listOfQNames" 
+        	use="optional"/>
+        <attribute name="policySets" type="sca:listOfQNames" 
+        	use="optional"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
+    </complexType>
+    
+    <complexType name="ComponentConsumer">
+        <sequence>
+        	 <element name="operation" type="sca:Operation" minOccurs="0" 
+  					maxOccurs="unbounded" />
+    		<choice minOccurs="0" maxOccurs="unbounded">
+    			<element ref="sca:binding" />
+    			<any namespace="##other" processContents="lax"/>
+    		</choice>
+        </sequence>
+        <attribute name="name" type="NCName" use="required"/>       
+    	<attribute name="source" type="sca:listOfAnyURIs" use="optional" />
+        <attribute name="requires" type="sca:listOfQNames" 
+        	use="optional"/>
+        <attribute name="policySets" type="sca:listOfQNames" 
+        	use="optional"/>
+        <anyAttribute namespace="##any" processContents="lax"/>
+    </complexType>
+    
 
     <element name="implementation" type="sca:Implementation"
     	abstract="true" />