From 000793a7aa0eec4fbc1689fc930fad5226efde9b Mon Sep 17 00:00:00 2001
From: Thomas Becker
Date: Tue, 17 Sep 2013 12:40:23 +0200
Subject: 416940 avoid download of spring-beans.dtd

---
 .../src/test/resources/org/eclipse/jetty/spring/configure.xml      | 7 ++++---
 jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml | 5 +++--
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml
index 740e85b81d..978c1dfc59 100644
--- a/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml
+++ b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml
@@ -1,12 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-<beans>
   <!-- define the singleton properties Map, filled in with XmlConfiguration.getProperties() -->
   <bean id="properties" class="java.util.Map"/>
 
   <!-- extract a value from the property map -->
-  <bean id="testProperty" singleton="false" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
+  <bean id="testProperty" class="org.springframework.beans.factory.config.MethodInvokingFactoryBean">
     <property name="targetObject"><ref local="properties" /></property>
     <property name="targetMethod" value="get" />
     <property name="arguments"><list><value>test</value></list></property>
diff --git a/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml
index 76d27fb617..ffa485faf7 100644
--- a/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml
+++ b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml
@@ -1,7 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
+<beans xmlns="http://www.springframework.org/schema/beans"
+      xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+      xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans-3.0.xsd">
 
-<beans>
   <bean id="contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
   <bean id="server" name="Main" class="org.eclipse.jetty.server.Server">
     <constructor-arg type="org.eclipse.jetty.util.thread.ThreadPool">
-- 
cgit v1.2.3