[Springframework-cvs] spring/src/org/springframework/context/config spring-context-2.5.xsd, 1.13, 1.14

[Arjen J.W. P. <po...@us...>]

Update of /cvsroot/springframework/spring/src/org/springframework/context/config
In directory fdv4jf1.ch3.sourceforge.com:/tmp/cvs-serv19426/src/org/springframework/context/config

Modified Files:
	spring-context-2.5.xsd 
Log Message:
SPR-5089

Index: spring-context-2.5.xsd
===================================================================
RCS file: /cvsroot/springframework/spring/src/org/springframework/context/config/spring-context-2.5.xsd,v
retrieving revision 1.13
retrieving revision 1.14
diff -C2 -d -r1.13 -r1.14
*** spring-context-2.5.xsd	19 May 2008 12:37:22 -0000	1.13
--- spring-context-2.5.xsd	14 Oct 2008 08:23:39 -0000	1.14
***************
*** 111,125 ****
  		<xsd:complexType>
  			<xsd:sequence>
! 				<xsd:element name="include-filter" type="filterType" minOccurs="0" maxOccurs="unbounded"/>
! 				<xsd:element name="exclude-filter" type="filterType" minOccurs="0" maxOccurs="unbounded"/>
! 			</xsd:sequence>
! 			<xsd:attribute name="base-package" type="xsd:string" use="required"/>
! 			<xsd:attribute name="resource-pattern" type="xsd:string"/>
! 			<xsd:attribute name="use-default-filters" type="xsd:boolean" default="true"/>
! 			<xsd:attribute name="annotation-config" type="xsd:boolean" default="true"/>
! 			<xsd:attribute name="name-generator" type="xsd:string"/>
! 			<xsd:attribute name="scope-resolver" type="xsd:string"/>
! 			<xsd:attribute name="scoped-proxy">
! 				<xsd:simpleType>
  					<xsd:restriction base="xsd:string">
  						<xsd:enumeration value="no"/>
--- 111,193 ----
  		<xsd:complexType>
  			<xsd:sequence>
! 				<xsd:element name="include-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
!                     <xsd:annotation>
!                         <xsd:documentation><![CDATA[
!     Controls which eligible types to include for component scanning.
!                         ]]></xsd:documentation>
!                     </xsd:annotation>
!                 </xsd:element>
!                 <xsd:element name="exclude-filter" type="filterType" minOccurs="0" maxOccurs="unbounded">
!                     <xsd:annotation>
!                         <xsd:documentation><![CDATA[
!     Controls which eligible types to exclude for component scanning.
!                         ]]></xsd:documentation>
!                     </xsd:annotation>
!                 </xsd:element>
!             </xsd:sequence>
! 			<xsd:attribute name="base-package" type="xsd:string" use="required">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
!      The comma-separated list of packages to scan for annotated components.                    
!                     ]]></xsd:documentation>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="resource-pattern" type="xsd:string">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
!      Controls the class files eligible for component detection. Defaults to "**/*.class", the recommended value.
!                     ]]></xsd:documentation>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="use-default-filters" type="xsd:boolean" default="true">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
!      Indicates whether automatic detection of classes annotated with @Component, @Repository, @Service, or @Controller
!      should be enabled. Default is "true".
!                     ]]></xsd:documentation>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="annotation-config" type="xsd:boolean" default="true">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
!      Indicates whether the implicit AutowiredAnnotationBeanPostProcessor and CommonAnnotationBeanPostProcessor should
!      be enabled. Default is "true".
!                     ]]></xsd:documentation>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="name-generator" type="xsd:string">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
! 	The fully-qualified classname of the BeanNameGenerator to be used for naming detected components.
!                     ]]></xsd:documentation>
!                     <xsd:appinfo>
!                         <tool:annotation>
!                             <tool:expected-type type="java.lang.Class"/>
!                             <tool:assignable-to type="org.springframework.beans.factory.support.BeanNameGenerator"/>
!                         </tool:annotation>
!                     </xsd:appinfo>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="scope-resolver" type="xsd:string">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
! 	The fully-qualified classname of the ScopeMetadataResolver to be used for resolving the scope of detected components.
!                     ]]></xsd:documentation>
!                     <xsd:appinfo>
!                         <tool:annotation>
!                             <tool:expected-type type="java.lang.Class"/>
!                             <tool:assignable-to type="org.springframework.context.annotation.ScopeMetadataResolver"/>
!                         </tool:annotation>
!                     </xsd:appinfo>
!                 </xsd:annotation>
!             </xsd:attribute>
!             <xsd:attribute name="scoped-proxy" default="no">
!                 <xsd:annotation>
!                     <xsd:documentation><![CDATA[
!      Indicates whether proxies should be generated for detected components, which may be necessary when using certain
!      non-singleton scopes.  The default is "no".
!                     ]]></xsd:documentation>
!                 </xsd:annotation>
!                 <xsd:simpleType>
  					<xsd:restriction base="xsd:string">
  						<xsd:enumeration value="no"/>
***************
*** 306,321 ****
  	<xsd:complexType name="filterType">
  		<xsd:attribute name="type" use="required">
! 			<xsd:simpleType>
  				<xsd:restriction base="xsd:string">
! 					<xsd:enumeration value="annotation"/>
!           <xsd:enumeration value="assignable"/>
!           <xsd:enumeration value="aspectj"/>
!           <xsd:enumeration value="regex"/>
!           <xsd:enumeration value="custom"/>
  				</xsd:restriction>
  			</xsd:simpleType>
  		</xsd:attribute>
! 		<xsd:attribute name="expression" type="xsd:string" use="required"/>
! 	</xsd:complexType>
  
  </xsd:schema>
--- 374,409 ----
  	<xsd:complexType name="filterType">
  		<xsd:attribute name="type" use="required">
!             <xsd:annotation>
!                 <xsd:documentation><![CDATA[
!     Controls the type of filtering to apply to the expression.
! 
!     "annotation" indicates an annotation to be present at the type level in target components;
!     "assignable" indicates a class (or interface) that the target components are assignable to (extend/implement);
!     "aspectj" indicates an AspectJ type expression to be matched by the target components;
!     "regex" indicates a regex expression to be matched by the target components' class names;
!     "custom" indicates a custom implementation of the org.springframework.core.type.TypeFilter interface.
! 
!     Note: This attribute will not be inherited by child bean definitions.
!     Hence, it needs to be specified per concrete bean definition.
!                 ]]></xsd:documentation>
!             </xsd:annotation>
!             <xsd:simpleType>
  				<xsd:restriction base="xsd:string">
!                     <xsd:enumeration value="annotation"/>
!                     <xsd:enumeration value="assignable"/>
!                     <xsd:enumeration value="aspectj"/>
!                     <xsd:enumeration value="regex"/>
!                     <xsd:enumeration value="custom"/>
  				</xsd:restriction>
  			</xsd:simpleType>
  		</xsd:attribute>
! 		<xsd:attribute name="expression" type="xsd:string" use="required">
!             <xsd:annotation>
!                 <xsd:documentation><![CDATA[
!     Indicates the filter expression, the type of which is indicated by "type".
!                 ]]></xsd:documentation>
!             </xsd:annotation>
!         </xsd:attribute>
!     </xsd:complexType>
  
  </xsd:schema>