henning 2003/04/04 06:59:29
Modified: src/java/org/apache/turbine/om OMTool.java
src/java/org/apache/turbine/services/cache CachedObject.java
TurbineGlobalCacheService.java
src/java/org/apache/turbine/services/localization
LocaleDetector.java TurbineLocalizationService.java
src/java/org/apache/turbine/services/naming
TurbineNamingService.java
src/java/org/apache/turbine/services/pull/util
UIManager.java
Log:
Remove a few references to the TurbineResources Service
Revision Changes Path
1.4 +6 -3 jakarta-turbine-2/src/java/org/apache/turbine/om/OMTool.java
Index: OMTool.java
===================================================================
RCS file: /home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/om/OMTool.java,v
retrieving revision 1.3
retrieving revision 1.4
diff -u -r1.3 -r1.4
--- OMTool.java 9 Mar 2003 02:45:15 -0000 1.3
+++ OMTool.java 4 Apr 2003 14:59:28 -0000 1.4
@@ -56,14 +56,16 @@
import java.util.HashMap;
import java.util.Map;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.pull.ApplicationTool;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.pool.Recyclable;
/**
* A Pull tool to make om objects available to a template
*
* @author <a href="mailto:[EMAIL PROTECTED]">John D. McNally</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class OMTool implements ApplicationTool, Recyclable
@@ -88,7 +90,8 @@
public OMTool()throws Exception
{
omMap = new HashMap();
- String className = TurbineResources.getString("tool.om.factory");
+ String className = Turbine.getConfiguration()
+ .getString("tool.om.factory");
// RetrieverFactory omFactory =
// (RetrieverFactory)Class.forName(className).newInstance();
}
1.6 +7 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/cache/CachedObject.java
Index: CachedObject.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/CachedObject.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- CachedObject.java 9 Mar 2003 03:06:25 -0000 1.5
+++ CachedObject.java 4 Apr 2003 14:59:29 -0000 1.6
@@ -54,7 +54,9 @@
* <http://www.apache.org/>.
*/
-import org.apache.turbine.services.resources.TurbineResources;
+import java.io.Serializable;
+
+import org.apache.turbine.Turbine;
/**
* Wrapper for an object you want to store in a cache for a period of
@@ -65,7 +67,7 @@
* @version $Id$
*/
public class CachedObject
- implements java.io.Serializable
+ implements Serializable
{
/** Cache the object with the Default TTL */
@@ -79,7 +81,8 @@
/** Default age (30 minutes). */
private long defaultage =
- TurbineResources.getLong("cachedobject.defaultage", 1800000);
+ Turbine.getConfiguration()
+ .getLong("cachedobject.defaultage", 1800000);
/** When created. **/
protected long created = 0;
1.8 +7 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java
Index: TurbineGlobalCacheService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/cache/TurbineGlobalCacheService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineGlobalCacheService.java 25 Mar 2003 17:13:12 -0000 1.7
+++ TurbineGlobalCacheService.java 4 Apr 2003 14:59:29 -0000 1.8
@@ -57,14 +57,16 @@
import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.ObjectOutputStream;
+
import java.util.Enumeration;
import java.util.Hashtable;
import java.util.Vector;
import org.apache.commons.configuration.Configuration;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
/**
* This Service functions as a Global Cache. A global cache is a good
@@ -94,6 +96,7 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Dave Bryson</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @author <a href="mailto:[EMAIL PROTECTED]">John Thorhauer</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class TurbineGlobalCacheService
@@ -124,7 +127,8 @@
* Default = 5 seconds
*/
public static final long DEFAULT_CACHE_CHECK_FREQUENCY =
- TurbineResources.getLong("cache.check.frequency", 5000); // 5 seconds
+ Turbine.getConfiguration()
+ .getLong("cache.check.frequency", 5000); // 5 seconds
/** The cache. **/
private Hashtable cache = null;
1.6 +9 -3
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocaleDetector.java
Index: LocaleDetector.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/LocaleDetector.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- LocaleDetector.java 9 Mar 2003 03:06:29 -0000 1.5
+++ LocaleDetector.java 4 Apr 2003 14:59:29 -0000 1.6
@@ -57,7 +57,9 @@
import java.util.Locale;
import java.util.StringTokenizer;
-import org.apache.turbine.services.resources.TurbineResources;
+import org.apache.commons.configuration.Configuration;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.util.RunData;
/**
@@ -69,6 +71,8 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Frank Y. Kim</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
+ * @version $Id$
* @deprecated Use LocaleTokenizer instead.
*/
public class LocaleDetector
@@ -98,6 +102,8 @@
*/
public static Locale getLocale(String languageHeader)
{
+ Configuration conf = Turbine.getConfiguration();
+
Locale locale = null;
// return a "default" locale
@@ -105,8 +111,8 @@
languageHeader.trim().equals(""))
{
return new Locale(
- TurbineResources.getString("locale.default.language", "en"),
- TurbineResources.getString("locale.default.country", "US"));
+ conf.getString("locale.default.language", "en"),
+ conf.getString("locale.default.country", "US"));
}
// The HTTP Accept-Header is something like
1.8 +19 -10
jakarta-turbine-2/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineLocalizationService.java 9 Mar 2003 03:06:29 -0000 1.7
+++ TurbineLocalizationService.java 4 Apr 2003 14:59:29 -0000 1.8
@@ -58,14 +58,19 @@
import java.util.Locale;
import java.util.MissingResourceException;
import java.util.ResourceBundle;
+
import javax.servlet.http.HttpServletRequest;
+import org.apache.commons.configuration.Configuration;
+
import org.apache.commons.lang.StringUtils;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
/**
@@ -94,6 +99,8 @@
* @author <a href="mailto:[EMAIL PROTECTED]">Jon S. Stevens</a>
* @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]">Henning P. Schmiedehausen</a>
+ * @version $Id$
*/
public class TurbineLocalizationService
extends TurbineBaseService
@@ -140,15 +147,17 @@
public void init()
throws InitializationException
{
+ Configuration conf = Turbine.getConfiguration();
+
initBundleNames(null);
Locale jvmDefault = Locale.getDefault();
- defaultLanguage = TurbineResources
- .getString("locale.default.language",
- jvmDefault.getLanguage()).trim();
- defaultCountry = TurbineResources
- .getString("locale.default.country",
- jvmDefault.getCountry()).trim();
+
+ defaultLanguage = conf.getString("locale.default.language",
+ jvmDefault.getLanguage()).trim();
+ defaultCountry = conf.getString("locale.default.country",
+ jvmDefault.getCountry()).trim();
+
defaultLocale = new Locale(defaultLanguage, defaultCountry);
setInit(true);
}
@@ -160,9 +169,9 @@
*/
protected void initBundleNames(String[] ignored)
{
- bundleNames =
- TurbineResources.getStringArray("locale.default.bundles");
- String name = TurbineResources.getString("locale.default.bundle");
+ Configuration conf = Turbine.getConfiguration();
+ bundleNames = conf.getStringArray("locale.default.bundles");
+ String name = conf.getString("locale.default.bundle");
if (name != null && name.length() > 0)
{
1.7 +11 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
Index: TurbineNamingService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/naming/TurbineNamingService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineNamingService.java 9 Mar 2003 03:06:29 -0000 1.6
+++ TurbineNamingService.java 4 Apr 2003 14:59:29 -0000 1.7
@@ -58,14 +58,18 @@
import java.util.Hashtable;
import java.util.Iterator;
import java.util.Properties;
+
import javax.naming.Context;
import javax.naming.InitialContext;
+import org.apache.commons.configuration.Configuration;
+
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.services.InitializationException;
import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.util.RunData;
/**
@@ -74,6 +78,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Greg Ritter</a>
* @author <a href="mailto:[EMAIL PROTECTED]">Colin Chalmers</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class TurbineNamingService extends TurbineBaseService implements
NamingService
@@ -99,11 +104,13 @@
// "contextname." is the name of the property that will be
// used by the InitialContext class to create a new context
// instance.
+
+ Configuration conf = Turbine.getConfiguration();
try
{
contextPropsList = new Hashtable();
- for (Iterator contextKeys = TurbineResources.getKeys("context.");
contextKeys.hasNext();)
+ for (Iterator contextKeys = conf.getKeys("context.");
contextKeys.hasNext();)
{
String key = (String) contextKeys.next();
int start = key.indexOf(".") + 1;
@@ -122,7 +129,7 @@
}
contextProps.put(
- key.substring(end + 1), TurbineResources.getString(key));
+ key.substring(end + 1), conf.getString(key));
contextPropsList.put(contextName, contextProps);
}
1.7 +8 -4
jakarta-turbine-2/src/java/org/apache/turbine/services/pull/util/UIManager.java
Index: UIManager.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine-2/src/java/org/apache/turbine/services/pull/util/UIManager.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- UIManager.java 9 Mar 2003 03:06:30 -0000 1.6
+++ UIManager.java 4 Apr 2003 14:59:29 -0000 1.7
@@ -55,14 +55,16 @@
*/
import java.io.FileInputStream;
+
import java.util.Properties;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
+
+import org.apache.turbine.Turbine;
import org.apache.turbine.om.security.User;
import org.apache.turbine.services.pull.ApplicationTool;
import org.apache.turbine.services.pull.TurbinePull;
-import org.apache.turbine.services.resources.TurbineResources;
import org.apache.turbine.services.servlet.TurbineServlet;
import org.apache.turbine.util.ContentURI;
import org.apache.turbine.util.RunData;
@@ -103,6 +105,7 @@
*
* @author <a href="mailto:[EMAIL PROTECTED]">Jason van Zyl</a>
* @author <a href="mailto:[EMAIL PROTECTED]">James Coltman</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]">Henning P. Schmiedehausen</a>
* @version $Id$
*/
public class UIManager implements ApplicationTool
@@ -383,8 +386,9 @@
*/
public void setSkin()
{
- this.skinName = TurbineResources.getString(SKIN_PROPERTY,
- SKIN_PROPERTY_DEFAULT);
+ this.skinName = Turbine.getConfiguration()
+ .getString(SKIN_PROPERTY,
+ SKIN_PROPERTY_DEFAULT);
}
/**
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
