You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-dev@ws.apache.org by li...@apache.org on 2005/02/06 15:26:54 UTC
svn commit: r151588 - in
incubator/hermes/trunk/src/java/org/apache/ws/eventing: ./ app/ services/
Author: lischke
Date: Sun Feb 6 06:26:52 2005
New Revision: 151588
URL: http://svn.apache.org/viewcvs?view=rev&rev=151588
Log:
new structure
Removed:
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PopUpConsumer.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSmanager.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsemantic.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/PubSubWSsyntactic.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/TestApp.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/EventSourcePort.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/NotificationPort.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/SubscriptionEndPort.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/SubscriptionManagerPort.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/deploy.wsdd
incubator/hermes/trunk/src/java/org/apache/ws/eventing/services/undeploy.wsdd
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/RemoteSubscription.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java
incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/JettyAxisServer.java
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java?view=diff&r1=151587&r2=151588
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/AbstractSubscription.java Sun Feb 6 06:26:52 2005
@@ -28,7 +28,7 @@
import org.w3c.dom.*;
import edu.berkeley.cs.db.yfilterplus.queryparser.Query;
-public abstract class AbstractSubscription implements org.apache.ws.pubsub.Subscription {
+public abstract class AbstractSubscription implements org.apache.ws.pubsub.Subscription, org.apache.ws.resource.Resource {
// public SubscriptionManager sMan;
private NotificationConsumer consumer;
@@ -47,7 +47,7 @@
this.QueryID = q;
}
- public String getID(){
+ public Object getID(){
return this.id;
}
public void setID(String id){
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/RemoteSubscription.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/RemoteSubscription.java?view=diff&r1=151587&r2=151588
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/RemoteSubscription.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/RemoteSubscription.java Sun Feb 6 06:26:52 2005
@@ -19,7 +19,7 @@
*
* @author Administrator
*/
-public class RemoteSubscription extends AbstractSubscription{
+public class RemoteSubscription extends AbstractSubscription /*implements org.apache.ws.resource.Resource*/{
private org.xmlsoap.schemas.ws.x2004.x08.eventing.SubscribeDocument subdom;
@@ -27,6 +27,20 @@
this.subdom =subdom;
}
public String getFilterString()throws Exception{
- return this.subdom.getSubscribe().getFilter().xmlText();
+ System.out.println("getFilterString : "+this.subdom.getSubscribe().getFilter().newCursor().getTextValue());
+ return this.subdom.getSubscribe().getFilter().newCursor().getTextValue();
}
+
+ public void destroy() {
+ System.out.println("destroy");
+ }
+
+ public void init() {
+ System.out.println("init");
+ }
+
+ public void setID(Object id) {
+ System.out.println("set id "+id);
+ }
+
}
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java?view=diff&r1=151587&r2=151588
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/Subscriber.java Sun Feb 6 06:26:52 2005
@@ -65,9 +65,8 @@
SubscribeDocument sdom = SubscribeDocument.Factory.newInstance();
SubscribeDocument.Subscribe s = sdom.addNewSubscribe();
//notifications are send to:
- DeliveryType delivery = DeliveryType.Factory.newInstance();
+ DeliveryType delivery = s.addNewDelivery();
delivery.setNotifyTo((org.xmlsoap.schemas.ws.x2004.x08.addressing.EndpointReferenceType)((XmlObjectWrapper)notificationConsumer.getEPR()).getXmlObject());
- s.setDelivery(delivery);
//TODO
//s.setEndTo(endTo);
@@ -78,18 +77,12 @@
s.setExpires(expires);
//TODO multiple filters
- FilterType filter = FilterType.Factory.newInstance();
+ FilterType filter = s.addNewFilter();
java.net.URI uri = filters[0].getURI();
if(uri!=null)
filter.setDialect(uri.toString());
- try{
-// filter.set(XmlBeanUtils.toXmlObject(filters[0].getExpression()));
-//TODO
-// filter.set(org.apache.xmlbeans.XmlObject.Factory.newInstance().setxmlText());// parse((String)filters[0].getExpression()));
- }catch(Exception e){
- e.printStackTrace();
- }
- s.setFilter(filter);
+ filter.newCursor().setTextValue((String)filters[0].getExpression());
+
try{
//now call
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java?view=diff&r1=151587&r2=151588
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/YFilterStore.java Sun Feb 6 06:26:52 2005
@@ -61,8 +61,8 @@
public String addSubscription(org.apache.ws.pubsub.Subscription ss){
try{
c++;
- if(ss instanceof org.apache.ws.eventing.Subscription){
- org.apache.ws.eventing.Subscription s = (org.apache.ws.eventing.Subscription)ss;
+ if(ss instanceof org.apache.ws.eventing.RemoteSubscription){
+ org.apache.ws.eventing.RemoteSubscription s = (org.apache.ws.eventing.RemoteSubscription)ss;
Query query = XPQuery.parseQuery(s.getFilterString(),c);
String id = "subscriptionID"+c;
System.out.println("addSubscription "+id+" query :"+query);
Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/JettyAxisServer.java
URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/JettyAxisServer.java?view=diff&r1=151587&r2=151588
==============================================================================
--- incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/JettyAxisServer.java (original)
+++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/app/JettyAxisServer.java Sun Feb 6 06:26:52 2005
@@ -60,11 +60,11 @@
servlets.addServlet("AdminServlet", "/servlet/AdminServlet",
"org.apache.axis.transport.http.AdminServlet");
servlets.addServlet("AxisServlet", "/servlet/AxisServlet",
- "org.apache.axis.transport.http.AxisServlet");
+ "org.apache.ws.resource.handler.axis.WsrfAxisServlet");
servlets.addServlet("AxisServlet", "/services/*",
- "org.apache.axis.transport.http.AxisServlet");
- servlets.addServlet("AxisServlet", "*.jws",
- "org.apache.axis.transport.http.AxisServlet");
+ "org.apache.ws.resource.handler.axis.WsrfAxisServlet");
+ //servlets.addServlet("AxisServlet", "*.jws",
+ // "org.apache.axis.transport.http.AxisServlet");
context.addHandler(new ResourceHandler());
}
@@ -99,6 +99,7 @@
new Integer(listener.getServerSocket().getLocalPort()).toString()));
}
+ /*
public static void main(String[] args) {
Options opts = null;
try {
@@ -123,4 +124,5 @@
log.error(Messages.getMessage("exception00"), e);
}
}
+ */
}
---------------------------------------------------------------------
To unsubscribe, e-mail: hermes-dev-unsubscribe@ws.apache.org
For additional commands, e-mail: hermes-dev-help@ws.apache.org