jon 01/05/19 17:49:08
Modified: src/java/org/apache/turbine/services/localization
Localization.java TurbineLocalizationService.java
src/java/org/apache/turbine/services/naming
TurbineNamingService.java
Log:
bring some code up to date with services stuff
remove full path to log. no need for that.
Revision Changes Path
1.7 +3 -3
jakarta-turbine/src/java/org/apache/turbine/services/localization/Localization.java
Index: Localization.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/Localization.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- Localization.java 2001/05/05 14:43:56 1.6
+++ Localization.java 2001/05/20 00:49:07 1.7
@@ -83,10 +83,10 @@
*
* Localization.getString(str)
*
- * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @version $Id: Localization.java,v 1.6 2001/05/05 14:43:56 jvanzyl Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
+ * @version $Id: Localization.java,v 1.7 2001/05/20 00:49:07 jon Exp $
*/
-public class Localization
+public abstract class Localization
{
/**
* Pulls a string out of the LocalizationService with the default
1.7 +13 -4
jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java
Index: TurbineLocalizationService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/localization/TurbineLocalizationService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- TurbineLocalizationService.java 2001/05/05 14:43:56 1.6
+++ TurbineLocalizationService.java 2001/05/20 00:49:07 1.7
@@ -57,6 +57,7 @@
import java.util.Hashtable;
import java.util.Locale;
import java.util.ResourceBundle;
+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;
@@ -90,9 +91,9 @@
* - getBundle("MyBundleName", Locale)<br>
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Jonas Maurus</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
- * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
- * @version $Id: TurbineLocalizationService.java,v 1.6 2001/05/05 14:43:56 jvanzyl
Exp $
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Jon S. Stevens</a>
+ * @author <a href="mailto:[EMAIL PROTECTED]";>Frank Y. Kim</a>
+ * @version $Id: TurbineLocalizationService.java,v 1.7 2001/05/20 00:49:07 jon Exp $
*/
public class TurbineLocalizationService
extends TurbineBaseService
@@ -108,14 +109,22 @@
/** The name of the default bundle to use. */
private static String defaultBundle = null;
-
/**
* Constructor.
*/
public TurbineLocalizationService()
{
+ }
+
+ /**
+ * Called the first time the Service is used.
+ */
+ public void init()
+ throws InitializationException
+ {
bundles = new Hashtable();
defaultBundle = TurbineResources.getString("locale.default.bundle");
+ setInit(true);
}
/**
1.8 +3 -5
jakarta-turbine/src/java/org/apache/turbine/services/naming/TurbineNamingService.java
Index: TurbineNamingService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/naming/TurbineNamingService.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- TurbineNamingService.java 2001/05/05 14:43:58 1.7
+++ TurbineNamingService.java 2001/05/20 00:49:08 1.8
@@ -72,7 +72,7 @@
* provides JNDI naming contexts.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
- * @version $Id: TurbineNamingService.java,v 1.7 2001/05/05 14:43:58 jvanzyl Exp $
+ * @version $Id: TurbineNamingService.java,v 1.8 2001/05/20 00:49:08 jon Exp $
*/
public class TurbineNamingService
extends TurbineBaseService
@@ -98,7 +98,6 @@
try
{
- org.apache.turbine.util.Log.info("Initializing JNDI contexts!");
Iterator contextKeys = TurbineResources.getKeys("context.");
Hashtable contextPropsList = new Hashtable();
while( contextKeys.hasNext() )
@@ -130,12 +129,11 @@
InitialContext context = new InitialContext(contextProps);
data.getJNDIContexts().put(key, context);
}
- org.apache.turbine.util.Log.info("Initialized JNDI contexts!");
}
catch(Exception e)
{
- org.apache.turbine.util.Log.error("Failed to initialize JDNI
contexts!");
- org.apache.turbine.util.Log.error(e);
+ Log.error("Failed to initialize JDNI contexts!");
+ Log.error(e);
throw new InitializationException("Failed to initialize JDNI
contexts!");
}
}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
