cxf-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From serg...@apache.org
Subject svn commit: r1225218 - in /cxf/branches/2.4.x-fixes: ./ rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
Date Wed, 28 Dec 2011 16:21:18 GMT
Author: sergeyb
Date: Wed Dec 28 16:21:17 2011
New Revision: 1225218

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

........
  r1225217 | sergeyb | 2011-12-28 16:18:20 +0000 (Wed, 28 Dec 2011) | 1 line
  
  [CXF-3877] Returning endpoint address for foreign contexts
........

Modified:
    cxf/branches/2.4.x-fixes/   (props changed)
    cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java

Propchange: cxf/branches/2.4.x-fixes/
------------------------------------------------------------------------------
    svn:mergeinfo = /cxf/trunk:1225217

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

Modified: cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
URL: http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java?rev=1225218&r1=1225217&r2=1225218&view=diff
==============================================================================
--- cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
(original)
+++ cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/FormattedServiceListWriter.java
Wed Dec 28 16:21:17 2011
@@ -24,7 +24,6 @@ import java.util.Map;
 
 import org.apache.cxf.service.model.OperationInfo;
 import org.apache.cxf.transport.AbstractDestination;
-import org.apache.cxf.transport.servlet.ServletDestination;
 
 public class FormattedServiceListWriter implements ServiceListWriter {
     private String styleSheetPath;
@@ -124,15 +123,8 @@ public class FormattedServiceListWriter 
         }
         endpointAddress = d.getEndpointInfo().getAddress();
         if (endpointAddress.startsWith("http://") || endpointAddress.startsWith("https://"))
{
-            if (endpointAddress.startsWith(basePath)) {
+            if (endpointAddress.startsWith(basePath) || showForeignContexts) {
                 return endpointAddress;
-            } else if (showForeignContexts) {
-                if (d instanceof ServletDestination) {
-                    String path = ((ServletDestination)d).getPath();
-                    return basePath + path;
-                } else {
-                    return endpointAddress;
-                }
             } else {
                 return null;
             }



Mime
View raw message