aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorThomas Becker2013-09-17 06:40:23 (EDT)
committerThomas Becker2013-09-17 06:41:05 (EDT)
commit9fb8fbec141f65fae81a1f8e898ce492cb3fe8ef (patch)
treec81af3557293b42b0000e8e1f16988f0fad27d46
parentf44787075ab32126aab00732f1e27a6d2cd512ca (diff)
downloadorg.eclipse.jetty.project-9fb8fbec141f65fae81a1f8e898ce492cb3fe8ef.zip
org.eclipse.jetty.project-9fb8fbec141f65fae81a1f8e898ce492cb3fe8ef.tar.gz
org.eclipse.jetty.project-9fb8fbec141f65fae81a1f8e898ce492cb3fe8ef.tar.bz2
416940 avoid download of spring-beans.dtd
-rw-r--r--jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml7
-rw-r--r--jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml5
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 740e85b..978c1df 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 76d27fb..ffa485f 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">