INT-3208 Create 4.0 Schemas
Update the spring.schemas files. Update the version in the abstract namespace parser. JIRA: https://jira.springsource.org/browse/INT-3208 The following is a diff showing changes between the 3.0 and 4.0 schemas... ./spring-integration-amqp/src/main/resources/org/springframework/integration/amqp/config/spring-integration-amqp-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-core/src/main/resources/org/springframework/integration/config/xml/spring-integration-3.0.xsd ./spring-integration-event/src/main/resources/org/springframework/integration/event/config/spring-integration-event-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-feed/src/main/resources/org/springframework/integration/feed/config/spring-integration-feed-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-file/src/main/resources/org/springframework/integration/file/config/spring-integration-file-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ftp/src/main/resources/org/springframework/integration/ftp/config/spring-integration-ftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-gemfire/src/main/resources/org/springframework/integration/gemfire/config/xml/spring-integration-gemfire-3.0.xsd ./spring-integration-groovy/src/main/resources/org/springframework/integration/groovy/config/spring-integration-groovy-3.0.xsd 10c10 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" 13c13 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-http/src/main/resources/org/springframework/integration/http/config/spring-integration-http-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-ip/src/main/resources/org/springframework/integration/ip/config/spring-integration-ip-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jdbc/src/main/resources/org/springframework/integration/jdbc/config/spring-integration-jdbc-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jms/src/main/resources/org/springframework/integration/jms/config/spring-integration-jms-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-jmx/src/main/resources/org/springframework/integration/jmx/config/spring-integration-jmx-3.0.xsd 9c9 < <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > <xsd:import namespace="http://www.springframework.org/schema/integration" schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-jpa/src/main/resources/org/springframework/integration/jpa/config/xml/spring-integration-jpa-3.0.xsd 12c12 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-mail/src/main/resources/org/springframework/integration/mail/config/spring-integration-mail-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-mongodb/src/main/resources/org/springframework/integration/mongodb/config/spring-integration-mongodb-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-redis/src/main/resources/org/springframework/integration/redis/config/spring-integration-redis-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-rmi/src/main/resources/org/springframework/integration/rmi/config/spring-integration-rmi-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-3.0.xsd 8c8 < schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/scripting/spring-integration-scripting-core-4.0.xsd" /> ./spring-integration-scripting/src/main/resources/org/springframework/integration/scripting/config/spring-integration-scripting-core-3.0.xsd 11c11 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> ./spring-integration-security/src/main/resources/org/springframework/integration/security/config/spring-integration-security-3.0.xsd ./spring-integration-sftp/src/main/resources/org/springframework/integration/sftp/config/spring-integration-sftp-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/file/spring-integration-file-4.0.xsd" /> ./spring-integration-stream/src/main/resources/org/springframework/integration/stream/config/spring-integration-stream-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-syslog/src/main/resources/org/springframework/integration/syslog/config/spring-integration-syslog-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd" /> 15c15 < schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-3.0.xsd" /> --- > schemaLocation="http://www.springframework.org/schema/integration/ip/spring-integration-ip-4.0.xsd" /> ./spring-integration-twitter/src/main/resources/org/springframework/integration/twitter/config/spring-integration-twitter-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-ws/src/main/resources/org/springframework/integration/ws/config/spring-integration-ws-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xml/src/main/resources/org/springframework/integration/xml/config/spring-integration-xml-3.0.xsd 13c13 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/> ./spring-integration-xmpp/src/main/resources/org/springframework/integration/xmpp/config/spring-integration-xmpp-3.0.xsd 14c14 < schemaLocation="http://www.springframework.org/schema/integration/spring-integration-3.0.xsd"/> --- > schemaLocation="http://www.springframework.org/schema/integration/spring-integration-4.0.xsd"/>
This commit is contained in:
Gary Russell
@@ -3,4 +3,5 @@ http\://www.springframework.org/schema/integration/security/spring-integration-s
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security-2.1.xsd=org/springframework/integration/security/config/spring-integration-security-2.1.xsd
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security-2.2.xsd=org/springframework/integration/security/config/spring-integration-security-2.2.xsd
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security-3.0.xsd=org/springframework/integration/security/config/spring-integration-security-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-3.0.xsd
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security-4.0.xsd=org/springframework/integration/security/config/spring-integration-security-4.0.xsd
|
||||
http\://www.springframework.org/schema/integration/security/spring-integration-security.xsd=org/springframework/integration/security/config/spring-integration-security-4.0.xsd
|
||||
|
||||
@@ -0,0 +1,54 @@
|
||||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<xsd:schema xmlns="http://www.springframework.org/schema/integration/security"
|
||||
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/integration/security"
|
||||
elementFormDefault="qualified" attributeFormDefault="unqualified">
|
||||
|
||||
<xsd:import namespace="http://www.springframework.org/schema/beans" />
|
||||
<xsd:import namespace="http://www.springframework.org/schema/tool" />
|
||||
|
||||
<xsd:element name="secured-channels">
|
||||
<xsd:complexType>
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Defines security requirements for one or more Message Channels.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:sequence>
|
||||
<xsd:element name="access-policy" type="accessPolicyType" minOccurs="1" maxOccurs="unbounded"/>
|
||||
</xsd:sequence>
|
||||
<xsd:attribute name="authentication-manager" type="xsd:string" default="authenticationManager">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type type="org.springframework.security.authentication.AuthenticationManager"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
<xsd:attribute name="access-decision-manager" type="xsd:string" default="accessDecisionManager">
|
||||
<xsd:annotation>
|
||||
<xsd:appinfo>
|
||||
<tool:annotation kind="ref">
|
||||
<tool:expected-type type="org.springframework.security.access.AccessDecisionManager"/>
|
||||
</tool:annotation>
|
||||
</xsd:appinfo>
|
||||
</xsd:annotation>
|
||||
</xsd:attribute>
|
||||
</xsd:complexType>
|
||||
</xsd:element>
|
||||
|
||||
<xsd:complexType name="accessPolicyType">
|
||||
<xsd:annotation>
|
||||
<xsd:documentation>
|
||||
Defines the security access policy for send and/or receive invocations based on a Message Channel name pattern.
|
||||
</xsd:documentation>
|
||||
</xsd:annotation>
|
||||
<xsd:attribute name="pattern" type="xsd:string" use="required"/>
|
||||
<xsd:attribute name="send-access" type="xsd:string"/>
|
||||
<xsd:attribute name="receive-access" type="xsd:string"/>
|
||||
</xsd:complexType>
|
||||
|
||||
</xsd:schema>
|
||||
Reference in New Issue
Block a user