svn commit: r1435364 - in /cxf/branches/2.7.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/ services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/

[sergeyb]

Author: sergeyb
Date: Fri Jan 18 21:54:01 2013
New Revision: 1435364

URL: http://svn.apache.org/viewvc?rev=1435364&view=rev
Log:
Merged revisions 1435354 via svnmerge from 
https://svn.apache.org/repos/asf/cxf/trunk

........
  r1435354 | sergeyb | 2013-01-18 21:30:16 +0000 (Fri, 18 Jan 2013) | 1 line
  
  [CXF-4767] Making JAX-RS endpoints interact well with WS-Discovery, setting 
JAX-RS EndpointInfo QName same as Service QName instead of keeping it null
........

Modified:
    cxf/branches/2.7.x-fixes/   (props changed)
    
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
    
cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/WSDiscoveryServerListener.java

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
  Merged /cxf/trunk:r1435354

Propchange: cxf/branches/2.7.x-fixes/
------------------------------------------------------------------------------
--- svnmerge-integrated (original)
+++ svnmerge-integrated Fri Jan 18 21:54:01 2013
@@ -1 +1 @@
-/cxf/trunk:1-1430398,1430564,1430881-1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007,1433033,1433135,1433305,1433347,1433895,1434042,1434124,1434564,1435034,1435111,1435223
+/cxf/trunk:1-1430398,1430564,1430881-1430882,1430905,1430965,1430976,1431315,1431604-1431607,1432070,1432236,1432798,1433007,1433033,1433135,1433305,1433347,1433895,1434042,1434124,1434564,1435034,1435111,1435223,1435354

Modified: 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java?rev=1435364&r1=1435363&r2=1435364&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/AbstractJAXRSFactoryBean.java
 Fri Jan 18 21:54:01 2013
@@ -127,7 +127,7 @@ public class AbstractJAXRSFactoryBean ex
      * transport is http, binding is JAX-RS binding, endpoint address is from
      * server mainline.
      */    
-    protected EndpointInfo createEndpointInfo() throws BusException {
+    protected EndpointInfo createEndpointInfo(Service service) throws 
BusException {
         String transportId = getTransportId();
         if (transportId == null && getAddress() != null) {
             DestinationFactory df = getDestinationFactory();
@@ -159,7 +159,7 @@ public class AbstractJAXRSFactoryBean ex
         if (!StringUtils.isEmpty(publishedEndpointUrl)) {
             ei.setProperty("publishedEndpointUrl", publishedEndpointUrl);
         }
-        
+        ei.setName(service.getName());
         
serviceFactory.sendEvent(FactoryBeanListener.Event.ENDPOINTINFO_CREATED, ei);
 
         return ei;
@@ -220,7 +220,7 @@ public class AbstractJAXRSFactoryBean ex
             service = serviceFactory.create();
         }
 
-        EndpointInfo ei = createEndpointInfo();
+        EndpointInfo ei = createEndpointInfo(service);
         Endpoint ep = new EndpointImpl(getBus(), service, ei);
         
         if (properties != null) {

Modified: 
cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/WSDiscoveryServerListener.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/WSDiscoveryServerListener.java?rev=1435364&r1=1435363&r2=1435364&view=diff
==============================================================================
--- 
cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/WSDiscoveryServerListener.java
 (original)
+++ 
cxf/branches/2.7.x-fixes/services/ws-discovery/ws-discovery-api/src/main/java/org/apache/cxf/ws/discovery/listeners/WSDiscoveryServerListener.java
 Fri Jan 18 21:54:01 2013
@@ -85,8 +85,10 @@ public class WSDiscoveryServerListener i
         InterfaceInfo ii = ei.getInterface();
         if (ii != null) {
             return ii.getName();
-        } else {
+        } else if (ei.getService() != null) {
             return ei.getService().getName();
+        } else {
+            return ei.getName();
         }
     }