svn commit: r821802 - in /cxf/trunk/rt: frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/ transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/ transports/http/src/main/java/org/apache/cxf/transport/servlet/

[sergeyb]

Author: sergeyb
Date: Mon Oct  5 14:00:38 2009
New Revision: 821802

URL: http://svn.apache.org/viewvc?rev=821802&view=rev
Log:
Minor update to JAXRS runtime for it to get the endpoint address from all 
AbsractHTTPDestinations

Modified:
    
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
    
cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
    
cxf/trunk/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/ServletDestination.java

Modified: 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java?rev=821802&r1=821801&r2=821802&view=diff
==============================================================================
--- 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 (original)
+++ 
cxf/trunk/rt/frontend/jaxrs/src/main/java/org/apache/cxf/jaxrs/utils/HttpUtils.java
 Mon Oct  5 14:00:38 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/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
URL: 
http://svn.apache.org/viewvc/cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java?rev=821802&r1=821801&r2=821802&view=diff
==============================================================================
--- 
cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 (original)
+++ 
cxf/trunk/rt/transports/http-osgi/src/main/java/org/apache/cxf/transport/http_osgi/OsgiDestination.java
 Mon Oct  5 14:00:38 2009
@@ -97,7 +97,4 @@
         return this.incomingObserver;
     }
 
-    public EndpointInfo getEndpointInfo() {
-        return endpointInfo;
-    }
 }

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