From paul24@example.com Tue Mar 01 13:47:26 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 16506 invoked from network); 1 Mar 2005 13:47:26 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 13:47:26 -0000 Received: (qmail 88341 invoked by uid 500); 1 Mar 2005 13:47:26 -0000 Delivered-To: paul24@example.com Received: (qmail 88313 invoked by uid 500); 1 Mar 2005 13:47:25 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 88299 invoked by uid 500); 1 Mar 2005 13:47:25 -0000 Delivered-To: paul24@example.com Received: (qmail 88295 invoked by uid 99); 1 Mar 2005 13:47:25 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Mar 2005 05:47:25 -0800 Received: (qmail 16475 invoked by uid 65534); 1 Mar 2005 13:47:24 -0000 Message-ID: <paul24@example.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 01 Mar 2005 13:47:24 -0000 Subject: svn commit: r155778 - in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics: impl/TopicImpl.java util/TopicSpaceParser.java To: paul24@example.com From: paul24@example.com X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: lischke Date: Tue Mar 1 05:47:22 2005 New Revision: 155778 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155778 Log: added parser and fixed bug in Topic.addTopic Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics= /impl/TopicImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/impl/TopicImpl.java?view=3Ddiff&r1=3D155777&r2=3D= 155778 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java Tue Mar 1 05:47:22 2005 @@ -54,7 +54,8 @@ =20 List topicPath =3D new LinkedList(); =20 - topicPath.addAll( m_topicPath ); + if(m_topicPath!=3Dnull) + topicPath.addAll( m_topicPath ); topicPath.add( topic.getName() ); =20 topic.setTopicPath( topicPath ); @@ -214,5 +215,9 @@ public Topic getParent() { return null; //To change body of implemented methods use File | S= ettings | File Templates. + } + =20 + public String toString(){ + return getName(); } } Added: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/ut= il/TopicSpaceParser.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/util/TopicSpaceParser.java?view=3Dauto&rev=3D1557= 78 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java (added) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java Tue Mar 1 05:47:22 2005 @@ -0,0 +1,83 @@ +/* + * TopicSpaceParser.java + * + * Created on 1. M=C3=A4rz 2005, 12:54 + */ + +package org.apache.ws.notification.topics.util; +import org.apache.ws.notification.topics.*; +import org.apache.ws.notification.topics.impl.TopicSpaceImpl; +import org.apache.ws.notification.topics.impl.TopicImpl; +import java.io.InputStream; +import javax.xml.parsers.*; +import org.xml.sax.*; +import org.xml.sax.helpers.DefaultHandler; +/** + * + * @author Stefan Lischke + */ +public class TopicSpaceParser extends DefaultHandler{ + private static TopicSpace m_topicSpace; + private static java.util.Stack stack; + private int depth=3D0; + private String tns; + =20 + public static TopicSpace parse(InputStream is){ + // Use an instance of ourselves as the SAX event handler + DefaultHandler handler =3D new TopicSpaceParser(); + // Parse the input with the default (non-validating) parser + stack=3D new java.util.Stack(); + try{ + SAXParser saxParser =3D SAXParserFactory.newInstance().newSAXParse= r(); + //System.out.println("start parsing"); + saxParser.parse( is, handler ); + //System.out.println("end parsing"); + + }catch(Exception e){ + e.printStackTrace(); + } + return m_topicSpace;=20 + } + =20 + public void startElement( String namespaceURI, + String localName, // local name + String qName, // qualified name + Attributes attrs ) throws SAXException { + try{ + //System.out.println("start element "+qName); + if(qName.endsWith("topicSpace")){ + tns=3Dattrs.getValue("targetNamespace"); + m_topicSpace=3Dnew TopicSpaceImpl(tns); + //System.out.println("topicspace "+tns); + } + if(qName.endsWith("topic")){ + Topic t=3Dnew TopicImpl(attrs.getValue("name")); + if(depth=3D=3D0){ + m_topicSpace.addTopic(t);=20 + stack.push(t); + }else{ + Topic in =3D (Topic)stack.peek(); + in.addTopic(t); + stack.push(t); + } =20 + //System.out.println(depth+" : "+attrs.getValue("name")); + depth++; + } =20 + }catch(Exception e){ + e.printStackTrace(); + } + } + =20 + public void endElement( String namespaceURI, + String localName, // local name + String qName ) // qualified name + throws SAXException { + if(qName.endsWith("topic")){ + if(depth>0){ + depth--; + stack.pop(); + } + + } =20 + } +} \ No newline at end of file --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Tue Mar 01 15:10:14 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 81860 invoked from network); 1 Mar 2005 15:10:14 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 15:10:14 -0000 Received: (qmail 87220 invoked by uid 500); 1 Mar 2005 15:10:14 -0000 Delivered-To: paul24@example.com Received: (qmail 87187 invoked by uid 500); 1 Mar 2005 15:10:14 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 87173 invoked by uid 500); 1 Mar 2005 15:10:14 -0000 Delivered-To: paul24@example.com Received: (qmail 87168 invoked by uid 99); 1 Mar 2005 15:10:14 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Mar 2005 07:10:13 -0800 Received: (qmail 81823 invoked by uid 65534); 1 Mar 2005 15:10:12 -0000 Message-ID: <paul24@example.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 01 Mar 2005 15:10:12 -0000 Subject: svn commit: r155786 - in incubator/hermes/trunk: project.xml wse-xbeans/project.xml wsn-xbeans/project.xml To: paul24@example.com From: paul24@example.com X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ips Date: Tue Mar 1 07:10:10 2005 New Revision: 155786 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155786 Log: upgraded to xmlbeans 1.0.4 final Modified: incubator/hermes/trunk/project.xml incubator/hermes/trunk/wse-xbeans/project.xml incubator/hermes/trunk/wsn-xbeans/project.xml Modified: incubator/hermes/trunk/project.xml URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/project.xml?view= =3Ddiff&r1=3D155785&r2=3D155786 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/project.xml (original) +++ incubator/hermes/trunk/project.xml Tue Mar 1 07:10:10 2005 @@ -436,7 +436,7 @@ <dependency> <groupId>xmlbeans</groupId> <artifactId>xbean</artifactId> - <version>1.0.4-20050202-SNAPSHOT</version> + <version>1.0.4</version> <url>http://xmlbeans.apache.org/</url> <properties> <license>ApacheLicense-2.0.txt</license> @@ -448,7 +448,7 @@ <dependency> <groupId>xmlbeans</groupId> <artifactId>xbean_xpath</artifactId> - <version>1.0.4-20050202-SNAPSHOT</version> + <version>1.0.4</version> <url>http://xmlbeans.apache.org/</url> <properties> <license>ApacheLicense-2.0.txt</license> Modified: incubator/hermes/trunk/wse-xbeans/project.xml URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wse-xbeans/projec= t=2Exml?view=3Ddiff&r1=3D155785&r2=3D155786 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/wse-xbeans/project.xml (original) +++ incubator/hermes/trunk/wse-xbeans/project.xml Tue Mar 1 07:10:10 2005 @@ -52,7 +52,7 @@ <dependency> <groupId>xmlbeans</groupId> <artifactId>xbean</artifactId> - <version>v1HEAD-SNAPSHOT-20041129</version> + <version>1.0.4</version> <url>http://xmlbeans.apache.org/</url> <properties> <license>ApacheLicense-2.0.txt</license> Modified: incubator/hermes/trunk/wsn-xbeans/project.xml URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/projec= t=2Exml?view=3Ddiff&r1=3D155785&r2=3D155786 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/wsn-xbeans/project.xml (original) +++ incubator/hermes/trunk/wsn-xbeans/project.xml Tue Mar 1 07:10:10 2005 @@ -76,7 +76,7 @@ <dependency> <groupId>xmlbeans</groupId> <artifactId>xbean</artifactId> - <version>1.0.4-20050202-SNAPSHOT</version> + <version>1.0.4</version> <url>http://xmlbeans.apache.org/</url> <properties> <license>ApacheLicense-2.0.txt</license> --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Tue Mar 01 16:07:54 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 15229 invoked from network); 1 Mar 2005 16:07:54 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 16:07:54 -0000 Received: (qmail 3653 invoked by uid 500); 1 Mar 2005 16:07:54 -0000 Delivered-To: paul24@example.com Received: (qmail 3631 invoked by uid 500); 1 Mar 2005 16:07:54 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 3616 invoked by uid 500); 1 Mar 2005 16:07:53 -0000 Delivered-To: paul24@example.com Received: (qmail 3612 invoked by uid 99); 1 Mar 2005 16:07:53 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Tue, 01 Mar 2005 08:07:53 -0800 Received: (qmail 15220 invoked by uid 65534); 1 Mar 2005 16:07:52 -0000 Message-ID: <paul24@example.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Tue, 01 Mar 2005 16:07:52 -0000 Subject: svn commit: r155798 - in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics: Topic.java impl/TopicImpl.java impl/TopicSpaceImpl.java util/TopicSpaceParser.java To: paul24@example.com From: paul24@example.com X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: lischke Date: Tue Mar 1 08:07:51 2005 New Revision: 155798 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155798 Log: added TopicSpace reference to Topic, to get NameSpace Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic= .java incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicSpaceImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics= /Topic.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/Topic.java?view=3Ddiff&r1=3D155797&r2=3D155798 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic= .java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic= .java Tue Mar 1 08:07:51 2005 @@ -117,4 +117,18 @@ */ Iterator topicIterator(); =20 + /** + * Set the TopicSpace this Topic is part of + * + * @param topicSpace The TopicSpace this Topic is part of + */ + void setTopicSpace( TopicSpace topicSpace ); + =20 + /** + * gets the TopicSpace this Topic is part of + * + * @return The TopicSpace this Topic is part of + */ + TopicSpace getTopicSpace(); + } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics= /impl/TopicImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/impl/TopicImpl.java?view=3Ddiff&r1=3D155797&r2=3D= 155798 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicImpl.java Tue Mar 1 08:07:51 2005 @@ -18,6 +18,7 @@ import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.apache.ws.notification.topics.Topic; +import org.apache.ws.notification.topics.TopicSpace; import org.apache.ws.notification.topics.TopicExpression; import org.apache.ws.notification.topics.TopicListener; =20 @@ -41,6 +42,7 @@ protected String m_name; protected Object m_current; protected List m_topicPath; // ordered set of QNames + protected TopicSpace m_topicSpace; private static final Log LOG =3D LogFactory.getLog( TopicImpl.class.ge= tName() ); =20 public void addTopic( Topic topic ) throws Exception @@ -54,12 +56,14 @@ =20 List topicPath =3D new LinkedList(); =20 - if(m_topicPath!=3Dnull) - topicPath.addAll( m_topicPath ); + topicPath.addAll( m_topicPath ); topicPath.add( topic.getName() ); =20 topic.setTopicPath( topicPath ); topic.addTopicListener( this ); + =20 + topic.setTopicSpace(m_topicSpace); + =20 this.topicAdded( topic ); } =20 @@ -175,7 +179,10 @@ this.m_listeners =3D listeners; this.m_name =3D name; this.m_current =3D current; - this.m_topicPath =3D topicPath; + if(topicPath=3D=3Dnull){ + this.m_topicPath =3D new java.util.LinkedList(); + m_topicPath.add(name); + } } =20 public synchronized void topicAdded( Topic topic ) @@ -220,4 +227,12 @@ public String toString(){ return getName(); } + =20 + public void setTopicSpace(TopicSpace topicSpace) { + m_topicSpace=3DtopicSpace; + } + =20 + public TopicSpace getTopicSpace() { + return m_topicSpace; + } =20 } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics= /impl/TopicSpaceImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/impl/TopicSpaceImpl.java?view=3Ddiff&r1=3D155797&= r2=3D155798 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicSpaceImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/= TopicSpaceImpl.java Tue Mar 1 08:07:51 2005 @@ -52,6 +52,7 @@ public void addTopic( Topic topic ) { m_rootTopicMap.put( topic.getName(), topic ); + topic.setTopicSpace(this); } =20 public void removeTopic( Topic topic ) Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics= /util/TopicSpaceParser.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/topics/util/TopicSpaceParser.java?view=3Ddiff&r1=3D15579= 7&r2=3D155798 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/= TopicSpaceParser.java Tue Mar 1 08:07:51 2005 @@ -28,15 +28,15 @@ // Parse the input with the default (non-validating) parser stack=3D new java.util.Stack(); try{ - SAXParser saxParser =3D SAXParserFactory.newInstance().newSAXParse= r(); - //System.out.println("start parsing"); - saxParser.parse( is, handler ); - //System.out.println("end parsing"); - + SAXParser saxParser =3D SAXParserFactory.newInstance().newSAXP= arser(); + //System.out.println("start parsing"); + saxParser.parse( is, handler ); + //System.out.println("end parsing"); + =20 }catch(Exception e){ e.printStackTrace(); } - return m_topicSpace;=20 + return m_topicSpace; } =20 public void startElement( String namespaceURI, @@ -44,25 +44,25 @@ String qName, // qualified name Attributes attrs ) throws SAXException { try{ - //System.out.println("start element "+qName); - if(qName.endsWith("topicSpace")){ - tns=3Dattrs.getValue("targetNamespace"); - m_topicSpace=3Dnew TopicSpaceImpl(tns); - //System.out.println("topicspace "+tns); - } - if(qName.endsWith("topic")){ - Topic t=3Dnew TopicImpl(attrs.getValue("name")); - if(depth=3D=3D0){ - m_topicSpace.addTopic(t);=20 - stack.push(t); - }else{ - Topic in =3D (Topic)stack.peek(); - in.addTopic(t); - stack.push(t); - } =20 - //System.out.println(depth+" : "+attrs.getValue("name")); - depth++; - } =20 + //System.out.println("start element "+qName); + if(qName.endsWith("topicSpace")){ + tns=3Dattrs.getValue("targetNamespace"); + m_topicSpace=3Dnew TopicSpaceImpl(tns); + //System.out.println("topicspace "+tns); + } + if(qName.endsWith("topic")){ + Topic t=3Dnew TopicImpl(attrs.getValue("name")); + if(depth=3D=3D0){ + m_topicSpace.addTopic(t); + stack.push(t); + }else{ + Topic in =3D (Topic)stack.peek(); + in.addTopic(t); + stack.push(t); + } + //System.out.println(depth+" : "+attrs.getValue("name")); + depth++; + } }catch(Exception e){ e.printStackTrace(); } @@ -77,7 +77,7 @@ depth--; stack.pop(); } - - } =20 + =20 + } } } --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Tue Mar 01 16:26:34 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 30477 invoked from network); 1 Mar 2005 16:26:34 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 16:26:34 -0000 Received: (qmail 57891 invoked by uid 500); 1 Mar 2005 16:26:34 -0000 Delivered-To: paul24@example.com Received: (qmail 57872 invoked by uid 500); 1 Mar 2005 16:26:33 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 57852 invoked by uid 99); 1 Mar 2005 16:26:33 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from cliff.mcs.anl.gov (HELO mcs.anl.gov) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Tue, 01 Mar 2005 08:26:32 -0800 Received: from titan.mcs.anl.gov (vpnclient18112.mcs.anl.gov [83.161.120.155]) by mcs.anl.gov (8.11.6/8.9.3) with ESMTP id j21GQQB96576; Tue, 1 Mar 2005 10:26:27 -0600 Subject: Re: svn commit: r155798 - in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics: Topic.java impl/TopicImpl.java impl/TopicSpaceImpl.java util/TopicSpaceParser.java From: Samuel Meder <paul24@example.com> Reply-To: paul24@example.com To: hermes-dev <paul24@example.com> In-Reply-To: <paul24@example.com> References: <paul24@example.com> Content-Type: text/plain Organization: University of Chicago Date: Tue, 01 Mar 2005 10:26:09 -0600 Message-Id: <paul24@example.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.3 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N What's the rationale for this interface change? /Sam On Tue, 2005-03-01 at 16:07 +0000, paul24@example.com wrote: > Author: lischke > Date: Tue Mar 1 08:07:51 2005 > New Revision: 155798 > > URL: http://svn.apache.org/viewcvs?view=rev&rev=155798 > Log: > added TopicSpace reference to Topic, to get NameSpace > > Modified: > incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java > incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java > incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java > incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java > > Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java > URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java?view=diff&r1=155797&r2=155798 > ============================================================================== > --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java (original) > +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java Tue Mar 1 08:07:51 2005 > @@ -117,4 +117,18 @@ > */ > Iterator topicIterator(); > > + /** > + * Set the TopicSpace this Topic is part of > + * > + * @param topicSpace The TopicSpace this Topic is part of > + */ > + void setTopicSpace( TopicSpace topicSpace ); > + > + /** > + * gets the TopicSpace this Topic is part of > + * > + * @return The TopicSpace this Topic is part of > + */ > + TopicSpace getTopicSpace(); > + > } > > Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java > URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java?view=diff&r1=155797&r2=155798 > ============================================================================== > --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java (original) > +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java Tue Mar 1 08:07:51 2005 > @@ -18,6 +18,7 @@ > import org.apache.commons.logging.Log; > import org.apache.commons.logging.LogFactory; > import org.apache.ws.notification.topics.Topic; > +import org.apache.ws.notification.topics.TopicSpace; > import org.apache.ws.notification.topics.TopicExpression; > import org.apache.ws.notification.topics.TopicListener; > > @@ -41,6 +42,7 @@ > protected String m_name; > protected Object m_current; > protected List m_topicPath; // ordered set of QNames > + protected TopicSpace m_topicSpace; > private static final Log LOG = LogFactory.getLog( TopicImpl.class.getName() ); > > public void addTopic( Topic topic ) throws Exception > @@ -54,12 +56,14 @@ > > List topicPath = new LinkedList(); > > - if(m_topicPath!=null) > - topicPath.addAll( m_topicPath ); > + topicPath.addAll( m_topicPath ); > topicPath.add( topic.getName() ); > > topic.setTopicPath( topicPath ); > topic.addTopicListener( this ); > + > + topic.setTopicSpace(m_topicSpace); > + > this.topicAdded( topic ); > } > > @@ -175,7 +179,10 @@ > this.m_listeners = listeners; > this.m_name = name; > this.m_current = current; > - this.m_topicPath = topicPath; > + if(topicPath==null){ > + this.m_topicPath = new java.util.LinkedList(); > + m_topicPath.add(name); > + } > } > > public synchronized void topicAdded( Topic topic ) > @@ -220,4 +227,12 @@ > public String toString(){ > return getName(); > } > + > + public void setTopicSpace(TopicSpace topicSpace) { > + m_topicSpace=topicSpace; > + } > + > + public TopicSpace getTopicSpace() { > + return m_topicSpace; > + } > } > > Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java > URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java?view=diff&r1=155797&r2=155798 > ============================================================================== > --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java (original) > +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java Tue Mar 1 08:07:51 2005 > @@ -52,6 +52,7 @@ > public void addTopic( Topic topic ) > { > m_rootTopicMap.put( topic.getName(), topic ); > + topic.setTopicSpace(this); > } > > public void removeTopic( Topic topic ) > > Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java > URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java?view=diff&r1=155797&r2=155798 > ============================================================================== > --- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java (original) > +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java Tue Mar 1 08:07:51 2005 > @@ -28,15 +28,15 @@ > // Parse the input with the default (non-validating) parser > stack= new java.util.Stack(); > try{ > - SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); > - //System.out.println("start parsing"); > - saxParser.parse( is, handler ); > - //System.out.println("end parsing"); > - > + SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); > + //System.out.println("start parsing"); > + saxParser.parse( is, handler ); > + //System.out.println("end parsing"); > + > }catch(Exception e){ > e.printStackTrace(); > } > - return m_topicSpace; > + return m_topicSpace; > } > > public void startElement( String namespaceURI, > @@ -44,25 +44,25 @@ > String qName, // qualified name > Attributes attrs ) throws SAXException { > try{ > - //System.out.println("start element "+qName); > - if(qName.endsWith("topicSpace")){ > - tns=attrs.getValue("targetNamespace"); > - m_topicSpace=new TopicSpaceImpl(tns); > - //System.out.println("topicspace "+tns); > - } > - if(qName.endsWith("topic")){ > - Topic t=new TopicImpl(attrs.getValue("name")); > - if(depth==0){ > - m_topicSpace.addTopic(t); > - stack.push(t); > - }else{ > - Topic in = (Topic)stack.peek(); > - in.addTopic(t); > - stack.push(t); > - } > - //System.out.println(depth+" : "+attrs.getValue("name")); > - depth++; > - } > + //System.out.println("start element "+qName); > + if(qName.endsWith("topicSpace")){ > + tns=attrs.getValue("targetNamespace"); > + m_topicSpace=new TopicSpaceImpl(tns); > + //System.out.println("topicspace "+tns); > + } > + if(qName.endsWith("topic")){ > + Topic t=new TopicImpl(attrs.getValue("name")); > + if(depth==0){ > + m_topicSpace.addTopic(t); > + stack.push(t); > + }else{ > + Topic in = (Topic)stack.peek(); > + in.addTopic(t); > + stack.push(t); > + } > + //System.out.println(depth+" : "+attrs.getValue("name")); > + depth++; > + } > }catch(Exception e){ > e.printStackTrace(); > } > @@ -77,7 +77,7 @@ > depth--; > stack.pop(); > } > - > - } > + > + } > } > } > > > > --------------------------------------------------------------------- > To unsubscribe, e-mail: paul24@example.com > For additional commands, e-mail: paul24@example.com > -- Sam Meder <paul24@example.com> The Globus Alliance - University of Chicago 610-863-0746 --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Tue Mar 01 17:20:39 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 56679 invoked from network); 1 Mar 2005 17:20:39 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 17:20:39 -0000 Received: (qmail 5593 invoked by uid 500); 1 Mar 2005 17:20:39 -0000 Delivered-To: paul24@example.com Received: (qmail 5570 invoked by uid 500); 1 Mar 2005 17:20:39 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 5545 invoked by uid 99); 1 Mar 2005 17:20:39 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from skybase.novacom.net (HELO skybase.novacom.net) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Tue, 01 Mar 2005 09:20:37 -0800 Received: from localhost (localhost [83.161.120.155]) by skybase.novacom.net (Postfix) with ESMTP id BAF4489EAA for <paul24@example.com>; Tue, 1 Mar 2005 18:20:33 +0100 (CET) Received: from skybase.novacom.net ([83.161.120.155]) by localhost (skybase.novacom.net [83.161.120.155]) (amavisd-new, port 10024) with ESMTP id 08967-06 for <paul24@example.com>; Tue, 1 Mar 2005 18:20:32 +0100 (CET) Received: from [83.161.120.155] (p5483777A.dip.t-dialin.net [83.161.120.155]) by skybase.novacom.net (Postfix) with ESMTP id D9AB283F15 for <paul24@example.com>; Tue, 1 Mar 2005 18:20:31 +0100 (CET) Message-ID: <paul24@example.com> Date: Tue, 01 Mar 2005 18:16:11 +0100 From: Stefan Lischke <paul24@example.com> User-Agent: Mozilla/5.0 (Windows; U; Windows NT 5.0; en-US; rv:1.7) Gecko/20040616 X-Accept-Language: en-us, en MIME-Version: 1.0 To: paul24@example.com Subject: Re: svn commit: r155798 - in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics: Topic.java impl/TopicImpl.java impl/TopicSpaceImpl.java util/TopicSpaceParser.java References: <paul24@example.com> <paul24@example.com> In-Reply-To: <paul24@example.com> Content-Type: text/plain; charset=us-ascii; format=flowed Content-Transfer-Encoding: 7bit X-Virus-Scanned: by paul24@example.com X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Hi sam, Samuel Meder wrote: >What's the rationale for this interface change? > > its not really a change, its an enhancement. ian changed the topicPath attribute which was a list of QName in globus to a list of strings, cause the NameSpace in a TopicExpression never changes. I added a method to get the TopicSpace of each Topic, so we are able to get the NameSpace. Ok with that? stefan >/Sam > >On Tue, 2005-03-01 at 16:07 +0000, paul24@example.com wrote: > > >>Author: lischke >>Date: Tue Mar 1 08:07:51 2005 >>New Revision: 155798 >> >>URL: http://svn.apache.org/viewcvs?view=rev&rev=155798 >>Log: >>added TopicSpace reference to Topic, to get NameSpace >> >>Modified: >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java >> >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java?view=diff&r1=155797&r2=155798 >>============================================================================== >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java (original) >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java Tue Mar 1 08:07:51 2005 >>@@ -117,4 +117,18 @@ >> */ >> Iterator topicIterator(); >> >>+ /** >>+ * Set the TopicSpace this Topic is part of >>+ * >>+ * @param topicSpace The TopicSpace this Topic is part of >>+ */ >>+ void setTopicSpace( TopicSpace topicSpace ); >>+ >>+ /** >>+ * gets the TopicSpace this Topic is part of >>+ * >>+ * @return The TopicSpace this Topic is part of >>+ */ >>+ TopicSpace getTopicSpace(); >>+ >> } >> >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java?view=diff&r1=155797&r2=155798 >>============================================================================== >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java (original) >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java Tue Mar 1 08:07:51 2005 >>@@ -18,6 +18,7 @@ >> import org.apache.commons.logging.Log; >> import org.apache.commons.logging.LogFactory; >> import org.apache.ws.notification.topics.Topic; >>+import org.apache.ws.notification.topics.TopicSpace; >> import org.apache.ws.notification.topics.TopicExpression; >> import org.apache.ws.notification.topics.TopicListener; >> >>@@ -41,6 +42,7 @@ >> protected String m_name; >> protected Object m_current; >> protected List m_topicPath; // ordered set of QNames >>+ protected TopicSpace m_topicSpace; >> private static final Log LOG = LogFactory.getLog( TopicImpl.class.getName() ); >> >> public void addTopic( Topic topic ) throws Exception >>@@ -54,12 +56,14 @@ >> >> List topicPath = new LinkedList(); >> >>- if(m_topicPath!=null) >>- topicPath.addAll( m_topicPath ); >>+ topicPath.addAll( m_topicPath ); >> topicPath.add( topic.getName() ); >> >> topic.setTopicPath( topicPath ); >> topic.addTopicListener( this ); >>+ >>+ topic.setTopicSpace(m_topicSpace); >>+ >> this.topicAdded( topic ); >> } >> >>@@ -175,7 +179,10 @@ >> this.m_listeners = listeners; >> this.m_name = name; >> this.m_current = current; >>- this.m_topicPath = topicPath; >>+ if(topicPath==null){ >>+ this.m_topicPath = new java.util.LinkedList(); >>+ m_topicPath.add(name); >>+ } >> } >> >> public synchronized void topicAdded( Topic topic ) >>@@ -220,4 +227,12 @@ >> public String toString(){ >> return getName(); >> } >>+ >>+ public void setTopicSpace(TopicSpace topicSpace) { >>+ m_topicSpace=topicSpace; >>+ } >>+ >>+ public TopicSpace getTopicSpace() { >>+ return m_topicSpace; >>+ } >> } >> >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java?view=diff&r1=155797&r2=155798 >>============================================================================== >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java (original) >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java Tue Mar 1 08:07:51 2005 >>@@ -52,6 +52,7 @@ >> public void addTopic( Topic topic ) >> { >> m_rootTopicMap.put( topic.getName(), topic ); >>+ topic.setTopicSpace(this); >> } >> >> public void removeTopic( Topic topic ) >> >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java?view=diff&r1=155797&r2=155798 >>============================================================================== >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java (original) >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java Tue Mar 1 08:07:51 2005 >>@@ -28,15 +28,15 @@ >> // Parse the input with the default (non-validating) parser >> stack= new java.util.Stack(); >> try{ >>- SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); >>- //System.out.println("start parsing"); >>- saxParser.parse( is, handler ); >>- //System.out.println("end parsing"); >>- >>+ SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); >>+ //System.out.println("start parsing"); >>+ saxParser.parse( is, handler ); >>+ //System.out.println("end parsing"); >>+ >> }catch(Exception e){ >> e.printStackTrace(); >> } >>- return m_topicSpace; >>+ return m_topicSpace; >> } >> >> public void startElement( String namespaceURI, >>@@ -44,25 +44,25 @@ >> String qName, // qualified name >> Attributes attrs ) throws SAXException { >> try{ >>- //System.out.println("start element "+qName); >>- if(qName.endsWith("topicSpace")){ >>- tns=attrs.getValue("targetNamespace"); >>- m_topicSpace=new TopicSpaceImpl(tns); >>- //System.out.println("topicspace "+tns); >>- } >>- if(qName.endsWith("topic")){ >>- Topic t=new TopicImpl(attrs.getValue("name")); >>- if(depth==0){ >>- m_topicSpace.addTopic(t); >>- stack.push(t); >>- }else{ >>- Topic in = (Topic)stack.peek(); >>- in.addTopic(t); >>- stack.push(t); >>- } >>- //System.out.println(depth+" : "+attrs.getValue("name")); >>- depth++; >>- } >>+ //System.out.println("start element "+qName); >>+ if(qName.endsWith("topicSpace")){ >>+ tns=attrs.getValue("targetNamespace"); >>+ m_topicSpace=new TopicSpaceImpl(tns); >>+ //System.out.println("topicspace "+tns); >>+ } >>+ if(qName.endsWith("topic")){ >>+ Topic t=new TopicImpl(attrs.getValue("name")); >>+ if(depth==0){ >>+ m_topicSpace.addTopic(t); >>+ stack.push(t); >>+ }else{ >>+ Topic in = (Topic)stack.peek(); >>+ in.addTopic(t); >>+ stack.push(t); >>+ } >>+ //System.out.println(depth+" : "+attrs.getValue("name")); >>+ depth++; >>+ } >> }catch(Exception e){ >> e.printStackTrace(); >> } >>@@ -77,7 +77,7 @@ >> depth--; >> stack.pop(); >> } >>- >>- } >>+ >>+ } >> } >> } >> >> >> >>--------------------------------------------------------------------- >>To unsubscribe, e-mail: paul24@example.com >>For additional commands, e-mail: paul24@example.com >> >> >> -- My place : http://user.cs.tu-berlin.de/~lischke --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Tue Mar 01 17:48:31 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 70717 invoked from network); 1 Mar 2005 17:48:31 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 1 Mar 2005 17:48:31 -0000 Received: (qmail 71346 invoked by uid 500); 1 Mar 2005 17:48:31 -0000 Delivered-To: paul24@example.com Received: (qmail 71315 invoked by uid 500); 1 Mar 2005 17:48:30 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 71301 invoked by uid 99); 1 Mar 2005 17:48:30 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: pass (hermes.apache.org: local policy) Received: from cliff.mcs.anl.gov (HELO mcs.anl.gov) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Tue, 01 Mar 2005 09:48:28 -0800 Received: from titan.mcs.anl.gov (vpnclient18112.mcs.anl.gov [83.161.120.155]) by mcs.anl.gov (8.11.6/8.9.3) with ESMTP id j21HmOB60316; Tue, 1 Mar 2005 11:48:24 -0600 Subject: Re: svn commit: r155798 - in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics: Topic.java impl/TopicImpl.java impl/TopicSpaceImpl.java util/TopicSpaceParser.java From: Samuel Meder <paul24@example.com> Reply-To: paul24@example.com To: hermes-dev <paul24@example.com> In-Reply-To: <paul24@example.com> References: <paul24@example.com> <paul24@example.com> <paul24@example.com> Content-Type: text/plain Organization: University of Chicago Date: Tue, 01 Mar 2005 11:48:05 -0600 Message-Id: <paul24@example.com> Mime-Version: 1.0 X-Mailer: Evolution 2.0.3 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N On Tue, 2005-03-01 at 18:16 +0100, Stefan Lischke wrote: > Hi sam, > > Samuel Meder wrote: > > >What's the rationale for this interface change? > > > > > its not really a change, its an enhancement. ian changed the topicPath > attribute which was a list of QName in globus to a list of strings, > cause the NameSpace in a TopicExpression never changes. > I added a method to get the TopicSpace of each Topic, so we are able to > get the NameSpace. > > Ok with that? I see. So that list of QNames was supposed to be a self-contained representation that allowed you to find the topic again. With the move away from QName I would suggest that it should either return a list of string with the first string in the list being the namespace or a datastructure with a URI for the namespace and a list of strings for the topic name path in that namespace. Thoughts? /Sam > stefan > > >/Sam > > > >On Tue, 2005-03-01 at 16:07 +0000, paul24@example.com wrote: > > > > > >>Author: lischke > >>Date: Tue Mar 1 08:07:51 2005 > >>New Revision: 155798 > >> > >>URL: http://svn.apache.org/viewcvs?view=rev&rev=155798 > >>Log: > >>added TopicSpace reference to Topic, to get NameSpace > >> > >>Modified: > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java > >> > >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java > >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java?view=diff&r1=155797&r2=155798 > >>============================================================================== > >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic.java Tue Mar 1 08:07:51 2005 > >>@@ -117,4 +117,18 @@ > >> */ > >> Iterator topicIterator(); > >> > >>+ /** > >>+ * Set the TopicSpace this Topic is part of > >>+ * > >>+ * @param topicSpace The TopicSpace this Topic is part of > >>+ */ > >>+ void setTopicSpace( TopicSpace topicSpace ); > >>+ > >>+ /** > >>+ * gets the TopicSpace this Topic is part of > >>+ * > >>+ * @return The TopicSpace this Topic is part of > >>+ */ > >>+ TopicSpace getTopicSpace(); > >>+ > >> } > >> > >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java > >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java?view=diff&r1=155797&r2=155798 > >>============================================================================== > >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicImpl.java Tue Mar 1 08:07:51 2005 > >>@@ -18,6 +18,7 @@ > >> import org.apache.commons.logging.Log; > >> import org.apache.commons.logging.LogFactory; > >> import org.apache.ws.notification.topics.Topic; > >>+import org.apache.ws.notification.topics.TopicSpace; > >> import org.apache.ws.notification.topics.TopicExpression; > >> import org.apache.ws.notification.topics.TopicListener; > >> > >>@@ -41,6 +42,7 @@ > >> protected String m_name; > >> protected Object m_current; > >> protected List m_topicPath; // ordered set of QNames > >>+ protected TopicSpace m_topicSpace; > >> private static final Log LOG = LogFactory.getLog( TopicImpl.class.getName() ); > >> > >> public void addTopic( Topic topic ) throws Exception > >>@@ -54,12 +56,14 @@ > >> > >> List topicPath = new LinkedList(); > >> > >>- if(m_topicPath!=null) > >>- topicPath.addAll( m_topicPath ); > >>+ topicPath.addAll( m_topicPath ); > >> topicPath.add( topic.getName() ); > >> > >> topic.setTopicPath( topicPath ); > >> topic.addTopicListener( this ); > >>+ > >>+ topic.setTopicSpace(m_topicSpace); > >>+ > >> this.topicAdded( topic ); > >> } > >> > >>@@ -175,7 +179,10 @@ > >> this.m_listeners = listeners; > >> this.m_name = name; > >> this.m_current = current; > >>- this.m_topicPath = topicPath; > >>+ if(topicPath==null){ > >>+ this.m_topicPath = new java.util.LinkedList(); > >>+ m_topicPath.add(name); > >>+ } > >> } > >> > >> public synchronized void topicAdded( Topic topic ) > >>@@ -220,4 +227,12 @@ > >> public String toString(){ > >> return getName(); > >> } > >>+ > >>+ public void setTopicSpace(TopicSpace topicSpace) { > >>+ m_topicSpace=topicSpace; > >>+ } > >>+ > >>+ public TopicSpace getTopicSpace() { > >>+ return m_topicSpace; > >>+ } > >> } > >> > >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java > >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java?view=diff&r1=155797&r2=155798 > >>============================================================================== > >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/TopicSpaceImpl.java Tue Mar 1 08:07:51 2005 > >>@@ -52,6 +52,7 @@ > >> public void addTopic( Topic topic ) > >> { > >> m_rootTopicMap.put( topic.getName(), topic ); > >>+ topic.setTopicSpace(this); > >> } > >> > >> public void removeTopic( Topic topic ) > >> > >>Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java > >>URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java?view=diff&r1=155797&r2=155798 > >>============================================================================== > >>--- incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/util/TopicSpaceParser.java Tue Mar 1 08:07:51 2005 > >>@@ -28,15 +28,15 @@ > >> // Parse the input with the default (non-validating) parser > >> stack= new java.util.Stack(); > >> try{ > >>- SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); > >>- //System.out.println("start parsing"); > >>- saxParser.parse( is, handler ); > >>- //System.out.println("end parsing"); > >>- > >>+ SAXParser saxParser = SAXParserFactory.newInstance().newSAXParser(); > >>+ //System.out.println("start parsing"); > >>+ saxParser.parse( is, handler ); > >>+ //System.out.println("end parsing"); > >>+ > >> }catch(Exception e){ > >> e.printStackTrace(); > >> } > >>- return m_topicSpace; > >>+ return m_topicSpace; > >> } > >> > >> public void startElement( String namespaceURI, > >>@@ -44,25 +44,25 @@ > >> String qName, // qualified name > >> Attributes attrs ) throws SAXException { > >> try{ > >>- //System.out.println("start element "+qName); > >>- if(qName.endsWith("topicSpace")){ > >>- tns=attrs.getValue("targetNamespace"); > >>- m_topicSpace=new TopicSpaceImpl(tns); > >>- //System.out.println("topicspace "+tns); > >>- } > >>- if(qName.endsWith("topic")){ > >>- Topic t=new TopicImpl(attrs.getValue("name")); > >>- if(depth==0){ > >>- m_topicSpace.addTopic(t); > >>- stack.push(t); > >>- }else{ > >>- Topic in = (Topic)stack.peek(); > >>- in.addTopic(t); > >>- stack.push(t); > >>- } > >>- //System.out.println(depth+" : "+attrs.getValue("name")); > >>- depth++; > >>- } > >>+ //System.out.println("start element "+qName); > >>+ if(qName.endsWith("topicSpace")){ > >>+ tns=attrs.getValue("targetNamespace"); > >>+ m_topicSpace=new TopicSpaceImpl(tns); > >>+ //System.out.println("topicspace "+tns); > >>+ } > >>+ if(qName.endsWith("topic")){ > >>+ Topic t=new TopicImpl(attrs.getValue("name")); > >>+ if(depth==0){ > >>+ m_topicSpace.addTopic(t); > >>+ stack.push(t); > >>+ }else{ > >>+ Topic in = (Topic)stack.peek(); > >>+ in.addTopic(t); > >>+ stack.push(t); > >>+ } > >>+ //System.out.println(depth+" : "+attrs.getValue("name")); > >>+ depth++; > >>+ } > >> }catch(Exception e){ > >> e.printStackTrace(); > >> } > >>@@ -77,7 +77,7 @@ > >> depth--; > >> stack.pop(); > >> } > >>- > >>- } > >>+ > >>+ } > >> } > >> } > >> > >> > >> > >>--------------------------------------------------------------------- > >>To unsubscribe, e-mail: paul24@example.com > >>For additional commands, e-mail: paul24@example.com > >> > >> > >> > > -- Sam Meder <paul24@example.com> The Globus Alliance - University of Chicago 610-863-0746 --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Wed Mar 02 14:27:20 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 86287 invoked from network); 2 Mar 2005 14:27:20 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 2 Mar 2005 14:27:20 -0000 Received: (qmail 93465 invoked by uid 500); 2 Mar 2005 14:27:20 -0000 Delivered-To: paul24@example.com Received: (qmail 93431 invoked by uid 500); 2 Mar 2005 14:27:19 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 93402 invoked by uid 99); 2 Mar 2005 14:27:19 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received-SPF: neutral (hermes.apache.org: local policy) Received: from zmamail05.zma.compaq.com (HELO zmamail05.zma.compaq.com) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Wed, 02 Mar 2005 06:27:13 -0800 Received: from tayexg12.americas.cpqcorp.net (tayexg12.americas.cpqcorp.net [83.161.120.155]) by zmamail05.zma.compaq.com (Postfix) with ESMTP id 921083179; Wed, 2 Mar 2005 09:27:10 -0500 (EST) Received: from tayexc17.americas.cpqcorp.net ([83.161.120.155]) by tayexg12.americas.cpqcorp.net with Microsoft SMTPSVC(6.0.3790.211); Wed, 2 Mar 2005 09:27:10 -0500 X-MimeOLE: Produced By Microsoft Exchange V6.5.7226.0 Content-class: urn:content-classes:message MIME-Version: 1.0 Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: quoted-printable Subject: RE: svn commit: r155798 -in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics:Topic.java impl/TopicImpl.javaimpl/TopicSpaceImpl.java util/TopicSpaceParser.java Date: Wed, 2 Mar 2005 09:27:08 -0500 Message-ID: <paul24@example.com> X-MS-Has-Attach: X-MS-TNEF-Correlator: Thread-Topic: svn commit: r155798 -in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics:Topic.java impl/TopicImpl.javaimpl/TopicSpaceImpl.java util/TopicSpaceParser.java Thread-Index: AcUehvUD451NzzhZSXm/SeWk3cDO4QArL08Q From: "Campana Jr., Salvatore J" <paul24@example.com> To: <paul24@example.com>, <paul24@example.com> X-OriginalArrivalTime: 02 Mar 2005 14:27:10.0492 (UTC) FILETIME=[EB8285C0:01C51F33] X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N If I had to choose between the two, I'd say the second (datastucture with URI) ...Making a list whose first element is the namespace, and the rest local names, is not paul24@example.com.....=20 -----Original Message----- From: Samuel Meder [mailto:paul24@example.com]=20 Sent: Tuesday, March 01, 2005 12:48 PM To: hermes-dev Subject: Re: svn commit: r155798 -in incubator/hermes/trunk/src/java/org/apache/ws/notification/topics:Topic. java impl/TopicImpl.javaimpl/TopicSpaceImpl.java util/TopicSpaceParser.java On Tue, 2005-03-01 at 18:16 +0100, Stefan Lischke wrote: > Hi sam, >=20 > Samuel Meder wrote: >=20 > >What's the rationale for this interface change? > > =20 > > > its not really a change, its an enhancement. ian changed the topicPath > attribute which was a list of QName in globus to a list of strings,=20 > cause the NameSpace in a TopicExpression never changes. > I added a method to get the TopicSpace of each Topic, so we are able=20 > to get the NameSpace. >=20 > Ok with that? I see. So that list of QNames was supposed to be a self-contained representation that allowed you to find the topic again. With the move away from QName I would suggest that it should either return a list of string with the first string in the list being the namespace or a datastructure with a URI for the namespace and a list of strings for the topic name path in that namespace. Thoughts? /Sam > stefan >=20 > >/Sam > > > >On Tue, 2005-03-01 at 16:07 +0000, paul24@example.com wrote: > > =20 > > > >>Author: lischke > >>Date: Tue Mar 1 08:07:51 2005 > >>New Revision: 155798 > >> > >>URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D155798 > >>Log: > >>added TopicSpace reference to Topic, to get NameSpace > >> > >>Modified: > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/Topic. java > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/T opicImpl.java > >> incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/impl/T opicSpaceImpl.java > >> =20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/ut > >>il/TopicSpaceParser.java > >> > >>Modified:=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/To > >>pic.java > >>URL:=20 > >>http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/ap > = >>ache/ws/notification/topics/Topic.java?view=3Ddiff&r1=3D155797&r2=3D155= 798 > = >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>---=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/To > >>pic.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topic > >>+++ s/Topic.java Tue Mar 1 08:07:51 2005 > >>@@ -117,4 +117,18 @@ > >> */ > >> Iterator topicIterator(); > >>=20 > >>+ /** > >>+ * Set the TopicSpace this Topic is part of > >>+ * > >>+ * @param topicSpace The TopicSpace this Topic is part of > >>+ */ > >>+ void setTopicSpace( TopicSpace topicSpace ); > >>+ =20 > >>+ /** > >>+ * gets the TopicSpace this Topic is part of > >>+ * > >>+ * @return The TopicSpace this Topic is part of > >>+ */ > >>+ TopicSpace getTopicSpace(); > >>+ > >> } > >> > >>Modified:=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/im > >>pl/TopicImpl.java > >>URL:=20 > >>http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/ap > = >>ache/ws/notification/topics/impl/TopicImpl.java?view=3Ddiff&r1=3D155797= & > >>r2=3D155798=20 > = >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>---=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/im > >>pl/TopicImpl.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topic > >>+++ s/impl/TopicImpl.java Tue Mar 1 08:07:51 2005 > >>@@ -18,6 +18,7 @@ > >> import org.apache.commons.logging.Log; import=20 > >>org.apache.commons.logging.LogFactory; > >> import org.apache.ws.notification.topics.Topic; > >>+import org.apache.ws.notification.topics.TopicSpace; > >> import org.apache.ws.notification.topics.TopicExpression; > >> import org.apache.ws.notification.topics.TopicListener; > >>=20 > >>@@ -41,6 +42,7 @@ > >> protected String m_name; > >> protected Object m_current; > >> protected List m_topicPath; // ordered set of QNames > >>+ protected TopicSpace m_topicSpace; > >> private static final Log LOG =3D LogFactory.getLog(=20 > >> TopicImpl.class.getName() ); > >>=20 > >> public void addTopic( Topic topic ) throws Exception @@ -54,12=20 > >>+56,14 @@ > >>=20 > >> List topicPath =3D new LinkedList(); > >>=20 > >>- if(m_topicPath!=3Dnull) > >>- topicPath.addAll( m_topicPath ); > >>+ topicPath.addAll( m_topicPath ); > >> topicPath.add( topic.getName() ); > >>=20 > >> topic.setTopicPath( topicPath ); > >> topic.addTopicListener( this ); > >>+ =20 > >>+ topic.setTopicSpace(m_topicSpace); > >>+ =20 > >> this.topicAdded( topic ); > >> } > >>=20 > >>@@ -175,7 +179,10 @@ > >> this.m_listeners =3D listeners; > >> this.m_name =3D name; > >> this.m_current =3D current; > >>- this.m_topicPath =3D topicPath; > >>+ if(topicPath=3D=3Dnull){ > >>+ this.m_topicPath =3D new java.util.LinkedList(); > >>+ m_topicPath.add(name); > >>+ } > >> } > >>=20 > >> public synchronized void topicAdded( Topic topic ) @@ -220,4=20 > >>+227,12 @@ > >> public String toString(){ > >> return getName(); > >> } > >>+ =20 > >>+ public void setTopicSpace(TopicSpace topicSpace) { > >>+ m_topicSpace=3DtopicSpace; > >>+ } > >>+ =20 > >>+ public TopicSpace getTopicSpace() { > >>+ return m_topicSpace; > >>+ } =20 > >> } > >> > >>Modified:=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/im > >>pl/TopicSpaceImpl.java > >>URL:=20 > >>http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/ap > = >>ache/ws/notification/topics/impl/TopicSpaceImpl.java?view=3Ddiff&r1=3D1= 5 > >>5797&r2=3D155798=20 > = >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>---=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/im > >>pl/TopicSpaceImpl.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topic > >>+++ s/impl/TopicSpaceImpl.java Tue Mar 1 08:07:51 2005 > >>@@ -52,6 +52,7 @@ > >> public void addTopic( Topic topic ) > >> { > >> m_rootTopicMap.put( topic.getName(), topic ); > >>+ topic.setTopicSpace(this); > >> } > >>=20 > >> public void removeTopic( Topic topic ) > >> > >>Modified:=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/ut > >>il/TopicSpaceParser.java > >>URL:=20 > >>http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/ap > = >>ache/ws/notification/topics/util/TopicSpaceParser.java?view=3Ddiff&r1=3D= > >>155797&r2=3D155798=20 > = >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D > >>---=20 > >>incubator/hermes/trunk/src/java/org/apache/ws/notification/topics/ut > >>il/TopicSpaceParser.java (original) > >>+++ incubator/hermes/trunk/src/java/org/apache/ws/notification/topic > >>+++ s/util/TopicSpaceParser.java Tue Mar 1 08:07:51 2005 > >>@@ -28,15 +28,15 @@ > >> // Parse the input with the default (non-validating) parser > >> stack=3D new java.util.Stack(); > >> try{ > >>- SAXParser saxParser =3D SAXParserFactory.newInstance().newSAXParser(); > >>- //System.out.println("start parsing"); > >>- saxParser.parse( is, handler ); > >>- //System.out.println("end parsing"); > >>- > >>+ SAXParser saxParser =3D SAXParserFactory.newInstance().newSAXParser(); > >>+ //System.out.println("start parsing"); > >>+ saxParser.parse( is, handler ); > >>+ //System.out.println("end parsing"); > >>+ =20 > >> }catch(Exception e){ > >> e.printStackTrace(); > >> } > >>- return m_topicSpace;=20 > >>+ return m_topicSpace; > >> } > >> =20 > >> public void startElement( String namespaceURI, @@ -44,25 +44,25 > >>@@ > >> String qName, // qualified name > >> Attributes attrs ) throws SAXException { > >> try{ > >>- //System.out.println("start element "+qName); > >>- if(qName.endsWith("topicSpace")){ > >>- tns=3Dattrs.getValue("targetNamespace"); > >>- m_topicSpace=3Dnew TopicSpaceImpl(tns); > >>- //System.out.println("topicspace "+tns); > >>- } > >>- if(qName.endsWith("topic")){ > >>- Topic t=3Dnew TopicImpl(attrs.getValue("name")); > >>- if(depth=3D=3D0){ > >>- m_topicSpace.addTopic(t);=20 > >>- stack.push(t); > >>- }else{ > >>- Topic in =3D (Topic)stack.peek(); > >>- in.addTopic(t); > >>- stack.push(t); > >>- } =20 > >>- //System.out.println(depth+" : "+attrs.getValue("name")); > >>- depth++; > >>- } =20 > >>+ //System.out.println("start element "+qName); > >>+ if(qName.endsWith("topicSpace")){ > >>+ tns=3Dattrs.getValue("targetNamespace"); > >>+ m_topicSpace=3Dnew TopicSpaceImpl(tns); > >>+ //System.out.println("topicspace "+tns); > >>+ } > >>+ if(qName.endsWith("topic")){ > >>+ Topic t=3Dnew TopicImpl(attrs.getValue("name")); > >>+ if(depth=3D=3D0){ > >>+ m_topicSpace.addTopic(t); > >>+ stack.push(t); > >>+ }else{ > >>+ Topic in =3D (Topic)stack.peek(); > >>+ in.addTopic(t); > >>+ stack.push(t); > >>+ } > >>+ //System.out.println(depth+" : "+attrs.getValue("name")); > >>+ depth++; > >>+ } > >> }catch(Exception e){ > >> e.printStackTrace(); > >> } > >>@@ -77,7 +77,7 @@ > >> depth--; > >> stack.pop(); > >> } > >>- > >>- } =20 > >>+ =20 > >>+ } > >> } > >> } > >> > >> > >> > >>-------------------------------------------------------------------- > >>- To unsubscribe, e-mail: paul24@example.com > >>For additional commands, e-mail: paul24@example.com > >> > >> =20 > >> >=20 >=20 -- Sam Meder <paul24@example.com> The Globus Alliance - University of Chicago 610-863-0746 --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Wed Mar 09 19:19:08 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 21604 invoked from network); 9 Mar 2005 19:19:08 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 9 Mar 2005 19:19:08 -0000 Received: (qmail 86539 invoked by uid 500); 9 Mar 2005 19:19:07 -0000 Delivered-To: paul24@example.com Received: (qmail 86506 invoked by uid 500); 9 Mar 2005 19:19:07 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 86493 invoked by uid 500); 9 Mar 2005 19:19:07 -0000 Delivered-To: paul24@example.com Received: (qmail 86488 invoked by uid 99); 9 Mar 2005 19:19:07 -0000 X-ASF-Spam-Status: No, hits=-9.8 required=10.0 tests=ALL_TRUSTED,NO_REAL_NAME X-Spam-Check-By: apache.org Received: from minotaur.apache.org (HELO minotaur.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with SMTP; Wed, 09 Mar 2005 11:19:06 -0800 Received: (qmail 21585 invoked by uid 65534); 9 Mar 2005 19:19:05 -0000 Message-ID: <paul24@example.com> Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable X-Mailer: svnmailer-1.0.0-dev Date: Wed, 09 Mar 2005 19:19:05 -0000 Subject: svn commit: r156671 - in incubator/hermes/trunk/src/java/org/apache/ws: eventing/porttype/impl/ notification/base/impl/ notification/base/v1_2/impl/ notification/base/v1_2/porttype/impl/ notification/tool/v1_2/ To: paul24@example.com From: paul24@example.com X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N Author: ips Date: Wed Mar 9 11:19:00 2005 New Revision: 156671 URL: http://svn.apache.org/viewcvs?view=3Drev&rev=3D156671 Log: fixed compile errors caused by recent changes to Apollo Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/No= tificationPortTypeImpl.java incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionEndPortTypeImpl.java incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionManagerPortTypeImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/Su= bscriptionService.java incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/im= pl/Subscription1_2Resource.java incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/NotificationProducerPortTypeImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/SubscriptionManagerPortTypeImpl.java incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/No= tificationConsumerPortType2JavaInfo.java Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/i= mpl/NotificationPortTypeImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/eventing/porttype/impl/NotificationPortTypeImpl.java?view=3Ddiff&r1= =3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/No= tificationPortTypeImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/No= tificationPortTypeImpl.java Wed Mar 9 11:19:00 2005 @@ -17,7 +17,8 @@ package org.apache.ws.eventing.porttype.impl; =20 import org.apache.axis.message.SOAPEnvelope; -import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResour= cePropertiesPortType; +import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPo= rtType; +import org.apache.ws.resource.properties.NamespaceVersionHolder; import org.apache.ws.resource.ResourceContext; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; @@ -59,6 +60,11 @@ //TODO e.printStackTrace(); } + } + + protected NamespaceVersionHolder getNamespaceSet() + { + return null; // not currently used - will be needed once we need t= o support multiple spec versions } } =20 Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/i= mpl/SubscriptionEndPortTypeImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/eventing/porttype/impl/SubscriptionEndPortTypeImpl.java?view=3Ddiff&r= 1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionEndPortTypeImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionEndPortTypeImpl.java Wed Mar 9 11:19:00 2005 @@ -19,11 +19,12 @@ import java.rmi.RemoteException; import org.apache.ws.eventing.porttype.SubscriptionEndPortType; import org.apache.ws.eventing.Subscription; - -import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResour= cePropertiesPortType; +import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPo= rtType; +import org.apache.ws.resource.properties.NamespaceVersionHolder; import org.apache.ws.resource.ResourceContext; =20 public class SubscriptionEndPortTypeImpl extends AbstractResourcePropertie= sPortType implements SubscriptionEndPortType{ + public SubscriptionEndPortTypeImpl( ResourceContext resourceContext ) { =20 super( resourceContext ); @@ -33,4 +34,10 @@ Subscription subscription =3D (Subscription) getResource(); subscription.destroy(); } + + protected NamespaceVersionHolder getNamespaceSet() + { + return null; // not currently used - will be needed once we need t= o support multiple spec versions + } + } Modified: incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/i= mpl/SubscriptionManagerPortTypeImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/eventing/porttype/impl/SubscriptionManagerPortTypeImpl.java?view=3Ddi= ff&r1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionManagerPortTypeImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/eventing/porttype/impl/Su= bscriptionManagerPortTypeImpl.java Wed Mar 9 11:19:00 2005 @@ -14,19 +14,19 @@ * limitations under the License. */ package org.apache.ws.eventing.porttype.impl; -import org.apache.ws.addressing.*; - -import org.w3c.dom.Node; -import org.w3c.dom.NodeList; -import javax.xml.soap.SOAPHeader; =20 import org.apache.ws.eventing.RemoteSubscription; - -import org.xmlsoap.schemas.ws.x2004.x08.eventing.*; -import java.rmi.RemoteException; import org.apache.ws.eventing.porttype.SubscriptionManagerPortType; import org.apache.ws.resource.ResourceContext; -import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResour= cePropertiesPortType; +import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPo= rtType; +import org.apache.ws.resource.properties.NamespaceVersionHolder; +import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusDocument; +import org.xmlsoap.schemas.ws.x2004.x08.eventing.GetStatusResponseDocument= ; +import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewDocument; +import org.xmlsoap.schemas.ws.x2004.x08.eventing.RenewResponseDocument; +import org.xmlsoap.schemas.ws.x2004.x08.eventing.UnsubscribeDocument; + +import java.rmi.RemoteException; =20 public class SubscriptionManagerPortTypeImpl extends AbstractResourcePrope= rtiesPortType implements SubscriptionManagerPortType { =20 @@ -64,5 +64,9 @@ subscription.unsubscribe(); } =20 + protected NamespaceVersionHolder getNamespaceSet() + { + return null; // not currently used - will be needed once we need t= o support multiple spec versions + } =20 } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/i= mpl/SubscriptionService.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/base/impl/SubscriptionService.java?view=3Ddiff&r1=3D1566= 70&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/Su= bscriptionService.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/Su= bscriptionService.java Wed Mar 9 11:19:00 2005 @@ -20,9 +20,9 @@ * @author Sal Campana */ public class SubscriptionService implements WsrfService , SubscriptionMan= agerPortType, - org.apache.ws.resource.lifetim= e=2Ev1_2.porttype.ScheduledResourceTerminationPortType, - org.apache.ws.resource.propert= ies.v1_2.porttype.GetResourcePropertyPortType, - org.apache.ws.resource.lifetim= e=2Ev1_2.porttype.ImmediateResourceTerminationPortType + org.apache.ws.resource.lifetim= e=2Ev1_2_draft01.porttype.ScheduledResourceTerminationPortType, + org.apache.ws.resource.propert= ies.v1_2_draft01.porttype.GetResourcePropertyPortType, + org.apache.ws.resource.lifetim= e=2Ev1_2_draft01.porttype.ImmediateResourceTerminationPortType { public static final String TARGET_NSURI =3D "http://ws.apache.org/noti= fication/base/service/SubscriptionManager"; public static final String TARGET_NSPREFIX =3D "SubscriptionManager"; @@ -115,7 +115,7 @@ */ public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft0= 1=2ESetTerminationTimeResponseDocument setTerminationTime( org.oasisOpen.do= cs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft01.SetTerminationTimeDocumen= t requestDoc ) { - return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.Schedu= ledResourceTerminationPortTypeImpl( getResourceContext( ) ).setTermination= Time( requestDoc ); + return new org.apache.ws.resource.lifetime.v1_2_draft01.porttype.imp= l=2EScheduledResourceTerminationPortTypeImpl( getResourceContext( ) ).setT= erminationTime( requestDoc ); } /** * DOCUMENT_ME @@ -126,7 +126,7 @@ */ public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draf= t01.GetResourcePropertyResponseDocument getResourceProperty( org.oasisOpen.= docs.wsrf.x2004.x06.wsrfWSResourceProperties12Draft01.GetResourcePropertyDo= cument requestDoc ) { - return new org.apache.ws.resource.properties.v1_2.porttype.impl.GetR= esourcePropertyProvider( getResourceContext( ) ).getResourceProperty( requ= estDoc ); + return new org.apache.ws.resource.properties.v1_2_draft01.porttype.i= mpl.GetResourcePropertyPortTypeImpl( getResourceContext( ) ).getResourcePr= operty( requestDoc ); } =20 =20 @@ -139,7 +139,7 @@ */ public org.oasisOpen.docs.wsrf.x2004.x06.wsrfWSResourceLifetime12Draft0= 1=2EDestroyResponseDocument destroy( org.oasisOpen.docs.wsrf.x2004.x06.wsrf= WSResourceLifetime12Draft01.DestroyDocument requestDoc ) { - return new org.apache.ws.resource.lifetime.v1_2.porttype.impl.Immedi= ateResourceTerminationPortTypeImpl( getResourceContext( ) ).destroy( reque= stDoc ); + return new org.apache.ws.resource.lifetime.v1_2_draft01.porttype.imp= l=2EImmediateResourceTerminationPortTypeImpl( getResourceContext( ) ).dest= roy( requestDoc ); } =20 /** Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v= 1_2/impl/Subscription1_2Resource.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/base/v1_2/impl/Subscription1_2Resource.java?view=3Ddiff&= r1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/im= pl/Subscription1_2Resource.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/im= pl/Subscription1_2Resource.java Wed Mar 9 11:19:00 2005 @@ -15,19 +15,21 @@ *=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D*/ package org.apache.ws.notification.base.v1_2.impl; =20 +import org.apache.ws.XmlObjectWrapper; +import org.apache.ws.addressing.EndpointReference; import org.apache.ws.notification.base.impl.AbstractSubscription; import org.apache.ws.notification.base.impl.XmlBeansTopicExpression; import org.apache.ws.notification.base.v1_2.porttype.SubscriptionManagerPo= rtType; import org.apache.ws.notification.topics.TopicExpression; import org.apache.ws.resource.ResourceKey; import org.apache.ws.resource.lifetime.callback.CurrentTimeCallback; -import org.apache.ws.resource.lifetime.v1_2.porttype.ScheduledResourceTerm= inationPortType; +import org.apache.ws.resource.lifetime.v1_2_draft01.porttype.ScheduledReso= urceTerminationPortType; import org.apache.ws.resource.properties.ResourceProperty; +import org.apache.ws.resource.properties.ResourcePropertySetMetaData; import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySet; +import org.apache.ws.resource.properties.impl.XmlBeansResourcePropertySetM= etaData; import org.apache.ws.resource.properties.query.QueryExpression; import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpressio= n; -import org.apache.ws.addressing.EndpointReference; -import org.apache.ws.XmlObjectWrapper; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Con= sumerReferenceDocument; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Cre= ationTimeDocument; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Pre= conditionDocument; @@ -70,8 +72,8 @@ public void init() { SubscriptionManagerRPDocument propsDoc =3D SubscriptionManagerRPDo= cument.Factory.newInstance(); - m_propSet =3D - new XmlBeansResourcePropertySet( propsDoc, READ_ONLY_PROP_= NAMES ); + ResourcePropertySetMetaData propSetMetaData =3D new XmlBeansResour= cePropertySetMetaData( propsDoc.schemaType(), READ_ONLY_PROP_NAMES ); + m_propSet =3D new XmlBeansResourcePropertySet( propsDoc, propSetMe= taData ); =20 // wsrlw:ScheduledResourceTermination props ResourceProperty prop =3D m_propSet.get( ScheduledResourceTerminat= ionPortType.PROP_QNAME_CURRENT_TIME ); Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v= 1_2/porttype/impl/NotificationProducerPortTypeImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/base/v1_2/porttype/impl/NotificationProducerPortTypeImpl= .java?view=3Ddiff&r1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/NotificationProducerPortTypeImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/NotificationProducerPortTypeImpl.java Wed Mar 9 11:19:00 2005 @@ -15,6 +15,9 @@ *=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D*/ package org.apache.ws.notification.base.v1_2.porttype.impl; =20 +import org.apache.ws.XmlObjectWrapper; +import org.apache.ws.addressing.EndpointReference; +import org.apache.ws.addressing.XmlBeansEndpointReference; import org.apache.ws.notification.base.NotificationProducerResource; import org.apache.ws.notification.base.Subscription; import org.apache.ws.notification.base.impl.SubscriptionHome; @@ -26,20 +29,18 @@ import org.apache.ws.notification.topics.TopicSpaceSet; import org.apache.ws.notification.topics.impl.SimpleSubscriptionTopicListe= ner; import org.apache.ws.notification.topics.topicexpression.impl.TopicExpress= ionException; +import org.apache.ws.pubsub.DeliveryMode; +import org.apache.ws.pubsub.Filter; +import org.apache.ws.pubsub.NotificationConsumer; +import org.apache.ws.pubsub.NotificationProducer; import org.apache.ws.resource.ResourceContext; import org.apache.ws.resource.ResourceContextException; import org.apache.ws.resource.impl.AbstractResourceContext; +import org.apache.ws.resource.properties.NamespaceVersionHolder; +import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPo= rtType; import org.apache.ws.resource.properties.query.QueryExpression; import org.apache.ws.resource.properties.query.impl.XmlBeansQueryExpressio= n; -import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResour= cePropertiesPortType; import org.apache.ws.util.XmlBeanUtils; -import org.apache.ws.addressing.XmlBeansEndpointReference; -import org.apache.ws.addressing.EndpointReference; -import org.apache.ws.XmlObjectWrapper; -import org.apache.ws.pubsub.NotificationProducer; -import org.apache.ws.pubsub.Filter; -import org.apache.ws.pubsub.NotificationConsumer; -import org.apache.ws.pubsub.DeliveryMode; import org.apache.xmlbeans.XmlObject; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Get= CurrentMessageDocument; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Get= CurrentMessageResponseDocument; @@ -48,13 +49,12 @@ import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Top= icExpressionType; import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI; import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocume= nt; -import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType= ; import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType; +import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType= ; =20 import javax.naming.Context; import javax.naming.InitialContext; import javax.xml.rpc.JAXRPCException; -import javax.xml.soap.SOAPException; import java.util.Calendar; import java.util.Collection; import java.util.Iterator; @@ -141,7 +141,6 @@ } =20 private Collection evaluateTopicExpression(TopicExpression topicExpr) - throws SOAPException { NotificationProducerResource resource =3D (NotificationProducerRes= ource) getResource(); TopicSpaceSet topicSpaceSet =3D resource.getTopicSpaceSet(); @@ -245,4 +244,10 @@ { return null; } + + protected NamespaceVersionHolder getNamespaceSet() + { + return null; // not currently used - will be needed once we need t= o support multiple spec versions + } + } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v= 1_2/porttype/impl/SubscriptionManagerPortTypeImpl.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/base/v1_2/porttype/impl/SubscriptionManagerPortTypeImpl.= java?view=3Ddiff&r1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/SubscriptionManagerPortTypeImpl.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/base/v1_2/po= rttype/impl/SubscriptionManagerPortTypeImpl.java Wed Mar 9 11:19:00 2005 @@ -18,7 +18,8 @@ import org.apache.ws.notification.base.Subscription; import org.apache.ws.notification.base.v1_2.porttype.SubscriptionManagerPo= rtType; import org.apache.ws.resource.ResourceContext; -import org.apache.ws.resource.properties.v1_2.porttype.impl.AbstractResour= cePropertiesPortType; +import org.apache.ws.resource.properties.NamespaceVersionHolder; +import org.apache.ws.resource.properties.impl.AbstractResourcePropertiesPo= rtType; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Pau= seSubscriptionDocument; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Pau= seSubscriptionResponseDocument; import org.oasisOpen.docs.wsn.x2004.x06.wsnWSBaseNotification12Draft01.Res= umeSubscriptionDocument; @@ -80,6 +81,11 @@ ResumeSubscriptionResponseDocument.Factory.newInstance(); responseDoc.addNewResumeSubscriptionResponse(); return responseDoc; + } + + protected NamespaceVersionHolder getNamespaceSet() + { + return null; // not currently used - will be needed once we need t= o support multiple spec versions } =20 } Modified: incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v= 1_2/NotificationConsumerPortType2JavaInfo.java URL: http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apac= he/ws/notification/tool/v1_2/NotificationConsumerPortType2JavaInfo.java?vie= w=3Ddiff&r1=3D156670&r2=3D156671 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D --- incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/No= tificationConsumerPortType2JavaInfo.java (original) +++ incubator/hermes/trunk/src/java/org/apache/ws/notification/tool/v1_2/No= tificationConsumerPortType2JavaInfo.java Wed Mar 9 11:19:00 2005 @@ -16,7 +16,6 @@ package org.apache.ws.notification.tool.v1_2; =20 import org.apache.ws.notification.base.v1_2.porttype.NotificationConsumerP= ortType; -import org.apache.ws.resource.properties.v1_2.porttype.GetMultipleResource= PropertiesPortType; import org.apache.ws.resource.tool.PortType2JavaInfo; =20 import javax.xml.namespace.QName; --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Thu Mar 10 17:01:58 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 50875 invoked from network); 10 Mar 2005 17:01:57 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 10 Mar 2005 17:01:57 -0000 Received: (qmail 47543 invoked by uid 500); 10 Mar 2005 17:01:57 -0000 Delivered-To: paul24@example.com Received: (qmail 47486 invoked by uid 500); 10 Mar 2005 17:01:56 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 47468 invoked by uid 99); 10 Mar 2005 17:01:56 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from ajax-1.apache.org (HELO ajax.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 10 Mar 2005 09:01:55 -0800 Received: from ajax.apache.org (ajax.apache.org [83.161.120.155]) by ajax.apache.org (8.12.11/8.12.11) with ESMTP id j2AH1qdO010359 for <paul24@example.com>; Thu, 10 Mar 2005 18:01:52 +0100 Message-ID: <paul24@example.com> Date: Thu, 10 Mar 2005 18:01:52 +0100 (CET) From: "Ian Springer (JIRA)" <paul24@example.com> To: paul24@example.com Subject: [jira] Updated: (HERMES-1) check in README that explains why no code is currently checked in In-Reply-To: <1039547391.1100283686601.JavaMail.apache@nagoya> Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N [ http://issues.apache.org/jira/browse/HERMES-1?page=history ] Ian Springer updated HERMES-1: ------------------------------ Assign To: Ian Springer Environment: n/a (was: ) > check in README that explains why no code is currently checked in > ----------------------------------------------------------------- > > Key: HERMES-1 > URL: http://issues.apache.org/jira/browse/HERMES-1 > Project: Hermes > Type: Task > Environment: n/a > Reporter: Ian Springer > Assignee: Ian Springer > Attachments: README.txt > > dims, pls check the attached README.txt in. thx. -- This message is automatically generated by JIRA. - If you think it was sent incorrectly contact one of the administrators: http://issues.apache.org/jira/secure/Administrators.jspa - If you want more information on JIRA, or have a bug to report see: http://www.atlassian.com/software/jira --------------------------------------------------------------------- To unsubscribe, e-mail: paul24@example.com For additional commands, e-mail: paul24@example.com From paul24@example.com Thu Mar 10 17:12:56 2005 Return-Path: <paul24@example.com> Delivered-To: paul24@example.com Received: (qmail 56648 invoked from network); 10 Mar 2005 17:12:56 -0000 Received: from hermes.apache.org (HELO mail.apache.org) (83.161.120.155) by minotaur-2.apache.org with SMTP; 10 Mar 2005 17:12:56 -0000 Received: (qmail 61871 invoked by uid 500); 10 Mar 2005 17:12:56 -0000 Delivered-To: paul24@example.com Received: (qmail 61832 invoked by uid 500); 10 Mar 2005 17:12:55 -0000 Mailing-List: contact paul24@example.com; run by ezmlm Precedence: bulk list-help: <mailto:paul24@example.com> list-unsubscribe: <mailto:paul24@example.com> List-Post: <mailto:paul24@example.com> Reply-To: paul24@example.com Delivered-To: mailing list paul24@example.com Received: (qmail 61818 invoked by uid 99); 10 Mar 2005 17:12:55 -0000 X-ASF-Spam-Status: No, hits=0.0 required=10.0 tests= X-Spam-Check-By: apache.org Received: from ajax-1.apache.org (HELO ajax.apache.org) (83.161.120.155) by apache.org (qpsmtpd/0.28) with ESMTP; Thu, 10 Mar 2005 09:12:55 -0800 Received: from ajax.apache.org (ajax.apache.org [83.161.120.155]) by ajax.apache.org (8.12.11/8.12.11) with ESMTP id j2AHCqHf010579 for <paul24@example.com>; Thu, 10 Mar 2005 18:12:52 +0100 Message-ID: <paul24@example.com> Date: Thu, 10 Mar 2005 18:12:52 +0100 (CET) From: "Ian Springer (JIRA)" <paul24@example.com> To: paul24@example.com Subject: [jira] Created: (HERMES-3) subscription service + home must be versioned Mime-Version: 1.0 Content-Type: text/plain; charset=ISO-8859-1 Content-Transfer-Encoding: 7bit X-Virus-Checked: Checked X-Spam-Rating: minotaur-2.apache.org 1.6.2 0/1000/N subscription service + home must be versioned --------------------------------------------- Key: HERMES-3 URL: http://issues.apache.org/jira/browse/HERMES-3 Project: Hermes Type: Task Components: BaseNotification Environment: n/a Reporter: Ian Springer There will need to be a separate subscription resource, service and home for each version of the BaseN spec. Though we currently only support the June 2004 versions fo the WSN specs, once a WSN interop is scheduled, we will need to additionally support a more recent version of the specs (as we had to for Apollo). --
{'source': 'Apache Software Foundation Public Mail Archives'}