jvanzyl 01/07/13 10:36:46
Modified: src/java/org/apache/turbine/services/naming
NamingService.java TurbineNamingService.java
Log:
- don't use rundata to store the initial jndi contexts, they
should be stored locally in the service.
Revision Changes Path
1.7 +3 -2
jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java
Index: NamingService.java
===================================================================
RCS file:
/home/cvs/jakarta-turbine/src/java/org/apache/turbine/services/naming/NamingService.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- NamingService.java 2001/05/05 14:43:58 1.6
+++ NamingService.java 2001/07/13 17:36:23 1.7
@@ -62,9 +62,10 @@
* contexts.
*
* @author <a href="mailto:[EMAIL PROTECTED]";>Greg Ritter</a>
- * @version $Id: NamingService.java,v 1.6 2001/05/05 14:43:58 jvanzyl Exp $
+ * @version $Id: NamingService.java,v 1.7 2001/07/13 17:36:23 jvanzyl Exp $
*/
-public interface NamingService extends Service
+public interface NamingService
+ extends Service
{
public static final String SERVICE_NAME = "NamingService";
1.12 +5 -12
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.11
retrieving revision 1.12
diff -u -r1.11 -r1.12
--- TurbineNamingService.java 2001/07/10 01:04:25 1.11
+++ TurbineNamingService.java 2001/07/13 17:36:29 1.12
@@ -62,20 +62,14 @@
import javax.naming.InitialContext;
import org.apache.turbine.services.BaseService;
import org.apache.turbine.services.InitializationException;
-import org.apache.turbine.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.11 2001/07/10 01:04:25 jvanzyl Exp $
+ * @version $Id: TurbineNamingService.java,v 1.12 2001/07/13 17:36:29 jvanzyl Exp $
*/
public class TurbineNamingService
extends BaseService
@@ -87,6 +81,8 @@
*/
private static Hashtable contextPropsList = null;
+ private Hashtable initialContexts = new Hashtable();
+
/**
* Called the first time the Service is used.<br>
*
@@ -130,16 +126,13 @@
contextPropsList.put(contextName, contextProps);
}
- RunData data = (RunData) getServiceBroker().getServiceObject("data");
-
Enumeration contextPropsKeys = contextPropsList.keys();
while (contextPropsKeys.hasMoreElements())
{
String key = (String) contextPropsKeys.nextElement();
- Properties contextProps =
- (Properties) contextPropsList.get(key);
+ Properties contextProps = (Properties) contextPropsList.get(key);
InitialContext context = new InitialContext(contextProps);
- data.getJNDIContexts().put(key, context);
+ initialContexts.put(key, context);
}
setInit(true);
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
