From 17cf470a05723cb50e5d766290976941fb5ed50a Mon Sep 17 00:00:00 2001 From: Gary Russell Date: Tue, 6 Dec 2011 17:07:53 -0500 Subject: [PATCH] INT-2298 Remove Versions From Schemas in Reference It is generally advised to use version-less schemas; some examples in the reference still had 2.0 schema versions. --- docs/src/reference/docbook/configuration.xml | 22 ++++++++++---------- docs/src/reference/docbook/feed.xml | 2 +- docs/src/reference/docbook/file.xml | 6 +++--- docs/src/reference/docbook/ftp.xml | 2 +- docs/src/reference/docbook/gemfire.xml | 2 +- docs/src/reference/docbook/jms.xml | 2 +- docs/src/reference/docbook/mail.xml | 4 ++-- docs/src/reference/docbook/preface.xml | 2 +- docs/src/reference/docbook/samples.xml | 6 +++--- docs/src/reference/docbook/security.xml | 8 +++---- docs/src/reference/docbook/sftp.xml | 2 +- docs/src/reference/docbook/stream.xml | 4 ++-- docs/src/reference/docbook/twitter.xml | 2 +- docs/src/reference/docbook/whats-new.xml | 2 +- docs/src/reference/docbook/xml.xml | 2 +- docs/src/reference/docbook/xmpp.xml | 2 +- 16 files changed, 35 insertions(+), 35 deletions(-) diff --git a/docs/src/reference/docbook/configuration.xml b/docs/src/reference/docbook/configuration.xml index ac6a5be5a4..b065280f76 100644 --- a/docs/src/reference/docbook/configuration.xml +++ b/docs/src/reference/docbook/configuration.xml @@ -30,9 +30,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>xmlns:int="http://www.springframework.org/schema/integration"http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd"> + http://www.springframework.org/schema/integration/spring-integration.xsd"> You can choose any name after "xmlns:"; int is used here for clarity, but you might @@ -43,9 +43,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" ]]>xmlns:beans="http://www.springframework.org/schema/beans"]]> + http://www.springframework.org/schema/integration/spring-integration.xsd">]]> When using this alternative, no prefix is necessary for the Spring Integration elements. On the other hand, if @@ -71,19 +71,19 @@ xmlns:int-rmi="http://www.springframework.org/schema/integration/rmi" xmlns:int-ws="http://www.springframework.org/schema/integration/ws" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/file - http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd + http://www.springframework.org/schema/integration/file/spring-integration-file.xsd http://www.springframework.org/schema/integration/jms - http://www.springframework.org/schema/integration/jms/spring-integration-jms-2.0.xsd + http://www.springframework.org/schema/integration/jms/spring-integration-jms.xsd http://www.springframework.org/schema/integration/mail - http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd + http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd http://www.springframework.org/schema/integration/rmi - http://www.springframework.org/schema/integration/rmi/spring-integration-rmi-2.0.xsd + http://www.springframework.org/schema/integration/rmi/spring-integration-rmi.xsd http://www.springframework.org/schema/integration/ws - http://www.springframework.org/schema/integration/ws/spring-integration-ws-2.0.xsd"> + http://www.springframework.org/schema/integration/ws/spring-integration-ws.xsd"> ... ]]> The reference manual provides specific examples of the various elements in their corresponding chapters. Here, the diff --git a/docs/src/reference/docbook/feed.xml b/docs/src/reference/docbook/feed.xml index 17560d2503..0cb4054364 100644 --- a/docs/src/reference/docbook/feed.xml +++ b/docs/src/reference/docbook/feed.xml @@ -18,7 +18,7 @@ + http://www.springframework.org/schema/integration/feed/spring-integration-feed.xsd"]]> diff --git a/docs/src/reference/docbook/file.xml b/docs/src/reference/docbook/file.xml index 24a902bfbb..c3506c5d51 100644 --- a/docs/src/reference/docbook/file.xml +++ b/docs/src/reference/docbook/file.xml @@ -75,11 +75,11 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-file="http://www.springframework.org/schema/integration/file" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/file - http://www.springframework.org/schema/integration/file/spring-integration-file-2.0.xsd"> + http://www.springframework.org/schema/integration/file/spring-integration-file.xsd"> ]]> diff --git a/docs/src/reference/docbook/ftp.xml b/docs/src/reference/docbook/ftp.xml index 7bb5b8e6c1..3cc4343d30 100644 --- a/docs/src/reference/docbook/ftp.xml +++ b/docs/src/reference/docbook/ftp.xml @@ -27,7 +27,7 @@ To use the FTP namespace, add the following to the header of your XML file: diff --git a/docs/src/reference/docbook/gemfire.xml b/docs/src/reference/docbook/gemfire.xml index 16b426d6a7..b29cae3386 100644 --- a/docs/src/reference/docbook/gemfire.xml +++ b/docs/src/reference/docbook/gemfire.xml @@ -25,7 +25,7 @@ + http://www.springframework.org/schema/integration/gemfire/spring-integration-gemfire.xsd"]]>
diff --git a/docs/src/reference/docbook/jms.xml b/docs/src/reference/docbook/jms.xml index a5d68ad173..a051e62dfb 100644 --- a/docs/src/reference/docbook/jms.xml +++ b/docs/src/reference/docbook/jms.xml @@ -79,7 +79,7 @@ an instance of DefaultMessageListenerContainer will be created and configured based on these properties. For example, you can specify the "transaction-manager" reference, the "concurrent-consumers" value, and several other property references and values. Refer to the JavaDoc and Spring Integration's JMS Schema - (spring-integration-jms-2.0.xsd) for more detail. + (spring-integration-jms.xsd) for more detail. diff --git a/docs/src/reference/docbook/mail.xml b/docs/src/reference/docbook/mail.xml index f2b20d5a47..27f8d4e577 100644 --- a/docs/src/reference/docbook/mail.xml +++ b/docs/src/reference/docbook/mail.xml @@ -72,9 +72,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int-mail="http://www.springframework.org/schema/integration/mail" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration/mail - http://www.springframework.org/schema/integration/mail/spring-integration-mail-2.0.xsd">]]> + http://www.springframework.org/schema/integration/mail/spring-integration-mail.xsd">]]> To configure an outbound Channel Adapter, provide the channel to receive from, and the MailSender: diff --git a/docs/src/reference/docbook/preface.xml b/docs/src/reference/docbook/preface.xml index baec78d6e9..f2f90d6b1c 100644 --- a/docs/src/reference/docbook/preface.xml +++ b/docs/src/reference/docbook/preface.xml @@ -32,7 +32,7 @@ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/twitter http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd http://www.springframework.org/schema/integration/stream diff --git a/docs/src/reference/docbook/samples.xml b/docs/src/reference/docbook/samples.xml index 7e55907647..b9d880ca54 100644 --- a/docs/src/reference/docbook/samples.xml +++ b/docs/src/reference/docbook/samples.xml @@ -486,11 +486,11 @@ That includes Samples; so, if you can't find what you are looking for, let us kn xmlns:beans="http://www.springframework.org/schema/beans" xmlns:int-stream="http://www.springframework.org/schema/integration/stream" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/stream - http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd"> + http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd"> diff --git a/docs/src/reference/docbook/security.xml b/docs/src/reference/docbook/security.xml index 0682144cb1..90d7f9915a 100644 --- a/docs/src/reference/docbook/security.xml +++ b/docs/src/reference/docbook/security.xml @@ -32,13 +32,13 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:security="http://www.springframework.org/schema/security" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-2.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/security - http://www.springframework.org/schema/security/spring-security-2.0.xsd + http://www.springframework.org/schema/security/spring-security.xsd http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.0.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/security - http://www.springframework.org/schema/integration/security/spring-integration-security-2.0.xsd"> + http://www.springframework.org/schema/integration/security/spring-integration-security.xsd"> diff --git a/docs/src/reference/docbook/sftp.xml b/docs/src/reference/docbook/sftp.xml index 0a51e5f7ea..a44d94536e 100644 --- a/docs/src/reference/docbook/sftp.xml +++ b/docs/src/reference/docbook/sftp.xml @@ -25,7 +25,7 @@
diff --git a/docs/src/reference/docbook/stream.xml b/docs/src/reference/docbook/stream.xml index da62d31193..503e105f79 100644 --- a/docs/src/reference/docbook/stream.xml +++ b/docs/src/reference/docbook/stream.xml @@ -66,9 +66,9 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:beans="http://www.springframework.org/schema/beans" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration/stream - http://www.springframework.org/schema/integration/stream/spring-integration-stream-2.0.xsd">]]> + http://www.springframework.org/schema/integration/stream/spring-integration-stream.xsd">]]> To configure the inbound channel adapter the following code snippet shows the different configuration options that are supported. diff --git a/docs/src/reference/docbook/twitter.xml b/docs/src/reference/docbook/twitter.xml index 02265c082f..68e5812ea3 100644 --- a/docs/src/reference/docbook/twitter.xml +++ b/docs/src/reference/docbook/twitter.xml @@ -29,7 +29,7 @@ the following within your XML header. + http://www.springframework.org/schema/integration/twitter/spring-integration-twitter.xsd"]]> diff --git a/docs/src/reference/docbook/whats-new.xml b/docs/src/reference/docbook/whats-new.xml index b84844315c..2b8ae4e176 100644 --- a/docs/src/reference/docbook/whats-new.xml +++ b/docs/src/reference/docbook/whats-new.xml @@ -276,7 +276,7 @@ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:int="http://www.springframework.org/schema/integration" xsi:schemaLocation="http://www.springframework.org/schema/integration - http://www.springframework.org/schema/integration/spring-integration-2.1.xsd + http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd"> ... diff --git a/docs/src/reference/docbook/xml.xml b/docs/src/reference/docbook/xml.xml index b1e18c7166..e5a5f9fe73 100644 --- a/docs/src/reference/docbook/xml.xml +++ b/docs/src/reference/docbook/xml.xml @@ -66,7 +66,7 @@ xmlns:int="http://www.springframework.org/schema/integration" xmlns:int-xml="http://www.springframework.org/schema/integration/xml" xsi:schemaLocation="http://www.springframework.org/schema/beans - http://www.springframework.org/schema/beans/spring-beans-3.0.xsd + http://www.springframework.org/schema/beans/spring-beans.xsd http://www.springframework.org/schema/integration http://www.springframework.org/schema/integration/spring-integration.xsd http://www.springframework.org/schema/integration/xml diff --git a/docs/src/reference/docbook/xmpp.xml b/docs/src/reference/docbook/xmpp.xml index 1ad3600113..dd109c0411 100644 --- a/docs/src/reference/docbook/xmpp.xml +++ b/docs/src/reference/docbook/xmpp.xml @@ -34,7 +34,7 @@ + http://www.springframework.org/schema/integration/xmpp/spring-integration-xmpp.xsd"]]>