henning 2003/02/28 08:42:56
Modified: src/java/org/apache/turbine TurbineConstants.java
src/java/org/apache/turbine/util/db UUIdGenerator.java
Log:
Move init key into TurbineConstants. Remove TurbineResources
Revision Changes Path
1.17 +4 -1
jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java
Index: TurbineConstants.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/TurbineConstants.java,v
retrieving revision 1.16
retrieving revision 1.17
diff -u -r1.16 -r1.17
--- TurbineConstants.java 28 Feb 2003 16:25:49 -0000 1.16
+++ TurbineConstants.java 28 Feb 2003 16:42:56 -0000 1.17
@@ -289,4 +289,7 @@
/** Default Value for the Logging Directory, relative to the webroot */
String LOGGING_ROOT_DEFAULT = "/logs";
+
+ /** Key for loading the UUID Generator with a constant value */
+ String UUID_ADDRESS_KEY = "uuid.address";
}
1.7 +14 -4
jakarta-turbine-2/src/java/org/apache/turbine/util/db/UUIdGenerator.java
Index: UUIdGenerator.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/util/db/UUIdGenerator.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UUIdGenerator.java 12 Feb 2003 17:24:29 -0000 1.6
+++ UUIdGenerator.java 28 Feb 2003 16:42:56 -0000 1.7
@@ -56,12 +56,19 @@
import java.io.ByteArrayOutputStream;
import java.io.OutputStream;
+
import java.util.StringTokenizer;
+
import javax.mail.internet.MimeUtility;
+import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.turbine.services.resources.TurbineResources;
+
+import org.apache.turbine.Turbine;
+import org.apache.turbine.TurbineConstants;
+
import org.apache.turbine.util.TurbineException;
/**
@@ -88,6 +95,7 @@
* TurbineResources.properties file.</p>
*
* @author <a href="mailto:[EMAIL PROTECTED]">John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class UUIdGenerator
@@ -109,8 +117,10 @@
*/
public UUIdGenerator() throws TurbineException
{
- String addr = TurbineResources.getString("uuid.address");
- if (addr == null)
+ String addr =
+ Turbine.getConfiguration().getString(TurbineConstants.UUID_ADDRESS_KEY);
+
+ if (StringUtils.isEmpty(addr))
{
log.info("UUIdGenerator is using a random number as the "
+ "base for id's. This is not the best method for many "
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
