Author: ips
Date: Tue Feb 22 11:17:13 2005
New Revision: 154887
URL: http://svn.apache.org/viewcvs?view=rev&rev=154887
Log: (empty)
Removed:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/QueryExpressionFilter.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/ResourcePropertyValueChangeListenerImpl.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/XmlBeansQueryExpressionFilter.java
incubator/hermes/trunk/wsn-xbeans/src/wsdl/wsa/
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
incubator/hermes/trunk/wsn-xbeans/project.xml
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java?view=diff&r1=154886&r2=154887
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/AbstractSubscription.java
Tue Feb 22 11:17:13 2005
@@ -40,7 +40,6 @@
import javax.naming.Context;
import javax.naming.InitialContext;
-import javax.naming.directory.SchemaViolationException;
import java.net.URI;
import java.util.Calendar;
import java.util.Collection;
@@ -216,22 +215,22 @@
public void remove() throws ResourceException
{
- Object resource = null;
+ Resource producerResource = null;
try
{
- resource = getResource();
+ producerResource = getResource();
}
catch ( Exception e )
{
throw new ResourceException( "", e );
}
- if ( !( resource instanceof NotificationProducerResource ) )
+ if ( !( producerResource instanceof NotificationProducerResource ) )
{
return;
}
- TopicSpaceSet topicSpaceSet = ( (NotificationProducerResource)
resource ).getTopicSpaceSet();
+ TopicSpaceSet topicSpaceSet = ( (NotificationProducerResource)
producerResource ).getTopicSpaceSet();
Collection topics = null;
try
{ //todo fix!
@@ -242,12 +241,12 @@
throw new ResourceException( "", e );
}
- synchronized ( resource )
+ synchronized ( producerResource )
{
boolean removed = removeListener( topics );
- if ( removed && resource instanceof PersistenceCallback )
+ if ( removed && producerResource instanceof PersistenceCallback )
{
- ( (PersistenceCallback) resource ).store();
+ ( (PersistenceCallback) producerResource ).store();
}
}
}
@@ -298,17 +297,19 @@
public void unsubscribe()
{
- //To change body of implemented methods use File | Settings | File
Templates.
+ destroy();
}
public Filter getFilters()
{
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ // TODO. remove?
+ return null;
}
public URI getDeliveryMode()
{
- return null; //To change body of implemented methods use File |
Settings | File Templates.
+ // TODO. remove?
+ return null;
}
public NotificationConsumer getNotificationConsumer()
Modified:
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java?view=diff&r1=154886&r2=154887
==============================================================================
---
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
(original)
+++
incubator/hermes/trunk/src/java/org/apache/ws/notification/base/impl/SubscriptionHome.java
Tue Feb 22 11:17:13 2005
@@ -15,35 +15,32 @@
*=============================================================================*/
package org.apache.ws.notification.base.impl;
-import org.apache.ws.resource.impl.AbstractResourceHome;
-import org.apache.ws.resource.impl.SimpleTypeResourceKey;
+import org.apache.ws.addressing.EndpointReference;
+import org.apache.ws.addressing.XmlBeansEndpointReference;
+import org.apache.ws.notification.base.Subscription;
+import org.apache.ws.notification.topics.TopicExpression;
+import org.apache.ws.resource.JndiConstants;
import org.apache.ws.resource.Resource;
import org.apache.ws.resource.ResourceContext;
-import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceContextException;
-import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.ResourceException;
import org.apache.ws.resource.ResourceKey;
-import org.apache.ws.resource.JndiConstants;
+import org.apache.ws.resource.ResourceUnknownException;
+import org.apache.ws.resource.impl.AbstractResourceHome;
+import org.apache.ws.resource.impl.SimpleTypeResourceKey;
import org.apache.ws.resource.properties.query.QueryExpression;
-import org.apache.ws.notification.base.Subscription;
-import org.apache.ws.notification.topics.TopicExpression;
import org.apache.ws.util.XmlBeanUtils;
-import org.apache.ws.addressing.EndpointReference;
-import org.apache.ws.addressing.XmlBeansEndpointReference;
-import org.apache.ws.XmlObjectWrapper;
-import org.apache.xmlbeans.XmlObject;
import org.apache.xmlbeans.XmlCursor;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
+import org.apache.xmlbeans.XmlObject;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.AttributedURI;
-import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceDocument;
import org.xmlsoap.schemas.ws.x2003.x03.addressing.EndpointReferenceType;
+import org.xmlsoap.schemas.ws.x2003.x03.addressing.ReferencePropertiesType;
-import javax.xml.rpc.JAXRPCException;
import javax.xml.namespace.QName;
-import javax.naming.Context;
-import javax.naming.InitialContext;
-import java.util.Calendar;
+import javax.xml.rpc.JAXRPCException;
import java.lang.reflect.Constructor;
+import java.util.Calendar;
/**
* TODO
Modified: incubator/hermes/trunk/wsn-xbeans/project.xml
URL:
http://svn.apache.org/viewcvs/incubator/hermes/trunk/wsn-xbeans/project.xml?view=diff&r1=154886&r2=154887
==============================================================================
--- incubator/hermes/trunk/wsn-xbeans/project.xml (original)
+++ incubator/hermes/trunk/wsn-xbeans/project.xml Tue Feb 22 11:17:13 2005
@@ -51,6 +51,18 @@
<dependency>
<groupId>apollo</groupId>
+ <artifactId>wsa-xbeans</artifactId>
+ <version>SNAPSHOT</version>
+ <url>http://incubator.apache.org/apollo/</url>
+ <properties>
+ <license>ApacheLicense-2.0.txt</license>
+ <usage>XMLBeans for WSA spec types</usage>
+ <war.bundle>true</war.bundle>
+ </properties>
+ </dependency>
+
+ <dependency>
+ <groupId>apollo</groupId>
<artifactId>wsrf-xbeans</artifactId>
<version>SNAPSHOT</version>
<url>http://incubator.apache.org/apollo/</url>
@@ -64,7 +76,7 @@
<dependency>
<groupId>xmlbeans</groupId>
<artifactId>xbean</artifactId>
- <version>v1HEAD-SNAPSHOT-20041129</version>
+ <version>1.0.4-20050202-SNAPSHOT</version>
<url>http://xmlbeans.apache.org/</url>
<properties>
<license>ApacheLicense-2.0.txt</license>
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
