jvanzyl 02/02/28 15:22:10
Modified: . build-test.xml build.xml default.properties
deps.list
src/java/org/apache/stratum/xo Mapper.java
Log:
Updating to use the new commons-lang and commons-io packages.
Revision Changes Path
1.11 +2 -0 jakarta-turbine-stratum/build-test.xml
Index: build-test.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build-test.xml,v
retrieving revision 1.10
retrieving revision 1.11
diff -u -r1.10 -r1.11
--- build-test.xml 25 Feb 2002 01:52:28 -0000 1.10
+++ build-test.xml 28 Feb 2002 23:22:10 -0000 1.11
@@ -17,6 +17,8 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-util.jar}"/>
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-io.jar}"/>
<pathelement location="${concurrent.jar}"/>
<pathelement location="${jgl.jar}"/>
<pathelement location="${jetty.jar}"/>
1.25 +2 -0 jakarta-turbine-stratum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/build.xml,v
retrieving revision 1.24
retrieving revision 1.25
diff -u -r1.24 -r1.25
--- build.xml 24 Feb 2002 06:48:17 -0000 1.24
+++ build.xml 28 Feb 2002 23:22:10 -0000 1.25
@@ -17,6 +17,8 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-util.jar}"/>
<pathelement location="${commons-logging.jar}"/>
+ <pathelement location="${commons-lang.jar}"/>
+ <pathelement location="${commons-io.jar}"/>
<pathelement location="${concurrent.jar}"/>
<pathelement location="${jgl.jar}"/>
<pathelement location="${jetty.jar}"/>
1.21 +3 -1 jakarta-turbine-stratum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/default.properties,v
retrieving revision 1.20
retrieving revision 1.21
diff -u -r1.20 -r1.21
--- default.properties 24 Feb 2002 06:48:22 -0000 1.20
+++ default.properties 28 Feb 2002 23:22:10 -0000 1.21
@@ -44,8 +44,10 @@
commons-beanutils.jar = ${lib.repo}/commons-beanutils.jar
commons-collections.jar = ${lib.repo}/commons-collections.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
+commons-util.jar = ${lib.repo}/commons-util-1.0-rc2-dev.jar
commons-logging.jar = ${lib.repo}/commons-logging.jar
+commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
+commons-io.jar = ${lib.repo}/commons-io.jar
concurrent.jar = ${lib.repo}/concurrent.jar
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
junit.jar = ${lib.repo}/junit-3.7.jar
1.10 +3 -1 jakarta-turbine-stratum/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-stratum/deps.list,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- deps.list 26 Feb 2002 22:29:44 -0000 1.9
+++ deps.list 28 Feb 2002 23:22:10 -0000 1.10
@@ -2,7 +2,9 @@
commons-beanutils.jar
commons-collections.jar
commons-logging.jar
-commons-util-0.1-dev.jar
+commons-util-1.0-rc2-dev.jar
+commons-lang-0.1-dev.jar
+commons-io.jar
commons-logging.jar
concurrent.jar
dom4j-1.1.jar
1.17 +4 -4
jakarta-turbine-stratum/src/java/org/apache/stratum/xo/Mapper.java
Index: Mapper.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-stratum/src/java/org/apache/stratum/xo/Mapper.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- Mapper.java 21 Feb 2002 19:05:29 -0000 1.16
+++ Mapper.java 28 Feb 2002 23:22:10 -0000 1.17
@@ -69,8 +69,8 @@
import org.apache.commons.beanutils.PropertyUtils;
import org.apache.commons.beanutils.ConvertUtils;
-import org.apache.commons.util.FileUtils;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.io.FileUtils;
+import org.apache.commons.lang.Strings;
import java.lang.reflect.Method;
import org.apache.stratum.introspection.Introspector;
@@ -141,7 +141,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
- * @version $Id: Mapper.java,v 1.16 2002/02/21 19:05:29 jvanzyl Exp $
+ * @version $Id: Mapper.java,v 1.17 2002/02/28 23:22:10 jvanzyl Exp $
*/
// How to use the resources package to pull in the
@@ -398,7 +398,7 @@
if (basePath == null)
{
// Overloads were not called, assuming classpath loading.
- basePath = StringUtils.replace(basePackage, ".", "/");
+ basePath = Strings.replace(basePackage, ".", "/");
}
// Determine the base package to use for object creation.
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
