Skip to content

Commit

Permalink
#23507 Fixed webservice tests + removed dead tests
Browse files Browse the repository at this point in the history 
- dead tests - mejb or JAX-RPC dependency
  • Loading branch information
@dmatej
dmatej committed Mar 3, 2022
1 parent f8c6202 commit 70914ba
Show file tree
Hide file tree
Showing 440 changed files with 4,162 additions and 20,936 deletions.
5 changes: 1 addition & 4 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,6 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.S1AS_HOME}/modules/endorsed">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
Expand All @@ -53,7 +50,7 @@

<target name="compile-client">
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${build.classes.dir}/client"
includes="${client-src-name}"/>
</target>

Expand Down
5 changes: 3 additions & 2 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -64,8 +64,9 @@
value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/AsyncService?WSDL"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/client"
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/lib/webservices-rt.jar:${env.S1AS_HOME}/lib/webservices-tools.jar"
includes="client/**"/>
classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
includes="client/**"
/>
</target>

<target name="deploy-app">
Expand Down
19 changes: 11 additions & 8 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,14 +17,17 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/asyncservice/webservice/AsyncService?WSDL"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
<enableAsyncMapping>true</enableAsyncMapping>
</bindings>
</bindings>
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="client"/>
<ws:enableAsyncMapping>true</ws:enableAsyncMapping>
</ws:bindings>
</ws:bindings>

3 changes: 0 additions & 3 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,6 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${env.S1AS_HOME}/modules/endorsed">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
Expand Down
23 changes: 12 additions & 11 deletions ...er/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="client"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
23 changes: 12 additions & 11 deletions ...er/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="endpoint"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="endpoint"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
3 changes: 0 additions & 3 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -67,9 +67,6 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${env.S1AS_HOME}/modules/endorsed">
<include name="**/*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="**/*.jar"/>
</fileset>
Expand Down
23 changes: 12 additions & 11 deletions ...er/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="client"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
23 changes: 12 additions & 11 deletions ...er/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="endpoint"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="endpoint"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
3 changes: 0 additions & 3 deletions ...er/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -35,9 +35,6 @@
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.S1AS_HOME}/modules/endorsed">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
</fileset>
Expand Down
7 changes: 2 additions & 5 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -33,13 +33,10 @@

<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
</fileset>
<fileset dir="${env.S1AS_HOME}/modules/endorsed">
<include name="*.jar"/>
<include name="*.jar"/>
</fileset>
<fileset dir="${env.APS_HOME}/lib">
<include name="*.jar"/>
<include name="*.jar"/>
</fileset>
</path>

Expand Down
23 changes: 12 additions & 11 deletions ...rver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="client"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']" >
<jaxb:schemaBindings>
<jaxb:package name="client"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
23 changes: 12 additions & 11 deletions ...rver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,19 +17,20 @@
-->

<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
<ws:bindings
xmlns:jaxb="https://jakarta.ee/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
xmlns:ws="https://jakarta.ee/xml/ns/jaxws"
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
wsdlLocation="SubtractNumbers.wsdl"
xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="endpoint"/>
</bindings>
<bindings node="ns1:definitions/ns1:types/xsd:schema[@targetNamespace='http://duke.org']" xmlns:xs="http://www.w3.org/2001/XMLSchema" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
version="3.0"
>
<ws:bindings node="wsdl:definitions">
<ws:package name="endpoint"/>
</ws:bindings>
<ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://duke.org']">
<jaxb:schemaBindings>
<jaxb:package name="endpoint"/>
</jaxb:schemaBindings>
</bindings>
</bindings>

</ws:bindings>
</ws:bindings>
4 changes: 3 additions & 1 deletion ...rv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
View file
Original file line number Diff line number Diff line change
Expand Up @@ -16,7 +16,9 @@

package endpoint;

@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
import jakarta.jws.WebService;

@WebService(serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {

public int subtractNumbers (int number1, int number2) {
Expand Down
6 changes: 3 additions & 3 deletions appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml
View file
Original file line number Diff line number Diff line change
Expand Up @@ -17,10 +17,10 @@
-->

<webservices xmlns="http://java.sun.com/xml/ns/javaee"
<webservices xmlns="https://jakarta.ee/xml/ns/jakartaee"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
version="1.2"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://www.ibm.com/webservices/xsd/javaee_web_services_1_2.xsd">
version="2.0"
xsi:schemaLocation="https://jakarta.ee/xml/ns/jakartaee https://jakarta.ee/xml/ns/jakartaee/jakartaee_web_services_2_0.xsd">
<webservice-description>
<display-name>SubtractNumbersService</display-name>
<webservice-description-name>SubtractNumbersService</webservice-description-name>
Expand Down
37 changes: 0 additions & 37 deletions ...rver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
View file

This file was deleted.

0 comments on commit 70914ba

Please sign in to comment.