Author: norman
Date: Thu Jan 6 19:15:13 2011
New Revision: 1056013
URL: http://svn.apache.org/viewvc?rev=1056013&view=rev
Log:
Fix handling of dot's in config param names. See JAMES-1177
Added:
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
Modified:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
Modified:
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java?rev=1056013&r1=1056012&r2=1056013&view=diff
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
(original)
+++
james/server/trunk/mailetcontainer-library/src/main/java/org/apache/james/mailetcontainer/lib/MailetConfigImpl.java
Thu Jan 6 19:15:13 2011
@@ -22,6 +22,7 @@
package org.apache.james.mailetcontainer.lib;
import org.apache.commons.configuration.Configuration;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
import org.apache.mailet.MailetConfig;
import org.apache.mailet.MailetContext;
@@ -84,6 +85,7 @@ public class MailetConfigImpl implements
while (it.hasNext()) {
String param = it.next();
if ((param.startsWith("[@") && param.endsWith("]")) == false) {
+
params.add(param);
}
}
@@ -124,8 +126,23 @@ public class MailetConfigImpl implements
*
* @param newConfiguration the new Configuration for the mailet
*/
+ @SuppressWarnings("unchecked")
public void setConfiguration(Configuration newConfiguration) {
- configuration = newConfiguration;
+ DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
+ Iterator<String> keys = newConfiguration.getKeys();
+ while(keys.hasNext()) {
+ String key = keys.next();
+ String value = newConfiguration.getString(key);
+ // See JAMES-1177
+ // Need to replace ".." with "."
+ // See
http://commons.apache.org/configuration/userguide-1.2/howto_xml.html
+ // Escaping dot characters in XML tags
+ key = key.replaceAll("\\.\\.", "\\.");
+ builder.addProperty(key, value);
+ }
+
+
+ configuration = builder;
}
/**
Added:
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
URL:
http://svn.apache.org/viewvc/james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java?rev=1056013&view=auto
==============================================================================
---
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
(added)
+++
james/server/trunk/mailetcontainer-library/src/test/java/org/apache/james/mailetcontainer/lib/MailetConfigImplTest.java
Thu Jan 6 19:15:13 2011
@@ -0,0 +1,54 @@
+/****************************************************************
+ * Licensed to the Apache Software Foundation (ASF) under one *
+ * or more contributor license agreements. See the NOTICE file *
+ * distributed with this work for additional information *
+ * regarding copyright ownership. The ASF licenses this file *
+ * to you under the Apache License, Version 2.0 (the *
+ * "License"); you may not use this file except in compliance *
+ * with the License. You may obtain a copy of the License at *
+ * *
+ * http://www.apache.org/licenses/LICENSE-2.0 *
+ * *
+ * Unless required by applicable law or agreed to in writing, *
+ * software distributed under the License is distributed on an *
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY *
+ * KIND, either express or implied. See the License for the *
+ * specific language governing permissions and limitations *
+ * under the License. *
+ ****************************************************************/
+
+package org.apache.james.mailetcontainer.lib;
+
+import java.io.ByteArrayInputStream;
+
+import org.apache.commons.configuration.ConfigurationException;
+import org.apache.commons.configuration.DefaultConfigurationBuilder;
+
+import junit.framework.TestCase;
+
+public class MailetConfigImplTest extends TestCase{
+
+ public void testDotParamsFromXML() throws ConfigurationException {
+ DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
+ builder.load(new
ByteArrayInputStream("<mailet><mail.debug>true</mail.debug></mailet>".getBytes()));
+
+ MailetConfigImpl config = new MailetConfigImpl();
+ config.setConfiguration(builder);
+
+ String param = config.getInitParameterNames().next();
+ assertEquals("mail.debug", param);
+ assertEquals("true", config.getInitParameter(param));
+ }
+
+ public void testDotParamsFromConfig() throws ConfigurationException {
+ DefaultConfigurationBuilder builder = new
DefaultConfigurationBuilder();
+ builder.addProperty("mail.debug", "true");
+
+ MailetConfigImpl config = new MailetConfigImpl();
+ config.setConfiguration(builder);
+
+ String param = config.getInitParameterNames().next();
+ assertEquals("mail.debug", param);
+ assertEquals("true", config.getInitParameter(param));
+ }
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
