You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by dk...@apache.org on 2013/05/29 19:11:59 UTC
svn commit: r1487548 - in /cxf/trunk/rt/ws/eventing: ./
src/main/java/org/apache/cxf/ws/eventing/backend/database/
src/main/java/org/apache/cxf/ws/eventing/backend/manager/
src/main/java/org/apache/cxf/ws/eventing/shared/handlers/
src/main/java/org/apa...
Author: dkulp
Date: Wed May 29 17:11:58 2013
New Revision: 1487548
URL: http://svn.apache.org/r1487548
Log:
Use the addressing types already generated in cxf-api
Modified:
cxf/trunk/rt/ws/eventing/pom.xml
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/database/SubscriptionTicket.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerInterfaceForEventSources.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionTicketGrantingResponse.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/EPRInspectionTool.java
cxf/trunk/rt/ws/eventing/src/main/resources/schemas/eventing.xjb
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
Modified: cxf/trunk/rt/ws/eventing/pom.xml
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/pom.xml?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/pom.xml (original)
+++ cxf/trunk/rt/ws/eventing/pom.xml Wed May 29 17:11:58 2013
@@ -132,11 +132,6 @@
<catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog>
<extension>true</extension>
</xsdOption>
- <xsdOption>
- <xsd>${basedir}/src/main/resources/schemas/ws-addr.xsd</xsd>
- <packagename>org.apache.cxf.ws.eventing.addressing</packagename>
- <catalog>${basedir}/src/main/resources/schemas/catalog.cat</catalog>
- </xsdOption>
</xsdOptions>
</configuration>
</execution>
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/database/SubscriptionTicket.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/database/SubscriptionTicket.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/database/SubscriptionTicket.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/database/SubscriptionTicket.java Wed May 29 17:11:58 2013
@@ -21,12 +21,14 @@ package org.apache.cxf.ws.eventing.backe
import java.util.GregorianCalendar;
import java.util.UUID;
+
+import javax.xml.bind.JAXBElement;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.FilterType;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.shared.faults.FilteringRequestedUnavailable;
import org.apache.cxf.ws.eventing.shared.utils.FilteringUtil;
@@ -110,8 +112,10 @@ public class SubscriptionTicket {
* @return
*/
public String getTargetURL() {
- return ((org.apache.cxf.ws.eventing.NotifyTo)this.getDelivery().getContent().get(0)).getValue()
- .getAddress().getValue().trim();
+ @SuppressWarnings("unchecked")
+ JAXBElement<EndpointReferenceType> el
+ = (JAXBElement<EndpointReferenceType>)this.getDelivery().getContent().get(0);
+ return el.getValue().getAddress().getValue().trim();
}
/**
@@ -144,8 +148,10 @@ public class SubscriptionTicket {
}
public ReferenceParametersType getNotificationReferenceParams() {
- return ((org.apache.cxf.ws.eventing.NotifyTo)this
- .getDelivery().getContent().get(0)).getValue().getReferenceParameters();
+ @SuppressWarnings("unchecked")
+ JAXBElement<EndpointReferenceType> el
+ = (JAXBElement<EndpointReferenceType>)this.getDelivery().getContent().get(0);
+ return el.getValue().getReferenceParameters();
}
public boolean isNonExpiring() {
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerImpl.java Wed May 29 17:11:58 2013
@@ -33,14 +33,13 @@ import javax.xml.namespace.QName;
import org.apache.cxf.binding.soap.SoapFault;
import org.apache.cxf.common.logging.LogUtils;
-import org.apache.cxf.ws.eventing.AttributedURIType;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.ExpirationType;
import org.apache.cxf.ws.eventing.FilterType;
import org.apache.cxf.ws.eventing.FormatType;
-import org.apache.cxf.ws.eventing.NotifyTo;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.backend.database.SubscriptionDatabase;
import org.apache.cxf.ws.eventing.backend.database.SubscriptionDatabaseImpl;
import org.apache.cxf.ws.eventing.backend.database.SubscriptionTicket;
@@ -206,7 +205,9 @@ public class SubscriptionManagerImpl imp
SubscriptionTicketGrantingResponse response) {
// check if there is any usable EPR in the Delivery part
try {
- NotifyTo notifyTo = (NotifyTo)request.getContent().get(0);
+ @SuppressWarnings("unchecked")
+ JAXBElement<EndpointReferenceType> notifyTo
+ = (JAXBElement<EndpointReferenceType>)request.getContent().get(0);
if (!EPRInspectionTool.containsUsableEPR(notifyTo.getValue())) {
throw new NoDeliveryMechanismEstablished();
}
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerInterfaceForEventSources.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerInterfaceForEventSources.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerInterfaceForEventSources.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionManagerInterfaceForEventSources.java Wed May 29 17:11:58 2013
@@ -21,8 +21,8 @@ package org.apache.cxf.ws.eventing.backe
import java.util.List;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.ExpirationType;
import org.apache.cxf.ws.eventing.FilterType;
import org.apache.cxf.ws.eventing.FormatType;
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionTicketGrantingResponse.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionTicketGrantingResponse.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionTicketGrantingResponse.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/backend/manager/SubscriptionTicketGrantingResponse.java Wed May 29 17:11:58 2013
@@ -23,8 +23,8 @@ import java.util.UUID;
import javax.xml.datatype.XMLGregorianCalendar;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.FilterType;
import org.apache.cxf.ws.eventing.shared.faults.FilteringRequestedUnavailable;
import org.apache.cxf.ws.eventing.shared.utils.FilteringUtil;
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/handlers/ReferenceParametersAddingHandler.java Wed May 29 17:11:58 2013
@@ -29,7 +29,8 @@ import javax.xml.ws.handler.soap.SOAPHan
import javax.xml.ws.handler.soap.SOAPMessageContext;
import org.w3c.dom.Element;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
+
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
public class ReferenceParametersAddingHandler implements SOAPHandler<SOAPMessageContext> {
Modified: cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/EPRInspectionTool.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/EPRInspectionTool.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/EPRInspectionTool.java (original)
+++ cxf/trunk/rt/ws/eventing/src/main/java/org/apache/cxf/ws/eventing/shared/utils/EPRInspectionTool.java Wed May 29 17:11:58 2013
@@ -20,7 +20,7 @@
package org.apache.cxf.ws.eventing.shared.utils;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
public final class EPRInspectionTool {
Modified: cxf/trunk/rt/ws/eventing/src/main/resources/schemas/eventing.xjb
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/main/resources/schemas/eventing.xjb?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/main/resources/schemas/eventing.xjb (original)
+++ cxf/trunk/rt/ws/eventing/src/main/resources/schemas/eventing.xjb Wed May 29 17:11:58 2013
@@ -1,32 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
<bindings version="2.0" xmlns="http://java.sun.com/xml/ns/jaxb"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:xjc="http://java.sun.com/xml/ns/jaxb/xjc"
- extensionBindingPrefixes="xjc">
-<!-- <globalBindings>
- <javaType name="java.util.Calendar" xmlType="xs:date"
- parseMethod="javax.xml.bind.DatatypeConverter.parseDate"
- printMethod="javax.xml.bind.DatatypeConverter.printDate"/>
- <javaType name="java.util.Calendar" xmlType="xs:time"
- parseMethod="javax.xml.bind.DatatypeConverter.parseTime"
- printMethod="javax.xml.bind.DatatypeConverter.printTime"/>
- <javaType name="java.util.Calendar" xmlType="xs:dateTime"
- parseMethod="javax.xml.bind.DatatypeConverter.parseDateTime"
- printMethod="javax.xml.bind.DatatypeConverter.printDateTime"/>
- </globalBindings>-->
- <bindings schemaLocation="eventing.xsd">
+ xmlns:xs="http://www.w3.org/2001/XMLSchema">
+
+ <!--bindings schemaLocation="eventing.xsd">
<bindings node="//xs:element[@name='RetryAfter']">
<class name="EvtRetryAfter" />
</bindings>
<bindings node="//xs:element[@name='NotifyTo']">
<class implClass="org.apache.cxf.ws.eventing.addressing.EndpointReferenceType" />
</bindings>
- </bindings>
- <!-- use it or not? -->
-<!-- <bindings schemaLocation="eventing.xsd">
- <bindings node="//xs:simpleType[@name='DurationDateTime']">
- <xjc:javaType name="org.apache.cxf.ws.eventing.shared.jaxbutils.DurationDateTime"
- adapter="org.apache.cxf.ws.eventing.shared.jaxbutils.DurationDateTimeAdapter" />
+ </bindings-->
+ <bindings schemaLocation="http://www.w3.org/2006/03/addressing/ws-addr.xsd">
+ <schemaBindings map="false"/>
+ <bindings node="//xs:complexType[@name='EndpointReferenceType']">
+ <class ref="org.apache.cxf.ws.addressing.EndpointReferenceType"/>
+ </bindings>
+ <bindings node="//xs:element[@name='EndpointReference']">
+ <class ref="org.apache.cxf.ws.addressing.EndpointReferenceType"/>
</bindings>
- </bindings>-->
+ </bindings>
</bindings>
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/base/SimpleEventingIntegrationTest.java Wed May 29 17:11:58 2013
@@ -19,16 +19,18 @@
package org.apache.cxf.ws.eventing.base;
+import javax.xml.bind.JAXBElement;
+
import org.apache.cxf.endpoint.Server;
import org.apache.cxf.interceptor.LoggingInInterceptor;
import org.apache.cxf.interceptor.LoggingOutInterceptor;
import org.apache.cxf.jaxws.JaxWsProxyFactoryBean;
import org.apache.cxf.jaxws.JaxWsServerFactoryBean;
import org.apache.cxf.transport.local.LocalTransportFactory;
-import org.apache.cxf.ws.eventing.AttributedURIType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
-import org.apache.cxf.ws.eventing.NotifyTo;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
+import org.apache.cxf.ws.eventing.ObjectFactory;
import org.apache.cxf.ws.eventing.backend.database.SubscriptionTicket;
import org.apache.cxf.ws.eventing.backend.manager.SubscriptionManagerInterfaceForNotificators;
import org.apache.cxf.ws.eventing.backend.notification.EventSinkInterfaceNotificatorService;
@@ -193,14 +195,12 @@ public abstract class SimpleEventingInte
return (SubscriptionManagerEndpoint)factory.create();
}
- protected NotifyTo createDummyNotifyTo() {
- NotifyTo ret = new NotifyTo();
+ protected JAXBElement<EndpointReferenceType> createDummyNotifyTo() {
EndpointReferenceType eventSinkERT = new EndpointReferenceType();
AttributedURIType eventSinkAddr = new AttributedURIType();
eventSinkAddr.setValue("local://dummy-sink");
eventSinkERT.setAddress(eventSinkAddr);
- ret.setValue(eventSinkERT);
- return ret;
+ return new ObjectFactory().createNotifyTo(eventSinkERT);
}
protected static String allocatePort(Class<?> cls) {
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/NotificationTest.java Wed May 29 17:11:58 2013
@@ -25,14 +25,14 @@ import javax.xml.bind.JAXBElement;
import javax.xml.namespace.QName;
import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.ws.eventing.AttributedURIType;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
import org.apache.cxf.ws.eventing.ExpirationType;
import org.apache.cxf.ws.eventing.FilterType;
import org.apache.cxf.ws.eventing.FormatType;
-import org.apache.cxf.ws.eventing.NotifyTo;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
+import org.apache.cxf.ws.eventing.ObjectFactory;
import org.apache.cxf.ws.eventing.Subscribe;
import org.apache.cxf.ws.eventing.backend.notification.NotificatorService;
import org.apache.cxf.ws.eventing.backend.notification.emitters.Emitter;
@@ -68,8 +68,8 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
+ subscribe.getDelivery().getContent()
+ .add(new ObjectFactory().createNotifyTo(eventSinkERT));
eventSourceClient.subscribeOp(subscribe);
@@ -115,12 +115,10 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
FormatType formatType = new FormatType();
formatType.setName(EventingConstants.DELIVERY_FORMAT_WRAPPED);
subscribe.setFormat(formatType);
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
-
eventSourceClient.subscribeOp(subscribe);
eventSourceClient.subscribeOp(subscribe);
@@ -165,9 +163,7 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
-
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
eventSourceClient.subscribeOp(subscribe);
@@ -220,9 +216,7 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
-
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
eventSourceClient.subscribeOp(subscribe);
@@ -271,9 +265,8 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
-
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
+
subscribe.setFilter(new FilterType());
subscribe.getFilter().getContent().add("//*[local-name()='fire' and "
+ "namespace-uri()='http://www.events.com']/location[text()='Canada']");
@@ -325,8 +318,7 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
subscribe.setFilter(new FilterType());
subscribe.getFilter().getContent().add("/*[local-name()='fire']/location[text()='Russia']");
@@ -376,8 +368,7 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
subscribe.setFilter(new FilterType());
subscribe.getFilter().getContent()
@@ -437,9 +428,7 @@ public class NotificationTest extends Si
eventSinkAddr.setValue(url);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
-
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
eventSourceClient.subscribeOp(subscribe);
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/SubscriptionEndTest.java Wed May 29 17:11:58 2013
@@ -29,11 +29,11 @@ import javax.xml.namespace.QName;
import org.w3c.dom.Element;
import org.apache.cxf.endpoint.Server;
-import org.apache.cxf.ws.eventing.AttributedURIType;
+import org.apache.cxf.ws.addressing.AttributedURIType;
+import org.apache.cxf.ws.addressing.EndpointReferenceType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
import org.apache.cxf.ws.eventing.DeliveryType;
-import org.apache.cxf.ws.eventing.EndpointReferenceType;
-import org.apache.cxf.ws.eventing.NotifyTo;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
+import org.apache.cxf.ws.eventing.ObjectFactory;
import org.apache.cxf.ws.eventing.Subscribe;
import org.apache.cxf.ws.eventing.SubscribeResponse;
import org.apache.cxf.ws.eventing.backend.notification.NotificatorService;
@@ -60,8 +60,7 @@ public class SubscriptionEndTest extends
eventSinkAddr.setValue(eventSinkURL);
eventSinkERT.setAddress(eventSinkAddr);
subscribe.setDelivery(new DeliveryType());
- subscribe.getDelivery().getContent().add(new NotifyTo());
- ((NotifyTo)subscribe.getDelivery().getContent().get(0)).setValue(eventSinkERT);
+ subscribe.getDelivery().getContent().add(new ObjectFactory().createNotifyTo(eventSinkERT));
JAXBElement<String> idqn
= new JAXBElement<String>(new QName("http://www.example.org", "MyReferenceParameter"),
Modified: cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java
URL: http://svn.apache.org/viewvc/cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java?rev=1487548&r1=1487547&r2=1487548&view=diff
==============================================================================
--- cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java (original)
+++ cxf/trunk/rt/ws/eventing/src/test/java/org/apache/cxf/ws/eventing/integration/notificationapi/assertions/ReferenceParametersAssertingHandler.java Wed May 29 17:11:58 2013
@@ -31,7 +31,7 @@ import org.w3c.dom.Element;
import com.ibm.wsdl.util.xml.DOMUtils;
-import org.apache.cxf.ws.eventing.ReferenceParametersType;
+import org.apache.cxf.ws.addressing.ReferenceParametersType;
public class ReferenceParametersAssertingHandler implements SOAPHandler<SOAPMessageContext> {