svn commit: r821804 - in /cxf/branches/2.2.x-fixes: ./ rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/

[sergeyb]

Author: sergeyb
Date: Mon Oct  5 14:13:00 2009
New Revision: 821804

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

........
  r821802 | sergeyb | 2009-10-05 15:00:38 +0100 (Mon, 05 Oct 2009) | 1 line
  
  Minor update to JAXRS runtime for it to get the endpoint address from all 
AbsractHTTPDestinations
........

Modified:
    cxf/branches/2.2.x-fixes/   (props changed)
    
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
    
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
    
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:821802

Propchange: cxf/branches/2.2.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.

Modified: 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java?rev=821804&r1=821803&r2=821804&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 Mon Oct  5 14:13:00 2009
@@ -43,7 +43,6 @@
 import org.apache.cxf.message.Message;
 import org.apache.cxf.transport.Destination;
 import org.apache.cxf.transport.http.AbstractHTTPDestination;
-import org.apache.cxf.transport.servlet.ServletDestination;
 
 public final class HttpUtils {
     
@@ -166,8 +165,8 @@
         String address = null;
         Destination d = m.getExchange().getDestination();
         if (d != null) {
-            if (d instanceof ServletDestination) {
-                address = 
((ServletDestination)d).getEndpointInfo().getAddress();
+            if (d instanceof AbstractHTTPDestination) {
+                address = 
((AbstractHTTPDestination)d).getEndpointInfo().getAddress();
             } else {
                 address = d.getAddress().getAddress().getValue();
             }

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java?rev=821804&r1=821803&r2=821804&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 Mon Oct  5 14:13:00 2009
@@ -97,7 +97,4 @@
         return this.incomingObserver;
     }
 
-    public EndpointInfo getEndpointInfo() {
-        return endpointInfo;
-    }
 }

Modified: 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java?rev=821804&r1=821803&r2=821804&view=diff
==============================================================================
--- 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
 (original)
+++ 
cxf/branches/2.2.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java
 Mon Oct  5 14:13:00 2009
@@ -113,8 +113,5 @@
     public MessageObserver getMessageObserver() {
         return this.incomingObserver;
     }
-
-    public EndpointInfo getEndpointInfo() {
-        return endpointInfo;
-    }
+    
 }