svn commit: r1187021 - in /cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws: JaxwsCreatePullPoint.java JaxwsNotificationBroker.java JaxwsPublisher.java

[dk...@apache.org]

Author: dkulp
Date: Thu Oct 20 19:55:31 2011
New Revision: 1187021

URL: http://svn.apache.org/viewvc?rev=1187021&view=rev
Log:
Add serviceName/portName/targetNamespace attributes to the impls to make
the generated wsdl look a bit better.
Switch to SOAP 1.2 (which also allows SOAP 1.1 calls)

Modified:
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java
    cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java?rev=1187021&r1=1187020&r2=1187021&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsCreatePullPoint.java Thu Oct 20 19:55:31 2011
@@ -21,11 +21,16 @@ package org.apache.cxf.wsn.jaxws;
 import java.net.URI;
 import javax.jms.ConnectionFactory;
 import javax.jws.WebService;
+import javax.xml.ws.BindingType;
 
 import org.apache.cxf.wsn.AbstractPullPoint;
 import org.apache.cxf.wsn.jms.JmsCreatePullPoint;
 
-@WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.CreatePullPoint")
+@WebService(endpointInterface = "org.oasis_open.docs.wsn.bw_2.CreatePullPoint",
+            targetNamespace = "http://docs.oasis-open.org/wsn/bw-2",
+            serviceName = "CreatePullPoint",
+            portName = "CreatePullPointPort")
+@BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
 public class JaxwsCreatePullPoint extends JmsCreatePullPoint {
 
     public JaxwsCreatePullPoint(String name) {

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java?rev=1187021&r1=1187020&r2=1187021&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsNotificationBroker.java Thu Oct 20 19:55:31 2011
@@ -20,12 +20,17 @@ package org.apache.cxf.wsn.jaxws;
 
 import javax.jms.ConnectionFactory;
 import javax.jws.WebService;
+import javax.xml.ws.BindingType;
 
 import org.apache.cxf.wsn.jms.JmsNotificationBroker;
 import org.apache.cxf.wsn.jms.JmsPublisher;
 import org.apache.cxf.wsn.jms.JmsSubscription;
 
-@WebService(endpointInterface = "org.oasis_open.docs.wsn.brw_2.NotificationBroker")
+@WebService(endpointInterface = "org.oasis_open.docs.wsn.brw_2.NotificationBroker",
+            targetNamespace = "http://docs.oasis-open.org/wsn/brw-2",
+            serviceName = "NotificationBroker",
+            portName = "NotificationBrokerPort")
+@BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
 public class JaxwsNotificationBroker extends JmsNotificationBroker {
 
     public JaxwsNotificationBroker(String name) {

Modified: cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java
URL: http://svn.apache.org/viewvc/cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java?rev=1187021&r1=1187020&r2=1187021&view=diff
==============================================================================
--- cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java (original)
+++ cxf/trunk/services/wsn/wsn-core/src/main/java/org/apache/cxf/wsn/jaxws/JaxwsPublisher.java Thu Oct 20 19:55:31 2011
@@ -23,6 +23,7 @@ import java.util.logging.Logger;
 
 import javax.jws.WebService;
 import javax.xml.bind.JAXBElement;
+import javax.xml.ws.BindingType;
 
 import org.apache.cxf.common.logging.LogUtils;
 import org.apache.cxf.wsn.AbstractSubscription;
@@ -37,7 +38,11 @@ import org.oasis_open.docs.wsn.brw_2.Pub
 import org.oasis_open.docs.wsn.bw_2.NotificationProducer;
 import org.oasis_open.docs.wsn.bw_2.SubscriptionManager;
 
-@WebService(endpointInterface = "org.oasis_open.docs.wsn.brw_2.PublisherRegistrationManager")
+@WebService(endpointInterface = "org.oasis_open.docs.wsn.brw_2.PublisherRegistrationManager",
+            targetNamespace = "http://docs.oasis-open.org/wsn/brw-2",
+            serviceName = "PublisherRegistrationManager",
+            portName = "PublisherRegistrationManagerPort")
+@BindingType(javax.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
 public class JaxwsPublisher extends JmsPublisher {
 
     private static final Logger LOGGER = LogUtils.getL7dLogger(JaxwsPublisher.class);