jmcnally 02/03/07 15:43:48
Modified: . build.xml default.properties deps.list
src/core/java/org/apache/fulcrum ServiceException.java
ServiceRuntimeException.java
src/services/java/org/apache/fulcrum/intake/xmlmodel
Rule.java XmlField.java
src/services/java/org/apache/fulcrum/localization
TurbineLocalizationService.java
src/services/java/org/apache/fulcrum/security
BaseSecurityService.java
src/util/java/org/apache/fulcrum/template TemplateEmail.java
src/util/java/org/apache/fulcrum/util/parser
BaseValueParser.java
Log:
classes moved from commons-util to commons-lang and commons-codec
Revision Changes Path
1.44 +22 -9 jakarta-turbine-fulcrum/build.xml
Index: build.xml
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/build.xml,v
retrieving revision 1.43
retrieving revision 1.44
diff -u -r1.43 -r1.44
--- build.xml 1 Mar 2002 14:21:14 -0000 1.43
+++ build.xml 7 Mar 2002 23:43:47 -0000 1.44
@@ -15,7 +15,7 @@
<pathelement location="${commons-collections.jar}"/>
<pathelement location="${commons-email.jar}"/>
<pathelement location="${commons-lang.jar}"/>
- <pathelement location="${commons-util.jar}"/>
+ <pathelement location="${commons-codec.jar}"/>
<pathelement location="${jaf.jar}"/>
<pathelement location="${javamail.jar}"/>
<pathelement location="${jdbc.jar}"/>
@@ -78,7 +78,7 @@
<echo message="bsf.jar = ${bsf.jar}"/>
<echo message="commons-collections.jar = ${commons-collections.jar}"/>
<echo message="commons-lang.jar = ${commons-lang.jar}"/>
- <echo message="commons-util.jar = ${commons-util.jar}"/>
+ <echo message="commons-codec.jar = ${commons-codec.jar}"/>
<echo message="dom4j.jar = ${dom4j.jar}"/>
<echo message="dvsl.jar = ${dvsl.jar}"/>
<echo message="jaf.jar = ${jaf.jar}"/>
@@ -195,8 +195,14 @@
/>
<available
- classname="org.apache.commons.util.exception.NestableException"
- property="commons-util.present"
+ classname="org.apache.commons.lang.exception.NestableException"
+ property="commons-lang.present"
+ classpathref="classpath"
+ />
+
+ <available
+ classname="org.apache.commons.codec.base64.Base64"
+ property="commons-codec.present"
classpathref="classpath"
/>
@@ -307,10 +313,17 @@
</antcall>
</target>
- <target name="check.commons-util" unless="commons-util.present">
+ <target name="check.commons-lang" unless="commons-lang.present">
+ <antcall target="property-warning">
+ <param name="name" value="commons-lang.jar"/>
+ <param name="value" value="${commons-lang.jar}"/>
+ </antcall>
+ </target>
+
+ <target name="check.commons-codec" unless="commons-codec.present">
<antcall target="property-warning">
- <param name="name" value="commons-util.jar"/>
- <param name="value" value="${commons-util.jar}"/>
+ <param name="name" value="commons-codec.jar"/>
+ <param name="value" value="${commons-codec.jar}"/>
</antcall>
</target>
@@ -391,8 +404,8 @@
depends="init,env,create-dirs,
check.velocity,check.log4j,check.torque,check.bsf,
check.servlet,check.javamail,check.jaf,check.xerces,check.xalan,
- check.xmlrpc,check.commons-collections,check.commons-util,
- check.regexp,check.dvsl,check.dom4j,
+ check.xmlrpc,check.commons-collections,check.commons-lang,
+ check.commons-codec,check.regexp,check.dvsl,check.dom4j,
include-email,om">
<!-- We have some static files that should overwrite
1.20 +1 -1 jakarta-turbine-fulcrum/default.properties
Index: default.properties
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/default.properties,v
retrieving revision 1.19
retrieving revision 1.20
diff -u -r1.19 -r1.20
--- default.properties 1 Mar 2002 14:21:14 -0000 1.19
+++ default.properties 7 Mar 2002 23:43:47 -0000 1.20
@@ -45,7 +45,7 @@
commons-collections.jar = ${lib.repo}/commons-collections.jar
commons-email.jar = ${lib.repo}/commons-email-0.1-dev.jar
commons-lang.jar = ${lib.repo}/commons-lang-0.1-dev.jar
-commons-util.jar = ${lib.repo}/commons-util-0.1-dev.jar
+commons-codec.jar = ${lib.repo}/commons-codec.jar
dom4j.jar = ${lib.repo}/dom4j-1.1.jar
dvsl.jar = ${lib.repo}/velocity-dvsl-0.40.jar
jaf.jar = ${lib.repo}/activation-1.0.1.jar
1.7 +1 -1 jakarta-turbine-fulcrum/deps.list
Index: deps.list
===================================================================
RCS file: /home/cvs/jakarta-turbine-fulcrum/deps.list,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- deps.list 2 Mar 2002 20:02:04 -0000 1.6
+++ deps.list 7 Mar 2002 23:43:47 -0000 1.7
@@ -3,7 +3,7 @@
commons-collections.jar
commons-email-0.1-dev.jar
commons-lang-0.1-dev.jar
-commons-util-0.1-dev.jar
+commons-codec.jar
dom4j-1.1.jar
jakarta-regexp-1.3-dev.jar
jdbc2_0-stdext.jar
1.4 +1 -1
jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/ServiceException.java
Index: ServiceException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/ServiceException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceException.java 10 Aug 2001 11:46:22 -0000 1.3
+++ ServiceException.java 7 Mar 2002 23:43:47 -0000 1.4
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.util.exception.NestableException;
+import org.apache.commons.lang.exception.NestableException;
/**
* The base class of all regular exceptions thrown by Fulcrum.
1.4 +1 -1
jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/ServiceRuntimeException.java
Index: ServiceRuntimeException.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/core/java/org/apache/fulcrum/ServiceRuntimeException.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- ServiceRuntimeException.java 10 Aug 2001 11:46:22 -0000 1.3
+++ ServiceRuntimeException.java 7 Mar 2002 23:43:47 -0000 1.4
@@ -54,7 +54,7 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.util.exception.NestableRuntimeException;
+import org.apache.commons.lang.exception.NestableRuntimeException;
/**
* This is a base class of runtime exeptions thrown by Fulcrum.
1.2 +1 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/xmlmodel/Rule.java
Index: Rule.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/xmlmodel/Rule.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- Rule.java 23 Aug 2001 07:20:22 -0000 1.1
+++ Rule.java 7 Mar 2002 23:43:48 -0000 1.2
@@ -54,7 +54,6 @@
* <http://www.apache.org/>.
*/
-import org.apache.commons.util.StringUtils;
import org.xml.sax.Attributes;
import org.apache.fulcrum.intake.validator.Constraint;
@@ -62,7 +61,7 @@
* A Class for holding data about a constraint on a property.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: Rule.java,v 1.1 2001/08/23 07:20:22 jmcnally Exp $
+ * @version $Id: Rule.java,v 1.2 2002/03/07 23:43:48 jmcnally Exp $
*/
public class Rule
implements Constraint, java.io.Serializable
1.3 +3 -3
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/xmlmodel/XmlField.java
Index: XmlField.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/intake/xmlmodel/XmlField.java,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- XmlField.java 2 Oct 2001 16:32:30 -0000 1.2
+++ XmlField.java 7 Mar 2002 23:43:48 -0000 1.3
@@ -59,14 +59,14 @@
import java.util.List;
import java.util.ArrayList;
import java.util.Iterator;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
import org.xml.sax.Attributes;
/**
* A Class for holding data about a property used in an Application.
*
* @author <a href="mailto:[EMAIL PROTECTED]>John McNally</a>
- * @version $Id: XmlField.java,v 1.2 2001/10/02 16:32:30 dlr Exp $
+ * @version $Id: XmlField.java,v 1.3 2002/03/07 23:43:48 jmcnally Exp $
*/
public class XmlField
implements java.io.Serializable
@@ -203,7 +203,7 @@
*/
public String getName()
{
- return StringUtils.replace(name, "_", "");
+ return Strings.replace(name, "_", "");
}
/**
1.30 +5 -5
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/localization/TurbineLocalizationService.java,v
retrieving revision 1.29
retrieving revision 1.30
diff -u -r1.29 -r1.30
--- TurbineLocalizationService.java 11 Dec 2001 19:13:23 -0000 1.29
+++ TurbineLocalizationService.java 7 Mar 2002 23:43:48 -0000 1.30
@@ -64,7 +64,7 @@
import java.util.StringTokenizer;
import javax.servlet.http.HttpServletRequest;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
import org.apache.log4j.Category;
import org.apache.fulcrum.BaseService;
import org.apache.fulcrum.InitializationException;
@@ -97,7 +97,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Daniel Rall</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Leonard Richardson</a>
- * @version $Id: TurbineLocalizationService.java,v 1.29 2001/12/11 19:13:23 dlr Exp
$
+ * @version $Id: TurbineLocalizationService.java,v 1.30 2002/03/07 23:43:48
jmcnally Exp $
*/
public class TurbineLocalizationService
extends BaseService
@@ -394,7 +394,7 @@
Map bundlesByLocale)
{
ResourceBundle rb = null;
- if ( !StringUtils.isValid(locale.getCountry()) &&
+ if ( !Strings.isValid(locale.getCountry()) &&
defaultLanguage.equals(locale.getLanguage()) )
{
/*
@@ -410,7 +410,7 @@
rb = getBundleIgnoreException(bundleName, withDefaultCountry);
}
}
- else if ( !StringUtils.isValid(locale.getLanguage()) &&
+ else if ( !Strings.isValid(locale.getLanguage()) &&
defaultCountry.equals(locale.getCountry()) )
{
Locale withDefaultLanguage = new Locale(defaultLanguage,
@@ -486,7 +486,7 @@
*/
public Locale getLocale(String header)
{
- if (!StringUtils.isEmpty(header))
+ if (!Strings.isEmpty(header))
{
LocaleTokenizer tok = new LocaleTokenizer(header);
if (tok.hasNext())
1.6 +2 -2
jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java
Index: BaseSecurityService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/services/java/org/apache/fulcrum/security/BaseSecurityService.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- BaseSecurityService.java 28 Oct 2001 20:57:17 -0000 1.5
+++ BaseSecurityService.java 7 Mar 2002 23:43:48 -0000 1.6
@@ -75,7 +75,7 @@
// Classes needed for password encryption
import java.security.MessageDigest;
-import org.apache.commons.util.Base64;
+import org.apache.commons.codec.base64.Base64;
/**
* This is a common subset of SecurityService implementation.
@@ -93,7 +93,7 @@
* </ul>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Rafal Krzewski</a>
- * @version $Id: BaseSecurityService.java,v 1.5 2001/10/28 20:57:17 jmcnally Exp $
+ * @version $Id: BaseSecurityService.java,v 1.6 2002/03/07 23:43:48 jmcnally Exp $
*/
public abstract class BaseSecurityService
extends BaseService
1.7 +8 -8
jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/template/TemplateEmail.java
Index: TemplateEmail.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/template/TemplateEmail.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TemplateEmail.java 18 Jan 2002 19:29:23 -0000 1.6
+++ TemplateEmail.java 7 Mar 2002 23:43:48 -0000 1.7
@@ -58,7 +58,7 @@
import java.util.List;
import javax.mail.internet.InternetAddress;
import org.apache.commons.mail.SimpleEmail;
-import org.apache.commons.util.StringUtils;
+import org.apache.commons.lang.Strings;
/**
* This is a simple class for sending email from within the TemplateService.
@@ -127,7 +127,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Coladonato</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Elicia David</a>
- * @version $Id: TemplateEmail.java,v 1.6 2002/01/18 19:29:23 dlr Exp $
+ * @version $Id: TemplateEmail.java,v 1.7 2002/03/07 23:43:48 jmcnally Exp $
*/
public class TemplateEmail
{
@@ -381,9 +381,9 @@
// If the caller desires word-wrapping, do it here
if (wordWrap > 0)
{
- body = StringUtils.wrapText (body,
- System.getProperty("line.separator"),
- wordWrap);
+ body = Strings.wrapText (body,
+ System.getProperty("line.separator"),
+ wordWrap);
}
SimpleEmail se = new SimpleEmail();
@@ -415,9 +415,9 @@
// If the caller desires word-wrapping, do it here
if (wordWrap > 0)
{
- body = StringUtils.wrapText (body,
- System.getProperty("line.separator"),
- wordWrap);
+ body = Strings.wrapText (body,
+ System.getProperty("line.separator"),
+ wordWrap);
}
SimpleEmail se = new SimpleEmail();
1.4 +1 -2
jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/BaseValueParser.java
Index: BaseValueParser.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-fulcrum/src/util/java/org/apache/fulcrum/util/parser/BaseValueParser.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- BaseValueParser.java 27 Aug 2001 08:25:48 -0000 1.3
+++ BaseValueParser.java 7 Mar 2002 23:43:48 -0000 1.4
@@ -69,7 +69,6 @@
import java.util.Hashtable;
import org.apache.fulcrum.pool.Recyclable;
import org.apache.fulcrum.pool.RecyclableSupport;
-import org.apache.commons.util.StringUtils;
/**
* BaseValueParser is a base class for classes that need to parse
@@ -97,7 +96,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Sean Legassick</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Jason van Zyl</a>
- * @version $Id: BaseValueParser.java,v 1.3 2001/08/27 08:25:48 dlr Exp $
+ * @version $Id: BaseValueParser.java,v 1.4 2002/03/07 23:43:48 jmcnally Exp $
*/
public class BaseValueParser
extends RecyclableSupport
--
To unsubscribe, e-mail: <mailto:[EMAIL PROTECTED]>
For additional commands, e-mail: <mailto:[EMAIL PROTECTED]>
