Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSimone Bordet2012-09-06 02:41:48 -0400
committerSimone Bordet2012-09-06 02:41:48 -0400
commit7231c82b69aedf92de554f80f93f24bc0f977597 (patch)
treea5f3c3ed7dac2e7a9c1d804cd473c8753b4af905 /jetty-spring/src/test
parentc8b76fa75932afa4c0cde2e6205b26aec78ccc18 (diff)
parentc02f266511585196ba256da8e470018c9796d3bf (diff)
downloadorg.eclipse.jetty.project-7231c82b69aedf92de554f80f93f24bc0f977597.tar.gz
org.eclipse.jetty.project-7231c82b69aedf92de554f80f93f24bc0f977597.tar.xz
org.eclipse.jetty.project-7231c82b69aedf92de554f80f93f24bc0f977597.zip
Merged branch 'jetty-9' into jetty-9-client.
Diffstat (limited to 'jetty-spring/src/test')
-rw-r--r--jetty-spring/src/test/java/org/eclipse/jetty/spring/SpringXmlConfigurationTest.java6
-rw-r--r--jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml (renamed from jetty-spring/src/test/resources/org/mortbay/jetty/spring/configure.xml)6
-rw-r--r--jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty-deploy.xml (renamed from jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty-deploy.xml)4
-rw-r--r--jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml (renamed from jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty.xml)14
4 files changed, 16 insertions, 14 deletions
diff --git a/jetty-spring/src/test/java/org/eclipse/jetty/spring/SpringXmlConfigurationTest.java b/jetty-spring/src/test/java/org/eclipse/jetty/spring/SpringXmlConfigurationTest.java
index 5b4da01e38..4b607b3173 100644
--- a/jetty-spring/src/test/java/org/eclipse/jetty/spring/SpringXmlConfigurationTest.java
+++ b/jetty-spring/src/test/java/org/eclipse/jetty/spring/SpringXmlConfigurationTest.java
@@ -33,7 +33,7 @@ import static junit.framework.Assert.assertEquals;
public class SpringXmlConfigurationTest
{
- protected String _configure="org/mortbay/jetty/spring/configure.xml";
+ protected String _configure="org/eclipse/jetty/spring/configure.xml";
@Before
public void init() throws Exception
@@ -127,7 +127,7 @@ public class SpringXmlConfigurationTest
@Test
public void testJettyXml() throws Exception
{
- URL url = SpringXmlConfigurationTest.class.getClassLoader().getResource("org/mortbay/jetty/spring/jetty.xml");
+ URL url = SpringXmlConfigurationTest.class.getClassLoader().getResource("org/eclipse/jetty/spring/jetty.xml");
XmlConfiguration configuration = new XmlConfiguration(url);
Server server = (Server)configuration.configure();
@@ -139,7 +139,7 @@ public class SpringXmlConfigurationTest
@Test
public void XmlConfigurationMain() throws Exception
{
- XmlConfiguration.main(new String[]{"src/test/resources/org/mortbay/jetty/spring/jetty.xml"});
+ XmlConfiguration.main(new String[]{"src/test/resources/org/eclipse/jetty/spring/jetty.xml"});
}
}
diff --git a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/configure.xml b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml
index d55b645321..8263c469f4 100644
--- a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/configure.xml
+++ b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/configure.xml
@@ -12,20 +12,20 @@
<property name="arguments"><list><value>test</value></list></property>
</bean>
- <bean id="root" name="Some,Names,Main" class="org.mortbay.jetty.spring.TestConfiguration">
+ <bean id="root" name="Some,Names,Main" class="org.eclipse.jetty.spring.TestConfiguration">
<property name="testString1"><value>SetValue</value></property>
<property name="testInt1"><value>1</value></property>
<property name="nested" ref="nested"/>
<property name="testString2" ref="testProperty"/>
</bean>
- <bean id="nested" class="org.mortbay.jetty.spring.TestConfiguration">
+ <bean id="nested" class="org.eclipse.jetty.spring.TestConfiguration">
<property name="testInt2"><value>2</value></property>
<property name="testString1"><value>nested</value></property>
<property name="nested" ref="nestedDeep"/>
</bean>
- <bean id="nestedDeep" class="org.mortbay.jetty.spring.TestConfiguration">
+ <bean id="nestedDeep" class="org.eclipse.jetty.spring.TestConfiguration">
<property name="testString1"><value>deep</value></property>
<property name="testInt2"><value>2</value></property>
</bean>
diff --git a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty-deploy.xml b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty-deploy.xml
index 88258fd108..290873d779 100644
--- a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty-deploy.xml
+++ b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty-deploy.xml
@@ -2,12 +2,12 @@
<!DOCTYPE beans PUBLIC "-//SPRING//DTD BEAN//EN" "http://www.springframework.org/dtd/spring-beans.dtd">
<beans>
- <bean id="Server" name="Main" class="org.mortbay.jetty.spring.Server">
+ <bean id="Server" name="Main" class="org.eclipse.jetty.spring.Server">
<!--
<property name="beans">
<list>
- <bean id="ContextDeployer" class="org.mortbay.jetty.spring.ContextDeployer">
+ <bean id="ContextDeployer" class="org.eclipse.jetty.spring.ContextDeployer">
<property name="contexts" ref="contexts"/>
<property name="contextsDir" value="contexts"/>
<property name="scanInterval" value="5"/>
diff --git a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty.xml b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml
index cf7dafe16a..479e6b4fb7 100644
--- a/jetty-spring/src/test/resources/org/mortbay/jetty/spring/jetty.xml
+++ b/jetty-spring/src/test/resources/org/eclipse/jetty/spring/jetty.xml
@@ -3,22 +3,24 @@
<beans>
<bean id="Contexts" class="org.eclipse.jetty.server.handler.ContextHandlerCollection"/>
- <bean id="Server" name="Main" class="org.mortbay.jetty.spring.Server">
-
- <property name="threadPool">
+ <bean id="Server" name="Main" class="org.eclipse.jetty.spring.Server">
+ <constructor-arg type="org.eclipse.jetty.util.thread.ThreadPool">
<bean id="ThreadPool" class="org.eclipse.jetty.util.thread.QueuedThreadPool">
<property name="minThreads" value="10"/>
<property name="maxThreads" value="200"/>
</bean>
- </property>
-
+ </constructor-arg>
+
+ <!--
<property name="connectors">
<list>
- <bean id="Connector" class="org.eclipse.jetty.server.nio.SelectChannelConnector">
+ <bean id="Connector" class="org.eclipse.jetty.server.SelectChannelConnector">
+ <constructor-arg type="org.eclipse.jetty.spring.Server"><ref bean="Server"/></constructor-arg>
<property name="port" value="0"/>
</bean>
</list>
</property>
+ -->
<property name="handler">
<bean id="handlers" class="org.eclipse.jetty.server.handler.HandlerCollection">

Back to the top