329410 Enforce XmlConfiguration properties as Map<String,String>

git-svn-id: svn+ssh://dev.eclipse.org/svnroot/rt/org.eclipse.jetty/jetty/trunk@2469 7e9141cc-0065-0410-87d8-b60c137991c4

1 files changed, 56 insertions, 52 deletions

diff --git a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
index 52704a4b1e..09271dcc12 100644
--- a/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
+++ b/jetty-deploy/src/test/java/org/eclipse/jetty/deploy/test/XmlConfiguredJetty.java
@@ -28,7 +28,9 @@ import java.net.URL;
 import java.net.URLConnection;
 import java.net.UnknownHostException;
 import java.util.ArrayList;
+import java.util.HashMap;
 import java.util.List;
+import java.util.Map;
 import java.util.Properties;
 
 import org.eclipse.jetty.deploy.DeploymentManager;
@@ -48,12 +50,12 @@ import org.junit.Assert;
  */
 public class XmlConfiguredJetty
 {
-    private List<URL> xmlConfigurations;
-    private Properties properties = new Properties();
-    private Server server;
-    private int serverPort;
-    private String scheme = HttpSchemes.HTTP;
-    private File jettyHome;
+    private List<URL> _xmlConfigurations;
+    private Map<String,String> _properties = new HashMap<String,String>();
+    private Server _server;
+    private int _serverPort;
+    private String _scheme = HttpSchemes.HTTP;
+    private File _jettyHome;
 
     public XmlConfiguredJetty() throws IOException
     {
@@ -62,52 +64,52 @@ public class XmlConfiguredJetty
 
     public XmlConfiguredJetty(String testname) throws IOException
     {
-        xmlConfigurations = new ArrayList<URL>();
-        properties = new Properties();
+        _xmlConfigurations = new ArrayList<URL>();
+        Properties properties = new Properties();
 
         String jettyHomeBase = MavenTestingUtils.getTargetTestingDir(testname).getAbsolutePath();
         // Ensure we have a new (pristene) directory to work with. 
         int idx = 0;
-        jettyHome = new File(jettyHomeBase + "#" + idx);
-        while (jettyHome.exists())
+        _jettyHome = new File(jettyHomeBase + "#" + idx);
+        while (_jettyHome.exists())
         {
             idx++;
-            jettyHome = new File(jettyHomeBase + "#" + idx);
+            _jettyHome = new File(jettyHomeBase + "#" + idx);
         }
-        deleteContents(jettyHome);
+        deleteContents(_jettyHome);
         // Prepare Jetty.Home (Test) dir
-        jettyHome.mkdirs();
+        _jettyHome.mkdirs();
 
-        File logsDir = new File(jettyHome,"logs");
+        File logsDir = new File(_jettyHome,"logs");
         logsDir.mkdirs();
 
-        File etcDir = new File(jettyHome,"etc");
+        File etcDir = new File(_jettyHome,"etc");
         etcDir.mkdirs();
         IO.copyFile(MavenTestingUtils.getTestResourceFile("etc/realm.properties"),new File(etcDir,"realm.properties"));
         IO.copyFile(MavenTestingUtils.getTestResourceFile("etc/webdefault.xml"),new File(etcDir,"webdefault.xml"));
 
-        File contextsDir = new File(jettyHome,"contexts");
+        File contextsDir = new File(_jettyHome,"contexts");
         if (contextsDir.exists())
         {
             deleteContents(contextsDir);
         }
         contextsDir.mkdirs();
 
-        File webappsDir = new File(jettyHome,"webapps");
+        File webappsDir = new File(_jettyHome,"webapps");
         if (webappsDir.exists())
         {
             deleteContents(webappsDir);
         }
         webappsDir.mkdirs();
 
-        File tmpDir = new File(jettyHome,"tmp");
+        File tmpDir = new File(_jettyHome,"tmp");
         if (tmpDir.exists())
         {
             deleteContents(tmpDir);
         }
         tmpDir.mkdirs();
 
-        File workishDir = new File(jettyHome,"workish");
+        File workishDir = new File(_jettyHome,"workish");
         if (workishDir.exists())
         {
             deleteContents(workishDir);
@@ -116,8 +118,8 @@ public class XmlConfiguredJetty
 
         // Setup properties
         System.setProperty("java.io.tmpdir",tmpDir.getAbsolutePath());
-        properties.setProperty("jetty.home",jettyHome.getAbsolutePath());
-        System.setProperty("jetty.home",jettyHome.getAbsolutePath());
+        properties.setProperty("jetty.home",_jettyHome.getAbsolutePath());
+        System.setProperty("jetty.home",_jettyHome.getAbsolutePath());
         properties.setProperty("test.basedir",MavenTestingUtils.getBasedir().getAbsolutePath());
         properties.setProperty("test.resourcesdir",MavenTestingUtils.getTestResourcesDir().getAbsolutePath());
         properties.setProperty("test.webapps",webappsDir.getAbsolutePath());
@@ -128,11 +130,13 @@ public class XmlConfiguredJetty
         File testConfig = MavenTestingUtils.getTargetFile("xml-configured-jetty.properties");
         FileOutputStream out = new FileOutputStream(testConfig);
         properties.store(out,"Generated by " + XmlConfiguredJetty.class.getName());
+        for (Object key:properties.keySet())
+            _properties.put(String.valueOf(key),String.valueOf(properties.get(key)));
     }
 
     public void addConfiguration(File xmlConfigFile) throws MalformedURLException
     {
-        xmlConfigurations.add(xmlConfigFile.toURI().toURL());
+        _xmlConfigurations.add(xmlConfigFile.toURI().toURL());
     }
 
     public void addConfiguration(String testConfigName) throws MalformedURLException
@@ -142,7 +146,7 @@ public class XmlConfiguredJetty
 
     public void addConfiguration(URL xmlConfig)
     {
-        xmlConfigurations.add(xmlConfig);
+        _xmlConfigurations.add(xmlConfig);
     }
 
     public void assertNoWebAppContexts()
@@ -221,7 +225,7 @@ public class XmlConfiguredJetty
     {
         System.out.printf("Copying Context: %s -> %s%n",srcName,destName);
         File srcDir = MavenTestingUtils.getTestResourceDir("contexts");
-        File destDir = new File(jettyHome,"contexts");
+        File destDir = new File(_jettyHome,"contexts");
 
         File srcFile = new File(srcDir,srcName);
         File destFile = new File(destDir,destName);
@@ -242,7 +246,7 @@ public class XmlConfiguredJetty
     {
         System.out.printf("Copying Webapp: %s -> %s%n",srcName,destName);
         File srcDir = MavenTestingUtils.getTestResourceDir("webapps");
-        File destDir = new File(jettyHome,"webapps");
+        File destDir = new File(_jettyHome,"webapps");
 
         File srcFile = new File(srcDir,srcName);
         File destFile = new File(destDir,destName);
@@ -276,48 +280,48 @@ public class XmlConfiguredJetty
 
     public DeploymentManager getActiveDeploymentManager()
     {
-        return server.getBean(DeploymentManager.class);
+        return _server.getBean(DeploymentManager.class);
     }
 
     public File getJettyDir(String name)
     {
-        return new File(jettyHome,name);
+        return new File(_jettyHome,name);
     }
 
     public File getJettyHome()
     {
-        return jettyHome;
+        return _jettyHome;
     }
 
     public String getScheme()
     {
-        return scheme;
+        return _scheme;
     }
 
     public Server getServer()
     {
-        return server;
+        return _server;
     }
 
     public int getServerPort()
     {
-        return serverPort;
+        return _serverPort;
     }
 
     public URI getServerURI() throws UnknownHostException
     {
         StringBuffer uri = new StringBuffer();
-        uri.append(this.scheme).append("://");
+        uri.append(this._scheme).append("://");
         uri.append(InetAddress.getLocalHost().getHostAddress());
-        uri.append(":").append(this.serverPort);
+        uri.append(":").append(this._serverPort);
         return URI.create(uri.toString());
     }
 
     public List<WebAppContext> getWebAppContexts()
     {
         List<WebAppContext> contexts = new ArrayList<WebAppContext>();
-        HandlerCollection handlers = (HandlerCollection)server.getHandler();
-        System.out.println(server.dump());
+        HandlerCollection handlers = (HandlerCollection)_server.getHandler();
+        System.out.println(_server.dump());
         Handler children[] = handlers.getChildHandlers();
 
         for (Handler handler : children)
@@ -336,18 +340,18 @@ public class XmlConfiguredJetty
     public void load() throws Exception
     {
         XmlConfiguration last = null;
-        Object[] obj = new Object[this.xmlConfigurations.size()];
+        Object[] obj = new Object[this._xmlConfigurations.size()];
 
         // Configure everything
-        for (int i = 0; i < this.xmlConfigurations.size(); i++)
+        for (int i = 0; i < this._xmlConfigurations.size(); i++)
         {
-            URL configURL = this.xmlConfigurations.get(i);
+            URL configURL = this._xmlConfigurations.get(i);
             XmlConfiguration configuration = new XmlConfiguration(configURL);
             if (last != null)
             {
                 configuration.getIdMap().putAll(last.getIdMap());
             }
-            configuration.setProperties(properties);
+            configuration.setProperties(_properties);
             obj[i] = configuration.configure();
             last = configuration;
         }
@@ -355,7 +359,7 @@ public class XmlConfiguredJetty
         // Test for Server Instance.
         Server foundServer = null;
         int serverCount = 0;
-        for (int i = 0; i < this.xmlConfigurations.size(); i++)
+        for (int i = 0; i < this._xmlConfigurations.size(); i++)
         {
             if (obj[i] instanceof Server)
             {
@@ -376,14 +380,14 @@ public class XmlConfiguredJetty
 
         Assert.assertEquals("Server load count",1,serverCount);
 
-        this.server = foundServer;
-        this.server.setGracefulShutdown(10);
+        this._server = foundServer;
+        this._server.setGracefulShutdown(10);
 
     }
 
     public void removeContext(String name)
     {
-        File destDir = new File(jettyHome,"contexts");
+        File destDir = new File(_jettyHome,"contexts");
         File contextFile = new File(destDir,name);
         if (contextFile.exists())
         {
@@ -393,34 +397,34 @@ public class XmlConfiguredJetty
 
     public void setProperty(String key, String value)
     {
-        properties.setProperty(key,value);
+        _properties.put(key,value);
     }
 
     public void setScheme(String scheme)
     {
-        this.scheme = scheme;
+        this._scheme = scheme;
     }
 
     public void start() throws Exception
     {
-        Assert.assertNotNull("Server should not be null (failed load?)",server);
+        Assert.assertNotNull("Server should not be null (failed load?)",_server);
 
-        server.start();
+        _server.start();
 
         // Find the active server port.
-        this.serverPort = (-1);
-        Connector connectors[] = server.getConnectors();
+        this._serverPort = (-1);
+        Connector connectors[] = _server.getConnectors();
         for (int i = 0; i < connectors.length; i++)
         {
             Connector connector = connectors[i];
             if (connector.getLocalPort() > 0)
             {
-                this.serverPort = connector.getLocalPort();
+                this._serverPort = connector.getLocalPort();
                 break;
             }
         }
 
-        Assert.assertTrue("Server Port is between 1 and 65535. Actually <" + serverPort + ">",(1 <= this.serverPort) && (this.serverPort <= 65535));
+        Assert.assertTrue("Server Port is between 1 and 65535. Actually <" + _serverPort + ">",(1 <= this._serverPort) && (this._serverPort <= 65535));
 
         // Uncomment to have server start and continue to run (without exiting)
         // System.out.printf("Listening to port %d%n",this.serverPort);
@@ -429,7 +433,7 @@ public class XmlConfiguredJetty
 
     public void stop() throws Exception
     {
-        server.stop();
+        _server.stop();
     }