jvanzyl 01/06/14 07:41:45
Modified: src/java/org/apache/turbine/services/naming
TurbineNamingService.java
Log:
- updating service as per notes.
Revision Changes Path
1.10 +19 -37
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.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- TurbineNamingService.java 2001/05/23 13:51:32 1.9
+++ TurbineNamingService.java 2001/06/14 14:41:45 1.10
@@ -62,20 +62,24 @@
import javax.naming.InitialContext;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.services.TurbineBaseService;
-import org.apache.turbine.services.resources.TurbineResources;
-import org.apache.turbine.util.Log;
import org.apache.turbine.util.RunData;
+//!! NOTE
+// Why are JNDI context stored in RunData? This
+// makes the naming service completely dependent on
+// Turbine which isn't good.
+
/**
* This class is the default implementation of NamingService, which
* provides JNDI naming contexts.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
* @author <a href="mailto:[EMAIL PROTECTED]";>Colin Chalmers</a>
- * @version $Id: TurbineNamingService.java,v 1.9 2001/05/23 13:51:32 jvanzyl Exp $
+ * @version $Id: TurbineNamingService.java,v 1.10 2001/06/14 14:41:45 jvanzyl Exp $
*/
-public class TurbineNamingService extends TurbineBaseService implements
NamingService
+public class TurbineNamingService
+ extends BaseService
+ implements NamingService
{
/**
* A global HashTable of Property objects which are initialised using
@@ -87,7 +91,8 @@
* Called the first time the Service is used.<br>
*
*/
- public void init() throws InitializationException
+ public void init()
+ throws InitializationException
{
// Context properties are specified in lines in the properties
// file that begin with "context.contextname.", allowing
@@ -97,7 +102,8 @@
// instance.
try
{
- Iterator contextKeys = TurbineResources.getKeys("context.");
+ //!! "context" should be a constant.
+ Iterator contextKeys = getConfiguration().getKeys("context");
contextPropsList = new Hashtable();
while (contextKeys.hasNext())
@@ -119,39 +125,13 @@
}
contextProps.put(
- key.substring(end + 1),TurbineResources.getString(key));
+ key.substring(end + 1), getConfiguration().getString(key));
contextPropsList.put(contextName, contextProps);
}
-
- setInit(true);
- }
- catch (Exception e)
- {
- Log.error("Failed to initialize JDNI contexts!", e);
- throw new InitializationException(
- "Failed to initialize JDNI contexts!");
- }
- }
-
- /**
- * Places the contexts defined in the TurbineResources instance
- * (if any) into the data.contexts Hashtable.
- *
- * @param data The RunData object for the current request.
- * @exception InitializationException, if there was a problem
- * during initialization.
- */
- public void init(RunData data) throws InitializationException
- {
- try
- {
- if (contextPropsList == null)
- {
- init();
- }
-
+ RunData data = (RunData) getServiceBroker().getServiceObject("data");
+
Enumeration contextPropsKeys = contextPropsList.keys();
while (contextPropsKeys.hasMoreElements())
{
@@ -161,10 +141,12 @@
InitialContext context = new InitialContext(contextProps);
data.getJNDIContexts().put(key, context);
}
+
+ setInit(true);
}
catch (Exception e)
{
- Log.error("Failed to initialize JDNI contexts!",e);
+ getCategory().error("Failed to initialize JDNI contexts!", e);
throw new InitializationException(
"Failed to initialize JDNI contexts!");
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
