Author: dkulp
Date: Tue Aug 30 20:59:49 2011
New Revision: 1163378
URL: http://svn.apache.org/viewvc?rev=1163378&view=rev
Log:
Merged revisions 1163375 via svnmerge from
https://svn.apache.org/repos/asf/cxf/trunk
........
r1163375 | dkulp | 2011-08-30 16:56:48 -0400 (Tue, 30 Aug 2011) | 1 line
[CXF-2774] Use the endpointPublishUrl in the service list
........
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
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
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=1163378&r1=1163377&r2=1163378&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
Tue Aug 30 20:59:49 2011
@@ -109,7 +109,11 @@ public class FormattedServiceListWriter
}
private String getAbsoluteAddress(String basePath, AbstractDestination d) {
- String endpointAddress = d.getEndpointInfo().getAddress();
+ String endpointAddress =
(String)d.getEndpointInfo().getProperty("publishedEndpointUrl");
+ if (endpointAddress != null) {
+ return endpointAddress;
+ }
+ endpointAddress = d.getEndpointInfo().getAddress();
if (basePath == null || endpointAddress.startsWith(basePath)) {
return endpointAddress;
} else {
Modified:
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.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/UnformattedServiceListWriter.java?rev=1163378&r1=1163377&r2=1163378&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
(original)
+++
cxf/branches/2.4.x-fixes/rt/transports/http/src/main/java/org/apache/cxf/transport/servlet/servicelist/UnformattedServiceListWriter.java
Tue Aug 30 20:59:49 2011
@@ -71,7 +71,11 @@ public class UnformattedServiceListWrite
}
private String getAbsoluteAddress(String basePath, AbstractDestination d) {
- String endpointAddress = d.getEndpointInfo().getAddress();
+ String endpointAddress =
(String)d.getEndpointInfo().getProperty("publishedEndpointUrl");
+ if (endpointAddress != null) {
+ return endpointAddress;
+ }
+ endpointAddress = d.getEndpointInfo().getAddress();
if (basePath == null || endpointAddress.startsWith(basePath)) {
return endpointAddress;
} else {
Modified:
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java?rev=1163378&r1=1163377&r2=1163378&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/CXFServletTest.java
Tue Aug 30 20:59:49 2011
@@ -96,7 +96,7 @@ public class CXFServletTest extends Abst
WebLink[] links = res.getLinks();
- assertEquals("There should get two links for the service", 3,
links.length);
+ assertEquals("Wrong number of service links", 4, links.length);
Set<String> links2 = new HashSet<String>();
for (WebLink l : links) {
@@ -105,6 +105,7 @@ public class CXFServletTest extends Abst
assertTrue(links2.contains(CONTEXT_URL + "/services/greeter?wsdl"));
assertTrue(links2.contains(CONTEXT_URL + "/services/greeter2?wsdl"));
+ assertTrue(links2.contains("http://cxf.apache.org/MyGreeter?wsdl";));
assertEquals("text/html", res.getContentType());
res = client.getResponse(CONTEXT_URL + "/services/");
@@ -116,9 +117,10 @@ public class CXFServletTest extends Abst
links2.add(l.getURLString());
}
- assertEquals("There should get two links for the service", 3,
links.length);
+ assertEquals("Wrong number of service links", 4, links.length);
assertTrue(links2.contains(CONTEXT_URL + "/services/greeter?wsdl"));
assertTrue(links2.contains(CONTEXT_URL + "/services/greeter2?wsdl"));
+ assertTrue(links2.contains("http://cxf.apache.org/MyGreeter?wsdl";));
assertEquals("text/html", res.getContentType());
Modified:
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java?rev=1163378&r1=1163377&r2=1163378&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
(original)
+++
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
Tue Aug 30 20:59:49 2011
@@ -59,7 +59,7 @@ public class ExternalServicesServletTest
//test the '/' context get service list
WebResponse res = client.getResponse(CONTEXT_URL + "/");
WebLink[] links = res.getLinks();
- assertEquals("There should get two links for the services", 3,
links.length);
+ assertEquals("Wrong number of service links", 4, links.length);
Set<String> links2 = new HashSet<String>();
for (WebLink l : links) {
Modified:
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
URL:
http://svn.apache.org/viewvc/cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml?rev=1163378&r1=1163377&r2=1163378&view=diff
==============================================================================
---
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
(original)
+++
cxf/branches/2.4.x-fixes/systests/transports/src/test/java/org/apache/cxf/systest/servlet/cxf-servlet.xml
Tue Aug 30 20:59:49 2011
@@ -44,5 +44,18 @@ http://cxf.apache.org/jaxws http://cxf.a
<jaxws:schemaLocation>/org/apache/cxf/systest/servlet/hello_world_includes.xsd</jaxws:schemaLocation>
</jaxws:schemaLocations>
</jaxws:endpoint>
+
+ <jaxws:endpoint
+ id="greeter4"
+ address="/greeter4"
+ implementor="org.apache.cxf.systest.servlet.CXFServletTest$NoWsdlGreeter">
+ <jaxws:schemaLocations >
+
<jaxws:schemaLocation>/org/apache/cxf/systest/servlet/hello_world_includes.xsd</jaxws:schemaLocation>
+ </jaxws:schemaLocations>
+ <jaxws:properties>
+ <entry key="publishedEndpointUrl"
value="http://cxf.apache.org/MyGreeter"/>
+ </jaxws:properties>
+ </jaxws:endpoint>
+
</beans>
\ No newline at end of file
