Skip to main content
aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGreg Wilkins2010-12-09 11:49:46 -0500
committerGreg Wilkins2010-12-09 11:49:46 -0500
commit312cf416ec9d7118b7a0f1b3ade17857bfcdb986 (patch)
tree0dd6e5a05d6244fe7d9f4e787824b5823a9cb26c /jetty-deploy/src/main
parent703aca344906a0b64c44a241b35d5849a8df753f (diff)
downloadorg.eclipse.jetty.project-312cf416ec9d7118b7a0f1b3ade17857bfcdb986.tar.gz
org.eclipse.jetty.project-312cf416ec9d7118b7a0f1b3ade17857bfcdb986.tar.xz
org.eclipse.jetty.project-312cf416ec9d7118b7a0f1b3ade17857bfcdb986.zip
minor cleanups and test improvements
git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2603 7e9141cc-0065-0410-87d8-b60c137991c4
Diffstat (limited to 'jetty-deploy/src/main')
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java6
-rw-r--r--jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java4
2 files changed, 3 insertions, 7 deletions
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
index 06770dfd47..e510a9f55e 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/ContextDeployer.java
@@ -443,12 +443,10 @@ public class ContextDeployer extends AbstractLifeCycle
return null;
XmlConfiguration xmlConfiguration=new XmlConfiguration(resource.getURL());
- HashMap properties = new HashMap();
- properties.put("Server", _contexts.getServer());
+ xmlConfiguration.getIdMap().put("Server", _contexts.getServer());
if (_configMgr!=null)
- properties.putAll(_configMgr.getProperties());
+ xmlConfiguration.getProperties().putAll(_configMgr.getProperties());
- xmlConfiguration.setProperties(properties);
ContextHandler context=(ContextHandler)xmlConfiguration.configure();
// merge attributes
diff --git a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
index 3191f14405..ff53e248f5 100644
--- a/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
+++ b/jetty-deploy/src/main/java/org/eclipse/jetty/deploy/providers/ContextProvider.java
@@ -64,12 +64,10 @@ public class ContextProvider extends ScanningAppProvider
if (resource.exists() && FileID.isXmlFile(file))
{
XmlConfiguration xmlc = new XmlConfiguration(resource.getURL());
- Map<String,String> props = new HashMap<String,String>();
xmlc.getIdMap().put("Server",getDeploymentManager().getServer());
if (getConfigurationManager() != null)
- props.putAll(getConfigurationManager().getProperties());
- xmlc.setProperties(props);
+ xmlc.getProperties().putAll(getConfigurationManager().getProperties());
return (ContextHandler)xmlc.configure();
}

Back to the top