Author: dkulp
Date: Fri Nov 2 06:57:53 2007
New Revision: 591330
URL: http://svn.apache.org/viewvc?rev=591330&view=rev
Log:
Merged revisions 591240 via svnmerge from
https://svn.apache.org/repos/asf/incubator/cxf/trunk
........
r591240 | ningjiang | 2007-11-02 02:03:54 -0400 (Fri, 02 Nov 2007) | 1 line
CXF-1158 Added a test to show how to set the base-address as you like when
using the servlet transprot
........
Modified:
incubator/cxf/branches/2.0.x-fixes/ (props changed)
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/web-external.xml
Propchange: incubator/cxf/branches/2.0.x-fixes/
------------------------------------------------------------------------------
Binary property 'svnmerge-integrated' - no diff available.
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java?rev=591330&r1=591329&r2=591330&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/ExternalServicesServletTest.java
Fri Nov 2 06:57:53 2007
@@ -34,7 +34,8 @@
import org.junit.Test;
public class ExternalServicesServletTest extends AbstractServletTest {
-
+ static final String FORCED_BASE_ADDRESS
+ = "http://localhost/somewhere";;
@Override
protected Bus createBus() throws BusException {
return null;
@@ -55,8 +56,8 @@
WebResponse res = client.getResponse(CONTEXT_URL + "/");
WebLink[] links = res.getLinks();
assertEquals("There should get two links for the services", 2,
links.length);
- assertEquals(CONTEXT_URL + "/greeter?wsdl", links[0].getURLString());
- assertEquals(CONTEXT_URL + "/greeter2?wsdl", links[1].getURLString());
+ assertEquals(FORCED_BASE_ADDRESS + "/greeter?wsdl",
links[0].getURLString());
+ assertEquals(FORCED_BASE_ADDRESS + "/greeter2?wsdl",
links[1].getURLString());
assertEquals("text/html", res.getContentType());
//HTTPUnit do not support require url with ""
Modified:
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/web-external.xml
URL:
http://svn.apache.org/viewvc/incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/web-external.xml?rev=591330&r1=591329&r2=591330&view=diff
==============================================================================
---
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/web-external.xml
(original)
+++
incubator/cxf/branches/2.0.x-fixes/systests/src/test/java/org/apache/cxf/systest/servlet/web-external.xml
Fri Nov 2 06:57:53 2007
@@ -35,6 +35,10 @@
<param-name>config-location</param-name>
<param-value>org/apache/cxf/systest/servlet/cxf-servlet.xml</param-value>
</init-param>
+ <init-param>
+ <param-name>base-address</param-name>
+ <param-value>http://localhost/somewhere</param-value>
+ </init-param>
</servlet>
<servlet-mapping>
