svn commit: r209004 - in /jakarta/commons/proper/lang/trunk: ./ src/java/org/apache/commons/lang/text/ src/test/org/apache/commons/lang/text/

[ggregory]

Author: ggregory
Date: Sun Jul  3 18:25:30 2005
New Revision: 209004

URL: http://svn.apache.org/viewcvs?rev=209004&view=rev
Log:
Towards version 2.2:
 - Set the component version to 2.2-dev.
 - Add .text classes VariableFormat and VariableFormatTest.
 - Enable build of .text package.

Modified:
    jakarta/commons/proper/lang/trunk/build.xml
    jakarta/commons/proper/lang/trunk/default.properties
    
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/Interpolation.java
    
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/MappedMessageFormat.java
    
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/TextTestSuite.java

Modified: jakarta/commons/proper/lang/trunk/build.xml
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/build.xml?rev=209004&r1=209003&r2=209004&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/build.xml (original)
+++ jakarta/commons/proper/lang/trunk/build.xml Sun Jul  3 18:25:30 2005
@@ -122,8 +122,6 @@
                </copy>
        </target>
        <!-- ========== Unit Test Targets 
========================================= -->
-       <!-- removed test.text target from the depends list for the 2.1 
release. It
-     should be reinstated when the text package is included -->
        <target name="test" depends="
                                 compile.tests, 
                                 test.lang,
@@ -132,7 +130,8 @@
                                                        test.enums,
                                 test.exception,
                                 test.math,
-                                test.mutable,
+                                                       test.mutable,
+                                                       test.text,
                                                        test.time" 
description="Run all unit test cases">
                <echo message="Running tests ..."/>
        </target>

Modified: jakarta/commons/proper/lang/trunk/default.properties
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/default.properties?rev=209004&r1=209003&r2=209004&view=diff
==============================================================================
--- jakarta/commons/proper/lang/trunk/default.properties (original)
+++ jakarta/commons/proper/lang/trunk/default.properties Sun Jul  3 18:25:30 
2005
@@ -32,7 +32,7 @@
 component.title = Core Language Utilities
 
 # The current version number of this component
-component.version = 2.1
+component.version = 2.2-dev
 
 # The current year used for the end date in copyrights.
 copyright.end = 2005
@@ -77,10 +77,10 @@
 compile.source = 1.3
 
 # Files to be excluded from the compile
-compile.excludes=org/apache/commons/lang/text/**/*.java
+#compile.excludes=org/apache/commons/lang/text/**/*.java
 
 # Packages to be excluded from javadocs
-javadoc.excludepackagenames=org.apache.commons.lang.text
+#javadoc.excludepackagenames=org.apache.commons.lang.text
 
 # Should all tests fail if one does?
 test.failonerror = true

Modified: 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/Interpolation.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/Interpolation.java?rev=209004&r1=209003&r2=209004&view=diff
==============================================================================
--- 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/Interpolation.java
 (original)
+++ 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/Interpolation.java
 Sun Jul  3 18:25:30 2005
@@ -6,6 +6,8 @@
 import org.apache.commons.lang.StringUtils;
 
 /**
+ * Might be replaced by VariableFormat?
+ * 
  * <p>Performs basic variable interpolation on a String for variables within a 
Map.
  * Variables of the form, ${var}, are supported.</p>
  *

Modified: 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/MappedMessageFormat.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/MappedMessageFormat.java?rev=209004&r1=209003&r2=209004&view=diff
==============================================================================
--- 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/MappedMessageFormat.java
 (original)
+++ 
jakarta/commons/proper/lang/trunk/src/java/org/apache/commons/lang/text/MappedMessageFormat.java
 Sun Jul  3 18:25:30 2005
@@ -19,6 +19,8 @@
 import java.util.ArrayList;
 
 /**
+ * Might be replaced by VariableFormat?
+ * 
  * Substitutes values from one or more maps into designated places within a 
string.
  * <p>
  * For example:

Modified: 
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/TextTestSuite.java
URL: 
http://svn.apache.org/viewcvs/jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/TextTestSuite.java?rev=209004&r1=209003&r2=209004&view=diff
==============================================================================
--- 
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/TextTestSuite.java
 (original)
+++ 
jakarta/commons/proper/lang/trunk/src/test/org/apache/commons/lang/text/TextTestSuite.java
 Sun Jul  3 18:25:30 2005
@@ -51,6 +51,7 @@
         suite.addTest(InterpolationTest.suite());
         suite.addTest(StrBuilderTest.suite());
         suite.addTest(StrTokenizerTest.suite());
+        suite.addTestSuite(VariableFormatTest.class);
         return suite;
     }
 



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]