You are viewing a plain text version of this content. The canonical link for it is here.
Posted to muse-commits@ws.apache.org by da...@apache.org on 2007/03/01 20:35:25 UTC
svn commit: r513461 - in
/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl:
MessagePatternFilterHandler.java SimpleNotificationMessage.java
TopicFilter.java TopicFilterHandler.java
Author: danj
Date: Thu Mar 1 11:35:25 2007
New Revision: 513461
URL: http://svn.apache.org/viewvc?view=rev&rev=513461
Log:
Fixed two copy and paste errors: one that made TopicFilters reference XPath dialect in error messages and
one that caused MessagePatternFilterHandler to return TopicFilters.
Modified:
webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java
webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java
webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilter.java
webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilterHandler.java
Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java?view=diff&rev=513461&r1=513460&r2=513461
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/MessagePatternFilterHandler.java Thu Mar 1 11:35:25 2007
@@ -45,7 +45,7 @@
throws BaseFault
{
String dialect = filterXML.getAttribute(WsnConstants.DIALECT);
- QName topicName = XmlUtils.getQName(filterXML);
- return new TopicFilter(topicName, dialect);
+ String pattern = XmlUtils.extractText(filterXML);
+ return new MessagePatternFilter(pattern, dialect);
}
}
Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java?view=diff&rev=513461&r1=513460&r2=513461
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/SimpleNotificationMessage.java Thu Mar 1 11:35:25 2007
@@ -31,7 +31,6 @@
import org.apache.muse.core.serializer.SerializerRegistry;
import org.apache.muse.util.messages.Messages;
import org.apache.muse.util.messages.MessagesFactory;
-import org.apache.muse.util.xml.XPathUtils;
import org.apache.muse.util.xml.XmlSerializable;
import org.apache.muse.util.xml.XmlUtils;
import org.apache.muse.ws.addressing.EndpointReference;
@@ -221,7 +220,7 @@
{
if (dialect == null || !dialect.equals(WstConstants.CONCRETE_TOPIC_URI))
{
- Object[] filler = { dialect, XPathUtils.NAMESPACE_URI };
+ Object[] filler = { dialect, WstConstants.CONCRETE_TOPIC_URI };
throw new TopicExpressionDialectUnknownFault(_MESSAGES.get("InvalidDialect", filler));
}
}
Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilter.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilter.java?view=diff&rev=513461&r1=513460&r2=513461
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilter.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilter.java Thu Mar 1 11:35:25 2007
@@ -70,10 +70,9 @@
//
// we only support simple and concrete topic expressions
//
- if (!dialect.equals(WstConstants.SIMPLE_TOPIC_URI) &&
- !dialect.equals(WstConstants.CONCRETE_TOPIC_URI))
+ if (!dialect.equals(WstConstants.CONCRETE_TOPIC_URI))
{
- Object[] filler = { dialect, XPathUtils.NAMESPACE_URI };
+ Object[] filler = { dialect, WstConstants.CONCRETE_TOPIC_URI };
throw new TopicExpressionDialectUnknownFault(_MESSAGES.get("InvalidDialect", filler));
}
Modified: webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilterHandler.java
URL: http://svn.apache.org/viewvc/webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilterHandler.java?view=diff&rev=513461&r1=513460&r2=513461
==============================================================================
--- webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilterHandler.java (original)
+++ webservices/muse/trunk/modules/muse-wsn-impl/src/org/apache/muse/ws/notification/impl/TopicFilterHandler.java Thu Mar 1 11:35:25 2007
@@ -37,9 +37,7 @@
public boolean accepts(QName filterName, String filterDialect)
{
boolean rightName = filterName.equals(WsnConstants.TOPIC_EXPRESSION_QNAME);
- boolean rightDialect = filterDialect.equals(WstConstants.CONCRETE_TOPIC_URI) ||
- filterDialect.equals(WstConstants.SIMPLE_TOPIC_URI);
-
+ boolean rightDialect = filterDialect.equals(WstConstants.CONCRETE_TOPIC_URI);
return rightName && rightDialect;
}
---------------------------------------------------------------------
To unsubscribe, e-mail: muse-commits-unsubscribe@ws.apache.org
For additional commands, e-mail: muse-commits-help@ws.apache.org