Skip to content

Commit 2b6d724

Browse files
committed
Remove xsd versions from reference samples
Remove all xsd versions from the reference manual samples in favor of "versionless" XSDs. For example, spring-beans-3.0.xsd becomes spring-beans.xsd Issue: SPR-10010
1 parent 3749313 commit 2b6d724

22 files changed

+122
-122
lines changed

src/reference/docbook/aop.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2152,8 +2152,8 @@ public class SimpleProfiler {
21522152
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21532153
xmlns:aop="http://www.springframework.org/schema/aop"
21542154
xsi:schemaLocation="
2155-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
2156-
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
2155+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
2156+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
21572157

21582158
<lineannotation>&lt;!-- this is the object that will be proxied by Spring's AOP infrastructure --&gt;</lineannotation>
21592159
&lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -3310,9 +3310,9 @@ public class ProfilingAspect {
33103310
xmlns:context="http://www.springframework.org/schema/context"
33113311
xsi:schemaLocation="
33123312
http://www.springframework.org/schema/beans
3313-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3313+
http://www.springframework.org/schema/beans/spring-beans.xsd
33143314
http://www.springframework.org/schema/context
3315-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3315+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
33163316

33173317
<lineannotation>&lt;!-- a service object; we will be profiling its methods --&gt;</lineannotation>
33183318
&lt;bean id="entitlementCalculationService"
@@ -3541,9 +3541,9 @@ public class AppConfig {
35413541
xmlns:context="http://www.springframework.org/schema/context"
35423542
xsi:schemaLocation="
35433543
http://www.springframework.org/schema/beans
3544-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3544+
http://www.springframework.org/schema/beans/spring-beans.xsd
35453545
http://www.springframework.org/schema/context
3546-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3546+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
35473547

35483548
&lt;context:load-time-weaver/&gt;
35493549

@@ -3655,9 +3655,9 @@ public class AppConfig implements LoadTimeWeavingConfigurer {
36553655
xmlns:context="http://www.springframework.org/schema/context"
36563656
xsi:schemaLocation="
36573657
http://www.springframework.org/schema/beans
3658-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3658+
http://www.springframework.org/schema/beans/spring-beans.xsd
36593659
http://www.springframework.org/schema/context
3660-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3660+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
36613661

36623662
&lt;context:load-time-weaver
36633663
weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"/&gt;

src/reference/docbook/beans-annotation-config.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -68,9 +68,9 @@
6868
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6969
<lineannotation>xmlns:context="http://www.springframework.org/schema/context"</lineannotation>
7070
xsi:schemaLocation="http://www.springframework.org/schema/beans
71-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
71+
http://www.springframework.org/schema/beans/spring-beans.xsd
7272
http://www.springframework.org/schema/context
73-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
73+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
7474

7575
<lineannotation>&lt;context:annotation-config/&gt;</lineannotation>
7676

@@ -362,9 +362,9 @@
362362
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
363363
xmlns:context="http://www.springframework.org/schema/context"
364364
xsi:schemaLocation="http://www.springframework.org/schema/beans
365-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
365+
http://www.springframework.org/schema/beans/spring-beans.xsd
366366
http://www.springframework.org/schema/context
367-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
367+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
368368

369369
&lt;context:annotation-config/&gt;
370370

@@ -479,9 +479,9 @@ public @interface Genre {
479479
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
480480
xmlns:context="http://www.springframework.org/schema/context"
481481
xsi:schemaLocation="http://www.springframework.org/schema/beans
482-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
482+
http://www.springframework.org/schema/beans/spring-beans.xsd
483483
http://www.springframework.org/schema/context
484-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
484+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
485485

486486
&lt;context:annotation-config/&gt;
487487

@@ -602,9 +602,9 @@ public @interface MovieQualifier {
602602
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
603603
xmlns:context="http://www.springframework.org/schema/context"
604604
xsi:schemaLocation="http://www.springframework.org/schema/beans
605-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
605+
http://www.springframework.org/schema/beans/spring-beans.xsd
606606
http://www.springframework.org/schema/context
607-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
607+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
608608

609609
&lt;context:annotation-config/&gt;
610610

src/reference/docbook/beans-classpath-scanning.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -113,9 +113,9 @@ public class JpaMovieFinder implements MovieFinder {
113113
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
114114
xmlns:context="http://www.springframework.org/schema/context"
115115
xsi:schemaLocation="http://www.springframework.org/schema/beans
116-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
116+
http://www.springframework.org/schema/beans/spring-beans.xsd
117117
http://www.springframework.org/schema/context
118-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
118+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
119119

120120
&lt;context:component-scan base-package="org.example"/&gt;
121121

src/reference/docbook/beans-dependencies.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -537,7 +537,7 @@ public class ExampleBean {
537537
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
538538
xmlns:p="http://www.springframework.org/schema/p"
539539
xsi:schemaLocation="http://www.springframework.org/schema/beans
540-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
540+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
541541

542542
&lt;bean id="myDataSource" class="org.apache.commons.dbcp.BasicDataSource"
543543
destroy-method="close"
@@ -973,7 +973,7 @@ [email protected]</programlisting>
973973
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
974974
xmlns:p="http://www.springframework.org/schema/p"
975975
xsi:schemaLocation="http://www.springframework.org/schema/beans
976-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
976+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
977977

978978
&lt;bean name="classic" class="com.example.ExampleBean"&gt;
979979
&lt;property name="email" value="[email protected]"/&gt;
@@ -996,7 +996,7 @@ [email protected]</programlisting>
996996
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
997997
xmlns:p="http://www.springframework.org/schema/p"
998998
xsi:schemaLocation="http://www.springframework.org/schema/beans
999-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
999+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
10001000

10011001
&lt;bean name="john-classic" class="com.example.Person"&gt;
10021002
&lt;property name="name" value="John Doe"/&gt;

src/reference/docbook/beans-extension-points.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -180,9 +180,9 @@ public class InstantiationTracingBeanPostProcessor implements BeanPostProcessor
180180
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
181181
xmlns:lang="http://www.springframework.org/schema/lang"
182182
xsi:schemaLocation="http://www.springframework.org/schema/beans
183-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
183+
http://www.springframework.org/schema/beans/spring-beans.xsd
184184
http://www.springframework.org/schema/lang
185-
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"&gt;
185+
http://www.springframework.org/schema/lang/spring-lang.xsd"&gt;
186186

187187
&lt;lang:groovy id="messenger"
188188
script-source="classpath:org/springframework/scripting/groovy/Messenger.groovy"&gt;

src/reference/docbook/beans-scopes.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -393,9 +393,9 @@
393393
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
394394
xmlns:aop="http://www.springframework.org/schema/aop"
395395
xsi:schemaLocation="http://www.springframework.org/schema/beans
396-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
396+
http://www.springframework.org/schema/beans/spring-beans.xsd
397397
http://www.springframework.org/schema/aop
398-
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
398+
http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
399399

400400
<lineannotation>&lt;!-- an HTTP Session-scoped bean exposed as a proxy --&gt;</lineannotation>
401401
&lt;bean id="userPreferences" class="com.foo.UserPreferences" scope="session"&gt;
@@ -640,9 +640,9 @@ beanFactory.registerScope("thread", threadScope);</programlisting>
640640
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
641641
xmlns:aop="http://www.springframework.org/schema/aop"
642642
xsi:schemaLocation="http://www.springframework.org/schema/beans
643-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
643+
http://www.springframework.org/schema/beans/spring-beans.xsd
644644
http://www.springframework.org/schema/aop
645-
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
645+
http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
646646

647647
&lt;bean class="org.springframework.beans.factory.config.CustomScopeConfigurer"&gt;
648648
&lt;property name="scopes"&gt;

src/reference/docbook/beans.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -187,7 +187,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
187187
&lt;beans xmlns="http://www.springframework.org/schema/beans"
188188
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
189189
xsi:schemaLocation="http://www.springframework.org/schema/beans
190-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
190+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
191191

192192
&lt;bean id="..." class="..."&gt;
193193
&lt;!-- collaborators and configuration for this bean go here --&gt;
@@ -241,7 +241,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
241241
&lt;beans xmlns="http://www.springframework.org/schema/beans"
242242
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
243243
xsi:schemaLocation="http://www.springframework.org/schema/beans
244-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
244+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
245245

246246
&lt;!-- services --&gt;
247247

@@ -264,7 +264,7 @@ The footnote should x-ref to first section in that chapter but I can't find the
264264
&lt;beans xmlns="http://www.springframework.org/schema/beans"
265265
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
266266
xsi:schemaLocation="http://www.springframework.org/schema/beans
267-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
267+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
268268

269269
&lt;bean id="accountDao"
270270
class="org.springframework.samples.jpetstore.dao.ibatis.SqlMapAccountDao"&gt;

src/reference/docbook/dynamic-languages.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -130,8 +130,8 @@ class GroovyMessenger implements Messenger {
130130
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
131131
xmlns:lang="http://www.springframework.org/schema/lang"
132132
xsi:schemaLocation="
133-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
134-
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
133+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
134+
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
135135
136136
]]><lineannotation>&lt;!-- this is the bean definition for the Groovy-backed Messenger implementation --&gt;</lineannotation><![CDATA[
137137
<lang:groovy id="messenger" script-source="classpath:Messenger.groovy">
@@ -1041,8 +1041,8 @@ class TestBeanValidator implements Validator {
10411041
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10421042
xmlns:lang="http://www.springframework.org/schema/lang"
10431043
xsi:schemaLocation="
1044-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
1045-
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
1044+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
1045+
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
10461046
10471047
<lang:groovy id="messenger" script-source="classpath:Messenger.groovy" ]]><lineannotation>scope="prototype"</lineannotation><![CDATA[>
10481048
<lang:property name="message" value="I Can Do The RoboCop" />

src/reference/docbook/jdbc.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -463,9 +463,9 @@ private static final class ActorMapper implements RowMapper&lt;Actor&gt; {
463463
xmlns:context="http://www.springframework.org/schema/context"
464464
xsi:schemaLocation="
465465
http://www.springframework.org/schema/beans
466-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
466+
http://www.springframework.org/schema/beans/spring-beans.xsd
467467
http://www.springframework.org/schema/context
468-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
468+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
469469

470470
&lt;bean id="corporateEventDao" class="com.example.JdbcCorporateEventDao"&gt;
471471
&lt;property name="dataSource" ref="dataSource"/&gt;
@@ -512,9 +512,9 @@ public class JdbcCorporateEventDao implements CorporateEventDao {
512512
xmlns:context="http://www.springframework.org/schema/context"
513513
xsi:schemaLocation="
514514
http://www.springframework.org/schema/beans
515-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
515+
http://www.springframework.org/schema/beans/spring-beans.xsd
516516
http://www.springframework.org/schema/context
517-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
517+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
518518

519519
&lt;!-- Scans within the base package of the application for @Components to configure as beans --&gt;
520520
&lt;context:component-scan base-package="org.springframework.docs.test" /&gt;

src/reference/docbook/jms.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -922,8 +922,8 @@ public interface SessionAwareMessageListener {
922922
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
923923
<emphasis role="bold">xmlns:jms="http://www.springframework.org/schema/jms"</emphasis>
924924
xsi:schemaLocation="
925-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
926-
<emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms-3.0.xsd"</emphasis>&gt;
925+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
926+
<emphasis role="bold">http://www.springframework.org/schema/jms http://www.springframework.org/schema/jms/spring-jms.xsd"</emphasis>&gt;
927927

928928
<lineannotation>&lt;!-- &lt;bean/&gt; definitions here --&gt;</lineannotation>
929929

0 commit comments

Comments
 (0)