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 wi...@apache.org on 2005/09/19 17:32:36 UTC
svn commit: r290186 - in
/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client:
./ impl/notification/ model/
Author: wire
Date: Mon Sep 19 08:32:30 2005
New Revision: 290186
URL: http://svn.apache.org/viewcvs?rev=290186&view=rev
Log:
Created interfaces for Queries and TopicExpressions
Added:
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/Query.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/TopicExpression.java
Modified:
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/ManageableResource.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotificationImpl.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotifyableResourceImpl.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/QueryImpl.java
webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/TopicExpressionImpl.java
Modified: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/ManageableResource.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/ManageableResource.java?rev=290186&r1=290185&r2=290186&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/ManageableResource.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/ManageableResource.java Mon Sep 19 08:32:30 2005
@@ -14,8 +14,8 @@
import org.apache.ws.client.muse.client.impl.exceptions.UnexpectedServerResponseException;
import org.apache.ws.client.muse.client.impl.notification.NotificationImpl;
import org.apache.ws.client.muse.client.impl.notification.NotifyableResourceImpl;
-import org.apache.ws.client.muse.client.impl.notification.QueryImpl;
-import org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl;
+import org.apache.ws.client.muse.client.model.Query;
+import org.apache.ws.client.muse.client.model.TopicExpression;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -118,7 +118,7 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.Temp#getTopics()
*/
- public abstract TopicExpressionImpl[] getTopics() throws FaultException,
+ public abstract TopicExpression[] getTopics() throws FaultException,
URISyntaxException, IOException, XmlException,
UnexpectedServerResponseException;
@@ -139,7 +139,7 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.Temp#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl, org.apache.ws.addressing.XmlBeansEndpointReference)
*/
- public abstract ManageableResource subscribe(TopicExpressionImpl topic,
+ public abstract ManageableResource subscribe(TopicExpression topic,
XmlBeansEndpointReference consumerReference)
throws URISyntaxException, IOException, XmlException,
UnexpectedServerResponseException;
@@ -147,7 +147,7 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.Temp#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl, org.apache.ws.addressing.XmlBeansEndpointReference, java.util.Calendar, boolean)
*/
- public abstract ManageableResource subscribe(TopicExpressionImpl topic,
+ public abstract ManageableResource subscribe(TopicExpression topic,
XmlBeansEndpointReference consumerReference,
Calendar terminationTime, boolean notify)
throws URISyntaxException, IOException, XmlException,
@@ -157,17 +157,17 @@
* @see org.apache.ws.client.muse.client.impl.notification.Temp#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl[], org.apache.ws.addressing.XmlBeansEndpointReference, java.util.Calendar, boolean, org.apache.ws.client.muse.client.impl.notification.QueryImpl, org.apache.ws.client.muse.client.impl.notification.QueryImpl, org.apache.xmlbeans.XmlObject)
*/
public abstract ManageableResource subscribe(
- TopicExpressionImpl[] topics,
+ TopicExpression[] topics,
XmlBeansEndpointReference consumerReference,
Calendar terminationTime, boolean useNotify,
- QueryImpl precondition, QueryImpl selector, XmlObject policy)
+ Query precondition, Query selector, XmlObject policy)
throws URISyntaxException, IOException, XmlException,
UnexpectedServerResponseException;
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.Temp#getCurrentMessage(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl)
*/
- public abstract NotificationImpl getCurrentMessage(TopicExpressionImpl topic)
+ public abstract NotificationImpl getCurrentMessage(TopicExpression topic)
throws URISyntaxException, IOException, XmlException,
UnexpectedServerResponseException;
Modified: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotificationImpl.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotificationImpl.java?rev=290186&r1=290185&r2=290186&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotificationImpl.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotificationImpl.java Mon Sep 19 08:32:30 2005
@@ -6,6 +6,7 @@
import org.apache.ws.addressing.EndpointReference;
import org.apache.ws.addressing.XmlBeansEndpointReference;
import org.apache.ws.client.muse.client.impl.exceptions.UnexpectedServerResponseException;
+import org.apache.ws.client.muse.client.model.TopicExpression;
import org.apache.ws.util.XmlBeanUtils;
import org.apache.xmlbeans.XmlException;
import org.apache.xmlbeans.XmlObject;
@@ -76,7 +77,7 @@
return message.xmlText();
}
// WS-Notif -------------------------------------------
- public TopicExpressionImpl getTopic(){
+ public TopicExpression getTopic(){
TopicExpressionType topic = message.getTopic();
if(topic==null)
return null;
Modified: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotifyableResourceImpl.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotifyableResourceImpl.java?rev=290186&r1=290185&r2=290186&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotifyableResourceImpl.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/NotifyableResourceImpl.java Mon Sep 19 08:32:30 2005
@@ -31,6 +31,8 @@
import org.apache.ws.client.muse.client.impl.ManageableResourceImpl;
import org.apache.ws.client.muse.client.impl.exceptions.FaultException;
import org.apache.ws.client.muse.client.impl.exceptions.UnexpectedServerResponseException;
+import org.apache.ws.client.muse.client.model.Query;
+import org.apache.ws.client.muse.client.model.TopicExpression;
import org.apache.ws.muws.v1_0.impl.advertiser.ResourceAdvertiserPropertyQNames;
import org.apache.ws.notification.base.v2004_06.porttype.NotificationProducerPortType;
import org.apache.ws.util.XmlBeanUtils;
@@ -71,7 +73,7 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.NotifyableResource#getTopics()
*/
- public TopicExpressionImpl[] getTopics() throws FaultException, URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
+ public TopicExpression[] getTopics() throws FaultException, URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
XmlObject[] propsValue = getProperty(NotificationProducerPortType.PROP_QNAME_TOPIC);
Vector results=new Vector(10);
for (int index = 0; index < propsValue.length; index++) {
@@ -83,7 +85,7 @@
results.add(new TopicExpressionImpl(value,dialect));
}
}
- return (TopicExpressionImpl[]) results.toArray(new TopicExpressionImpl[0]);
+ return (TopicExpression[]) results.toArray(new TopicExpression[0]);
}
/* (non-Javadoc)
@@ -122,9 +124,9 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.NotifyableResource#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl, org.apache.ws.addressing.XmlBeansEndpointReference)
*/
- public ManageableResource subscribe(TopicExpressionImpl topic,
+ public ManageableResource subscribe(TopicExpression topic,
XmlBeansEndpointReference consumerReference) throws URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
- TopicExpressionImpl[] topics={topic};
+ TopicExpression[] topics={topic};
return subscribe(topics,consumerReference,null,false,null,null,null);
}
@@ -134,9 +136,9 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.NotifyableResource#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl, org.apache.ws.addressing.XmlBeansEndpointReference, java.util.Calendar, boolean)
*/
- public ManageableResource subscribe(TopicExpressionImpl topic,
+ public ManageableResource subscribe(TopicExpression topic,
XmlBeansEndpointReference consumerReference,Calendar terminationTime,boolean notify) throws URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
- TopicExpressionImpl[] topics={topic};
+ TopicExpression[] topics={topic};
return subscribe(topics,consumerReference,terminationTime,notify,null,null,null);
}
@@ -146,9 +148,9 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.NotifyableResource#subscribe(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl[], org.apache.ws.addressing.XmlBeansEndpointReference, java.util.Calendar, boolean, org.apache.ws.client.muse.client.impl.notification.QueryImpl, org.apache.ws.client.muse.client.impl.notification.QueryImpl, org.apache.xmlbeans.XmlObject)
*/
- public ManageableResource subscribe(TopicExpressionImpl[] topics,
+ public ManageableResource subscribe(TopicExpression[] topics,
XmlBeansEndpointReference consumerReference,Calendar terminationTime,boolean useNotify,
- QueryImpl precondition,QueryImpl selector, XmlObject policy)
+ Query precondition,Query selector, XmlObject policy)
throws URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
// Construct request
@@ -163,7 +165,7 @@
// Add all topics you would like to subscribe to
for (int i = 0; i < topics.length; i++) {
- TopicExpressionImpl expression = topics[i];
+ TopicExpression expression = topics[i];
TopicExpressionType topicExpression = subscribeMessage.addNewTopicExpression();
topicExpression.setDialect(expression.getDialect());
XmlBeanUtils.setValueAsQName(topicExpression,expression.getName());
@@ -200,7 +202,7 @@
/* (non-Javadoc)
* @see org.apache.ws.client.muse.client.impl.notification.NotifyableResource#getCurrentMessage(org.apache.ws.client.muse.client.impl.notification.TopicExpressionImpl)
*/
- public NotificationImpl getCurrentMessage(TopicExpressionImpl topic) throws URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
+ public NotificationImpl getCurrentMessage(TopicExpression topic) throws URISyntaxException, IOException, XmlException, UnexpectedServerResponseException{
//TODO This is not finished.
// Construct request
GetCurrentMessageDocument cmd=GetCurrentMessageDocument.Factory.newInstance();
Modified: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/QueryImpl.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/QueryImpl.java?rev=290186&r1=290185&r2=290186&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/QueryImpl.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/QueryImpl.java Mon Sep 19 08:32:30 2005
@@ -1,14 +1,18 @@
package org.apache.ws.client.muse.client.impl.notification;
+import org.apache.ws.client.muse.client.model.Query;
import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
-public class QueryImpl {
+public class QueryImpl implements Query {
public QueryImpl() {
super();
// TODO Auto-generated constructor stub
}
+ /* (non-Javadoc)
+ * @see org.apache.ws.client.muse.client.impl.notification.Query#toXmlObject()
+ */
public QueryExpressionType toXmlObject() {
// TODO Auto-generated method stub
return null;
Modified: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/TopicExpressionImpl.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/TopicExpressionImpl.java?rev=290186&r1=290185&r2=290186&view=diff
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/TopicExpressionImpl.java (original)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/impl/notification/TopicExpressionImpl.java Mon Sep 19 08:32:30 2005
@@ -2,7 +2,9 @@
import javax.xml.namespace.QName;
-public class TopicExpressionImpl {
+import org.apache.ws.client.muse.client.model.TopicExpression;
+
+public class TopicExpressionImpl implements TopicExpression {
private QName name;
private String dialect="http://docs.oasis-open.org/wsn/2004/06/TopicExpression/Simple";
public TopicExpressionImpl(QName name,String dialect) {
@@ -10,26 +12,26 @@
this.name=name;
this.dialect=dialect;
}
- /**
- * @return Returns the dialect.
+ /* (non-Javadoc)
+ * @see org.apache.ws.client.muse.client.impl.notification.TopicExpression#getDialect()
*/
public String getDialect() {
return dialect;
}
- /**
- * @param dialect The dialect to set.
+ /* (non-Javadoc)
+ * @see org.apache.ws.client.muse.client.impl.notification.TopicExpression#setDialect(java.lang.String)
*/
public void setDialect(String dialect) {
this.dialect = dialect;
}
- /**
- * @return Returns the name.
+ /* (non-Javadoc)
+ * @see org.apache.ws.client.muse.client.impl.notification.TopicExpression#getName()
*/
public QName getName() {
return name;
}
- /**
- * @param name The name to set.
+ /* (non-Javadoc)
+ * @see org.apache.ws.client.muse.client.impl.notification.TopicExpression#setName(javax.xml.namespace.QName)
*/
public void setName(QName name) {
this.name = name;
Added: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/Query.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/Query.java?rev=290186&view=auto
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/Query.java (added)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/Query.java Mon Sep 19 08:32:30 2005
@@ -0,0 +1,9 @@
+package org.apache.ws.client.muse.client.model;
+
+import org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.QueryExpressionType;
+
+public interface Query {
+
+ public abstract QueryExpressionType toXmlObject();
+
+}
\ No newline at end of file
Added: webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/TopicExpression.java
URL: http://svn.apache.org/viewcvs/webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/TopicExpression.java?rev=290186&view=auto
==============================================================================
--- webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/TopicExpression.java (added)
+++ webservices/muse/trunk/src/examples/client/src/java/org/apache/ws/client/muse/client/model/TopicExpression.java Mon Sep 19 08:32:30 2005
@@ -0,0 +1,27 @@
+package org.apache.ws.client.muse.client.model;
+
+import javax.xml.namespace.QName;
+
+public interface TopicExpression {
+
+ /**
+ * @return Returns the dialect.
+ */
+ public abstract String getDialect();
+
+ /**
+ * @param dialect The dialect to set.
+ */
+ public abstract void setDialect(String dialect);
+
+ /**
+ * @return Returns the name.
+ */
+ public abstract QName getName();
+
+ /**
+ * @param name The name to set.
+ */
+ public abstract void setName(QName name);
+
+}
\ No newline at end of file