diff options
author | Jesse McConnell | 2011-05-18 21:34:22 +0000 |
---|---|---|
committer | Jesse McConnell | 2011-05-18 21:34:22 +0000 |
commit | b1edad57e43f7400b84e05c8ad695e94eb806b72 (patch) | |
tree | 7c53fa3d37bbd305908c053ccc53d5b30ef6552f | |
parent | a85e00f3ff200c42352c07f1f3d57420873e756b (diff) | |
download | org.eclipse.jetty.project-b1edad57e43f7400b84e05c8ad695e94eb806b72.tar.gz org.eclipse.jetty.project-b1edad57e43f7400b84e05c8ad695e94eb806b72.tar.xz org.eclipse.jetty.project-b1edad57e43f7400b84e05c8ad695e94eb806b72.zip |
Bug 345729 change example around to call as opposed to set
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3209 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r-- | jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java | 22 | ||||
-rw-r--r-- | jetty-deploy/src/test/resources/context-binding-test-1.xml | 8 |
2 files changed, 17 insertions, 13 deletions
diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java index 26fa919281..ecf5587280 100644 --- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java +++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java @@ -72,7 +72,7 @@ public class GlobalJettyXmlBindingTest Assert.assertNotNull(context); Assert.assertEquals(context.getDefaultServerClasses().length, context.getServerClasses().length - 1); // added a pattern - Assert.assertEquals(context.getDefaultSystemClasses().length,context.getSystemClasses().length + 1); // removed a patter + //Assert.assertEquals(context.getDefaultSystemClasses().length,context.getSystemClasses().length + 1); // removed a patter boolean fooPackage = false; @@ -87,19 +87,19 @@ public class GlobalJettyXmlBindingTest Assert.assertTrue(fooPackage); - boolean jndiPackage = false; + // boolean jndiPackage = false; // this test overrides and we removed the jndi from the list so it // should test false - for (String entry : context.getSystemClasses()) - { - if ("org.eclipse.jetty.jndi.".equals(entry)) - { - jndiPackage = true; - } - } - - Assert.assertFalse(jndiPackage); +// for (String entry : context.getSystemClasses()) +// { +// if ("org.eclipse.jetty.jndi.".equals(entry)) +// { +// jndiPackage = true; +// } +// } +// +// Assert.assertFalse(jndiPackage); } } diff --git a/jetty-deploy/src/test/resources/context-binding-test-1.xml b/jetty-deploy/src/test/resources/context-binding-test-1.xml index 846208e641..925f2578d6 100644 --- a/jetty-deploy/src/test/resources/context-binding-test-1.xml +++ b/jetty-deploy/src/test/resources/context-binding-test-1.xml @@ -1,6 +1,10 @@ <Configure class="org.eclipse.jetty.webapp.WebAppContext"> - <Array id="serverClasses" type="java.lang.String"> + <Call name="addServerClass"> + <Arg>org.eclipse.foo.</Arg> + </Call> + + <!-- Array id="serverClasses" type="java.lang.String"> <Item>-org.eclipse.jetty.continuation.</Item> <Item>-org.eclipse.jetty.jndi.</Item> <Item>-org.eclipse.jetty.plus.jaas.</Item> @@ -23,5 +27,5 @@ </Array> <Set name="serverClasses"><Ref id="serverClasses"/></Set> - <Set name="systemClasses"><Ref id="systemClasses"/></Set> + <Set name="systemClasses"><Ref id="systemClasses"/></Set--> </Configure> |