Skip to content

Commit a52396b

Browse files
committed
Backport "Remove xsd versions from reference samples"
Issue: SPR-10010
1 parent d547570 commit a52396b

22 files changed

+124
-124
lines changed

spring-framework-reference/src/aop.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -2129,8 +2129,8 @@ public class SimpleProfiler {
21292129
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
21302130
xmlns:aop="http://www.springframework.org/schema/aop"
21312131
xsi:schemaLocation="
2132-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
2133-
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop-3.0.xsd">
2132+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
2133+
http://www.springframework.org/schema/aop http://www.springframework.org/schema/aop/spring-aop.xsd">
21342134

21352135
<lineannotation>&lt;!-- this is the object that will be proxied by Spring's AOP infrastructure --&gt;</lineannotation>
21362136
&lt;bean id="fooService" class="x.y.service.DefaultFooService"/&gt;
@@ -3272,9 +3272,9 @@ public class ProfilingAspect {
32723272
xmlns:context="http://www.springframework.org/schema/context"
32733273
xsi:schemaLocation="
32743274
http://www.springframework.org/schema/beans
3275-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3275+
http://www.springframework.org/schema/beans/spring-beans.xsd
32763276
http://www.springframework.org/schema/context
3277-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3277+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
32783278

32793279
<lineannotation>&lt;!-- a service object; we will be profiling its methods --&gt;</lineannotation>
32803280
&lt;bean id="entitlementCalculationService"
@@ -3495,9 +3495,9 @@ public final class Main {
34953495
xmlns:context="http://www.springframework.org/schema/context"
34963496
xsi:schemaLocation="
34973497
http://www.springframework.org/schema/beans
3498-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3498+
http://www.springframework.org/schema/beans/spring-beans.xsd
34993499
http://www.springframework.org/schema/context
3500-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3500+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
35013501

35023502
&lt;context:load-time-weaver/&gt;
35033503

@@ -3602,9 +3602,9 @@ http://www.springframework.org/schema/context
36023602
xmlns:context="http://www.springframework.org/schema/context"
36033603
xsi:schemaLocation="
36043604
http://www.springframework.org/schema/beans
3605-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
3605+
http://www.springframework.org/schema/beans/spring-beans.xsd
36063606
http://www.springframework.org/schema/context
3607-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
3607+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
36083608

36093609
&lt;context:load-time-weaver
36103610
<emphasis role="bold">weaver-class="org.springframework.instrument.classloading.ReflectiveLoadTimeWeaver"</emphasis>/&gt;

spring-framework-reference/src/beans-annotation-config.xml

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -63,9 +63,9 @@
6363
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
6464
<lineannotation>xmlns:context="http://www.springframework.org/schema/context"</lineannotation>
6565
xsi:schemaLocation="http://www.springframework.org/schema/beans
66-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
66+
http://www.springframework.org/schema/beans/spring-beans.xsd
6767
http://www.springframework.org/schema/context
68-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
68+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
6969

7070
<lineannotation>&lt;context:annotation-config/&gt;</lineannotation>
7171

@@ -357,9 +357,9 @@
357357
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
358358
xmlns:context="http://www.springframework.org/schema/context"
359359
xsi:schemaLocation="http://www.springframework.org/schema/beans
360-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
360+
http://www.springframework.org/schema/beans/spring-beans.xsd
361361
http://www.springframework.org/schema/context
362-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
362+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
363363

364364
&lt;context:annotation-config/&gt;
365365

@@ -474,9 +474,9 @@ public @interface Genre {
474474
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
475475
xmlns:context="http://www.springframework.org/schema/context"
476476
xsi:schemaLocation="http://www.springframework.org/schema/beans
477-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
477+
http://www.springframework.org/schema/beans/spring-beans.xsd
478478
http://www.springframework.org/schema/context
479-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
479+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
480480

481481
&lt;context:annotation-config/&gt;
482482

@@ -597,9 +597,9 @@ public @interface MovieQualifier {
597597
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
598598
xmlns:context="http://www.springframework.org/schema/context"
599599
xsi:schemaLocation="http://www.springframework.org/schema/beans
600-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
600+
http://www.springframework.org/schema/beans/spring-beans.xsd
601601
http://www.springframework.org/schema/context
602-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
602+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
603603

604604
&lt;context:annotation-config/&gt;
605605

spring-framework-reference/src/beans-classpath-scanning.xml

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

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

spring-framework-reference/src/beans-dependencies.xml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -532,7 +532,7 @@ public class ExampleBean {
532532
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
533533
xmlns:p="http://www.springframework.org/schema/p"
534534
xsi:schemaLocation="http://www.springframework.org/schema/beans
535-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
535+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
536536

537537
&lt;bean id="myDataSource" class="org.apache.commons.dbcp.BasicDataSource"
538538
destroy-method="close"
@@ -968,7 +968,7 @@ [email protected]</programlisting>
968968
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
969969
xmlns:p="http://www.springframework.org/schema/p"
970970
xsi:schemaLocation="http://www.springframework.org/schema/beans
971-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
971+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
972972

973973
&lt;bean name="classic" class="com.example.ExampleBean"&gt;
974974
&lt;property name="email" value="[email protected]"/&gt;
@@ -991,7 +991,7 @@ [email protected]</programlisting>
991991
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
992992
xmlns:p="http://www.springframework.org/schema/p"
993993
xsi:schemaLocation="http://www.springframework.org/schema/beans
994-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd"&gt;
994+
http://www.springframework.org/schema/beans/spring-beans.xsd"&gt;
995995

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

spring-framework-reference/src/beans-extension-points.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -175,9 +175,9 @@ public class InstantiationTracingBeanPostProcessor implements BeanPostProcessor
175175
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
176176
xmlns:lang="http://www.springframework.org/schema/lang"
177177
xsi:schemaLocation="http://www.springframework.org/schema/beans
178-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
178+
http://www.springframework.org/schema/beans/spring-beans.xsd
179179
http://www.springframework.org/schema/lang
180-
http://www.springframework.org/schema/lang/spring-lang-3.0.xsd"&gt;
180+
http://www.springframework.org/schema/lang/spring-lang.xsd"&gt;
181181

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

spring-framework-reference/src/beans-scopes.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -398,9 +398,9 @@
398398
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
399399
xmlns:aop="http://www.springframework.org/schema/aop"
400400
xsi:schemaLocation="http://www.springframework.org/schema/beans
401-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
401+
http://www.springframework.org/schema/beans/spring-beans.xsd
402402
http://www.springframework.org/schema/aop
403-
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
403+
http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
404404

405405
<lineannotation>&lt;!-- an HTTP <interfacename>Session</interfacename>-scoped bean exposed as a proxy --&gt;</lineannotation>
406406
&lt;bean id="userPreferences" class="com.foo.UserPreferences" <emphasis role="bold">scope="session"</emphasis>&gt;
@@ -650,9 +650,9 @@ beanFactory.registerScope("<emphasis role="bold">thread</emphasis>", threadScope
650650
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
651651
xmlns:aop="http://www.springframework.org/schema/aop"
652652
xsi:schemaLocation="http://www.springframework.org/schema/beans
653-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
653+
http://www.springframework.org/schema/beans/spring-beans.xsd
654654
http://www.springframework.org/schema/aop
655-
http://www.springframework.org/schema/aop/spring-aop-3.0.xsd"&gt;
655+
http://www.springframework.org/schema/aop/spring-aop.xsd"&gt;
656656

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

spring-framework-reference/src/beans.xml

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

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

242242
&lt;!-- services --&gt;
243243

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

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

spring-framework-reference/src/dynamic-languages.xml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -126,8 +126,8 @@ class GroovyMessenger implements Messenger {
126126
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
127127
xmlns:lang="http://www.springframework.org/schema/lang"
128128
xsi:schemaLocation="
129-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
130-
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
129+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
130+
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
131131
132132
]]><lineannotation>&lt;!-- this is the bean definition for the Groovy-backed <interfacename>Messenger</interfacename> implementation --&gt;</lineannotation><![CDATA[
133133
<lang:groovy id="messenger" script-source="classpath:Messenger.groovy">
@@ -1038,8 +1038,8 @@ class TestBeanValidator implements Validator {
10381038
<beans xmlns="http://www.springframework.org/schema/beans" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
10391039
xmlns:lang="http://www.springframework.org/schema/lang"
10401040
xsi:schemaLocation="
1041-
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
1042-
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang-3.0.xsd">
1041+
http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
1042+
http://www.springframework.org/schema/lang http://www.springframework.org/schema/lang/spring-lang.xsd">
10431043
10441044
<lang:groovy id="messenger" script-source="classpath:Messenger.groovy" ]]><lineannotation><emphasis role="bold">scope="prototype"</emphasis></lineannotation><![CDATA[>
10451045
<lang:property name="message" value="I Can Do The RoboCop" />

spring-framework-reference/src/jdbc.xml

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

465465
&lt;bean id="corporateEventDao" class="com.example.JdbcCorporateEventDao"&gt;
466466
&lt;property name="dataSource" ref="dataSource"/&gt;
@@ -507,9 +507,9 @@ public class JdbcCorporateEventDao implements CorporateEventDao {
507507
xmlns:context="http://www.springframework.org/schema/context"
508508
xsi:schemaLocation="
509509
http://www.springframework.org/schema/beans
510-
http://www.springframework.org/schema/beans/spring-beans-3.0.xsd
510+
http://www.springframework.org/schema/beans/spring-beans.xsd
511511
http://www.springframework.org/schema/context
512-
http://www.springframework.org/schema/context/spring-context-3.0.xsd"&gt;
512+
http://www.springframework.org/schema/context/spring-context.xsd"&gt;
513513

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

spring-framework-reference/src/jms.xml

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

923923
<lineannotation>&lt;!-- <literal>&lt;bean/&gt;</literal> definitions here --&gt;</lineannotation>
924924

0 commit comments

Comments
 (0)