|
From: <tr...@us...> - 2003-07-19 15:32:31
|
Update of /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core
In directory sc8-pr-cvs1:/tmp/cvs-serv13778/modules/core/src/com/babeldoc/core
Modified Files:
EnvironmentLoader.java TieredConfigurationHelper.java
VelocityUtilityContext.java
Log Message:
Removed ostermiller utils from babeldoc
Index: EnvironmentLoader.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/EnvironmentLoader.java,v
retrieving revision 1.8
retrieving revision 1.9
diff -C2 -d -r1.8 -r1.9
*** EnvironmentLoader.java 27 Jun 2003 02:19:57 -0000 1.8
--- EnvironmentLoader.java 19 Jul 2003 15:32:27 -0000 1.9
***************
*** 66,71 ****
package com.babeldoc.core;
- import com.Ostermiller.util.StringTokenizer;
-
import com.babeldoc.core.config.ConfigService;
import com.babeldoc.core.config.IConfig;
--- 66,69 ----
***************
*** 76,79 ****
--- 74,78 ----
import java.util.ArrayList;
import java.util.Iterator;
+ import java.util.StringTokenizer;
Index: TieredConfigurationHelper.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/TieredConfigurationHelper.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** TieredConfigurationHelper.java 16 Jul 2003 22:45:26 -0000 1.4
--- TieredConfigurationHelper.java 19 Jul 2003 15:32:27 -0000 1.5
***************
*** 68,72 ****
import com.babeldoc.core.config.IConfig;
import com.babeldoc.core.config.ConfigService;
- import com.Ostermiller.util.StringTokenizer;
import java.util.*;
--- 68,71 ----
Index: VelocityUtilityContext.java
===================================================================
RCS file: /cvsroot/babeldoc/babeldoc/modules/core/src/com/babeldoc/core/VelocityUtilityContext.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** VelocityUtilityContext.java 27 Jun 2003 02:19:57 -0000 1.9
--- VelocityUtilityContext.java 19 Jul 2003 15:32:27 -0000 1.10
***************
*** 66,73 ****
package com.babeldoc.core;
- import com.Ostermiller.util.Base64;
- import com.Ostermiller.util.MD5;
- import com.Ostermiller.util.StringTokenizer;
-
import com.babeldoc.core.config.ConfigService;
--- 66,69 ----
***************
*** 82,85 ****
--- 78,86 ----
import java.util.Calendar;
import java.util.Random;
+ import java.util.StringTokenizer;
+ import java.security.MessageDigest;
+ import java.security.NoSuchAlgorithmException;
+
+ import org.apache.xerces.impl.dv.util.Base64;
***************
*** 354,359 ****
*/
public String md5String(String value) {
! return MD5.getHashString(value);
! }
/**
--- 355,366 ----
*/
public String md5String(String value) {
! try {
! MessageDigest messageDigest = MessageDigest.getInstance("MD5");
! return new String(messageDigest.digest(value.getBytes()));
! } catch (NoSuchAlgorithmException e) {
! LogService.getInstance().logError(e);
! }
! return "";
! }
/**
***************
*** 435,439 ****
*/
public String toBase64(String string) {
! return Base64.encode(string);
}
--- 442,446 ----
*/
public String toBase64(String string) {
! return new String(Base64.encode(string.getBytes()));
}
|