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

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

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

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

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.16
retrieving revision 1.17
diff -C2 -d -r1.16 -r1.17
*** spring-context-2.5.xsd	17 Oct 2008 16:39:10 -0000	1.16
--- spring-context-2.5.xsd	20 Oct 2008 19:44:27 -0000	1.17
***************
*** 1,11 ****
  <?xml version="1.0" encoding="UTF-8"?>
  
! <xsd:schema xmlns="http://www.springframework.org/schema/context"
! 		xmlns:xsd="http://www.w3.org/2001/XMLSchema"
! 		xmlns:beans="http://www.springframework.org/schema/beans"
! 		xmlns:tool="http://www.springframework.org/schema/tool"
! 		targetNamespace="http://www.springframework.org/schema/context"
! 		elementFormDefault="qualified"
! 		attributeFormDefault="unqualified">
  
  	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
--- 1,9 ----
  <?xml version="1.0" encoding="UTF-8"?>
  
! <xsd:schema xmlns="http://www.springframework.org/schema/context" xmlns:xsd="http://www.w3.org/2001/XMLSchema"
! 			xmlns:beans="http://www.springframework.org/schema/beans"
! 			xmlns:tool="http://www.springframework.org/schema/tool"
! 			targetNamespace="http://www.springframework.org/schema/context" elementFormDefault="qualified"
! 			attributeFormDefault="unqualified">
  
  	<xsd:import namespace="http://www.springframework.org/schema/beans"/>
***************
*** 68,72 ****
  		</xsd:annotation>
  		<xsd:complexType>
! 			<xsd:attribute name="location" type="xsd:string" use="required">
  				<xsd:annotation>
  					<xsd:documentation><![CDATA[
--- 66,70 ----
  		</xsd:annotation>
  		<xsd:complexType>
! 			<xsd:attribute name="location" type="xsd:string">
  				<xsd:annotation>
  					<xsd:documentation><![CDATA[
***************
*** 128,132 ****
  				<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>
--- 126,130 ----
  				<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>
***************
*** 293,297 ****
  	<xsd:element name="spring-configured">
  		<xsd:annotation>
! 			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect"><![CDATA[
  	Signals the current application context to apply dependency injection
  	to non-managed classes that are instantiated outside of the Spring bean
--- 291,296 ----
  	<xsd:element name="spring-configured">
  		<xsd:annotation>
! 			<xsd:documentation source="java:org.springframework.beans.factory.aspectj.AnnotationBeanConfigurerAspect">
! 				<![CDATA[
  	Signals the current application context to apply dependency injection
  	to non-managed classes that are instantiated outside of the Spring bean
***************
*** 389,394 ****
  	<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.
  
--- 388,393 ----
  	<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.
  
***************
*** 402,424 ****
      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>
--- 401,423 ----
      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>