Towards version 2.2:

- Set the component version to 2.2-dev.
 - Add .text classes VariableFormat and VariableFormatTest.
 - Enable build of .text package.

git-svn-id: https://svn.apache.org/repos/asf/jakarta/commons/proper/lang/trunk@209004 13f79535-47bb-0310-9956-ffa450edef68

build.xml

@@ -122,8 +122,6 @@ limitations under the License.
 		</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 @@ limitations under the License.
 						        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>

default.properties

@@ -32,7 +32,7 @@ component.package = org.apache.commons.lang
 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.target = 1.1
 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

src/java/org/apache/commons/lang/text/Interpolation.java

@@ -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>
  *

src/java/org/apache/commons/lang/text/MappedMessageFormat.java

@@ -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:

src/test/org/apache/commons/lang/text/TextTestSuite.java

@@ -51,6 +51,7 @@ public static Test suite() {
         suite.addTest(InterpolationTest.suite());
         suite.addTest(StrBuilderTest.suite());
         suite.addTest(StrTokenizerTest.suite());
+        suite.addTestSuite(VariableFormatTest.class);
         return suite;
     }