Author: oheger
Date: Sun Mar 14 14:30:36 2010
New Revision: 922865
URL: http://svn.apache.org/viewvc?rev=922865&view=rev
Log:
CONFIGURATION-408: Switched to commons-lang 2.5. Added a unit test to ensure that with commons-lang
2.5 the escaping problem does not occur.
Modified:
commons/proper/configuration/branches/configuration2_experimental/pom.xml
commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
Modified: commons/proper/configuration/branches/configuration2_experimental/pom.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/pom.xml?rev=922865&r1=922864&r2=922865&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/pom.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/pom.xml Sun Mar 14 14:30:36
2010
@@ -205,7 +205,7 @@
<dependency>
<groupId>commons-lang</groupId>
<artifactId>commons-lang</artifactId>
- <version>2.4</version>
+ <version>2.5</version>
</dependency>
<dependency>
Modified: commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java?rev=922865&r1=922864&r2=922865&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/src/test/java/org/apache/commons/configuration2/TestPropertiesConfiguration.java
Sun Mar 14 14:30:36 2010
@@ -977,6 +977,20 @@ public class TestPropertiesConfiguration
}
/**
+ * Tests whether properties with slashes in their values can be saved. This
+ * test is related to CONFIGURATION-408.
+ */
+ public void testSlashEscaping() throws ConfigurationException
+ {
+ conf.setProperty(PROP_NAME, "http://www.apache.org");
+ StringWriter writer = new StringWriter();
+ conf.save(writer);
+ String s = writer.toString();
+ assertTrue("Value not found: " + s, s.indexOf(PROP_NAME
+ + " = http://www.apache.org") >= 0);
+ }
+
+ /**
* Creates a configuration that can be used for testing copy operations.
*
* @return the configuration to be copied
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml?rev=922865&r1=922864&r2=922865&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml (original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/changes.xml Sun
Mar 14 14:30:36 2010
@@ -83,6 +83,11 @@
HierarchicalINIConfiguration now correctly saves sections whose name
contains delimiter characters.
</action>
+ <action dev="oheger" type="update" issue="CONFIGURATION-408">
+ PropertiesConfiguration.save() escaped slashes in properties values.
+ This was caused by a bug in commons-lang 2.4. Updating to the new
+ version commons-lang 2.5 fixed this problem.
+ </action>
<action dev="oheger" type="fix" issue="CONFIGURATION-407">
Fixed a potential IllegalStateException in HierarchicalINIConfiguration
that can be thrown when the global section is requested concurrently.
Modified: commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
URL: http://svn.apache.org/viewvc/commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml?rev=922865&r1=922864&r2=922865&view=diff
==============================================================================
--- commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
(original)
+++ commons/proper/configuration/branches/configuration2_experimental/xdocs/dependencies.xml
Sun Mar 14 14:30:36 2010
@@ -86,7 +86,7 @@
<tbody>
<tr>
<td>commons-lang</td>
- <td>2.2, 2.3</td>
+ <td>2.2, 2.3, 2.4, 2.5</td>
</tr>
<tr>
<td>commons-beanutils</td>
|