Author: rmannibucau
Date: Fri Sep 19 05:11:23 2014
New Revision: 1626127
URL: http://svn.apache.org/r1626127
Log:
fixing tests broken by sed
Modified:
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
Modified:
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java?rev=1626127&r1=1626126&r2=1626127&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiHandlersTest.java
Fri Sep 19 05:11:23 2014
@@ -16,8 +16,6 @@
*/
package org.apache.openejb.server.cxf;
-import org.apache.cxf.endpoint.Client;
-import org.apache.cxf.frontend.ClientProxy;
import org.apache.openejb.jee.WebApp;
import org.apache.openejb.junit.ApplicationComposer;
import org.apache.openejb.server.cxf.handler.SimpleHandler;
@@ -34,7 +32,6 @@ import org.junit.runner.RunWith;
import javax.jws.HandlerChain;
import javax.jws.WebService;
import javax.xml.namespace.QName;
-import javax.xml.ws.Endpoint;
import javax.xml.ws.Service;
import java.net.MalformedURLException;
import java.net.URL;
@@ -67,7 +64,7 @@ public class CdiHandlersTest {
@Test
public void checkHandlersAreCDIBeans() throws MalformedURLException {
SimpleHandler.reset();
- final Service service = Service.create(new URL("http://localhost:"; +
port + "/test/ws?wsdl"), new QName("http://cxf.server.tomee.apache.org/";,
"MyHandledWebserviceService"));
+ final Service service = Service.create(new URL("http://localhost:"; +
port + "/test/ws?wsdl"), new QName("http://cxf.server.openejb.apache.org/";,
"MyHandledWebserviceService"));
final MyHandledWsApi servicePort =
service.getPort(MyHandledWsApi.class);
servicePort.test();
assertTrue(SimpleHandler.close);
Modified:
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java?rev=1626127&r1=1626126&r2=1626127&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/CdiPojoTest.java
Fri Sep 19 05:11:23 2014
@@ -67,7 +67,7 @@ public class CdiPojoTest {
@Test
public void checkInjection() throws MalformedURLException {
final MyWsApi api = Service.create(new URL("http://localhost:"; + port
+ "/test/ws?wsdl"),
- new QName("http://cxf.server.tomee.apache.org/";,
"MyWebserviceService"))
+ new QName("http://cxf.server.openejb.apache.org/";,
"MyWebserviceService"))
.getPort(MyWsApi.class);
assertEquals("ok", api.test());
}
Modified:
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java?rev=1626127&r1=1626126&r2=1626127&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/SoapBinding12ClientTest.java
Fri Sep 19 05:11:23 2014
@@ -79,9 +79,9 @@ public class SoapBinding12ClientTest {
protected void service(HttpServletRequest req, HttpServletResponse
resp) throws ServletException, IOException {
if ("GET".equals(req.getMethod())) {
resp.getWriter().write("<?xml version='1.0'
encoding='UTF-8'?>" +
- "<wsdl:definitions
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";
xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\";
xmlns:tns=\"http://cxf.server.tomee.apache.org/\";
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\";
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\";
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/http\";
name=\"MyWebservice12Service\"
targetNamespace=\"http://cxf.server.tomee.apache.org/\";>\n" +
+ "<wsdl:definitions
xmlns:xsd=\"http://www.w3.org/2001/XMLSchema\";
xmlns:wsdl=\"http://schemas.xmlsoap.org/wsdl/\";
xmlns:tns=\"http://cxf.server.openejb.apache.org/\";
xmlns:soap12=\"http://schemas.xmlsoap.org/wsdl/soap12/\";
xmlns:soap=\"http://schemas.xmlsoap.org/wsdl/soap/\";
xmlns:ns1=\"http://schemas.xmlsoap.org/soap/http\";
name=\"MyWebservice12Service\"
targetNamespace=\"http://cxf.server.openejb.apache.org/\";>\n" +
" <wsdl:types>\n" +
- "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:tns=\"http://cxf.server.tomee.apache.org/\";
elementFormDefault=\"unqualified\"
targetNamespace=\"http://cxf.server.tomee.apache.org/\"; version=\"1.0\">\n" +
+ "<xs:schema xmlns:xs=\"http://www.w3.org/2001/XMLSchema\";
xmlns:tns=\"http://cxf.server.openejb.apache.org/\";
elementFormDefault=\"unqualified\"
targetNamespace=\"http://cxf.server.openejb.apache.org/\"; version=\"1.0\">\n" +
"<xs:element name=\"input\" type=\"tns:input\"/>\n" +
"<xs:element name=\"output\" type=\"tns:output\"/>\n" +
"<xs:element name=\"test\" type=\"tns:test\"/>\n" +
@@ -146,7 +146,7 @@ public class SoapBinding12ClientTest {
resp.getWriter().write("" +
"<soap:Envelope
xmlns:soap=\"http://www.w3.org/2003/05/soap-envelope\";>" +
" <soap:Body>" +
- " <ns2:testResponse
xmlns:ns2=\"http://cxf.server.tomee.apache.org/\";>" +
+ " <ns2:testResponse
xmlns:ns2=\"http://cxf.server.openejb.apache.org/\";>" +
" <return><attribute>ok</attribute></return>" +
" </ns2:testResponse>" +
" </soap:Body>" +
Modified:
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
URL:
http://svn.apache.org/viewvc/tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java?rev=1626127&r1=1626126&r2=1626127&view=diff
==============================================================================
---
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
(original)
+++
tomee/tomee/trunk/server/openejb-cxf/src/test/java/org/apache/openejb/server/cxf/WebServiceWithAnUserInterceptorTest.java
Fri Sep 19 05:11:23 2014
@@ -61,7 +61,7 @@ public class WebServiceWithAnUserInterce
public void test() throws Exception {
Foo foo = Service.create(
new URL("http://localhost:"; + port + "/openejb-cxf/FooImpl?wsdl"),
- new QName("http://cxf.server.tomee.apache.org/";, "FooImplService"))
+ new QName("http://cxf.server.openejb.apache.org/";,
"FooImplService"))
.getPort(Foo.class);
assertNotNull(foo);
assertEquals("bar", foo.hi());
