Author: scamp
Date: Mon Apr 25 08:26:32 2005
New Revision: 164588
URL: http://svn.apache.org/viewcvs?rev=164588&view=rev
Log: (empty)
Added:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/Topics1_2Constants.java
Removed:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v1_2/
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v1_3/
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluator.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.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/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluator.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluator.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluator.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/ConcreteTopicExpressionEvaluator.java
Mon Apr 25 08:26:32 2005
@@ -25,8 +25,8 @@
import
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionResolutionException;
import
org.apache.ws.notification.topics.topicexpression.impl.InvalidTopicExpressionException;
import
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
-import org.apache.ws.notification.topics.v1_2.Topics1_2Constants;
-import org.apache.ws.notification.base.v1_2.impl.WsnNamespaceVersionHolderImpl;
+import org.apache.ws.notification.topics.v2004_06.Topics1_2Constants;
+import
org.apache.ws.notification.base.v2004_6.impl.WsnNamespaceVersionHolderImpl;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.w3c.dom.Text;
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/SimpleSubscriptionTopicListener.java
Mon Apr 25 08:26:32 2005
@@ -22,7 +22,7 @@
import org.apache.ws.addressing.Addressing_03_2003_Constants;
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.notification.base.Subscription;
-import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
import org.apache.ws.notification.topics.Topic;
import org.apache.ws.notification.topics.TopicExpression;
import org.apache.ws.notification.topics.TopicListener;
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?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
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
Mon Apr 25 08:26:32 2005
@@ -25,7 +25,7 @@
import
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
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.apache.ws.notification.topics.v2004_06.Topics1_2Constants;
import org.w3c.dom.Text;
import java.util.ArrayList;
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?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
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
Mon Apr 25 08:26:32 2005
@@ -26,7 +26,7 @@
import
org.apache.ws.notification.topics.topicexpression.impl.InvalidTopicExpressionException;
import
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionException;
import
org.apache.ws.notification.topics.topicexpression.impl.TopicExpressionResolutionException;
-import org.apache.ws.notification.base.v1_2.impl.WsnNamespaceVersionHolderImpl;
+import
org.apache.ws.notification.base.v2004_6.impl.WsnNamespaceVersionHolderImpl;
import org.apache.ws.util.jndi.JNDIUtils;
import org.apache.ws.resource.JndiConstants;
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/InvalidTopicExpressionFaultException.java
Mon Apr 25 08:26:32 2005
@@ -1,7 +1,7 @@
package org.apache.ws.notification.topics.impl.faults;
import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import javax.xml.namespace.QName;
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/NoCurrentMessageOnTopicFaultException.java
Mon Apr 25 08:26:32 2005
@@ -1,7 +1,7 @@
package org.apache.ws.notification.topics.impl.faults;
import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import javax.xml.namespace.QName;
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicNotSupportedFaultException.java
Mon Apr 25 08:26:32 2005
@@ -1,7 +1,7 @@
package org.apache.ws.notification.topics.impl.faults;
import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import javax.xml.namespace.QName;
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java?rev=164588&r1=164587&r2=164588&view=diff
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/faults/TopicPathDialectUnknownFaultException.java
Mon Apr 25 08:26:32 2005
@@ -1,7 +1,7 @@
package org.apache.ws.notification.topics.impl.faults;
import org.apache.ws.notification.base.WsnNamespaceVersionHolder;
-import org.apache.ws.notification.base.v1_2.BaseNotification1_2Constants;
+import org.apache.ws.notification.base.v2004_6.BaseNotification1_2Constants;
import org.apache.ws.resource.faults.AbstractBaseFaultException;
import javax.xml.namespace.QName;
Added:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java?rev=164588&view=auto
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
(added)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/AbstractTopicExpression.java
Mon Apr 25 08:26:32 2005
@@ -0,0 +1,59 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
*=============================================================================*/
+package org.apache.ws.notification.topics.v2004_06;
+
+import org.apache.ws.pubsub.Filter;
+import org.apache.ws.util.XmlBeanUtils;
+import
org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.TopicExpressionType;
+
+import java.net.URI;
+import java.net.URISyntaxException;
+
+/**
+ * TODO
+ *
+ * @author Ian Springer (ian DOT springer AT hp DOT com)
+ */
+public abstract class AbstractTopicExpression implements Filter
+{
+
+ private String m_expr;
+ private URI m_dialect;
+
+ public AbstractTopicExpression( TopicExpressionType topicExprXBean )
+ {
+ m_expr = XmlBeanUtils.getValue( topicExprXBean );
+ try
+ {
+ m_dialect = new URI( topicExprXBean.getDialect() );
+ }
+ catch ( URISyntaxException urise )
+ {
+ throw new RuntimeException( urise );
+ }
+ }
+
+ public URI getDialect()
+ {
+ return m_dialect;
+ }
+
+ public Object getExpression()
+ {
+ return m_expr;
+ }
+
+}
Added:
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/Topics1_2Constants.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/Topics1_2Constants.java?rev=164588&view=auto
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/Topics1_2Constants.java
(added)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/v2004_06/Topics1_2Constants.java
Mon Apr 25 08:26:32 2005
@@ -0,0 +1,49 @@
+/*=============================================================================*
+ * Copyright 2004 The Apache Software Foundation
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+
*=============================================================================*/
+package org.apache.ws.notification.topics.v2004_06;
+
+/**
+ * Constants defined by the WS-Topics 1.2 specification.
+ */
+public interface Topics1_2Constants
+{
+
+ /**
+ * Namespace URI of the WS-Topics 1.2 schema.
+ */
+ String NSURI_WSTOP_SCHEMA =
"http://docs.oasis-open.org/wsn/2004/06/wsn-WS-Topics-1.2-draft-01.xsd";;
+
+ /**
+ * Namespace prefix of the WS-Topics 1.2 schema.
+ */
+ String NSPREFIX_WSTOP_SCHEMA = "wstop";
+
+ /**
+ * URI of the "Simple" topic expression dialect.
+ */
+ String TOPIC_EXPR_DIALECT_SIMPLE =
"http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Simple";;
+
+ /**
+ * URI of the "Concrete" topic expression dialect.
+ */
+ String TOPIC_EXPR_DIALECT_CONCRETE =
"http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Concrete";;
+
+ /**
+ * URI of the "Full" topic expression dialect.
+ */
+ String TOPIC_EXPR_DIALECT_FULL =
"http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Full";;
+
+}
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
