Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJesse McConnell2011-05-18 17:35:43 -0400
committerJesse McConnell2011-05-18 17:35:43 -0400
commit310cc72448df5aa3bc9412c3fc350b65a888d10f (patch)
treebf80def1f808109160cd024f1089703178efe689
parentb1edad57e43f7400b84e05c8ad695e94eb806b72 (diff)
downloadorg.eclipse.jetty.project-310cc72448df5aa3bc9412c3fc350b65a888d10f.tar.gz
org.eclipse.jetty.project-310cc72448df5aa3bc9412c3fc350b65a888d10f.tar.xz
org.eclipse.jetty.project-310cc72448df5aa3bc9412c3fc350b65a888d10f.zip
Bug 345729 change name of key classes
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@3210 7e9141cc-0065-0410-87d8-b60c137991c4
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java (renamed from jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBinding.java)2
-rw-r--r--jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBindingTest.java (renamed from jetty-deploy/src/test/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBindingTest.java)2
-rw-r--r--jetty-deploy/src/test/resources/binding-test-contexts-1.xml2
3 files changed, 3 insertions, 3 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBinding.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java
index ddcd2877a6..17ca8df44f 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalJettyXmlBinding.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/bindings/GlobalWebappConfigBinding.java
@@ -12,7 +12,7 @@ import org.eclipse.jetty.util.resource.Resource;
import org.eclipse.jetty.webapp.WebAppContext;
import org.eclipse.jetty.xml.XmlConfiguration;
-public class GlobalJettyXmlBinding implements AppLifeCycle.Binding
+public class GlobalWebappConfigBinding implements AppLifeCycle.Binding
{
private String _jettyXml;
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/GlobalWebappConfigBindingTest.java
index ecf5587280..595023f28d 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/GlobalWebappConfigBindingTest.java
@@ -34,7 +34,7 @@ import org.junit.Test;
/**
* Tests {@link ScanningAppProvider} as it starts up for the first time.
*/
-public class GlobalJettyXmlBindingTest
+public class GlobalWebappConfigBindingTest
{
@Rule
public TestingDir testdir = new TestingDir();
diff --git a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
index 17cbb75a37..059fa0bb9c 100644
--- a/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
+++ b/jetty-deploy/src/test/resources/binding-test-contexts-1.xml
@@ -35,7 +35,7 @@
<Ref id="DeploymentManager">
<Call name="addLifeCycleBinding">
<Arg>
- <New class="org.eclipse.jetty.deploy.bindings.GlobalJettyXmlBinding">
+ <New class="org.eclipse.jetty.deploy.bindings.GlobalWebappConfigBinding">
<Set name="jettyXml">file://<SystemProperty name="jetty.home" />/context-binding-test-1.xml</Set>
</New>
</Arg>

Back to the top