svn commit: r126634 - /incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java /incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java

[scamp]

Author: scamp
Date: Thu Jan 27 10:22:17 2005
New Revision: 126634

URL: http://svn.apache.org/viewcvs?view=rev&rev=126634
Log:
moved extra constants over..no need for 2 files
Removed:
   incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java
Modified:
   
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java

Modified: 
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java
Url: 
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java?view=diff&rev=126634&p1=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java&r1=126633&p2=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java&r2=126634
==============================================================================
--- 
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java
       (original)
+++ 
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java
       Thu Jan 27 10:22:17 2005
@@ -26,7 +26,6 @@
 import 
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
 import 
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionResolutionException;
 import org.apache.ws.util.jndi.JNDIUtils;
-import org.apache.ws.util.JNDIConstants;
 import org.apache.ws.resource.JndiConstants;
 
 import javax.naming.Context;
@@ -71,7 +70,7 @@
         try
         {
             context = new InitialContext();
-            return (TopicExpressionEngine) context.lookup( 
JNDIConstants.DEFAULT_TOPIC_EXPRESSION_ENGINE );
+            return (TopicExpressionEngine) context.lookup( 
JndiConstants.KEY_NAME_DEFAULT_TOPIC_EXPRESSION_ENGINE );
         }
         catch ( NamingException e )
         {
@@ -91,14 +90,14 @@
         try
         {
             Context context = new InitialContext();
-            list = context.list( 
JNDIConstants.TOPIC_EXPRESSION_EVALUATOR_CONTEXT );
+            list = context.list( 
JndiConstants.TOPIC_EXPRESSION_EVALUATOR_CONTEXT );
             NameClassPair pair = null;
             TopicExpressionEvaluator evaluator = null;
             while ( list.hasMore() )
             {
                 pair = (NameClassPair) list.next();
                 evaluator = (TopicExpressionEvaluator) JNDIUtils.lookup( 
context,
-                        JNDIConstants.TOPIC_EXPRESSION_EVALUATOR_CONTEXT + "/" 
+ pair.getName(),
+                        JndiConstants.TOPIC_EXPRESSION_EVALUATOR_CONTEXT + "/" 
+ pair.getName(),
                         TopicExpressionEvaluator.class );
                 this.registerEvaluator( evaluator );
             }

Deleted: /incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java
Url: 
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java?view=auto&rev=126633
==============================================================================

---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]