You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@cxf.apache.org by bu...@apache.org on 2019/05/16 08:25:31 UTC
[cxf] branch master updated (5464908 -> 8c9895c)
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git.
from 5464908 [CXF-8042]:doPrivileged block doesn't totally work in ProxyClassLoaderCache (#554)
new 7d70dd6 cxf-systests-uncategorized: update wsdl location
new 8c9895c CXF-7953: apply workaround for JDK 9 & 10
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java | 2 +-
.../org/apache/cxf/systest/callback/CallbackImpl.java | 2 +-
.../java/org/apache/cxf/systest/callback/ServerImpl.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplA.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplB.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplC.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplD.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplE.java | 2 +-
.../test/java/org/apache/cxf/systest/corba/Server.java | 15 +++------------
.../java/org/apache/cxf/systest/corba/ServerTimeout.java | 15 +++------------
.../systest/factory_pattern/HttpNumberFactoryImpl.java | 2 +-
.../systest/factory_pattern/ManualNumberFactoryImpl.java | 2 +-
.../cxf/systest/factory_pattern/NumberFactoryImpl.java | 2 +-
.../java/org/apache/cxf/systest/fault/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/interceptor/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/lifecycle/LifeCycleTest.java | 2 +-
.../java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java | 2 +-
.../apache/cxf/systest/nested_callback/CallbackImpl.java | 2 +-
.../apache/cxf/systest/nested_callback/ServerImpl.java | 2 +-
.../cxf/systest/outofband/header/OOBHdrServiceImpl.java | 2 +-
.../org/apache/cxf/systest/outofband/header/Server.java | 2 +-
.../java/org/apache/cxf/systest/soap/TransformServer.java | 11 +----------
.../test/java/org/apache/cxf/systest/soap/XSLTServer.java | 11 +----------
.../java/org/apache/cxf/systest/soap12/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/soapfault/SOAPFaultImpl.java | 2 +-
.../cxf/systest/soapfault/details/GreeterImpl12.java | 2 +-
.../cxf/systest/type_test/AbstractTypeTestClient.java | 4 ++--
.../type_test/corba/CORBADocLitClientTypeTest.java | 4 ++--
.../systest/type_test/soap/SOAPDocLitClientTypeTest.java | 2 +-
.../cxf/systest/type_test/soap/SOAPDocLitServerImpl.java | 2 +-
.../systest/type_test/soap/SOAPRpcLitClientTypeTest.java | 2 +-
.../cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java | 2 +-
.../cxf/systest/type_test/xml/XMLClientTypeTest.java | 2 +-
.../apache/cxf/systest/type_test/xml/XMLServerImpl.java | 2 +-
.../test/resources/org/apache/cxf/systest/soap/client.xml | 15 +++++++++------
35 files changed, 49 insertions(+), 82 deletions(-)
[cxf] 01/02: cxf-systests-uncategorized: update wsdl location
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 7d70dd6a1f3fbb8ab53a40569e5b606984e16c3c
Author: amarkevich <am...@talend.com>
AuthorDate: Thu May 16 11:23:32 2019 +0300
cxf-systests-uncategorized: update wsdl location
---
.../cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java | 2 +-
.../org/apache/cxf/systest/callback/CallbackImpl.java | 2 +-
.../java/org/apache/cxf/systest/callback/ServerImpl.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplA.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplB.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplC.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplD.java | 2 +-
.../org/apache/cxf/systest/clustering/GreeterImplE.java | 2 +-
.../test/java/org/apache/cxf/systest/corba/Server.java | 15 +++------------
.../java/org/apache/cxf/systest/corba/ServerTimeout.java | 15 +++------------
.../systest/factory_pattern/HttpNumberFactoryImpl.java | 2 +-
.../systest/factory_pattern/ManualNumberFactoryImpl.java | 2 +-
.../cxf/systest/factory_pattern/NumberFactoryImpl.java | 2 +-
.../java/org/apache/cxf/systest/fault/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/interceptor/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/lifecycle/LifeCycleTest.java | 2 +-
.../java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java | 2 +-
.../apache/cxf/systest/nested_callback/CallbackImpl.java | 2 +-
.../apache/cxf/systest/nested_callback/ServerImpl.java | 2 +-
.../cxf/systest/outofband/header/OOBHdrServiceImpl.java | 2 +-
.../org/apache/cxf/systest/outofband/header/Server.java | 2 +-
.../java/org/apache/cxf/systest/soap/TransformServer.java | 11 +----------
.../test/java/org/apache/cxf/systest/soap/XSLTServer.java | 11 +----------
.../java/org/apache/cxf/systest/soap12/GreeterImpl.java | 2 +-
.../org/apache/cxf/systest/soapfault/SOAPFaultImpl.java | 2 +-
.../cxf/systest/soapfault/details/GreeterImpl12.java | 2 +-
.../cxf/systest/type_test/soap/SOAPDocLitServerImpl.java | 2 +-
.../cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java | 2 +-
.../apache/cxf/systest/type_test/xml/XMLServerImpl.java | 2 +-
.../test/resources/org/apache/cxf/systest/soap/client.xml | 15 +++++++++------
30 files changed, 42 insertions(+), 75 deletions(-)
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
index 9fc82fb..2174a90 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/basicDOCBare/PutLastTradedPriceImpl.java
@@ -30,7 +30,7 @@ import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType",
targetNamespace = "http://apache.org/hello_world_doc_lit_bare",
- wsdlLocation = "testutils/doc_lit_bare.wsdl")
+ wsdlLocation = "wsdl/doc_lit_bare.wsdl")
public class PutLastTradedPriceImpl implements PutLastTradedPricePortType {
public void sayHi(Holder<TradePriceData> inout) {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java
index b470e5b..29f840c 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/CallbackImpl.java
@@ -26,7 +26,7 @@ import org.apache.callback.CallbackPortType;
portName = "CallbackPort",
endpointInterface = "org.apache.callback.CallbackPortType",
targetNamespace = "http://apache.org/callback",
- wsdlLocation = "testutils/basic_callback_test.wsdl")
+ wsdlLocation = "wsdl/basic_callback_test.wsdl")
public class CallbackImpl implements CallbackPortType {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
index 9f79e8c..0c37d54 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/callback/ServerImpl.java
@@ -40,7 +40,7 @@ import org.apache.cxf.wsdl11.WSDLManagerImpl;
portName = "SOAPPort",
targetNamespace = "http://apache.org/callback",
endpointInterface = "org.apache.callback.ServerPortType",
- wsdlLocation = "testutils/basic_callback_test.wsdl")
+ wsdlLocation = "wsdl/basic_callback_test.wsdl")
public class ServerImpl implements ServerPortType {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
index ef69504..e9643d8 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplA.java
@@ -31,7 +31,7 @@ import org.apache.cxf.ws.addressing.JAXWSAConstants;
portName = "ReplicatedPortA",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImplA extends AbstractGreeterImpl {
@Resource
private WebServiceContext context;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplB.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplB.java
index ce6a914..8487daa 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplB.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplB.java
@@ -27,7 +27,7 @@ import org.apache.cxf.greeter_control.AbstractGreeterImpl;
portName = "ReplicatedPortB",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImplB extends AbstractGreeterImpl {
private String address;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplC.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplC.java
index 6576c2e..cf9404b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplC.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplC.java
@@ -27,7 +27,7 @@ import org.apache.cxf.greeter_control.AbstractGreeterImpl;
portName = "ReplicatedPortC",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImplC extends AbstractGreeterImpl {
private String address;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplD.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplD.java
index bee5108..30f387e 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplD.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplD.java
@@ -27,7 +27,7 @@ import org.apache.cxf.greeter_control.AbstractGreeterImpl;
portName = "ReplicatedPortD",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImplD extends AbstractGreeterImpl {
private String address;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplE.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplE.java
index 8e432e1..f20a94b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplE.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/clustering/GreeterImplE.java
@@ -27,7 +27,7 @@ import org.apache.cxf.greeter_control.AbstractGreeterImpl;
portName = "ReplicatedPortE",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImplE extends AbstractGreeterImpl {
private String address;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java
index ba26da4..3fb042d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/Server.java
@@ -29,24 +29,15 @@ public class Server extends AbstractBusTestServerBase {
public static final String PERSIST_PORT = allocatePort(Server.class);
protected void run() {
- System.out.println("Starting Server");
System.setProperty("com.sun.CORBA.POA.ORBServerId", "1");
System.setProperty("com.sun.CORBA.POA.ORBPersistentServerPort", PERSIST_PORT);
- new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_server.xml");
+ setBus(new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_server.xml"));
Object implementor = new BaseGreeterImpl();
String address = "file:./HelloWorld.ref";
Endpoint.publish(address, implementor);
}
- public static void main(String[] args) {
- try {
- Server s = new Server();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
+ public static void main(String[] args) throws Exception {
+ new Server().start();
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/ServerTimeout.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/ServerTimeout.java
index 4e62771..1477f77 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/ServerTimeout.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/corba/ServerTimeout.java
@@ -28,24 +28,15 @@ public class ServerTimeout extends AbstractBusTestServerBase {
public static final String PERSIST_PORT = allocatePort(ServerTimeout.class);
protected void run() {
- System.out.println("Starting Server");
System.setProperty("com.sun.CORBA.POA.ORBServerId", "1");
System.setProperty("com.sun.CORBA.POA.ORBPersistentServerPort", PERSIST_PORT);
- new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_server.xml");
+ setBus(new SpringBusFactory().createBus("org/apache/cxf/systest/corba/hello_world_server.xml"));
Object implementor = new BaseGreeterTimeoutImpl();
String address = "file:./HelloWorldTimeout.ref";
Endpoint.publish(address, implementor);
}
- public static void main(String[] args) {
- try {
- ServerTimeout s = new ServerTimeout();
- s.start();
- } catch (Exception ex) {
- ex.printStackTrace();
- System.exit(-1);
- } finally {
- System.out.println("done!");
- }
+ public static void main(String[] args) throws Exception {
+ new ServerTimeout().start();
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
index e4e7704..1b746fb 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/HttpNumberFactoryImpl.java
@@ -58,7 +58,7 @@ public class HttpNumberFactoryImpl extends NumberFactoryImpl {
protected void initDefaultServant() {
servant = new HttpNumberImpl();
- String wsdlLocation = "testutils/factory_pattern.wsdl";
+ String wsdlLocation = "wsdl/factory_pattern.wsdl";
String bindingId = null;
EndpointImpl ep =
new EndpointImpl(bus, servant, bindingId, wsdlLocation);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
index 0e0b01a..afe7ce6 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/ManualNumberFactoryImpl.java
@@ -52,7 +52,7 @@ public class ManualNumberFactoryImpl extends NumberFactoryImpl {
protected void initDefaultServant() {
servant = new ManualNumberImpl();
- String wsdlLocation = "testutils/factory_pattern.wsdl";
+ String wsdlLocation = "wsdl/factory_pattern.wsdl";
String bindingId = null;
EndpointImpl ep =
new EndpointImpl(bus, servant, bindingId, wsdlLocation);
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
index 36d4912..ea50a94 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/factory_pattern/NumberFactoryImpl.java
@@ -95,7 +95,7 @@ public class NumberFactoryImpl implements NumberFactory {
protected void initDefaultServant() {
servant = new NumberImpl();
- String wsdlLocation = "testutils/factory_pattern.wsdl";
+ String wsdlLocation = "wsdl/factory_pattern.wsdl";
String bindingId = null;
EndpointImpl ep = new EndpointImpl(bus,
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
index 4610810..d85999a 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/fault/GreeterImpl.java
@@ -33,7 +33,7 @@ import org.apache.intfault.types.BareDocumentResponse;
@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/intfault",
endpointInterface = "org.apache.intfault.Greeter",
- wsdlLocation = "testutils/hello_world_fault.wsdl")
+ wsdlLocation = "wsdl/hello_world_fault.wsdl")
public class GreeterImpl {
@Resource
protected WebServiceContext context;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/GreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/GreeterImpl.java
index 3b964f1..78ce4ea 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/GreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/interceptor/GreeterImpl.java
@@ -31,6 +31,6 @@ import org.apache.cxf.greeter_control.AbstractGreeterImpl;
portName = "GreeterPort",
endpointInterface = "org.apache.cxf.greeter_control.Greeter",
targetNamespace = "http://cxf.apache.org/greeter_control",
- wsdlLocation = "testutils/greeter_control.wsdl")
+ wsdlLocation = "wsdl/greeter_control.wsdl")
public class GreeterImpl extends AbstractGreeterImpl {
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
index 7952c83..eb00390 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/lifecycle/LifeCycleTest.java
@@ -253,7 +253,7 @@ public class LifeCycleTest {
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_soap_http.Greeter",
targetNamespace = "http://apache.org/hello_world_soap_http",
- wsdlLocation = "testutils/hello_world.wsdl")
+ wsdlLocation = "wsdl/hello_world.wsdl")
public class GreeterImpl extends org.apache.hello_world_soap_http.BaseGreeterImpl {
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java
index 5e6862e..24dfd4b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/mtom/TestMtomJMSImpl.java
@@ -31,7 +31,7 @@ import org.apache.cxf.mime.types.XopStringType;
portName = "TestMtomJMSPort",
targetNamespace = "http://cxf.apache.org/mime",
endpointInterface = "org.apache.cxf.mime.TestMtom",
- wsdlLocation = "testutils/mtom_xop.wsdl")
+ wsdlLocation = "wsdl/mtom_xop.wsdl")
public class TestMtomJMSImpl implements TestMtom {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackImpl.java
index 1261d96..ccf7b99 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/CallbackImpl.java
@@ -26,7 +26,7 @@ import org.apache.callback.CallbackPortType;
portName = "CallbackPort",
endpointInterface = "org.apache.callback.CallbackPortType",
targetNamespace = "http://apache.org/nested_callback",
- wsdlLocation = "testutils/nested_callback.wsdl")
+ wsdlLocation = "wsdl/nested_callback.wsdl")
public class CallbackImpl implements CallbackPortType {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
index 8491a77..dbaaeaa 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/nested_callback/ServerImpl.java
@@ -43,7 +43,7 @@ import org.apache.nested_callback.ServerPortType;
portName = "SOAPPort",
targetNamespace = "http://apache.org/nested_callback",
endpointInterface = "org.apache.nested_callback.ServerPortType",
- wsdlLocation = "testutils/nested_callback.wsdl")
+ wsdlLocation = "wsdl/nested_callback.wsdl")
public class ServerImpl implements ServerPortType {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java
index 06bd706..7df05af 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/OOBHdrServiceImpl.java
@@ -49,7 +49,7 @@ import org.apache.hello_world_doc_lit_bare.types.TradePriceData;
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType",
targetNamespace = "http://apache.org/hello_world_doc_lit_bare",
- wsdlLocation = "testutils/doc_lit_bare.wsdl")
+ wsdlLocation = "wsdl/doc_lit_bare.wsdl")
public class OOBHdrServiceImpl implements PutLastTradedPricePortType {
@Resource
private WebServiceContext context;
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java
index 1b9f6a5..f2d3ef6 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/outofband/header/Server.java
@@ -104,7 +104,7 @@ public class Server extends AbstractBusTestServerBase {
portName = "SoapPort",
endpointInterface = "org.apache.hello_world_doc_lit_bare.PutLastTradedPricePortType",
targetNamespace = "http://apache.org/hello_world_doc_lit_bare",
- wsdlLocation = "testutils/doc_lit_bare.wsdl")
+ wsdlLocation = "wsdl/doc_lit_bare.wsdl")
@EndpointProperty(key = "endpoint-processes-headers",
value = "{http://cxf.apache.org/outofband/Header}outofbandHeader")
public class OOBHdrPropertyServiceImpl extends OOBHdrServiceImpl {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/TransformServer.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/TransformServer.java
index 37b4119..949cee5 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/TransformServer.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/TransformServer.java
@@ -28,20 +28,11 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class TransformServer extends AbstractBusTestServerBase {
- public TransformServer() {
-
- }
-
protected void run() {
URL busFile = TransformServer.class.getResource("transform-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new TransformServer();
- } catch (Exception e) {
- e.printStackTrace();
- }
}
+
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTServer.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTServer.java
index ae64927..b0db24d 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTServer.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap/XSLTServer.java
@@ -28,20 +28,11 @@ import org.apache.cxf.testutil.common.AbstractBusTestServerBase;
public class XSLTServer extends AbstractBusTestServerBase {
- public XSLTServer() {
-
- }
-
protected void run() {
URL busFile = XSLTServer.class.getResource("xslt-server.xml");
Bus busLocal = new SpringBusFactory().createBus(busFile);
BusFactory.setDefaultBus(busLocal);
setBus(busLocal);
-
- try {
- new XSLTServer();
- } catch (Exception e) {
- e.printStackTrace();
- }
}
+
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
index 5a22603..a40185b 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soap12/GreeterImpl.java
@@ -29,7 +29,7 @@ import org.apache.hello_world_soap12_http.types.FaultDetail;
@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap12_http",
endpointInterface = "org.apache.hello_world_soap12_http.Greeter",
- wsdlLocation = "testutils/hello_world_soap12.wsdl")
+ wsdlLocation = "wsdl/hello_world_soap12.wsdl")
public class GreeterImpl implements Greeter {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java
index b33d01e..52e9d73 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/SOAPFaultImpl.java
@@ -27,7 +27,7 @@ import org.xmlsoap.schemas.soap.envelope.Fault;
@WebService(endpointInterface = "org.apache.cxf.soapfault.SoapFaultPortType",
serviceName = "SoapFaultService")
-@HandlerChain(file = "./handlers.xml", name = "TestHandlerChain")
+@HandlerChain(file = "handlers.xml")
public class SOAPFaultImpl implements SoapFaultPortType {
public void soapFault(Fault fault) {
//System.out.println("Received soap fault message");
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl12.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl12.java
index 16e4185..a298728 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl12.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/soapfault/details/GreeterImpl12.java
@@ -30,7 +30,7 @@ import org.apache.hello_world_soap12_http.types.FaultDetail;
@javax.jws.WebService(portName = "SoapPort", serviceName = "SOAPService",
targetNamespace = "http://apache.org/hello_world_soap12_http",
endpointInterface = "org.apache.hello_world_soap12_http.Greeter",
- wsdlLocation = "testutils/hello_world_soap12.wsdl")
+ wsdlLocation = "wsdl/hello_world_soap12.wsdl")
public class GreeterImpl12 implements Greeter {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
index e269428..0118d28 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitServerImpl.java
@@ -59,7 +59,7 @@ public class SOAPDocLitServerImpl extends AbstractBusTestServerBase {
@WebService(serviceName = "SOAPService", portName = "SOAPPort",
endpointInterface = "org.apache.type_test.doc.TypeTestPortType",
targetNamespace = "http://apache.org/type_test/doc",
- wsdlLocation = "testutils/type_test/type_test_doclit_soap.wsdl")
+ wsdlLocation = "wsdl/type_test/type_test_doclit_soap.wsdl")
public class SOAPTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
//override so we can test some bad validation things
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
index 172b667..3bd49be 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitServerImpl.java
@@ -50,7 +50,7 @@ public class SOAPRpcLitServerImpl extends AbstractBusTestServerBase {
portName = "SOAPPort",
endpointInterface = "org.apache.type_test.rpc.TypeTestPortType",
targetNamespace = "http://apache.org/type_test/rpc",
- wsdlLocation = "testutils/type_test/type_test_rpclit_soap.wsdl")
+ wsdlLocation = "wsdl/type_test/type_test_rpclit_soap.wsdl")
class SOAPTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
index a6fbfac..20ef007 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLServerImpl.java
@@ -56,7 +56,7 @@ public class XMLServerImpl extends AbstractBusTestServerBase {
portName = "XMLPort",
endpointInterface = "org.apache.type_test.xml.TypeTestPortType",
targetNamespace = "http://apache.org/type_test/xml",
- wsdlLocation = "testutils/type_test/type_test_xml.wsdl")
+ wsdlLocation = "wsdl/type_test/type_test_xml.wsdl")
@javax.xml.ws.BindingType(value = "http://cxf.apache.org/bindings/xmlformat")
class XMLTypeTestImpl extends TypeTestImpl implements TypeTestPortType {
}
diff --git a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml
index 9dd0f8c..0dfd1d6 100644
--- a/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml
+++ b/systests/uncategorized/src/test/resources/org/apache/cxf/systest/soap/client.xml
@@ -19,22 +19,25 @@
-->
<beans xmlns="http://www.springframework.org/schema/beans"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:http="http://cxf.apache.org/transports/http/configuration"
xmlns:jaxws="http://cxf.apache.org/jaxws"
xmlns:cxf="http://cxf.apache.org/core"
xmlns:p="http://cxf.apache.org/policy"
- xmlns:sec="http://cxf.apache.org/configuration/security"
- xsi:schemaLocation="http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd http://cxf.apache.org/transports/http/configuration http://cxf.apache.org/schemas/configuration/http-conf.xsd http://cxf.apache.org/configuration/security http://cxf.apache.org/schemas/configuration/security.xsd http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd http://cxf.apache [...]
+ xsi:schemaLocation="
+ http://www.springframework.org/schema/beans http://www.springframework.org/schema/beans/spring-beans.xsd
+ http://cxf.apache.org/jaxws http://cxf.apache.org/schemas/jaxws.xsd
+ http://cxf.apache.org/core http://cxf.apache.org/schemas/core.xsd
+ http://cxf.apache.org/policy http://cxf.apache.org/schemas/policy.xsd
+ ">
<cxf:bus>
<cxf:features>
<p:policies/>
<cxf:logging/>
</cxf:features>
</cxf:bus>
-
+
<jaxws:client name="{http://www.example.org/contract/DoubleIt}DoubleItPlaintextPort" createdFromAPI="true">
<jaxws:properties>
</jaxws:properties>
</jaxws:client>
-
-</beans>
\ No newline at end of file
+
+</beans>
[cxf] 02/02: CXF-7953: apply workaround for JDK 9 & 10
Posted by bu...@apache.org.
This is an automated email from the ASF dual-hosted git repository.
buhhunyx pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/cxf.git
commit 8c9895c7b214616221aef78c84512b6e2662b58b
Author: amarkevich <am...@talend.com>
AuthorDate: Thu May 16 11:24:52 2019 +0300
CXF-7953: apply workaround for JDK 9 & 10
---
.../java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java | 4 ++--
.../apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java | 4 ++--
.../apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java | 2 +-
.../apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java | 2 +-
.../java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java | 2 +-
5 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
index 2fe6763..f065125 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/AbstractTypeTestClient.java
@@ -71,10 +71,10 @@ public abstract class AbstractTypeTestClient
&& "GMonth".equals(name));
}
- public static void initClient(Class<?> clz, QName serviceName,
+ public static void initClient(QName serviceName,
QName portName, String wsdlPath)
throws Exception {
- URL wsdlLocation = clz.getResource(wsdlPath);
+ URL wsdlLocation = AbstractTypeTestClient.class.getResource(wsdlPath);
assertNotNull("Could not load wsdl " + wsdlPath, wsdlLocation);
testDocLiteral = wsdlPath.contains("doclit") || wsdlPath.contains("-corba");
testXMLBinding = wsdlPath.contains("_xml");
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
index 6ec9e34..df27554 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/corba/CORBADocLitClientTypeTest.java
@@ -200,7 +200,7 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
"DerivedEmptyBaseEmptyChoice"
));
}
- if (JavaUtils.isJava11Compatible()) {
+ if (JavaUtils.isJava9Compatible()) {
NOT_WORKING_TESTS.addAll(Arrays.asList(
"SimpleRestriction",
"SimpleRestriction4",
@@ -216,7 +216,7 @@ public class CORBADocLitClientTypeTest extends AbstractTypeTestClient5 {
public static void startServers() throws Exception {
boolean ok = launchServer(CORBADocLitServerImpl.class, true);
assertTrue("failed to launch server", ok);
- initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
+ initClient(SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
@AfterClass
public static void deleteRefFile() throws Exception {
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
index eb26744..d47db3f 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPDocLitClientTypeTest.java
@@ -50,7 +50,7 @@ public class SOAPDocLitClientTypeTest extends AbstractTypeTestClient5 {
public static void startServers() throws Exception {
boolean ok = launchServer(SOAPDocLitServerImpl.class, true);
assertTrue("failed to launch server", ok);
- initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
+ initClient(SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
@Test
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
index 1a39e5b..b09e0c2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/soap/SOAPRpcLitClientTypeTest.java
@@ -44,7 +44,7 @@ public class SOAPRpcLitClientTypeTest extends AbstractTypeTestClient5 {
public static void startServers() throws Exception {
boolean ok = launchServer(SOAPRpcLitServerImpl.class, true);
assertTrue("failed to launch server", ok);
- initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
+ initClient(SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
}
diff --git a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java
index 185d59e..83f47d2 100644
--- a/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java
+++ b/systests/uncategorized/src/test/java/org/apache/cxf/systest/type_test/xml/XMLClientTypeTest.java
@@ -41,6 +41,6 @@ public class XMLClientTypeTest extends AbstractTypeTestClient5 {
public static void startServers() throws Exception {
boolean ok = launchServer(XMLServerImpl.class, true);
assertTrue("failed to launch server", ok);
- initClient(AbstractTypeTestClient5.class, SERVICE_NAME, PORT_NAME, WSDL_PATH);
+ initClient(SERVICE_NAME, PORT_NAME, WSDL_PATH);
}
}