Author: scamp Date: Tue Jan 25 12:12:15 2005 New Revision: 126417 URL: http://svn.apache.org/viewcvs?view=rev&rev=126417 Log: updated Removed: incubator/hermes/trunk/src/java/org/apache/ws/eventing/ Modified: incubator/hermes/trunk/maven.xml incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml
Modified: incubator/hermes/trunk/maven.xml Url: http://svn.apache.org/viewcvs/incubator/hermes/trunk/maven.xml?view=diff&rev=126417&p1=incubator/hermes/trunk/maven.xml&r1=126416&p2=incubator/hermes/trunk/maven.xml&r2=126417 ============================================================================== --- incubator/hermes/trunk/maven.xml (original) +++ incubator/hermes/trunk/maven.xml Tue Jan 25 12:12:15 2005 @@ -45,13 +45,13 @@ <!-- ================================================================== --> <postGoal name="java:jar-resources"> <mkdir dir="${maven.build.dir}" /> - <copy file="${src.config.wsdd}" tofile="${target.config.wsdd}" overwrite="true" verbose="true" /> + <path id="jmuws.classpath.id"> <pathelement location="${maven.build.dest}" /> <path refid="maven.dependency.classpath" /> </path> - <attainGoal name="generate-submgr" /> - <attainGoal name="generate-registry" /> + + </postGoal> <!-- ================================================================== --> Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java Url: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java?view=diff&rev=126417&p1=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java&r1=126416&p2=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java&r2=126417 ============================================================================== --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/QueryEngineImpl.java Tue Jan 25 12:12:15 2005 @@ -139,7 +139,7 @@ throw new UnknownQueryExpressionDialectFaultException( new URI( "unsupportedQueryDialect"+ dialect) ); - } - return evaluator.evaluate(expression, resourcePropertySet); + } //todo fix this! + return null;//evaluator.evaluate(expression, resourcePropertySet); } } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java Url: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java?view=diff&rev=126417&p1=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java&r1=126416&p2=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java&r2=126417 ============================================================================== --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleTopicExpressionEvaluator.java Tue Jan 25 12:12:15 2005 @@ -15,30 +15,24 @@ */ package org.apache.ws.notification.topics.impl; -import java.util.Collection; -import java.util.LinkedList; -import java.util.List; -import java.util.Vector; -import java.io.IOException; - -import javax.xml.namespace.QName; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; - -import org.apache.ws.notification.topics.TopicSpace; -import org.apache.ws.notification.topics.TopicExpressionEvaluator; import org.apache.ws.notification.topics.Topic; import org.apache.ws.notification.topics.TopicExpression; -import org.apache.ws.notification.topics.v1_2.Topics1_2Constants; -import org.apache.ws.notification.topics.TopicExpression; -import org.apache.ws.notification.topics.topicexpression.impl.UnsupportedTopicExpressionDialectException; -import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionResolutionException; +import org.apache.ws.notification.topics.TopicExpressionEvaluator; +import org.apache.ws.notification.topics.TopicSpace; import org.apache.ws.notification.topics.topicexpression.impl.InvalidTopicExpressionException; import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException; -import org.apache.ws.notification.base.impl.XmlBeansTopicExpression; +import org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionResolutionException; +import org.apache.ws.notification.topics.topicexpression.impl.UnsupportedTopicExpressionDialectException; +import org.apache.ws.notification.topics.v1_2.Topics1_2Constants; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType; import org.w3c.dom.Text; + +import java.util.Collection; +import java.util.LinkedList; +import java.util.List; +import java.util.Vector; /** * Topic expression evalutor for the "Simple" topic dialect. 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=126417&p1=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java&r1=126416&p2=incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicExpressionEngineImpl.java&r2=126417 ============================================================================== --- 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 Tue Jan 25 12:12:15 2005 @@ -42,14 +42,12 @@ /** * Resolves topic expressions over topic lists. The engine looks for topic expression evaluators under - * "java:comp/env/topic/eval" context. + * "wsrf/topic/eval" context. * * @see org.apache.ws.notification.topics.TopicSpaceSet */ public class TopicExpressionEngineImpl implements TopicExpressionEngine { - private static String TOPIC_EXPRESSION_EVALUATOR_CONTEXT = - JndiConstants.CONTEXT_NAME_BASE + "/topic/eval"; private static final Log LOG = LogFactory.getLog( TopicExpressionEngineImpl.class.getName() ); @@ -93,14 +91,14 @@ try { Context context = new InitialContext(); - list = context.list( 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, - TOPIC_EXPRESSION_EVALUATOR_CONTEXT + "/" + pair.getName(), + JNDIConstants.TOPIC_EXPRESSION_EVALUATOR_CONTEXT + "/" + pair.getName(), TopicExpressionEvaluator.class ); this.registerEvaluator( evaluator ); } Modified: 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=diff&rev=126417&p1=incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java&r1=126416&p2=incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java&r2=126417 ============================================================================== --- incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/util/JNDIConstants.java Tue Jan 25 12:12:15 2005 @@ -12,4 +12,6 @@ */ public static final String DEFAULT_TOPIC_EXPRESSION_ENGINE = JndiConstants.CONTEXT_NAME_BASE + "/topic/ContainerTopicExpressionEngine"; + String TOPIC_EXPRESSION_EVALUATOR_CONTEXT = + JndiConstants.CONTEXT_NAME_BASE + "/topic/eval"; } Modified: incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Url: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml?view=diff&rev=126417&p1=incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml&r1=126416&p2=incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml&r2=126417 ============================================================================== --- incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml (original) +++ incubator/hermes/trunk/src/webapp/WEB-INF/classes/jndi-config.xml Tue Jan 25 12:12:15 2005 @@ -26,6 +26,24 @@ </resourceParams> </resource> + <resource name="topic/eval/simple" type="org.apache.ws.notification.topics.impl.SimpleTopicExpressionEvaluator"> + <resourceParams> + <parameter> + <name>factory</name> + <value>org.apache.ws.util.jndi.BeanFactory</value> + </parameter> + </resourceParams> + </resource> + + <resource name="topic/ContainerTopicExpressionEngine" type="org.apache.ws.notification.topics.impl.TopicExpressionEngineImpl"> + <resourceParams> + <parameter> + <name>factory</name> + <value>org.apache.ws.util.jndi.BeanFactory</value> + </parameter> + </resourceParams> + </resource> + </global> <service name="SubscriptionManager"> --------------------------------------------------------------------- To unsubscribe, e-mail: [EMAIL PROTECTED] For additional commands, e-mail: [EMAIL PROTECTED]
