[jboss-svn-commits] JBL Code SVN: r35992 - in labs/jbossrules/trunk/drools-container/drools-spring/src: test/resources/org/drools/container/spring and 1 other directory.

jboss-svn-commits at lists.jboss.org jboss-svn-commits at lists.jboss.org
Tue Nov 16 07:49:57 EST 2010


Author: mark.proctor at jboss.com
Date: 2010-11-16 07:49:56 -0500 (Tue, 16 Nov 2010)
New Revision: 35992

Modified:
   labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.2.0.xsd
   labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
Log:
JBRULES-2799 Extend Schema to support spring bean/map/list/ref types instead of xsd any

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.2.0.xsd
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.2.0.xsd	2010-11-16 11:19:44 UTC (rev 35991)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/main/resources/org/drools/container/spring/drools-spring-1.2.0.xsd	2010-11-16 12:49:56 UTC (rev 35992)
@@ -1,488 +1,537 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<xsd:schema xmlns="http://drools.org/schema/drools-spring"
-	xmlns:xsd="http://www.w3.org/2001/XMLSchema" 
-	targetNamespace="http://drools.org/schema/drools-spring"
-	elementFormDefault="qualified" 
-	attributeFormDefault="unqualified">
-	
-	<xsd:element name="grid">
-		<xsd:complexType>		
-			<xsd:all minOccurs="0">
-				<xsd:element name="core-services" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-		              <xsd:sequence>
-		                 <xsd:any minOccurs="0" maxOccurs="1" />
-		              </xsd:sequence>	           
-		              <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-					</xsd:complexType>				
-				</xsd:element>	
-				
-				<xsd:element name="whitepages" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-		              <xsd:choice>
-		                 <xsd:element ref="persistence" minOccurs="0" maxOccurs="1"/>
-		                 <xsd:any  minOccurs="0" maxOccurs="1" />
-		              </xsd:choice>
-		              <xsd:attribute name="ref" use="optional" type="xsd:string"/>	 		                        
-					</xsd:complexType>				
-				</xsd:element>		
-				
-			    <xsd:element name="socket-service" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-		              <xsd:sequence>
-		                 <xsd:element name="service" minOccurs="0" maxOccurs="unbounded">
-		                 	<xsd:complexType>
-		                 	   <xsd:attribute name="name" use="required" type="xsd:string"/>	
-		                 	   <xsd:attribute name="port" use="required" type="xsd:string"/>
-		                    </xsd:complexType>
-		                 </xsd:element>
-		              </xsd:sequence>					
-					  <xsd:attribute name="acceptor" use="optional" type="xsd:string"/>
- 				      <xsd:attribute name="ip" use="required" type="xsd:string"/>		              		              	           
-					</xsd:complexType>				
-				</xsd:element>	
-																					
-			</xsd:all>	
-			<xsd:attribute name="id" use="required" type="xsd:ID"/>			
-		</xsd:complexType>					
-	</xsd:element>
-
-	<xsd:element name="grid-node">
-		<xsd:complexType>
-	   	    <xsd:all>	
-			    <xsd:element name="socket-service" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
- 				         <xsd:attribute name="port" use="required" type="xsd:string"/>		              		              	           
-					</xsd:complexType>				
-				</xsd:element>	
-																					
-			</xsd:all>			
-			<xsd:attribute name="id" use="required" type="xsd:ID"/>
-			<xsd:attribute name="grid" use="optional" type="xsd:string"/>
-		</xsd:complexType>
-	</xsd:element>	
-	
-	<xsd:element name="resource-change-scanner">
-		<xsd:complexType>
-			<xsd:attribute name="id" use="required" type="xsd:ID"/>
-			<xsd:attribute name="interval" use="optional" type="xsd:integer"/>
-		</xsd:complexType>
-	</xsd:element>	
-	
-	<xsd:element name="resources">
-		<xsd:complexType>
-			<xsd:choice  minOccurs="0" maxOccurs="unbounded">
-				<xsd:element ref="resource" />
-			</xsd:choice>
-		</xsd:complexType>	
-	</xsd:element>
-	
-	<xsd:element name="resource">
-		<xsd:complexType>
-			<xsd:complexContent>
-				<xsd:extension base="resourceType">
-					<xsd:attribute name="id" use="optional" type="xsd:ID"/>
-                                        <xsd:attribute name="basic-authentication" use="optional" type="enabledDisabledEnum"/>
-                                        <xsd:attribute name="username" use="optional" type="xsd:string"/>
-                                        <xsd:attribute name="password" use="optional" type="xsd:string"/>
-				</xsd:extension>
-			</xsd:complexContent>
-		</xsd:complexType>
-	</xsd:element>	
-	
-
-	<xsd:element name="kbase">
-		<xsd:complexType>
-		    <xsd:all minOccurs="0">
-			    <xsd:element ref="resources"  minOccurs="0" maxOccurs="1" />
-			    
-				<xsd:element name="configuration" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-						<xsd:all minOccurs="0">
-	                        <xsd:element name="advanced-process-rule-integration" minOccurs="0">
-							    <xsd:complexType>
-							        <xsd:attribute name="enabled" type="xsd:boolean"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>
-	                        
-	                        <xsd:element name="multithread" minOccurs="0">
-							    <xsd:complexType>
-							        <xsd:attribute name="enabled" type="xsd:boolean"/>
-							        <xsd:attribute name="max-threads" type="xsd:positiveInteger"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>
-	                        	                        
-	                        <xsd:element name="mbeans" minOccurs="0">
-				                <xsd:complexType>
-							        <xsd:attribute name="enabled" type="xsd:boolean"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>	                        
-	                        
-	                        <xsd:element name="event-processing-mode" minOccurs="0">
-				                <xsd:complexType>
-							        <xsd:attribute name="mode" type="cloudModeEnum"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>	
-	                        
-	                        <xsd:element name="assert-behavior" minOccurs="0">
-				                <xsd:complexType>
-							        <xsd:attribute name="mode" type="assertBehaviorEnum"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>		                        
-
-	                        <xsd:element name="accumulate-functions" minOccurs="0">
-				                <xsd:complexType>
-				                    <xsd:choice>
-				                	    <xsd:element name="accumulate-function" minOccurs="0" maxOccurs="unbounded">
-					                	    <xsd:complexType>
-					                	        <xsd:attribute name="name" use="required" type="xsd:string"/>
-					                	        <xsd:attribute name="ref" use="required" type="xsd:string"/>
-					                	    </xsd:complexType>
-				                	    </xsd:element>				                	    
-				                	</xsd:choice>
-							    </xsd:complexType>	                        
-	                        </xsd:element>	
-	                        
-	                        <xsd:element name="evaluators" minOccurs="0">
-				                <xsd:complexType>
-				                    <xsd:choice>
-				                	    <xsd:element name="evaluator" minOccurs="0" maxOccurs="unbounded">
-					                	    <xsd:complexType>
-					                	        <xsd:attribute name="name" use="required" type="xsd:string"/>
-					                	        <xsd:attribute name="ref" use="required" type="xsd:string"/>
-					                	    </xsd:complexType>
-				                	    </xsd:element>				                	    
-				                	</xsd:choice>
-							    </xsd:complexType>	                        
-	                        </xsd:element>
-
-                                <xsd:element name="consequenceExceptionHandler" minOccurs="0">
-							    <xsd:complexType>
-							        <xsd:attribute name="handler" type="xsd:string"/>
-							    </xsd:complexType>
-	                        </xsd:element>
-						</xsd:all>
-					</xsd:complexType>				
-				</xsd:element>	
-			</xsd:all>
-			<xsd:attribute name="id" use="optional" type="xsd:ID"/>
-			<xsd:attribute name="node" use="optional" type="xsd:string"/>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<xsd:element name="kagent">
-		<xsd:complexType>
-		    <xsd:all>
-			    <xsd:element ref="resources"  minOccurs="0" maxOccurs="1" />
-			</xsd:all>		
-			<xsd:attribute name="id" use="required" type="xsd:ID"/>
-			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
-			<xsd:attribute name="new-instance" use="optional" type="xsd:boolean"/>
-		</xsd:complexType>
-	</xsd:element>		
-
-    <xsd:element name="kstore" />
-
-	<xsd:element name="ksession">
-		<xsd:complexType>
-			<xsd:all minOccurs="0">
-				<xsd:element name="batch" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-						<xsd:sequence>
-	                        <xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
-						</xsd:sequence>
-					</xsd:complexType>				
-				</xsd:element>
-				
-				<xsd:element name="script" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-						<xsd:sequence>
-	                        <xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
-						</xsd:sequence>
-					</xsd:complexType>				
-				</xsd:element>				
-				
-				<xsd:element name="configuration" minOccurs="0" maxOccurs="1">
-					<xsd:complexType>
-						<xsd:all minOccurs="0">
-	                        <xsd:element ref="persistence" minOccurs="0"/>
-	                        
-	                        <xsd:element name="keep-reference" minOccurs="0">
-				                <xsd:complexType>
-							        <xsd:attribute name="enabled" type="xsd:boolean"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>	                        
-	                        
-	                        <xsd:element name="clock-type" minOccurs="0">
-				                <xsd:complexType>
-							        <xsd:attribute name="type" type="clockTypeEnum"/>
-							    </xsd:complexType>	                        
-	                        </xsd:element>		
-	                        
-	                        <xsd:element name="work-item-handlers" minOccurs="0">
-				                <xsd:complexType>
-				                    <xsd:choice>
-				                	    <xsd:element name="work-item-handler" minOccurs="0" maxOccurs="unbounded">
-					                	    <xsd:complexType>
-					                	        <xsd:attribute name="name" use="required" type="xsd:string"/>
-					                	        <xsd:attribute name="ref" use="required" type="xsd:string"/>
-					                	    </xsd:complexType>
-				                	    </xsd:element>				                	    
-				                	</xsd:choice>
-							    </xsd:complexType>	                        
-	                        </xsd:element>		                                                
-						</xsd:all>
-					</xsd:complexType>				
-				</xsd:element>				
-								
-			</xsd:all>	
-				
-			<xsd:attribute name="type" use="required" type="knowledgeSessionTypeEnum"/>
-			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
-			<xsd:attribute name="id" use="required" type="xsd:ID"/>
-			<xsd:attribute name="node" use="optional" type="xsd:string"/>
-			<xsd:attribute name="name" use="optional" type="xsd:string"/>
-		</xsd:complexType>
-	</xsd:element>		
-
-	<xsd:simpleType name="connectionTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="local" />
-			<xsd:enumeration value="remote" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="knowledgeSessionTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="stateful" />
-			<xsd:enumeration value="stateless" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-	<xsd:simpleType name="resourceTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="DRL" />
-			<xsd:enumeration value="BPMN2" />
-			<xsd:enumeration value="XDRL" />
-			<xsd:enumeration value="DSL" />
-			<xsd:enumeration value="DSLR" />
-			<xsd:enumeration value="DRF" />
-			<xsd:enumeration value="DTABLE" />
-			<xsd:enumeration value="PKG" />
-			<xsd:enumeration value="BRL" />
-			<xsd:enumeration value="CHANGE_SET" />
-			<xsd:enumeration value="XSD" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	
-	<xsd:simpleType name="languageTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="DTD" />
-			<xsd:enumeration value="RELAXNG" />
-			<xsd:enumeration value="RELAXNG_COMPACT" />
-			<xsd:enumeration value="WSDL" />
-			<xsd:enumeration value="XMLSCHEMA" />
-		</xsd:restriction>
-	</xsd:simpleType>	
-	
-	<xsd:simpleType name="cloudModeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="STREAM" />
-			<xsd:enumeration value="CLOUD" />
-		</xsd:restriction>
-	</xsd:simpleType>
-
-        <xsd:simpleType name="enabledDisabledEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="enabled" />
-			<xsd:enumeration value="disabled" />
-		</xsd:restriction>
-	</xsd:simpleType>
-	
-	
-	<xsd:simpleType name="assertBehaviorEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="IDENTITY" />
-			<xsd:enumeration value="EQUALITY" />
-		</xsd:restriction>
-	</xsd:simpleType>	
-		
-	<xsd:simpleType name="clockTypeEnum">
-		<xsd:restriction base="xsd:string">
-			<xsd:enumeration value="REALTIME" />
-			<xsd:enumeration value="PSEUDO" />
-		</xsd:restriction>
-	</xsd:simpleType>		
-	
-	
-	<xsd:complexType name="resourceType">
-		<xsd:choice minOccurs="0" maxOccurs="1">
-			<xsd:element name="decisiontable-conf">
-				<xsd:complexType>
-					<xsd:attribute name="input-type" use="required" type="xsd:string"/>
-					<xsd:attribute name="worksheet-name" use="required" type="xsd:string"/>
-				</xsd:complexType>
-		    </xsd:element>
-			<xsd:element name="jaxb-conf">
-		        <xsd:complexType>
-					<xsd:attribute name="system-id" use="optional" type="xsd:string" />
-					<xsd:attribute name="schema-language" type="languageTypeEnum" use="optional" />
-				</xsd:complexType>				
-			</xsd:element>
-		</xsd:choice>
-		<xsd:attribute name="source" use="optional" type="xsd:string"/>
-		<xsd:attribute name="type" use="optional" type="resourceTypeEnum"/>
-	    <xsd:attribute name="ref"  use="optional" type="xsd:string"/>
-	</xsd:complexType>
-	
-	<xsd:complexType name="resourceRefType">
-		<xsd:attribute name="id" use="required" type="xsd:string"/>
-	</xsd:complexType>
-
-	
-	<xsd:complexType name="classesType">
-		<xsd:sequence>
-			<xsd:element name="class" type="xsd:string"  />
-		</xsd:sequence>
-	</xsd:complexType>
-
-	<xsd:complexType name="persisterType">
-		<xsd:attribute name="for-class" use="required" type="xsd:string"/>
-		<xsd:attribute name="implementation" use="required" type="xsd:string"/>
-	</xsd:complexType>
-
-	<xsd:complexType name="variablePersistersType">
-		<xsd:sequence>
-			<xsd:element name="persister" type="persisterType" minOccurs="1" maxOccurs="unbounded"/>
-		</xsd:sequence>
-	</xsd:complexType>
-	
-	<xsd:element name="jpaSessionServiceFactory">
-		<xsd:complexType>
-			<xsd:sequence>
-				<xsd:element name="variablePersisters" type="variablePersistersType" minOccurs="0" maxOccurs="1"/>
-			</xsd:sequence>
-			<xsd:attribute name="id" use="optional" type="xsd:ID"/>
-			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
-			<xsd:attribute name="entityManagerFactory" use="required" type="xsd:string"/>
-			<xsd:attribute name="transactionManager" use="required" type="xsd:string"/>
-		</xsd:complexType>
-	</xsd:element>
-	
-	<!-- Persistence -->
-	<xsd:element name="persistence" type="persistenceType" abstract="true"/>
-	
-	 <xsd:complexType name="persistenceType">
-     </xsd:complexType>	
-     
-	 <xsd:element name="jpa-persistence"  substitutionGroup="persistence" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="persistenceType">
-	              <xsd:all>
-	                 <xsd:element name="variable-persisters" type="variablePersistersType" minOccurs="0" maxOccurs="1"/>
-	                 <xsd:element name="transaction-manager" minOccurs="0" maxOccurs="1">
-				        <xsd:complexType>
-  					       <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-				        </xsd:complexType>
-		             </xsd:element>
-	                 <xsd:element name="entity-manager-factory" minOccurs="1" maxOccurs="1">
-				        <xsd:complexType>
-  					       <xsd:attribute name="ref" use="required" type="xsd:string"/>
-				        </xsd:complexType>
-		             </xsd:element>		             
-	              </xsd:all>	           
-	              <xsd:attribute name="load" use="optional" type="xsd:integer"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>     
-	
-	<!-- Commands -->
-	 <xsd:element name="command" type="commandType" abstract="true"/>
-	 
-	 <xsd:complexType name="commandType">
-     </xsd:complexType>
-	 	
-	 <xsd:element name="insert-object"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">
-	              <xsd:sequence>
-	                 <xsd:any minOccurs="0" maxOccurs="1" />
-	              </xsd:sequence>	           
-	              <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>
-	  
-	 <xsd:element name="set-global"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">
-	              <xsd:sequence>
-	                 <xsd:any minOccurs="0" maxOccurs="1" />
-	              </xsd:sequence>	           
-	              <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-	              <xsd:attribute name="identifier" use="required" type="xsd:string"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>	  
-	  
-	 <xsd:element name="fire-all-rules"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">	           
-	              <xsd:attribute name="max" use="optional" type="xsd:integer"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>	  
-	  
-	 <xsd:element name="fire-until-halt"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>
-
-	 <xsd:element name="start-process"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">
-	              <xsd:sequence>
-	                 <xsd:element name="parameter" minOccurs="0" maxOccurs="unbounded">
-	                    <xsd:complexType>
-			              <xsd:sequence>
-			                 <xsd:any minOccurs="0" maxOccurs="1" />
-			              </xsd:sequence>	           
-			              <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-			              <xsd:attribute name="identifier" use="required" type="xsd:string"/>	                    
-	                    </xsd:complexType>
-	                 </xsd:element>
-	              </xsd:sequence>	           
-	              <xsd:attribute name="process-id" use="required" type="xsd:string"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>	
-	  
-	  <xsd:element name="signal-event"  substitutionGroup="command" >
-	     <xsd:complexType>
-	        <xsd:complexContent>
-	           <xsd:extension base="commandType">
-	              <xsd:sequence>
-	                 <xsd:any minOccurs="0" maxOccurs="1" />
-	              </xsd:sequence>	           
-	              <xsd:attribute name="ref" use="optional" type="xsd:string"/>
-                  <xsd:attribute name="event-type" use="required" type="xsd:string"/>	              	              
-	              <xsd:attribute name="process-instance-id" use="optional" type="xsd:integer"/>
-	           </xsd:extension>
-	        </xsd:complexContent>
-	     </xsd:complexType>
-	  </xsd:element>		
-</xsd:schema>
+<?xml version="1.0" encoding="UTF-8"?>
+<xsd:schema xmlns="http://drools.org/schema/drools-spring"
+	xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+	xmlns:spring="http://www.springframework.org/schema/beans"
+	targetNamespace="http://drools.org/schema/drools-spring"
+	elementFormDefault="qualified"
+	attributeFormDefault="unqualified">
+
+	<xsd:import namespace="http://www.springframework.org/schema/beans" schemaLocation=" http://www.springframework.org/schema/beans/spring-beans-2.0.xsd"/>
+
+	<xsd:element name="grid">
+		<xsd:complexType>
+			<xsd:all minOccurs="0">
+				<xsd:element name="core-services" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+				        <xsd:choice minOccurs="0" maxOccurs="1">
+					       <xsd:element ref="spring:bean"/>
+						   <xsd:element ref="spring:ref"/>
+						   <xsd:element ref="spring:idref"/>
+						   <xsd:element ref="spring:value"/>
+						   <xsd:element ref="spring:null"/>
+						   <xsd:element ref="spring:list"/>
+						   <xsd:element ref="spring:set"/>
+						   <xsd:element ref="spring:map"/>
+						   <xsd:element ref="spring:props"/>		  
+						</xsd:choice>
+					<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+					</xsd:complexType>
+				</xsd:element>
+
+				<xsd:element name="whitepages" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:choice minOccurs="0" maxOccurs="1">
+							<xsd:element ref="persistence"/>
+					        <xsd:element ref="spring:bean"/>
+					 	    <xsd:element ref="spring:ref"/>
+						    <xsd:element ref="spring:idref"/>
+						    <xsd:element ref="spring:value"/>
+						    <xsd:element ref="spring:null"/>
+						    <xsd:element ref="spring:list"/>
+						    <xsd:element ref="spring:set"/>
+						    <xsd:element ref="spring:map"/>
+						    <xsd:element ref="spring:props"/>	
+						</xsd:choice>
+						<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+					</xsd:complexType>
+				</xsd:element>
+
+				<xsd:element name="socket-service" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+					<xsd:sequence>
+						<xsd:element name="service" minOccurs="0" maxOccurs="unbounded">
+							<xsd:complexType>
+								<xsd:attribute name="name" use="required" type="xsd:string"/>
+								<xsd:attribute name="port" use="required" type="xsd:string"/>
+							</xsd:complexType>
+						</xsd:element>
+					</xsd:sequence>
+					<xsd:attribute name="acceptor" use="optional" type="xsd:string"/>
+					<xsd:attribute name="ip" use="required" type="xsd:string"/>
+					</xsd:complexType>
+				</xsd:element>
+
+			</xsd:all>
+			<xsd:attribute name="id" use="required" type="xsd:ID"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="grid-node">
+		<xsd:complexType>
+			<xsd:all>
+				<xsd:element name="socket-service" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:attribute name="port" use="required" type="xsd:string"/>
+					</xsd:complexType>
+				</xsd:element>
+
+			</xsd:all>
+			<xsd:attribute name="id" use="required" type="xsd:ID"/>
+			<xsd:attribute name="grid" use="optional" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="resource-change-scanner">
+		<xsd:complexType>
+			<xsd:attribute name="id" use="required" type="xsd:ID"/>
+			<xsd:attribute name="interval" use="optional" type="xsd:integer"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="resources">
+		<xsd:complexType>
+			<xsd:choice  minOccurs="0" maxOccurs="unbounded">
+				<xsd:element ref="resource" />
+			</xsd:choice>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="resource">
+		<xsd:complexType>
+			<xsd:complexContent>
+				<xsd:extension base="resourceType">
+					<xsd:attribute name="id" use="optional" type="xsd:ID"/>
+										<xsd:attribute name="basic-authentication" use="optional" type="enabledDisabledEnum"/>
+										<xsd:attribute name="username" use="optional" type="xsd:string"/>
+										<xsd:attribute name="password" use="optional" type="xsd:string"/>
+				</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+
+	<xsd:element name="kbase">
+		<xsd:complexType>
+			<xsd:all minOccurs="0">
+				<xsd:element ref="resources"  minOccurs="0" maxOccurs="1" />
+
+				<xsd:element name="configuration" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:all minOccurs="0">
+							<xsd:element name="advanced-process-rule-integration" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="enabled" type="xsd:boolean"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="multithread" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="enabled" type="xsd:boolean"/>
+									<xsd:attribute name="max-threads" type="xsd:positiveInteger"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="mbeans" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="enabled" type="xsd:boolean"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="event-processing-mode" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="mode" type="cloudModeEnum"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="assert-behavior" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="mode" type="assertBehaviorEnum"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="accumulate-functions" minOccurs="0">
+								<xsd:complexType>
+									<xsd:choice>
+										<xsd:element name="accumulate-function" minOccurs="0" maxOccurs="unbounded">
+											<xsd:complexType>
+												<xsd:attribute name="name" use="required" type="xsd:string"/>
+												<xsd:attribute name="ref" use="required" type="xsd:string"/>
+											</xsd:complexType>
+										</xsd:element>
+									</xsd:choice>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="evaluators" minOccurs="0">
+								<xsd:complexType>
+									<xsd:choice>
+										<xsd:element name="evaluator" minOccurs="0" maxOccurs="unbounded">
+											<xsd:complexType>
+												<xsd:attribute name="name" use="required" type="xsd:string"/>
+												<xsd:attribute name="ref" use="required" type="xsd:string"/>
+											</xsd:complexType>
+										</xsd:element>
+									</xsd:choice>
+								</xsd:complexType>
+							</xsd:element>
+
+								<xsd:element name="consequenceExceptionHandler" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="handler" type="xsd:string"/>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:all>
+					</xsd:complexType>
+				</xsd:element>
+			</xsd:all>
+			<xsd:attribute name="id" use="optional" type="xsd:ID"/>
+			<xsd:attribute name="node" use="optional" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="kagent">
+		<xsd:complexType>
+			<xsd:all>
+				<xsd:element ref="resources"  minOccurs="0" maxOccurs="1" />
+			</xsd:all>
+			<xsd:attribute name="id" use="required" type="xsd:ID"/>
+			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
+			<xsd:attribute name="new-instance" use="optional" type="xsd:boolean"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="kstore" />
+
+	<xsd:element name="ksession">
+		<xsd:complexType>
+			<xsd:all minOccurs="0">
+				<xsd:element name="batch" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+
+				<xsd:element name="script" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:sequence>
+							<xsd:element ref="command" minOccurs="0" maxOccurs="unbounded" />
+						</xsd:sequence>
+					</xsd:complexType>
+				</xsd:element>
+
+				<xsd:element name="configuration" minOccurs="0" maxOccurs="1">
+					<xsd:complexType>
+						<xsd:all minOccurs="0">
+							<xsd:element ref="persistence" minOccurs="0"/>
+
+							<xsd:element name="keep-reference" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="enabled" type="xsd:boolean"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="clock-type" minOccurs="0">
+								<xsd:complexType>
+									<xsd:attribute name="type" type="clockTypeEnum"/>
+								</xsd:complexType>
+							</xsd:element>
+
+							<xsd:element name="work-item-handlers" minOccurs="0">
+								<xsd:complexType>
+									<xsd:choice>
+										<xsd:element name="work-item-handler" minOccurs="0" maxOccurs="unbounded">
+											<xsd:complexType>
+												<xsd:attribute name="name" use="required" type="xsd:string"/>
+												<xsd:attribute name="ref" use="required" type="xsd:string"/>
+											</xsd:complexType>
+										</xsd:element>
+									</xsd:choice>
+								</xsd:complexType>
+							</xsd:element>
+						</xsd:all>
+					</xsd:complexType>
+				</xsd:element>
+
+			</xsd:all>
+
+			<xsd:attribute name="type" use="required" type="knowledgeSessionTypeEnum"/>
+			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
+			<xsd:attribute name="id" use="required" type="xsd:ID"/>
+			<xsd:attribute name="node" use="optional" type="xsd:string"/>
+			<xsd:attribute name="name" use="optional" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:simpleType name="connectionTypeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="local" />
+			<xsd:enumeration value="remote" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="knowledgeSessionTypeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="stateful" />
+			<xsd:enumeration value="stateless" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="resourceTypeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="DRL" />
+			<xsd:enumeration value="BPMN2" />
+			<xsd:enumeration value="XDRL" />
+			<xsd:enumeration value="DSL" />
+			<xsd:enumeration value="DSLR" />
+			<xsd:enumeration value="DRF" />
+			<xsd:enumeration value="DTABLE" />
+			<xsd:enumeration value="PKG" />
+			<xsd:enumeration value="BRL" />
+			<xsd:enumeration value="CHANGE_SET" />
+			<xsd:enumeration value="XSD" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="languageTypeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="DTD" />
+			<xsd:enumeration value="RELAXNG" />
+			<xsd:enumeration value="RELAXNG_COMPACT" />
+			<xsd:enumeration value="WSDL" />
+			<xsd:enumeration value="XMLSCHEMA" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="cloudModeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="STREAM" />
+			<xsd:enumeration value="CLOUD" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+		<xsd:simpleType name="enabledDisabledEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="enabled" />
+			<xsd:enumeration value="disabled" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+
+	<xsd:simpleType name="assertBehaviorEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="IDENTITY" />
+			<xsd:enumeration value="EQUALITY" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+	<xsd:simpleType name="clockTypeEnum">
+		<xsd:restriction base="xsd:string">
+			<xsd:enumeration value="REALTIME" />
+			<xsd:enumeration value="PSEUDO" />
+		</xsd:restriction>
+	</xsd:simpleType>
+
+
+	<xsd:complexType name="resourceType">
+		<xsd:choice minOccurs="0" maxOccurs="1">
+			<xsd:element name="decisiontable-conf">
+				<xsd:complexType>
+					<xsd:attribute name="input-type" use="required" type="xsd:string"/>
+					<xsd:attribute name="worksheet-name" use="required" type="xsd:string"/>
+				</xsd:complexType>
+			</xsd:element>
+			<xsd:element name="jaxb-conf">
+				<xsd:complexType>
+					<xsd:attribute name="system-id" use="optional" type="xsd:string" />
+					<xsd:attribute name="schema-language" type="languageTypeEnum" use="optional" />
+				</xsd:complexType>
+			</xsd:element>
+		</xsd:choice>
+		<xsd:attribute name="source" use="optional" type="xsd:string"/>
+		<xsd:attribute name="type" use="optional" type="resourceTypeEnum"/>
+		<xsd:attribute name="ref"  use="optional" type="xsd:string"/>
+	</xsd:complexType>
+
+	<xsd:complexType name="resourceRefType">
+		<xsd:attribute name="id" use="required" type="xsd:string"/>
+	</xsd:complexType>
+
+
+	<xsd:complexType name="classesType">
+		<xsd:sequence>
+			<xsd:element name="class" type="xsd:string"  />
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:complexType name="persisterType">
+		<xsd:attribute name="for-class" use="required" type="xsd:string"/>
+		<xsd:attribute name="implementation" use="required" type="xsd:string"/>
+	</xsd:complexType>
+
+	<xsd:complexType name="variablePersistersType">
+		<xsd:sequence>
+			<xsd:element name="persister" type="persisterType" minOccurs="1" maxOccurs="unbounded"/>
+		</xsd:sequence>
+	</xsd:complexType>
+
+	<xsd:element name="jpaSessionServiceFactory">
+		<xsd:complexType>
+			<xsd:sequence>
+				<xsd:element name="variablePersisters" type="variablePersistersType" minOccurs="0" maxOccurs="1"/>
+			</xsd:sequence>
+			<xsd:attribute name="id" use="optional" type="xsd:ID"/>
+			<xsd:attribute name="kbase" use="required" type="xsd:string"/>
+			<xsd:attribute name="entityManagerFactory" use="required" type="xsd:string"/>
+			<xsd:attribute name="transactionManager" use="required" type="xsd:string"/>
+		</xsd:complexType>
+	</xsd:element>
+
+	<!-- Persistence -->
+	<xsd:element name="persistence" type="persistenceType" abstract="true"/>
+
+	<xsd:complexType name="persistenceType">
+	</xsd:complexType>
+
+	<xsd:element name="jpa-persistence"  substitutionGroup="persistence" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="persistenceType">
+				<xsd:all>
+					<xsd:element name="variable-persisters" type="variablePersistersType" minOccurs="0" maxOccurs="1"/>
+					<xsd:element name="transaction-manager" minOccurs="0" maxOccurs="1">
+						<xsd:complexType>
+							<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+						</xsd:complexType>
+					</xsd:element>
+					<xsd:element name="entity-manager-factory" minOccurs="1" maxOccurs="1">
+						<xsd:complexType>
+							<xsd:attribute name="ref" use="required" type="xsd:string"/>
+						</xsd:complexType>
+					</xsd:element>
+				</xsd:all>
+				<xsd:attribute name="load" use="optional" type="xsd:integer"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<!-- Commands -->
+	<xsd:element name="command" type="commandType" abstract="true"/>
+
+	<xsd:complexType name="commandType">
+	</xsd:complexType>
+
+	<xsd:element name="insert-object"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+				        <xsd:choice minOccurs="0" maxOccurs="1">
+					       <xsd:element ref="spring:bean"/>
+						   <xsd:element ref="spring:ref"/>
+						   <xsd:element ref="spring:idref"/>
+						   <xsd:element ref="spring:value"/>
+						   <xsd:element ref="spring:null"/>
+						   <xsd:element ref="spring:list"/>
+						   <xsd:element ref="spring:set"/>
+						   <xsd:element ref="spring:map"/>
+						   <xsd:element ref="spring:props"/>		  
+						</xsd:choice>
+				<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="set-global"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+				        <xsd:choice minOccurs="0" maxOccurs="1">
+					       <xsd:element ref="spring:bean"/>
+						   <xsd:element ref="spring:ref"/>
+						   <xsd:element ref="spring:idref"/>
+						   <xsd:element ref="spring:value"/>
+						   <xsd:element ref="spring:null"/>
+						   <xsd:element ref="spring:list"/>
+						   <xsd:element ref="spring:set"/>
+						   <xsd:element ref="spring:map"/>
+						   <xsd:element ref="spring:props"/>		  
+						</xsd:choice>
+				<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+				<xsd:attribute name="identifier" use="required" type="xsd:string"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="fire-all-rules"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+				<xsd:attribute name="max" use="optional" type="xsd:integer"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="fire-until-halt"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="start-process"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+				<xsd:sequence>
+					<xsd:element name="parameter" minOccurs="0" maxOccurs="unbounded">
+					    <xsd:complexType>
+					        <xsd:choice minOccurs="0" maxOccurs="1">
+						       <xsd:element ref="spring:bean"/>
+							   <xsd:element ref="spring:ref"/>
+							   <xsd:element ref="spring:idref"/>
+							   <xsd:element ref="spring:value"/>
+							   <xsd:element ref="spring:null"/>
+							   <xsd:element ref="spring:list"/>
+							   <xsd:element ref="spring:set"/>
+							   <xsd:element ref="spring:map"/>
+							   <xsd:element ref="spring:props"/>		  
+							</xsd:choice>
+                       </xsd:complexType>						
+					</xsd:element>
+				</xsd:sequence>
+				<xsd:attribute name="process-id" use="required" type="xsd:string"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+
+	<xsd:element name="signal-event"  substitutionGroup="command" >
+		<xsd:complexType>
+			<xsd:complexContent>
+			<xsd:extension base="commandType">
+				        <xsd:choice minOccurs="0" maxOccurs="1">
+					       <xsd:element ref="spring:bean"/>
+						   <xsd:element ref="spring:ref"/>
+						   <xsd:element ref="spring:idref"/>
+						   <xsd:element ref="spring:value"/>
+						   <xsd:element ref="spring:null"/>
+						   <xsd:element ref="spring:list"/>
+						   <xsd:element ref="spring:set"/>
+						   <xsd:element ref="spring:map"/>
+						   <xsd:element ref="spring:props"/>		  
+						</xsd:choice>
+				<xsd:attribute name="ref" use="optional" type="xsd:string"/>
+				<xsd:attribute name="event-type" use="required" type="xsd:string"/>
+				<xsd:attribute name="process-instance-id" use="optional" type="xsd:integer"/>
+			</xsd:extension>
+			</xsd:complexContent>
+		</xsd:complexType>
+	</xsd:element>
+</xsd:schema>

Modified: labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml
===================================================================
--- labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml	2010-11-16 11:19:44 UTC (rev 35991)
+++ labs/jbossrules/trunk/drools-container/drools-spring/src/test/resources/org/drools/container/spring/beans.xml	2010-11-16 12:49:56 UTC (rev 35992)
@@ -16,8 +16,8 @@
 	
 	<drools:resource id="resource1" type="DRL" source="classpath:org/drools/container/spring/testSpring.drl"/>
 
-        <drools:resource id="secureResource" basic-authentication="enabled" username="someUser" password="somePassword" type="DRL" source="http://someHost:1234/someDRLResource.drl"/>
-        <drools:resource id="insecureResource" type="DRL" source="http://someHost:1234/someOtherDRLResource.drl"/>
+   <drools:resource id="secureResource" basic-authentication="enabled" username="someUser" password="somePassword" type="DRL" source="http://someHost:1234/someDRLResource.drl"/>
+   <drools:resource id="insecureResource" type="DRL" source="http://someHost:1234/someOtherDRLResource.drl"/>
 	
 	<drools:kbase id="kbase1" node="node1">
 	    <drools:resources>



More information about the jboss-svn-commits mailing list