You are viewing a plain text version of this content. The canonical link for it is here.
Posted to pubscribe-commits@ws.apache.org by sc...@apache.org on 2005/07/28 16:59:42 UTC
svn commit: r225793 - in /webservices/pubscribe/trunk/src:
java/org/apache/ws/eventing/SubscriptionHome.java
java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
test/org/apache/ws/notification/base/impl/UnitExampleHome.java
Author: scamp
Date: Thu Jul 28 07:59:39 2005
New Revision: 225793
URL: http://svn.apache.org/viewcvs?rev=225793&view=rev
Log:
fixed for xhange to Abstract resource home
Modified:
webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java?rev=225793&r1=225792&r2=225793&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/eventing/SubscriptionHome.java Thu Jul 28 07:59:39 2005
@@ -78,7 +78,7 @@
String id = (String) rs.getID();
//TODO !!!!! woher kommt publisher epr url ??? HACK for tcpmon 12345-8080
String subscriptionAddress = "http://localhost:12345/axis/services/SubscriptionManager";
- EndpointReference subscriptionEPR = getEndpointReference( subscriptionAddress, id, Constants.NS_URI_ADDRESSING_2004_08 );
+ EndpointReference subscriptionEPR = getEndpointReference( id );
rs.setEpr(subscriptionEPR);
addSubscription(rs);
return rs;
Modified: webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java?rev=225793&r1=225792&r2=225793&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java (original)
+++ webservices/pubscribe/trunk/src/java/org/apache/ws/notification/base/v2004_06/impl/SubscriptionHome.java Thu Jul 28 07:59:39 2005
@@ -121,8 +121,8 @@
subscription.setPolicy( policy );
subscription.init(); // initialize resource properties
String id = (String) subscription.getID();
- EndpointReference subscriptionEPR = getEndpointReference( getSubscriptionAddress( producerReference ),
- id, nsSet.getAddressingNamespace() );
+ EndpointReference subscriptionEPR = getEndpointReference( id );
+ //do this here (rather than in find() ) since we need the EPR to be returned on the subscribe request.
subscription.setEndpointReference( subscriptionEPR );
add( subscription );
return subscription;
@@ -131,12 +131,6 @@
{
throw new ResourceException( "Failed to create Subscription resource.", e );
}
- }
-
- private String getSubscriptionAddress( EndpointReference producerReference )
- {
- String producerAddress = producerReference.getAddress();
- return producerAddress.substring( 0, producerAddress.lastIndexOf( "/" ) + 1 ) + SERVICE_NAME.getLocalPart();
}
public QName getServiceName()
Modified: webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java
URL: http://svn.apache.org/viewcvs/webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java?rev=225793&r1=225792&r2=225793&view=diff
==============================================================================
--- webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java (original)
+++ webservices/pubscribe/trunk/src/test/org/apache/ws/notification/base/impl/UnitExampleHome.java Thu Jul 28 07:59:39 2005
@@ -74,7 +74,7 @@
myResource.setID(RESOURCE_ID);
m_resource = myResource;
myResource.init();
- EndpointReference epr = getEndpointReference(resourceContext.getBaseURL() + "/" + getServiceName().getLocalPart(), RESOURCE_ID, m_namespaceSet.getAddressingNamespace());
+ EndpointReference epr = getEndpointReference(RESOURCE_ID);
myResource.setEndpointReference(epr); //make sure to set the EPR on your new instance
add(myResource);
}