#23507 Fixed webservice tests + removed dead tests
- dead tests - mejb or JAX-RPC dependency
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
index e6fb687..658780c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
@@ -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>
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
index 36dfdfc..e13a16e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
@@ -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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
index dfd257c..b4058a8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
index ee5b26f..d27bbe2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
index b13b122..8a1a886 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
index 323c00e..250f690 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
index 4b99e1e..2544a8c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
index 9a9fdfc..f188a5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/endpoint/SubtractNumbersImpl.java
@@ -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) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml
index b132d4f..41260b7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webservices.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
deleted file mode 100644
index 6d7128d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="jaxrpcinjection"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
deleted file mode 100644
index cb619c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpcinjection" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-
- <target name="all" depends="clean, assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="servlet"/>
- </antcall>
- </target>
-
- <target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
- <param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
- <param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
deleted file mode 100644
index ea2b681..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package simplehandler;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import javax.xml.rpc.Service;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import servlet.*;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-jaxrpc-handler-injection");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-jaxrpc-handler-injection");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
- SimpleServer test = (SimpleServer)
- testService.getPort(SimpleServer.class);
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
- System.out.println("Invocation returned " + test.sayHello("jerome"));
- } catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus("jaxrpc-handler-injection main", stat.FAIL);
- System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage());
- return;
- }
- stat.addStatus("webservices-jaxrpc-handler-injection", stat.PASS);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF
deleted file mode 100644
index 5085a53..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: simplehandler.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
deleted file mode 100644
index 4b08059..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="servlet.SimpleServer"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
deleted file mode 100644
index d2d8301..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml
deleted file mode 100644
index a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml
deleted file mode 100644
index 2089c30..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/sun-web.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN' 'http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>ServletHandlerTest</context-root>
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- <property name="prop1" value="value1"/>
- <property name="prop2" value="value2"/>
- </webservice-endpoint>
- </servlet>
- </sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml
deleted file mode 100644
index e3a3201..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/web.xml
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <servlet-class>servlet.ServletHandlerTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServletHandlerTest</servlet-name>
- <url-pattern>/ServletHandlerTest</url-pattern>
- </servlet-mapping>
- <env-entry>
- <env-entry-name>stringValue</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>injectedValue</env-entry-value>
- </env-entry>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml
deleted file mode 100644
index e66dd79..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/descriptor/webservices.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/javaee"
- 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">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>servlet.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ServletHandlerTest</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>SimpleHandler</handler-name>
- <handler-class>servlet.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
deleted file mode 100644
index 891d555..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.rmi.*;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class ServletHandlerTestImpl implements SessionBean {
- SessionContext sc;
-
- public String sayHello(String hello) throws RemoteException {
- return "salut " + hello;
- }
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
deleted file mode 100644
index 5a81f19..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.util.Date;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.*;
-import jakarta.annotation.Resource;
-
-public class SimpleHandler extends GenericHandler {
-
- protected HandlerInfo info = null;
-
-/*
- @Resource(name="stringValue")
- String injectedString = "undefined";
-*/
-
- public void init(HandlerInfo info) {
- this.info = info;
- }
-
- public boolean handleRequest(MessageContext context) {
-/*
- if ("undefined".equals(injectedString)) {
- System.out.println("Handler not injected property");
- return false;
- }
- System.out.println("injectedString = " + injectedString);
-*/
- try {
- Date startTime = new Date();
- context.setProperty("startTime", startTime);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- try {
- Date startTime = (Date) context.getProperty("startTime");
- Date endTime = new Date();
- long elapsed = endTime.getTime() - startTime.getTime();
- System.out.println(" in handler, elapsed " + elapsed);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
deleted file mode 100644
index 0675cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.rmi.*;
-
-public interface SimpleServer extends Remote {
-
- public String sayHello(String source) throws RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
index 9a5eaca..df1d91a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
@@ -20,9 +20,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
index bace84a..01ef8c3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
@@ -52,7 +52,8 @@
<target name="assemble-web" depends="init-common, compile">
<mkdir dir="${assemble.dir}"/>
- <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/> <mkdir dir="${build.classes.dir}/tmp"/>
+ <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
+ <mkdir dir="${build.classes.dir}/tmp"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
<mkdir dir="${build.classes.dir}/tmp/WEB-INF/lib"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
index 0e2c976..5e67cd9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/Client.java
@@ -16,9 +16,6 @@
package client;
-import jakarta.xml.ws.WebServiceRef;
-
-
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
index 74f9e12..ed1b4a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
index c3ec9e9..d5fa374 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
@@ -70,8 +70,9 @@
value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
index 60f53c4..6c3f102 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.xml
@@ -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>
@@ -104,7 +101,7 @@
value="-b custom-client.xml -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/prepkged-svc-1/AddNumbers.wsdl"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/appclient"
- 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"
includes="appclient/**"/>
<mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
<copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/wsdl"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
index 713874b..d97f17c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.xml
@@ -33,56 +33,58 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
- <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <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/**"/>
- </target>
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-svc-2"/>
- </antcall>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-svc-2" />
+ </antcall>
-<!--restore the tokens back in file-->
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
index 85852de..2a2aee0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
@@ -33,58 +33,57 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
-<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <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/**"/>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-svc-1" />
+ </antcall>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
-
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-svc-1"/>
- </antcall>
-
-
-<!--restore the tokens back in file-->
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
index ef09191..5a9e622 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
@@ -31,91 +31,105 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="localwsdl"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete dir="localwsdl" />
+ </target>
- <target name="setup" depends="assemble-web, assemble-appclient, deploy-app, deploy-appclient"/>
+ <target name="setup" depends="assemble-web, assemble-appclient, deploy-app, deploy-appclient" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common">
- <mkdir dir="${build.classes.dir}"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/AddNumbers.wsdl -extension -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"/>
- </antcall>
- <antcall target="compile"/>
- <copy file="sun-web.xml.template" tofile="sun-web.xml"/>
- <replace file="sun-web.xml">
- <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl"/>
- </replace>
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="${env.APS_HOME}/devtests/webservice/annotations/soap12"/>
- <param name="wsdlfile.name" value="AddNumbers.wsdl"/>
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common">
+ <mkdir dir="${build.classes.dir}" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/AddNumbers.wsdl -extension -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"
+ />
+ </antcall>
+ <antcall target="compile" />
+ <copy file="sun-web.xml.template" tofile="sun-web.xml" />
+ <replace file="sun-web.xml">
+ <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl" />
+ </replace>
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location"
+ value="${env.APS_HOME}/devtests/webservice/annotations/soap12"
+ />
+ <param name="wsdlfile.name" value="AddNumbers.wsdl" />
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-appclient" depends="init-common">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/appclient"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-b custom-client.xml -extension -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"/>
- </antcall>
- <replace file="appclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="appclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <javac srcdir="." destdir="${build.classes.dir}/appclient"
- 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="appclient/**"/>
- <mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl"/>
- <copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/appclient"/>
- <copy file="${application-client.xml}" tofile="${build.classes.dir}/META-INF/application-client.xml" failonerror="false"/>
- <copy file="sun-application-client.xml.template" tofile="sun-application-client.xml"/>
- <replace file="${sun-application-client.xml}">
- <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl"/>
- </replace>
- <copy file="${sun-application-client.xml}" tofile="${build.classes.dir}/META-INF/sun-application-client.xml" failonerror="false"/>
- <jar jarfile="${assemble.dir}/${appname}-client.jar" manifest="./appclient/MANIFEST.MF">
- <fileset dir="${build.classes.dir}/appclient">
- <include name="**"/>
- </fileset>
- </jar>
- </target>
+ <target name="assemble-appclient" depends="init-common">
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/appclient" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-b custom-client.xml -extension -keep -d ${build.classes.dir}/appclient ${env.APS_HOME}/devtests/webservice/annotations/soap12/AddNumbers.wsdl"
+ />
+ </antcall>
+ <replace file="appclient/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="appclient/Client.java" value="${http.port}" token="HTTP_PORT" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/appclient"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="appclient/**"
+ />
+ <mkdir dir="${build.classes.dir}/appclient/META-INF/wsdl" />
+ <copy file="AddNumbers.wsdl" todir="${build.classes.dir}/appclient/META-INF/wsdl" />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/appclient" />
+ <copy file="${application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/application-client.xml"
+ failonerror="false"
+ />
+ <copy file="sun-application-client.xml.template" tofile="sun-application-client.xml" />
+ <replace file="${sun-application-client.xml}">
+ <replacefilter token="%TOKEN%" value="file:${env.APS_HOME}/build/localwsdl" />
+ </replace>
+ <copy file="${sun-application-client.xml}"
+ tofile="${build.classes.dir}/META-INF/sun-application-client.xml"
+ failonerror="false"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-client.jar" manifest="./appclient/MANIFEST.MF">
+ <fileset dir="${build.classes.dir}/appclient">
+ <include name="**" />
+ </fileset>
+ </jar>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-appclient">
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
+ <target name="deploy-appclient">
+ <antcall target="deploy-client-common" />
+ <move file="${assemble.dir}/${appname}-clientClient.jar"
+ toFile="${assemble.dir}/${appname}AppClient.jar"
+ />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client-common" />
+ </target>
- <target name="runtest" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}"/>
- </antcall>
+ <target name="runtest" depends="init-common">
+ <antcall target="runclient-common">
+ <param name="appclient.application.args" value="http://${http.host}:${http.port}" />
+ </antcall>
- <replace file="appclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="appclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <replace file="appclient/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="appclient/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
index fe3f736..4b4fa04 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-client.xml
@@ -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="AddNumbers.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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
index e6bb237..23489f9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/custom-server.xml
@@ -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="AddNumbers.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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
index 01c9fca..df0b14d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
@@ -35,10 +35,8 @@
<path id="client-classpath">
<pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement path="${env.S1AS_HOME}/lib/activation.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/javaee.jar"/>
+ <pathelement path="${env.S1AS_HOME}/lib/webservices-osgi.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
</path>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
index 1188534..3e660e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.xml
@@ -41,9 +41,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
index 4931caf..d3d5205 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.xml
@@ -40,17 +40,13 @@
</target>
<target name="setup" depends="assemble-web, assemble-client, deploy-app, deploy-client"/>
-<path id="class.path">
+ <path id="class.path">
<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>
-
</path>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
index e72a881..6569c97 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.xml
@@ -32,13 +32,10 @@
&jaxwsTools;
<target name="all" depends="clean, setup, runtest, undeploy"/>
-<path id="class.path">
+ <path id="class.path">
<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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
index 1606289..55113ba 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.xml
@@ -33,13 +33,10 @@
&testproperties;
&jaxwsTools;
-<path id="classpath">
+ <path id="classpath">
<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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
index 48f1716..3bf875c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-client.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
index 0988122..53b52c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/custom-server.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
index f1f48e9..e2a257e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
index 4210493..1530e31 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
index 8aca3eb..751b71c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
@@ -17,7 +17,7 @@
-->
- <!DOCTYPE project [
+<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
<!ENTITY commonRun SYSTEM "file:./../../../../config/run.xml">
@@ -33,78 +33,86 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-web, clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all"
+ depends="clean, setup-web, clean, setup-ejb, assemble-client, runclient, undeploy"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-web" depends="assemble-web, deploy-web-app"/>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-web" depends="assemble-web, deploy-web-app" />
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="ejb_endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="ejb_endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="ejb_endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="ejb_endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-web">
- <antcall target="compile-common">
- <param name="src" value="servlet_endpoint"/>
- </antcall>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web">
+ <antcall target="compile-common">
+ <param name="src" value="servlet_endpoint" />
+ </antcall>
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"/>
- </antcall>
- <echo message="wsimporting http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
- </antcall>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/webservice/ServletHelloService?WSDL"
+ />
+ </antcall>
+ <echo message="wsimporting http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"
+ />
+ </antcall>
- <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
+ <replace file="client/Client.java" value="${http.host}" token="HTTP_HOST" />
+ <replace file="client/Client.java" value="${http.port}" token="HTTP_PORT" />
- <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/**"/>
- </target>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-web-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-web-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="webservicerefs-test"/>
- </antcall>
- <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="webservicerefs-test" />
+ </antcall>
+ <replace file="client/Client.java" token="${http.host}" value="HTTP_HOST" />
+ <replace file="client/Client.java" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
index 0961163..530d5d5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
index 4ae3018..fb8c04f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
index 8ef10aa..b5073f9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.xml
@@ -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>
@@ -78,7 +75,7 @@
<mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
<antcall target="wsimport">
<param name="wsimport.args"
- value="-p client -Xendorsed -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/webservices13-clientdds/webservice/SubtractNumbersService?wsdl"/>
+ value="-p client -Xendorsed -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/webservices13-clientdds/webservice/SubtractNumbersService?wsdl"/>
</antcall>
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
index 4c9bc4e..3ecd866 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/endpoint/SubtractNumbersImpl.java
@@ -16,7 +16,7 @@
package endpoint;
-import jakarta.jws.WebService ;
+import jakarta.jws.WebService;
@WebService(
portName="SubtractNumbersPortType",
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
index 12922e9..e06d393 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.xml
@@ -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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
index 7c41604..20c6aec 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
@@ -31,70 +31,74 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="service"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="service" />
+ </antcall>
+ </target>
- <target name="run-wsimport">
- <mkdir dir="${build.classes.dir}"/>
- <replace file="HttpTestService.wsdl" value="${http.host}" token="HTTP_HOST"/>
- <replace file="HttpTestService.wsdl" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"/>
- </antcall>
- </target>
+ <target name="run-wsimport">
+ <mkdir dir="${build.classes.dir}" />
+ <replace file="HttpTestService.wsdl" value="${http.host}" token="HTTP_HOST" />
+ <replace file="HttpTestService.wsdl" value="${http.port}" token="HTTP_PORT" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"
+ />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, run-wsimport, compile">
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="."/>
- <param name="wsdlfile.name" value="HttpTestService.wsdl"/>
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, run-wsimport, compile">
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location" value="." />
+ <param name="wsdlfile.name" value="HttpTestService.wsdl" />
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting localWSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/wsdltojava/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting localWSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/wsdltojava/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runtest">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="basic-wsdl-to-java-test-case"/>
- </antcall>
+ <target name="runtest">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="basic-wsdl-to-java-test-case" />
+ </antcall>
- <!--restore the tokens back in file-->
- <replace file="HttpTestService.wsdl" token="${http.host}" value="HTTP_HOST"/>
- <replace file="HttpTestService.wsdl" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="HttpTestService.wsdl" token="${http.host}" value="HTTP_HOST" />
+ <replace file="HttpTestService.wsdl" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
index d15839e..f1eba8d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
@@ -17,18 +17,20 @@
-->
-<bindings wsdlLocation="HttpTestService.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/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
- <ns2:package name="client"/>
- </ns2:schemaBindings>
- </bindings>
-
-</bindings>
+<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="HttpTestService.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://httptestservice.org/types']" >
+ <jaxb:schemaBindings>
+ <jaxb:package name="client"/>
+ </jaxb:schemaBindings>
+ </ws:bindings>
+</ws:bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
index 8ebaf93..dde9e4c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
@@ -17,18 +17,20 @@
-->
-<bindings wsdlLocation="HttpTestService.wsdl" xmlns="http://java.sun.com/xml/ns/jaxws">
-
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="service"/>
- </bindings>
-
- <bindings node="ns1:definitions/ns1:types/xs:schema[@targetNamespace='http://httptestservice.org/types']"
- xmlns:xs="http://www.w3.org/2001/XMLSchema"
- xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <ns2:schemaBindings xmlns:ns2="http://java.sun.com/xml/ns/jaxb">
- <ns2:package name="service"/>
- </ns2:schemaBindings>
- </bindings>
-
-</bindings>
+<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="HttpTestService.wsdl"
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="service"/>
+ </ws:bindings>
+ <ws:bindings node="wsdl:definitions/wsdl:types/xsd:schema[@targetNamespace='http://httptestservice.org/types']">
+ <jaxb:schemaBindings>
+ <jaxb:package name="service"/>
+ </jaxb:schemaBindings>
+ </ws:bindings>
+</ws:bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/build.xml
index ba142c3..e358c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/build.xml
@@ -36,59 +36,19 @@
<delete dir="${env.APS_HOME}/build/module"/>
<record name="webservice.output" action="start" />
<delete dir="${env.APS_HOME}/build/module"/>
- <ant dir="jaxrpc-hello-ejb" target="all"/>
- <delete dir="${env.APS_HOME}/build/module"/>
- <ant dir="jaxrpc-hello-web" target="all"/>
-<!-- <ant dir="googleserver" target="all"/>--> <!-- 3 tests -->
- <ant dir="xsdany" target="all"/> <!-- 1 test -->
- <ant dir="filter_urlhandling" target="all"/> <!-- 1 test -->
- <!-- <ant dir="security" target="all"/>--> <!-- 9 test -->
-<!-- <ant dir="simplefault" target="all"/>
- <ant dir="handler" target="all"/>
- <ant dir="webstub_properties" target="all"/>
- <ant dir="servlethandler" target="all"/>-->
+ <ant dir="filter_urlhandling" target="all"/>
+ <!--ant dir="security" target="all"/-->
<ant dir="annotations" target="all"/>
<ant dir="ejb_annotations" target="all"/>
- <ant dir="mapping/j2w/signature" target="all"/> <!-- 2 tests -->
- <ant dir="google" target="all"/> <!-- 1 test -->
- <ant dir="gf_dd/endpoint_address_uri" target="all"/> <!-- 1 test -->
+ <ant dir="gf_dd/endpoint_address_uri" target="all"/>
<record name="webservice.output" action="stop" />
<antcall target="report"/>
<antcall target="dev-report"/>
</target>
- <target name="google">
- <record name="google.output" action="start" />
- <ant dir="google" target="all"/>
- <record name="google.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="xsdany">
- <record name="xsdany.output" action="start" />
- <ant dir="xsdany" target="all"/>
- <record name="xsdany.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="soapfaults">
- <record name="soapfaults.output" action="start" />
- <ant dir="soapfaults" target="all"/>
- <record name="soapfaults.output" action="stop" />
- <antcall target="report"/>
- </target>
-
- <target name="signature">
- <record name="signature.output" action="start" />
- <ant dir="mapping/j2w/signature" target="all"/>
- <record name="signature.output" action="stop" />
- <antcall target="report"/>
- </target>
-
<target name="clean">
<delete>
- <fileset dir="${basedir}"
- includes="**.output, count.txt"/>
+ <fileset dir="${basedir}" includes="**.output, count.txt"/>
</delete>
<ant dir="google" target="clean"/>
<ant dir="xsdany" target="clean"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
index d6dea53..7e6b433 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
@@ -20,9 +20,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>
@@ -36,9 +33,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
index 9a35134..a5c5765 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/annotations-common.xml
@@ -48,22 +48,14 @@
<mkdir dir="${env.APS_HOME}/build/module/classes"/>
<mkdir dir="${env.APS_HOME}/build/module/archive"/>
</target>
- <path id="classpath">
-
- <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="reporter.jar"/>
- </fileset>
-
-
- </path>
+<path id="classpath">
+ <fileset dir="${env.S1AS_HOME}/modules">
+ <include name="*.jar" />
+ </fileset>
+ <fileset dir="${env.APS_HOME}/lib">
+ <include name="reporter.jar" />
+ </fileset>
+</path>
<target name="test-compile">
@@ -159,6 +151,10 @@
</target>
<target name="configurable-wsdl-import">
+ <tstamp>
+ <format property="TIMESTAMP" pattern="yyyy-MM-dd'T'HH:mm:ss.SSSZ" />
+ </tstamp>
+ <echo>Current time (ISO): ${TIMESTAMP}</echo>
<echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
index e02613e..e1f6813 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.xml
@@ -33,54 +33,58 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"/>
- <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST"/>
- <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"
+ />
+ <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST" />
+ <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -b custom-client.xml -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/AddNumbersImpl?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ 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/**"
+ />
+ </target>
- <target name="deploy-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- <!--restore the tokens back in file-->
- <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
- <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ <!--restore the tokens back in file-->
+ <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST" />
+ <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
index 0e3aca6..e6e4e2b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/custom-client.xml
@@ -17,14 +17,16 @@
-->
-<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/AddNumbersImplService/AddNumbersImpl?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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
index eafa23e..a4f6a98 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/build.xml
@@ -26,72 +26,71 @@
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
- <property name="client-src-name" value="client/Client.java"/>
+ <property name="client-src-name" value="client/Client.java"/>
- <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
+ <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
- <target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
- </target>
+ <target name="private-undeploy">
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar"/>
+ </antcall>
+ </target>
- <target name="private-run">
- <antcall target="clean"/>
- <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
- <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST"/>
- <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT"/>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -b custom-client.xml -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL"/>
- </exec>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="ejb/HelloEJB.java">
- <classpath refid="classpath"/>
- </javac>
- <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
+ <target name="private-run">
+ <antcall target="clean"/>
+ <echo message="wsimporting http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL" />
+ <replace file="custom-client.xml" value="${http.host}" token="HTTP_HOST" />
+ <replace file="custom-client.xml" value="${http.port}" token="HTTP_PORT" />
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -b custom-client.xml -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/WebServiceEJBService/WebServiceEJB?WSDL" />
+ </exec>
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes" includes="ejb/HelloEJB.java">
+ <classpath refid="classpath"/>
+ </javac>
+ <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
basedir="${env.APS_HOME}/build/module/classes"
includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- </condition>
- <condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </condition>
- <fail if="deploy_failed" message="Deployment failed"/>
- <basename file="${client-src-name}" property="client" suffix=".java"/>
- <dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
- <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
- <echo message="Running appclient with ${client-pkg-name}.${client}"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
- </exec>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
+ </condition>
+ <condition property="deploy_failed">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
+ </condition>
+ <fail if="deploy_failed" message="Deployment failed"/>
+ <basename file="${client-src-name}" property="client" suffix=".java"/>
+ <dirname file="${client-src-name}" property="client-directory"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
+ <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
+ <antcall target="compile-client"/>
+ <echo message="Running appclient with ${client-pkg-name}.${client}"/>
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
+ </exec>
-<!--restore the tokens back in file-->
- <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
- <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
- </target>
+ <!--restore the tokens back in file-->
+ <replace file="custom-client.xml" token="${http.host}" value="HTTP_HOST"/>
+ <replace file="custom-client.xml" token="${http.port}" value="HTTP_PORT"/>
+ </target>
- <target name="report-success">
- <echo message="Test PASSED"/>
- </target>
+ <target name="report-success">
+ <echo message="Test PASSED"/>
+ </target>
- <target name="report-failure">
- <echo message="Test FAILED"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test FAILED"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
index 67df59b..a65cc3e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/custom-client.xml
@@ -17,14 +17,16 @@
-->
-<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/WebServiceEJBService/WebServiceEJB?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
- <bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
- <package name="ejb"/>
- <enableAsyncMapping>true</enableAsyncMapping>
- </bindings>
-</bindings>
-
+ version="3.0"
+>
+ <ws:bindings node="wsdl:definitions">
+ <ws:package name="ejb"/>
+ <ws:enableAsyncMapping>true</ws:enableAsyncMapping>
+ </ws:bindings>
+</ws:bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
index 5a88fc3..aa86f6d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.xml
@@ -33,72 +33,74 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="persistence.xml" todir="${build.classes.dir}/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="**">
- </jar>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF" />
+ <copy file="persistence.xml" todir="${build.classes.dir}/META-INF" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar" basedir="${build.classes.dir}" includes="**">
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/CustomerManagerService/CustomerManager?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-ejb-jar" depends="setToolProperty">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-database"/>
- </exec>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="deploy"/>
- <arg line="${as.props}"/>
- <arg line="--upload=true"/>
- <arg line="--dropandcreatetables"/>
- <arg line="--target ${appserver.instance.name}"/>
- <arg line="${assemble.dir}/${appname}-ejb.jar"/>
- </exec>
- </target>
+ <target name="deploy-ejb-jar" depends="setToolProperty">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-database" />
+ </exec>
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="deploy" />
+ <arg line="${as.props}" />
+ <arg line="--upload=true" />
+ <arg line="--dropandcreatetables" />
+ <arg line="--target ${appserver.instance.name}" />
+ <arg line="${assemble.dir}/${appname}-ejb.jar" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common,setToolProperty">
- <exec executable="${ASADMIN}" failonerror="false">
- <arg line="undeploy"/>
- <arg line="${as.props}"/>
- <arg line="--droptables=true"/>
- <arg line="--cascade=true"/>
- <arg line="--target ${appserver.instance.name}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="stop-database"/>
- </exec>
- </target>
+ <target name="undeploy" depends="init-common,setToolProperty">
+ <exec executable="${ASADMIN}" failonerror="false">
+ <arg line="undeploy" />
+ <arg line="${as.props}" />
+ <arg line="--droptables=true" />
+ <arg line="--cascade=true" />
+ <arg line="--target ${appserver.instance.name}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="stop-database" />
+ </exec>
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
index c0a0496..89aa341 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
@@ -25,7 +25,7 @@
<ant dir="noname" target="all"/>
<ant dir="nointf" target="all"/>
<ant dir="security" target="all"/>
- <!--ant dir="provider" target="all"/-->
+ <ant dir="provider" target="all" />
<ant dir="oneway" target="all"/>
<ant dir="wsctxtinterceptor" target="all"/>
<ant dir="ejbclient" target="all"/>
@@ -43,9 +43,9 @@
<ant dir="ejbwebservicesinwar-3" target="all"/>
<ant dir="ejbwebservicesinwar-sessioncontext" target="all"/>
<ant dir="ejbwebservicesinwar-interceptor" target="all"/>
- <ant dir="ejbservletwebservicesinwar" target="all"/>
+ <ant dir="ejbservletwebservicesinwar" target="all"/>
<ant dir="async" target="all"/>
- <!--<ant dir="bigint" target="all"/>-->
+ <ant dir="bigint" target="all"/>
<ant dir="libdependent" target="all"/>
<ant dir="libdependent-2" target="all"/>
<ant dir="svchandler" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
index 6399029..c62159d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/build.xml
@@ -23,69 +23,68 @@
<project name="Hello" default="core" basedir=".">
+ &commonBuild;
+ <property name="src-name" value="endpoint/WebServiceEJB.java" />
+ <property name="client-src-name" value="client/Client.java" />
- &commonBuild;
- <property name="src-name" value="endpoint/WebServiceEJB.java"/>
- <property name="client-src-name" value="client/Client.java"/>
-
- <target name="all" depends="clean, deploy, private-run, private-undeploy, report"/>
+ <target name="all" depends="clean, deploy, private-run, private-undeploy, report" />
- <target name="private-undeploy">
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
- <antcall target="autoundeploy-file">
- <param name="filename" value="WebServiceEJB.jar"/>
- </antcall>
- </target>
+ <target name="private-undeploy">
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar" />
+ </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="WebServiceEJB.jar" />
+ </antcall>
+ </target>
- <target name="private-run">
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="WebServiceEJB"/>
- <param name="port" value="WebServiceEJB"/>
- </antcall>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
- includes="ejb/HelloEJB.java">
- <classpath refid="classpath"/>
- </javac>
- <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed"/>
- </condition>
- <condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
- </condition>
- <fail if="deploy_failed" message="Deployment failed"/>
- <basename file="${client-src-name}" property="client" suffix=".java"/>
- <dirname file="${client-src-name}" property="client-directory"/>
- <basename file="${client-directory}" property="client-pkg-name"/>
- <property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
- <echo message="Running appclient with ${client-pkg-name}.${client}"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
- <arg value="${client-pkg-name}.${client}"/>
- </exec>
- </target>
+ <target name="private-run">
+ <antcall target="clean" />
+ <antcall target="wsdl-import">
+ <param name="server" value="WebServiceEJB" />
+ <param name="port" value="WebServiceEJB" />
+ </antcall>
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes" includes="ejb/HelloEJB.java">
+ <classpath refid="classpath" />
+ </javac>
+ <jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**"
+ />
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed" />
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed" />
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployed" />
+ </condition>
+ <condition property="deploy_failed">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed" />
+ </condition>
+ <fail if="deploy_failed" message="Deployment failed" />
+ <basename file="${client-src-name}" property="client" suffix=".java" />
+ <dirname file="${client-src-name}" property="client-directory" />
+ <basename file="${client-directory}" property="client-pkg-name" />
+ <property name="client-class-name" value="${client-pkg-name}/${client}.class" />
+ <antcall target="compile-client" />
+ <echo message="Running appclient with ${client-pkg-name}.${client}" />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes" />
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}" />
+ <arg value="${client-pkg-name}.${client}" />
+ </exec>
+ </target>
- <target name="report-success">
- <echo message="Test PASSED"/>
- </target>
+ <target name="report-success">
+ <echo message="Test PASSED" />
+ </target>
- <target name="report-failure">
- <echo message="Test FAILED"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test FAILED" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
index 23fc718..1b36595 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
index f788575..2ced4e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
index f788575..2ced4e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
index f788575..2ced4e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
index f788575..2ced4e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
index 911c65c..9cea891 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.xml
@@ -33,61 +33,67 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <jar destfile="${build.classes.dir}/tmp/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- manifest="MANIFEST.MF"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <jar destfile="${build.classes.dir}/tmp/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ manifest="MANIFEST.MF"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-libdependent-2-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-libdependent-2-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
index 995cdb6..aafc609 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.xml
@@ -33,65 +33,72 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/lib"/>
- <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp/lib" />
+ <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- </antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac verbose="true"
+ srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="restart-test">
- <antcall target="restart-server-instance-common"/>
- <antcall target="runclient"/>
- </target>
+ <target name="restart-test">
+ <antcall target="restart-server-instance-common" />
+ <antcall target="runclient" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-libdependent-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-libdependent-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
index cfd00f4..1f6ee84 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.xml
@@ -33,64 +33,69 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, run, undeploy"/>
+ <target name="all" depends="clean, setup, run, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="service"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="service" />
+ </antcall>
+ </target>
- <target name="run-wsimport">
- <mkdir dir="${build.classes.dir}"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"/>
- </antcall>
- </target>
+ <target name="run-wsimport">
+ <mkdir dir="${build.classes.dir}" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-wsdllocation WEB-INF/wsdl/HttpTestService.wsdl -keep -b customservice.xml -d ${build.classes.dir} HttpTestService.wsdl"
+ />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="assemble-ejb" depends="init-common, run-wsimport, compile">
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="HttpTestService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <echo message="my build classes dir is:${build.classes.dir}" level="verbose"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="service/**,META-INF/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, run-wsimport, compile">
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/META-INF/wsdl" />
+ <copy file="HttpTestService.wsdl" todir="${build.classes.dir}/META-INF/wsdl" />
+ <echo message="my build classes dir is:${build.classes.dir}" level="verbose" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="service/**,META-INF/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting localWSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting localWSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -wsdllocation ${env.APS_HOME}/devtests/webservice/annotations/multiport/HttpTestService.wsdl -b customclient.xml -d ${build.classes.dir}/client HttpTestService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="run">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="basic-wsdl-to-java-test-case"/>
- </antcall>
- </target>
+ <target name="run">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="basic-wsdl-to-java-test-case" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
index 29258f0..fccb706 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/build.xml
@@ -23,40 +23,43 @@
<project name="Hello" default="core" basedir=".">
- &commonBuild;
- <property name="src-name" value="endpoint/HelloImpl.java"/>
- <property name="client-src-name" value="client/Client.java"/>
- <target name="all" depends="clean">
- <antcall target="test_build"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
- </or>
- </waitfor>
- <condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
- </condition>
+ &commonBuild;
+ <property name="src-name" value="endpoint/HelloImpl.java"/>
+ <property name="client-src-name" value="client/Client.java"/>
- <antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
- </target>
+ <target name="all" depends="clean">
+ <antcall target="test_build"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ </or>
+ </waitfor>
+ <condition property="deploy_succeeded">
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ </condition>
- <target name="test_build">
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
- </exec>
- <antcall target="build"/>
- </target>
+ <antcall target="run">
+ <param name="port" value="endpoint.HelloImpl" />
+ </antcall>
+ <antcall target="undeploy"/>
+ <antcall target="report"/>
+ </target>
- <target name="report-success">
- <echo message="Test passed"/>
- </target>
+ <target name="test_build">
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl" />
+ </exec>
+ <antcall target="build" />
+ </target>
- <target name="report-failure">
- <echo message="Test failed"/>
- </target>
+ <target name="report-success">
+ <echo message="Test passed" />
+ </target>
+
+ <target name="report-failure">
+ <echo message="Test failed"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
index 1caffc3..311e1b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/client/Client.java
@@ -28,7 +28,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- @WebServiceRef(wsdlLocation="http://localhost:8080/HelloImplService/HelloImpl?WSDL")
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
static HelloImplService service;
public static void main(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
index df6e1f3..ab78ffc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.xml
@@ -33,48 +33,52 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="restful-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="restful-ejb-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
index 563bed3..d0a7b33 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.xml
@@ -33,65 +33,72 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ear"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ear" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="outsidepkg"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <mkdir dir="${assemble.dir}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/lib"/>
- <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
- basedir="${build.classes.dir}"
- includes="outsidepkg/**"/>
- <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**"/>
- <jar destfile="${assemble.dir}/${appname}App.ear"
- basedir="${build.classes.dir}/tmp"
- includes="**"/>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="outsidepkg" />
+ </antcall>
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <mkdir dir="${assemble.dir}" />
+ <mkdir dir="${build.classes.dir}/tmp" />
+ <mkdir dir="${build.classes.dir}/tmp/lib" />
+ <jar destfile="${build.classes.dir}/tmp/lib/mylib.jar"
+ basedir="${build.classes.dir}"
+ includes="outsidepkg/**"
+ />
+ <jar destfile="${build.classes.dir}/tmp/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ />
+ <jar destfile="${assemble.dir}/${appname}App.ear"
+ basedir="${build.classes.dir}/tmp"
+ includes="**"
+ />
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"/>
- </antcall>
- <javac verbose="true" srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
- includes="client/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL"
+ />
+ </antcall>
+ <javac verbose="true"
+ srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.S1AS_HOME}/modules/jaxb-osgi.jar:${env.S1AS_HOME}/modules/jaxb-api-osgi.jar"
+ includes="client/**"
+ />
+ </target>
- <target name="deploy-ear">
- <antcall target="deploy-common"/>
- </target>
+ <target name="deploy-ear">
+ <antcall target="deploy-common" />
+ </target>
- <target name="restart-test">
- <antcall target="restart-server-instance-common"/>
- <antcall target="runclient"/>
- </target>
+ <target name="restart-test">
+ <antcall target="restart-server-instance-common" />
+ <antcall target="runclient" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="ejb-singleton-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="ejb-singleton-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
index 6acf7fe..9ce747f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.xml
@@ -38,9 +38,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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
index 6435ae1..ff3d47a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.xml
@@ -33,49 +33,53 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- </target>
+ <target name="assemble-ejb">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/AddNumbersImplService/ThisShouldBeIgnored?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="client.Client"/>
- <param name="other-args" value="wsname-ejbname-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="client.Client" />
+ <param name="other-args" value="wsname-ejbname-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl b/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl
deleted file mode 100644
index b544220..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/GoogleSearch.wsdl
+++ /dev/null
@@ -1,211 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- </portType>
-
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
- </binding>
-
- <!-- Endpoint for Google Web APIs -->
- <service name="GoogleSearchService">
- <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
- <soap:address location="dummy"/>
- </port>
- </service>
-
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/README b/appserver/tests/appserv-tests/devtests/webservice/google/README
deleted file mode 100644
index 1129dcf..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/README
+++ /dev/null
@@ -1,3 +0,0 @@
-This test uses a J2EE application client to access Google's Beta
-web service called GoogleSearch. It also includes an implementation
-of the web service in an ejb.
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
deleted file mode 100644
index 776d694..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="google"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml b/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
deleted file mode 100644
index 31b65e4..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
+++ /dev/null
@@ -1,180 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="google test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="mejbclient"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/google">
- <fileset dir="output/google"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleejb">
- <fileset dir="output/googleejb"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="GoogleMapping_appclient.xml,META-INF/wsdl/**,google/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="build-mejb" depends="init-common, compile">
- <copy file="mejbclient/application-client.xml" tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="mejbclient/sun-application-client.xml" tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/mejbclient.jar" manifest="mejbclient/MANIFEST.MF">
- <fileset dir="${build.classes.dir}"
- includes="google/MEJBClient.class META-INF/application-client.xml META-INF/sun-application-client.xml"
- />
- </jar>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="google"/>
- <delete dir="googleejb"/>
- <delete file="GoogleMapping_ejb.xml"/>
- <delete file="GoogleMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run-mejbclient" depends="init-common">
- <exec executable="${APPCLIENT}" failonerror="true">
- <arg line="-client ${assemble.dir}/mejbclient.jar"/>
- <arg line="-textauth"/>
- <arg line="-user j2ee"/>
- <arg line="-password j2ee"/>
- <arg line="${appclient.application.args}"/>
- </exec>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng http://${http.host}:${http.port}/googleejb/GoogleSearch"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="contactgoogle">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
deleted file mode 100644
index 6ce28ab..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package google;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- private String googleKey;
-
- public static void main (String[] args) {
- stat.addDescription("webservices-google");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-googleID");
- }
-
- public void doTest(String[] args) {
- String word = (args.length == 0) ?
- "spellng" : args[0];
- String targetEndpointAddress = (args.length == 2) ?
- args[1] : "http://api.google.com/search/beta2";
-
- try {
- Context ic = new InitialContext();
-
-
- String googleKey = (String) ic.lookup("java:comp/env/googlekey");
- GoogleSearchService googleSearchService =
- (GoogleSearchService) ic.lookup("java:comp/env/service/GoogleSearch");
- GoogleSearchPort googlePort =
- googleSearchService.getGoogleSearchPort();
-
- ((Stub)googlePort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
- System.out.println("Contacting google for a spelling suggestion at " + targetEndpointAddress);
- String spellingSuggestion =
- googlePort.doSpellingSuggestion(googleKey, word);
- System.out.println("Gave google the word '" + word + "' ... " +
- " and the suggested spelling is '" +
- spellingSuggestion + "'");
-
- stat.addStatus("googleclient main", stat.PASS);
-
- } catch (Exception ex) {
- System.out.println("google client test failed");
- ex.printStackTrace();
- stat.addStatus("googleclient main" , stat.FAIL);
- //System.exit(15);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF
deleted file mode 100644
index bbc5dde..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: google.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
deleted file mode 100644
index 5590d34..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my google app client</description>
- <display-name>googleClient</display-name>
- <env-entry>
- <env-entry-name>googlekey</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj</env-entry-value>
- </env-entry>
- <service-ref>
- <description>google service ref</description>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <service-interface>google.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:GoogleSearch">servicens:GoogleSearchService
- </service-qname>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml
deleted file mode 100644
index f8709ba..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>GoogleApp</display-name>
- <module>
- <java>google-client.jar</java>
- </module>
- <module>
- <ejb>google-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml
deleted file mode 100644
index 1ffa802..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>GoogleEjb</ejb-name>
- <service-endpoint>googleejb.GoogleSearchPort</service-endpoint>
- <ejb-class>googleejb.GoogleEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml
deleted file mode 100644
index 6b916e1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <port-info>
- <service-endpoint-interface>google.GoogleSearchPort</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 50713e3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>GoogleEjb</ejb-name>
- <jndi-name>GoogleEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>GoogleSearchPort</port-component-name>
- <endpoint-address-uri>googleejb/GoogleSearch</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml
deleted file mode 100644
index 8625fc6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/webservices.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>GoogleServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchPort</port-component-name>
- <wsdl-port xmlns:googlens="urn:GoogleSearch">googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleejb.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>GoogleEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
deleted file mode 100644
index 7205658..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-import javax.xml.rpc.handler.MessageContext;
-import java.security.Principal;
-
-public class GoogleEJB implements SessionBean {
- private SessionContext sc;
-
- public GoogleEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
- }
-
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
- }
-
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
- {
-
- try {
- Principal p = sc.getCallerPrincipal();
- if( p != null ) {
- System.out.println("getCallerPrincipal() was successful");
- } else {
- throw new EJBException("getCallerPrincipal() returned null");
- }
- } catch(Exception e) {
- EJBException ejbEx = new EJBException("getCallerPrincipal exception");
- ejbEx.initCause(e);
- throw ejbEx;
- }
-
- MessageContext msgContext = sc.getMessageContext();
- System.out.println("msgContext = " + msgContext);
-
- System.out.println("GoogleEJB.doSpellingSuggestion() called with " +
- phrase);
-
- String returnValue = phrase + "spelling suggestion";
-
- System.out.println("GoogleEJB returning " + returnValue);
-
- return returnValue;
- }
-
- public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
- return null;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
deleted file mode 100644
index 5298488..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="google"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
deleted file mode 100644
index beb846c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl
deleted file mode 100644
index b618634..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch.wsdl
+++ /dev/null
@@ -1,104 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
- <import namespace="urn:GoogleSearch" location="GoogleSearch_types.wsdl"/>
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
-
- </operation>
-
- </binding>
-
- <!-- Endpoint for Google Web APIs -->
- <service name="GoogleSearchService">
- <port name="GoogleSearchPort" binding="typens:GoogleSearchBinding">
- <soap:address location="http://api.google.com/search/beta2"/>
- </port>
- </service>
-
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl
deleted file mode 100644
index 845af9e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_partial.wsdl
+++ /dev/null
@@ -1,223 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
-
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-
-
- <!-- Binding for Google Web APIs - RPC, SOAP over HTTP -->
-
- <binding name="GoogleSearchBinding" type="typens:GoogleSearchPort">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
-
- <operation name="doGetCachedPage">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="doGoogleSearch">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- <output>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </output>
- </operation>
-
- <operation name="helloOneWay">
- <soap:operation soapAction="urn:GoogleSearchAction"/>
- <input>
- <soap:body use="encoded"
- namespace="urn:GoogleSearch"
- encodingStyle="http://schemas.xmlsoap.org/soap/encoding/"/>
- </input>
- </operation>
-
- </binding>
-
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl b/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl
deleted file mode 100644
index 8bd2839..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/GoogleSearch_types.wsdl
+++ /dev/null
@@ -1,161 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- WSDL description of the Google Web APIs.
- The Google Web APIs are in beta release. All interfaces are subject to
- change as we refine and extend our APIs. Please see the terms of use
- for more information. -->
-
-<definitions name="urn:GoogleSearch"
- targetNamespace="urn:GoogleSearch"
- xmlns:typens="urn:GoogleSearch"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns="http://schemas.xmlsoap.org/wsdl/">
- <!-- Types for search - result elements, directory categories -->
-
- <types>
- <xsd:schema xmlns="http://www.w3.org/2001/XMLSchema"
- targetNamespace="urn:GoogleSearch">
-
- <xsd:complexType name="GoogleSearchResult">
- <xsd:all>
- <xsd:element name="documentFiltering" type="xsd:boolean"/>
- <xsd:element name="searchComments" type="xsd:string"/>
- <xsd:element name="estimatedTotalResultsCount" type="xsd:int"/>
- <xsd:element name="estimateIsExact" type="xsd:boolean"/>
- <xsd:element name="resultElements" type="typens:ResultElementArray"/>
- <xsd:element name="searchQuery" type="xsd:string"/>
- <xsd:element name="startIndex" type="xsd:int"/>
- <xsd:element name="endIndex" type="xsd:int"/>
- <xsd:element name="searchTips" type="xsd:string"/>
- <xsd:element name="directoryCategories" type="typens:DirectoryCategoryArray"/>
- <xsd:element name="searchTime" type="xsd:double"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElement">
- <xsd:all>
- <xsd:element name="summary" type="xsd:string"/>
- <xsd:element name="URL" type="xsd:string"/>
- <xsd:element name="snippet" type="xsd:string"/>
- <xsd:element name="title" type="xsd:string"/>
- <xsd:element name="cachedSize" type="xsd:string"/>
- <xsd:element name="relatedInformationPresent" type="xsd:boolean"/>
- <xsd:element name="hostName" type="xsd:string"/>
- <xsd:element name="directoryCategory" type="typens:DirectoryCategory"/>
- <xsd:element name="directoryTitle" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- <xsd:complexType name="ResultElementArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:ResultElement[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategoryArray">
- <xsd:complexContent>
- <xsd:restriction base="soapenc:Array">
- <xsd:attribute ref="soapenc:arrayType" wsdl:arrayType="typens:DirectoryCategory[]"/>
- </xsd:restriction>
- </xsd:complexContent>
- </xsd:complexType>
-
- <xsd:complexType name="DirectoryCategory">
- <xsd:all>
- <xsd:element name="fullViewableName" type="xsd:string"/>
- <xsd:element name="specialEncoding" type="xsd:string"/>
- </xsd:all>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <!-- Messages for Google Web APIs - cached page, search, spelling. -->
-
- <message name="doGetCachedPage">
- <part name="key" type="xsd:string"/>
- <part name="url" type="xsd:string"/>
- </message>
-
- <message name="doGetCachedPageResponse">
- <part name="return" type="xsd:base64Binary"/>
- </message>
-
- <message name="doSpellingSuggestion">
- <part name="key" type="xsd:string"/>
- <part name="phrase" type="xsd:string"/>
- </message>
-
- <message name="doSpellingSuggestionResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearch">
- <part name="key" type="xsd:string"/>
- <part name="q" type="xsd:string"/>
- <part name="start" type="xsd:int"/>
- <part name="maxResults" type="xsd:int"/>
- <part name="filter" type="xsd:boolean"/>
- <part name="restrict" type="xsd:string"/>
- <part name="safeSearch" type="xsd:boolean"/>
- <part name="lr" type="xsd:string"/>
- <part name="ie" type="xsd:string"/>
- <part name="oe" type="xsd:string"/>
- </message>
-
- <message name="doGoogleSearchResponse">
- <part name="return" type="typens:GoogleSearchResult"/>
- </message>
-
- <message name="helloOneWay">
- <part name="string" type="xsd:string"/>
- </message>
- <message name="helloOneWayResponse"/>
-
- <!-- Port for Google Web APIs, "GoogleSearch" -->
-
- <portType name="GoogleSearchPort">
-
- <operation name="doGetCachedPage">
- <input message="typens:doGetCachedPage"/>
- <output message="typens:doGetCachedPageResponse"/>
- </operation>
-
- <operation name="doSpellingSuggestion">
- <input message="typens:doSpellingSuggestion"/>
- <output message="typens:doSpellingSuggestionResponse"/>
- </operation>
-
- <operation name="doGoogleSearch">
- <input message="typens:doGoogleSearch"/>
- <output message="typens:doGoogleSearchResponse"/>
- </operation>
-
- <operation name="helloOneWay">
- <input message="typens:helloOneWay"/>
- </operation>
-
- </portType>
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
deleted file mode 100644
index 8c2012e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="googleserver"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="web.xml" value="descriptor/war/web.xml"/>
-<property name="sun-web.xml" value="descriptor/war/sun-web.xml"/>
-<property name="sun-webservices.xml" value="descriptor/war/webservices.xml"/>
-<property name="war.file" value="${assemble}/${appname}-web.war"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
deleted file mode 100644
index 04df2c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
+++ /dev/null
@@ -1,312 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY commonRun SYSTEM "file:./../../../config/run.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="google test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &commonRun;
- &testproperties;
-
- <target name="all" depends="clean,build,create-user,restart,deploy,run,undeploy,delete-user"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="web"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="gen-mapping-web"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="wscompile-web"/>
- <antcall target="assemble"/>
- <antcall target="build-appclient-file"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . -model googleclient.model wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleclient">
- <fileset dir="output/googleclient"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <!-- <delete dir="output"/> -->
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleserver">
- <fileset dir="output/googleserver"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-web" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -f:norpcstructures -keep -d output -s output -model googleweb.model -classpath . wscompile_config_web.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/googleserverweb">
- <fileset dir="output/googleserverweb"
- includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <!--
- EJB module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleserver/*.class" />
-
- </antcall>
- <!--
- War module creation
- -->
- <antcall target="build-war-file"/>
- <!--
- AppClient module creation
- -->
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="GoogleSearch_partial.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_appclient.xml"/>
- <copy todir="${build.classes.dir}"
- file="googleclient.model"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,googleclient/*.class" />
-
- </antcall>
- <!--
- EAR file creation
- -->
- <antcall target="ear-common" />
- <copy todir="${build.classes.dir}/META-INF"
- file="${sun-application.xml}"/>
- <jar destfile = "${assemble.dir}/${appname}App.ear"
- update="true">
- <fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
- </fileset>
- </jar>
-
- </target>
-
- <target name="build-appclient-file" depends="init-common">
- </target>
-
- <target name="build-war-file" depends="init-common">
- <echo message="my build classes dir is:${build.classes.dir}"/>
- <delete file="${war.file}"/>
- <mkdir dir="${build.classes.dir}/tmp"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-web.xml}"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF"
- file="${sun-webservices.xml}"/>
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/classes"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch.wsdl"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
- file="GoogleSearch_types.wsdl"/>
- <copy todir="${build.classes.dir}/tmp"
- file="GoogleMapping_web.xml"/>
- <copy todir="${build.classes.dir}/tmp"
- file="googleweb.model"/>
- <copy todir="${build.classes.dir}/tmp/WEB-INF/classes/googleserverweb">
- <fileset dir="${build.classes.dir}/googleserverweb">
- <include name="**/*.class"/>
- </fileset>
- </copy>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
- <include name="**/**"/>
- </fileset>
- </jar>
- <delete dir="${build.classes.dir}/tmp"/>
- </target>
-
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="googleclient"/>
- <delete dir="googleserver"/>
- <delete dir="googleserverweb"/>
- <delete>
- <fileset dir="." includes="*.model"/>
- </delete>
- <delete file="GoogleMapping_ejb.xml"/>
- <delete file="GoogleMapping_appclient.xml"/>
- <delete file="GoogleMapping_web.xml"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardejb http://${http.host}:${http.port}/GoogleServlet/GoogleSearch"/>
- </antcall>
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="forwardweb http://${http.host}:${http.port}/google/GoogleSearch"/>
- </antcall>
- <antcall target="run-standalone"/>
- </target>
-
- <target name="build-standalone" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen:client -keep -d ${build.classes.dir} -s ${build.classes.dir} -classpath . wscompile_config_standalone.xml"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="standalone"/>
- </antcall>
- </target>
-
- <target name="run-standalone" depends="init-common">
- <antcall target="build-standalone"/>
- <java fork="true" classname="standalone.StandAloneClient"
- failonerror="true">
- <arg line="spellng http://${http.host}:${http.port}/google/GoogleSearch"/>
- <classpath>
- <pathelement location="${env.S1AS_HOME}/lib/j2ee.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-cmp.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-ext.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-rt.jar"/>
- <pathelement location="${env.S1AS_HOME}/lib/webservices-tools.jar"/>
- <pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
- <pathelement location="${build.classes.dir}"/>
- </classpath>
-
- <sysproperty key="http.proxyHost" value="scaweb2.sfbay"/>
- <sysproperty key="http.proxyPort" value="8080"/>
- </java>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="contactgoogle">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="spellng"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-web" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping GoogleMapping_web.xml wscompile_config_web.xml"/>
- </antcall>
- </target>
-
- <target name="create-user">
- <antcall target="create-user-common">
- <param name="user" value="j2ee"/>
- <param name="password" value="j2ee"/>
- <param name="groups" value="staff"/>
- </antcall>
- <antcall target="reconfig-common"/>
- </target>
-
- <target name="delete-user">
- <!-- remove test users, just cleanup. -->
- <antcall target="delete-user-common">
- <param name="user" value="j2ee"/>
- </antcall>
- </target>
-
- <target name="restart">
- <antcall target="restart-server-instance-common"/>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
deleted file mode 100644
index c8d2999..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
+++ /dev/null
@@ -1,297 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleclient;
-
-import java.io.*;
-import java.util.*;
-import java.net.URL;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import javax.xml.rpc.Call;
-import javax.xml.rpc.Service;
-import java.rmi.Remote;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- private static final QName PORT_QNAME =
- new QName("urn:GoogleSearch", "GoogleSearchPort");
- private static final QName OPERATION_QNAME =
- new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
- private String word;
- private String targetEndpointAddress;
-
- public static void main (String[] args) {
-
- stat.addDescription("googleserver appclient");
- Client client = new Client(args);
- client.doTest();
- stat.printSummary("googleserver-applientID");
- }
-
- public Client(String[] args) {
- word = (args.length > 0) ? args[0] : "spellng";
- targetEndpointAddress = (args.length > 1) ? args[1] : null;
- }
-
- public void doTest() {
-
- try {
- Context ic = new InitialContext();
- String googleKey = (String)
- ic.lookup("java:comp/env/googlekey");
- GoogleSearchService googleSearchService = (GoogleSearchService)
- ic.lookup("java:comp/env/service/GoogleSearch");
-
- try {
- googleSearchService.getHandlerRegistry();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println
- ("Successfully caught unsupported operation exception " +
- "for Service.getHandlerRegistry()");
- }
-
- try {
- googleSearchService.getTypeMappingRegistry();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println
- ("Successfully caught unsupported operation exception " +
- "for Service.getTypeMappingRegistry()");
- }
-
- doDynamicProxyTest(googleSearchService, googleKey);
-
- GoogleSearchPort googleSearchPort =
- googleSearchService.getGoogleSearchPort();
- doSpellingSuggestion(googleSearchPort, googleKey,
- targetEndpointAddress);
-
- System.out.println("Using dynamic proxy to invoke endpoint");
- Service genericServiceWithWsdl = (Service)
- ic.lookup("java:comp/env/service/GoogleSearchProxy");
-
- doDynamicProxyTest(genericServiceWithWsdl, googleKey);
-
- googleSearchPort = (GoogleSearchPort)
- genericServiceWithWsdl.getPort(GoogleSearchPort.class);
- doSpellingSuggestion(googleSearchPort, googleKey,
- targetEndpointAddress);
-
- doDIINoWSDLTest(ic, googleKey, targetEndpointAddress);
-
- System.out.println("Doing wsdl override tests");
-
- Service partialWsdlServiceGeneric = (Service)
- ic.lookup("java:comp/env/service/partialGeneric");
- GoogleSearchPort googleSearch = (GoogleSearchPort)
- partialWsdlServiceGeneric.getPort(GoogleSearchPort.class);
- googleSearch.doSpellingSuggestion(googleKey, word);
-
-/** GoogleSearchService partialWsdlServiceGenerated =
- (GoogleSearchService)
- ic.lookup("java:comp/env/service/partialGenerated");
- googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort();
- googleSearch.doSpellingSuggestion(googleKey, word);
-**/
- stat.addStatus("appclient main", stat.PASS);
-
-
- } catch (Exception ex) {
- System.out.println("google client test failed");
- ex.printStackTrace();
- stat.addStatus("appclient main" , stat.FAIL);
- }
-
- }
-
- private void doSpellingSuggestion(GoogleSearchPort googleSearchPort,
- String googleKey,
- String endpointAddress)
- throws Exception {
-
- if( endpointAddress != null ) {
- ((Stub)googleSearchPort)._setProperty
- (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
- System.out.println("Setting target endpoint address to " +
- endpointAddress);
- } else {
- // if not set, use default
- endpointAddress = (String)
- ((Stub)googleSearchPort)._getProperty
- (Stub.ENDPOINT_ADDRESS_PROPERTY);
- }
-
- System.out.println("Contacting google for spelling " +
- "suggestion at " + endpointAddress);
-
- String spellingSuggestion =
- googleSearchPort.doSpellingSuggestion(googleKey, word);
- System.out.println("Gave google the word '" + word + "' ... " +
- " and the suggested spelling is '" +
- spellingSuggestion + "'");
- }
-
- private void doDynamicProxyTest(Service service, String googleKey) throws Exception {
-
- Call c1 = service.createCall();
- Call c2 = service.createCall(PORT_QNAME);
- Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
- OPERATION_QNAME.getLocalPart());
- Call[] calls = service.getCalls(PORT_QNAME);
-
- if( targetEndpointAddress != null ) {
- c3.setTargetEndpointAddress(targetEndpointAddress);
- }
- Object params[] = new Object[] {googleKey, "hello" };
- String response = (String) c3.invoke(params);
- System.out.println("Response = " + response);
-
- // container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
- service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
- service.getPort(PORT_QNAME, GoogleSearchPort.class);
-
- QName serviceName = service.getServiceName();
- URL wsdlLocation = service.getWSDLDocumentLocation();
- if( wsdlLocation != null ) {
- System.out.println("wsdlLocation = " + wsdlLocation);
- }
- Iterator ports = service.getPorts();
-
- System.out.println("Calling oneway operation");
- Call oneway = service.createCall(PORT_QNAME, "helloOneWay");
- if( targetEndpointAddress != null ) {
- oneway.setTargetEndpointAddress(targetEndpointAddress);
- }
-
- long oneWayMethodWaitTimeInMillis = 7000;
-
- Date before = new Date();
- oneway.invokeOneWay(new Object[]
- { oneWayMethodWaitTimeInMillis + "" });
- Date after = new Date();
- long elapsedTime = after.getTime() - before.getTime();
- System.out.println("one way operation began at " + before +
- " and returned at " + after +
- " and took " + elapsedTime + " milli-seconds");
- if( elapsedTime > oneWayMethodWaitTimeInMillis ) {
- throw new Exception("one way operation blocked for too long ");
- }
-
- // now wait for the remainder of the time. this is to
- // avoid race conditions where we finish the test and begin
- // to undeploy, but the endpoint is still executing its
- // oneway operation.
- long sleepTime = (oneWayMethodWaitTimeInMillis - elapsedTime);
-
- System.out.println("now sleeping for " + sleepTime + " milli secs");
- Thread.sleep(sleepTime);
- System.out.println("returning from doDynamicProxyTest");
- }
-
- private void doDIINoWSDLTest(Context ic, String googleKey,
- String endpointAddress) throws Exception {
-
- System.out.println("Doing DII without WSDL tests");
-
- Service service =(Service) ic.lookup("java:comp/env/service/DIINoWSDL");
-
- try {
- Call call = service.createCall(PORT_QNAME);
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.createCall(QName port)");
- }
-
- try {
- Call call = service.createCall(PORT_QNAME, OPERATION_QNAME);
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getCall(QName, QName)");
- }
-
-
- try {
- Call call = service.createCall(PORT_QNAME, "doSpellingSuggestion");
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getCall(QName, String)");
- }
-
- try {
- Call[] calls = service.getCalls(PORT_QNAME);
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getCalls()");
- }
-
- try {
- service.getHandlerRegistry();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println
- ("Successfully caught unsupported operation exception " +
- "for Service.getHandlerRegistry()");
- }
-
- try {
- Remote remote = service.getPort(GoogleSearchPort.class);
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getPort(SEI)");
- }
-
- try {
- Remote remote = service.getPort(PORT_QNAME, GoogleSearchPort.class);
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getPort(QName, SEI)");
- }
-
- try {
- Iterator ports = service.getPorts();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getPorts()");
- }
-
- try {
- QName serviceName = service.getServiceName();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println("Successfully caught unsupported operation " +
- "for Service.getName()");
- }
-
- try {
- service.getTypeMappingRegistry();
- } catch(java.lang.UnsupportedOperationException uoe) {
- System.out.println
- ("Successfully caught unsupported operation exception " +
- "for Service.getTypeMappingRegistry()");
- }
-
- Call untypedCall = service.createCall();
-
- }
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
deleted file mode 100644
index 36d7960..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleclient;
-
-import java.util.Map;
-
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.namespace.QName;
-
-import javax.naming.InitialContext;
-
-public class ClientHandler extends GenericHandler {
-
- public void destroy() {
- System.out.println("In ClientHandler::destroy()");
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-
- public boolean handleFault(MessageContext context) {
- System.out.println("In ClientHandler::handleFault()");
- return true;
- }
-
- public boolean handleRequest(MessageContext context) {
- System.out.println("In ClientHandler::handleRequest()");
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- System.out.println("In ClientHandler::handleResponse()");
- return true;
- }
-
- public void init(HandlerInfo config) {
- System.out.println("In ClientHandler::init()");
- try {
- InitialContext ic = new InitialContext();
- String googleKey = (String) ic.lookup("java:comp/env/googlekey");
- System.out.println("google key = " + googleKey);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- System.out.println("Handler init params = " +
- config.getHandlerConfig());
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF
deleted file mode 100644
index 6541a72..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: googleclient.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
deleted file mode 100644
index 4e7445a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
+++ /dev/null
@@ -1,102 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my google app client</description>
- <display-name>googleserverClient</display-name>
- <env-entry>
- <env-entry-name>googlekey</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj</env-entry-value>
- </env-entry>
- <service-ref>
- <description>google service ref</description>
- <display-name>MY GOOGLE SERVICE REF DISPLAY name</display-name>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <service-interface>googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header xmlns:googlens="urn:GoogleSearch">googlens:DirectoryCategory
- </soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- <port-name>GoogleSearchPort</port-name>
- </handler>
- </service-ref>
- <service-ref>
- <description>dynamic proxy google service ref</description>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleclient.model</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- </port-component-ref>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleclient.ClientHandler</handler-class>
- <init-param>
- <description>param description</description>
- <param-name>c</param-name>
- <param-value>d</param-value>
- </init-param>
- </handler>
- </service-ref>
- <service-ref>
- <description>dii google service ref</description>
- <service-ref-name>service/DIINoWSDL</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- </service-ref>
- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
-<!-- <service-ref>
- <description>partial wsdl test google service ref</description>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <service-interface>googleclient.GoogleSearchService</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch_partial.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_appclient.xml</jaxrpc-mapping-file>
- </service-ref>
--->
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml
deleted file mode 100644
index 8559847..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application.xml
+++ /dev/null
@@ -1,35 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>GoogleServerApp</display-name>
- <module>
- <web>
- <web-uri>googleserver-web.war</web-uri>
- <context-root/>
- </web>
- </module>
- <module>
- <java>googleserver-client.jar</java>
- </module>
- <module>
- <ejb>googleserver-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml
deleted file mode 100644
index 6a7e35e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,84 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>GoogleEjb</ejb-name>
- <service-endpoint>googleserver.GoogleSearchPort</service-endpoint>
- <ejb-class>googleserver.GoogleEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for web endpoint</description>
- <service-ref-name>service/WebDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
- </port-component-ref>
- </service-ref>
- <security-role-ref>
- <role-name>foo</role-name>
- <role-link>User</role-link>
- </security-role-ref>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <security-role>
- <role-name>User</role-name>
- </security-role>
- <security-role>
- <role-name>Admin</role-name>
- </security-role>
- <method-permission>
- <role-name>User</role-name>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>doGoogleSearch</method-name>
- </method>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>doSpellingSuggestion</method-name>
- </method>
- </method-permission>
- <container-transaction>
- <method>
- <ejb-name>GoogleEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml
deleted file mode 100644
index 7a3aa87..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,89 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/GoogleSearch</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/GoogleSearchProxy</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleclient.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.service.endpoint.address</name>
- <value>http://localhost:8000/google/GoogleSearch</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </call-property>
- <call-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </call-property>
- </port-info>
- </service-ref>
- <service-ref>
- <service-ref-name>service/partialGeneric</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
-<!-- <service-ref>
- <service-ref-name>service/partialGenerated</service-ref-name>
- <wsdl-override>file:GoogleSearch_final.wsdl</wsdl-override>
- </service-ref>
--->
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
deleted file mode 100644
index c534d78..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 7.0 J2EE Application 1.3//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_3-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application>
- <web>
- <web-uri>googleserver-web.war</web-uri>
- <context-root>GoogleServlet</context-root>
- </web>
- <security-role-mapping>
- <role-name>User</role-name>
- <group-name>staff</group-name>
- </security-role-mapping>
- <security-role-mapping>
- <role-name>Admin</role-name>
- <group-name>staff</group-name>
- <group-name>eng</group-name>
- <group-name>mgr</group-name>
- <group-name>guest</group-name>
- </security-role-mapping>
-</sun-application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 5a1c38f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>GoogleEjb</ejb-name>
- <jndi-name>GoogleEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <endpoint-address-uri>google/GoogleSearch</endpoint-address-uri>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
- </webservice-endpoint>
- </ejb>
- <webservice-description>
- <webservice-description-name>GoogleServiceEjb
- </webservice-description-name>
- <wsdl-publish-location>file:publish</wsdl-publish-location>
- </webservice-description>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml
deleted file mode 100644
index 89b43b9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/sun-web.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <service-ref>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <port-info>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>urn:GoogleSearch</namespaceURI>
- <localpart>GoogleSearchPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>javax.xml.rpc.security.auth.username</name>
- <value>j2ee</value>
- </stub-property>
- <stub-property>
- <name>javax.xml.rpc.security.auth.password</name>
- <value>j2ee</value>
- </stub-property>
- </port-info>
- </service-ref>
-</sun-web-app>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml
deleted file mode 100644
index 07da282..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/web.xml
+++ /dev/null
@@ -1,52 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>GoogleWebApp</display-name>
- <servlet>
- <servlet-name>GoogleServlet</servlet-name>
- <servlet-class>googleserverweb.GoogleServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>GoogleServlet</servlet-name>
- <url-pattern>/GoogleSearch</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <env-entry>
- <env-entry-name>entry1</env-entry-name>
- <env-entry-type>java.lang.String</env-entry-type>
- <env-entry-value>Blah</env-entry-value>
- </env-entry>
- <service-ref>
- <description>service ref for ejb endpoint</description>
- <service-ref-name>service/EjbDIIReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <service-qname xmlns:googlens="urn:GoogleSearch">googlens:GoogleSearchService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <port-component-link>googleserver-ejb.jar#GoogleSearchEjbPort</port-component-link>
- </port-component-ref>
- </service-ref>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml
deleted file mode 100644
index a433828..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/war/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>googleweb.model</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleserverweb.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>GoogleServlet</servlet-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleserverweb.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml
deleted file mode 100644
index 804e42a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/webservices.xml
+++ /dev/null
@@ -1,54 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description xmlns:googlens="urn:GoogleSearch">
- <webservice-description-name>GoogleServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/GoogleSearch.wsdl</wsdl-file>
- <jaxrpc-mapping-file>GoogleMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>GoogleSearchEjbPort</port-component-name>
- <wsdl-port>googlens:GoogleSearchPort</wsdl-port>
- <service-endpoint-interface>googleserver.GoogleSearchPort
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>GoogleEjb</ejb-link>
- </service-impl-bean>
- <handler>
- <description>handler 1</description>
- <handler-name>handler1</handler-name>
- <handler-class>googleserver.FooHandler</handler-class>
- <init-param>
- <description>param1 description</description>
- <param-name>a</param-name>
- <param-value>b</param-value>
- </init-param>
- <soap-header>googlens:DirectoryCategory</soap-header>
- <soap-role>Role1</soap-role>
- <soap-role>Role2</soap-role>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
deleted file mode 100644
index abe2723..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleserver;
-
-import java.util.Map;
-
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.namespace.QName;
-
-import javax.naming.InitialContext;
-
-public class FooHandler extends GenericHandler {
-
- public void destroy() {
- System.out.println("In FooHandler::destroy()");
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-
- public boolean handleFault(MessageContext context) {
- System.out.println("In FooHandler::handleFault()");
- return true;
- }
-
- public boolean handleRequest(MessageContext context) {
- System.out.println("In FooHandler::handleRequest()");
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- System.out.println("In FooHandler::handleResponse()");
- return true;
- }
-
- public void init(HandlerInfo config) {
- System.out.println("In FooHandler::init()");
- try {
- InitialContext ic = new InitialContext();
- String envEntry = (String) ic.lookup("java:comp/env/entry1");
- System.out.println("env-entry = " + envEntry);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- System.out.println("Handler init params = " +
- config.getHandlerConfig());
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
deleted file mode 100644
index cc37d86..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
+++ /dev/null
@@ -1,172 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleserver;
-
-import java.util.Iterator;
-import java.util.Date;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.Call;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class GoogleEJB implements SessionBean {
- private SessionContext sc;
-
- private static final QName PORT_QNAME =
- new QName("urn:GoogleSearch", "GoogleSearchPort");
- private static final QName OPERATION_QNAME =
- new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
- public GoogleEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
- }
-
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
- }
-
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
- {
-
- try {
- InitialContext ic = new InitialContext();
- String entry1 = (String) ic.lookup("java:comp/env/entry1");
- System.out.println("java:comp/env/entry1 = " + entry1);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e.getMessage(), e);
- }
-
- MessageContext msgContext = sc.getMessageContext();
-
- System.out.println("GoogleEJB.doSpellingSuggestion() called with " +
- phrase);
-
- try {
- java.security.Principal principal = sc.getCallerPrincipal();
- System.out.println("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() = " + principal);
- if(principal == null) {
- throw new EJBException("GoogleEJB.doSpellingSuggestion():getCallerPrincipal() cannot return NULL");
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
- }
-
- try {
- boolean result = sc.isCallerInRole("foo");
- System.out.println(
- "GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) returned - " + result);
- if(!result) {
- throw new EJBException("GoogleEJB.doSpellingSuggestion():isCallerInRole(foo) should not have returned false");
- }
- } catch (Exception ex) {
- ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
- }
-
- String returnValue = "spelling suggestion from ejb";
- if( phrase.equals("forwardweb") ) {
- System.out.println("Forwarding spelling suggestion to webendpoint");
- Service genericServiceWithWSDL = null;
- try {
- InitialContext ic = new InitialContext();
- Service service = (Service)
- ic.lookup("java:comp/env/service/WebDIIReference");
- doDynamicProxyTest(service);
- GoogleSearchPort webPort = (GoogleSearchPort)
- service.getPort(GoogleSearchPort.class);
- returnValue = webPort.doSpellingSuggestion(key, phrase);
- } catch(Exception e) {
- e.printStackTrace();
- throw new EJBException(e.getMessage(), e);
- }
- }
-
- System.out.println("GoogleEJB returning " + returnValue);
- return returnValue;
- }
-
- public void helloOneWay(String s1) {
-
- System.out.println("In GoogleEJB::helloOneWay. param = " +
- s1);
- System.out.println("Sleeping for " + s1 + " milliseconds starting "
- + " at " + new Date());
-
- try {
- Thread.sleep((new Integer(s1)).intValue());
- } catch(Exception e) {
- e.printStackTrace();
- }
- System.out.println("Exiting GoogleEJB:helloOneWay at " +
- new Date());
- }
-
- public googleserver.GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
- return null;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
- private void doDynamicProxyTest(Service service) throws Exception {
-
- Call c1 = service.createCall();
- Call c2 = service.createCall(PORT_QNAME);
- Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
- OPERATION_QNAME.getLocalPart());
- Call[] calls = service.getCalls(PORT_QNAME);
-
- // container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
- service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
- service.getPort(PORT_QNAME, GoogleSearchPort.class);
-
- QName serviceName = service.getServiceName();
- URL wsdlLocation = service.getWSDLDocumentLocation();
- if( wsdlLocation != null ) {
- System.out.println("wsdlLocation = " + wsdlLocation);
- }
- Iterator ports = service.getPorts();
-
- }
-
-
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
deleted file mode 100644
index 7f11da1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
+++ /dev/null
@@ -1,86 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package standalone;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class StandAloneClient {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- private String word;
- private String targetEndpointAddress;
- private String googleKey;
-
- public static void main (String[] args) {
- stat.addDescription("googleserver standalone");
- StandAloneClient client = new StandAloneClient(args);
- client.doTest();
- stat.printSummary("googleserver-standaloneID");
- }
-
- public StandAloneClient(String[] args) {
- word = (args.length > 0) ? "spellng" : args[0];
- targetEndpointAddress = (args.length > 1) ?
- args[1] : "http://api.google.com/search/beta2";
- googleKey = (args.length > 2) ?
- args[2] : "vCkqMIpV1WMKIRpNa7gBiYQZxDUYOYOj";
- }
-
- public void doTest() {
- try {
- GoogleSearchService googleSearchService =
- new GoogleSearchService_Impl();
-
- GoogleSearchPort googleSearchPort =
- googleSearchService.getGoogleSearchPort();
-
- ((Stub)googleSearchPort)._setProperty
- (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- ((Stub)googleSearchPort)._setProperty
- (Stub.USERNAME_PROPERTY, "j2ee");
- ((Stub)googleSearchPort)._setProperty
- (Stub.PASSWORD_PROPERTY, "j2ee");
-
- System.out.println("Contacting google for spelling suggestion at "
- + targetEndpointAddress);
- String spellingSuggestion =
- googleSearchPort.doSpellingSuggestion(googleKey, word);
- System.out.println("Gave google the word '" + word + "' ... " +
- " and the suggested spelling is '" +
- spellingSuggestion + "'");
-
- stat.addStatus("appclient main", stat.PASS);
-
- } catch (Exception ex) {
- System.out.println("google client test failed");
- ex.printStackTrace();
- stat.addStatus("appclient main" , stat.FAIL);
-
- }
-
- }
-
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
deleted file mode 100644
index cbe53ff..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleserverweb;
-
-import java.util.Map;
-
-import javax.xml.rpc.handler.Handler;
-import javax.xml.rpc.handler.GenericHandler;
-import javax.xml.rpc.handler.HandlerInfo;
-import javax.xml.rpc.handler.MessageContext;
-import javax.xml.namespace.QName;
-
-import javax.naming.InitialContext;
-
-public class FooHandler extends GenericHandler {
-
- public void destroy() {
- System.out.println("In FooHandler::destroy()");
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-
- public boolean handleFault(MessageContext context) {
- System.out.println("In FooHandler::handleFault()");
- return true;
- }
-
- public boolean handleRequest(MessageContext context) {
- System.out.println("In FooHandler::handleRequest()");
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- System.out.println("In FooHandler::handleResponse()");
- return true;
- }
-
- public void init(HandlerInfo config) {
- System.out.println("In FooHandler::init()");
- try {
- InitialContext ic = new InitialContext();
- String envEntry = (String) ic.lookup("java:comp/env/entry1");
- System.out.println("env-entry = " + envEntry);
- } catch(Exception e) {
- e.printStackTrace();
- }
-
- System.out.println("Handler init params = " +
- config.getHandlerConfig());
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
deleted file mode 100644
index b41c202..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
+++ /dev/null
@@ -1,135 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package googleserverweb;
-
-import java.util.Date;
-import java.util.Iterator;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import javax.naming.*;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.namespace.QName;
-
-public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
-
- private static final QName PORT_QNAME =
- new QName("urn:GoogleSearch", "GoogleSearchPort");
- private static final QName OPERATION_QNAME =
- new QName("urn:GoogleSearch", "doSpellingSuggestion");
-
- private boolean gotInit = false;
-
- public GoogleServletImpl() {
- System.out.println("GoogleServletImpl() instantiated");
- }
-
- public void init(Object context) {
- System.out.println("Got ServiceLifecycle::init call " + context);
- gotInit = true;
- }
-
- public void destroy() {
- System.out.println("Got ServiceLifecycle::destroy call");
- }
-
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
- }
-
- public void helloOneWay(String s1) {
-
- System.out.println("In GoogleServletImpl::helloOneWay. param = " +
- s1);
- System.out.println("Sleeping for " + s1 + " milliseconds starting "
- + " at " + new Date());
-
- try {
- Thread.sleep((new Integer(s1)).intValue());
- } catch(Exception e) {
- e.printStackTrace();
- }
- System.out.println("Exiting GoogleServletImpl:helloOneWay at " +
- new Date());
- }
-
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
-
- throws RemoteException {
- System.out.println("GoogleServletImpl.doSpellingSuggestion() " +
- " called with " + phrase);
-
- if( !gotInit ) {
- throw new RuntimeException("Got business method before init()");
- }
-
- String returnValue = "spelling suggestion from web";
- if( phrase.equals("forwardejb") ) {
- System.out.println("Forwarding spelling suggestion to ejbendpoint");
- Service genericServiceWithWSDL = null;
- try {
- InitialContext ic = new InitialContext();
- Service service = (Service)
- ic.lookup("java:comp/env/service/EjbDIIReference");
- doDynamicProxyTest(service);
- GoogleSearchPort ejbPort = (GoogleSearchPort)
- service.getPort(GoogleSearchPort.class);
- returnValue = ejbPort.doSpellingSuggestion(key, phrase);
- } catch(Exception e) {
- e.printStackTrace();
- throw new RemoteException(e.getMessage(), e);
- }
- }
-
- System.out.println("GoogleServletImpl returning " + returnValue);
- return returnValue;
- }
-
- public GoogleSearchResult doGoogleSearch(java.lang.String key, java.lang.String q, int start, int maxResults, boolean filter, java.lang.String restrict, boolean safeSearch, java.lang.String lr, java.lang.String ie, java.lang.String oe) {
- return null;
- }
-
- private void doDynamicProxyTest(Service service) throws Exception {
-
- Call c1 = service.createCall();
- Call c2 = service.createCall(PORT_QNAME);
- Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
- OPERATION_QNAME.getLocalPart());
- Call[] calls = service.getCalls(PORT_QNAME);
-
- // container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
- service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
- service.getPort(PORT_QNAME, GoogleSearchPort.class);
-
- QName serviceName = service.getServiceName();
- URL wsdlLocation = service.getWSDLDocumentLocation();
- if( wsdlLocation != null ) {
- System.out.println("wsdlLocation = " + wsdlLocation);
- }
- Iterator ports = service.getPorts();
-
- }
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
deleted file mode 100644
index 5634c14..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleclient"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
deleted file mode 100644
index f1a8116..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleserver"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
deleted file mode 100644
index 99ad91c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="http://localhost:8080/GoogleServlet/GoogleSearch?WSDL"
- packageName="standalone"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
deleted file mode 100644
index db0ca77..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="GoogleSearch.wsdl"
- packageName="googleserverweb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
deleted file mode 100644
index 389fdeb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="simplehandler"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
deleted file mode 100644
index dec7290..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,ejb/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="gen-ejb-wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,simplehandler/**,ejb/SimpleServer.class,com/**" />
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/simplehandler"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
deleted file mode 100644
index 073cb49..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package simplehandler;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import javax.xml.rpc.Service;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import ejb.*;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-simple-soapfault");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-soapfaultID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
- SimpleServer test = (SimpleServer)
- testService.getPort(SimpleServer.class);
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
- System.out.println("Invocation returned " + test.sayHello("jerome"));
- } catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus("soapfaultsclient main", stat.FAIL);
- System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage());
- }
-
- stat.addStatus("soapfaultsclient main", stat.PASS);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF
deleted file mode 100644
index 5085a53..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: simplehandler.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
deleted file mode 100644
index d7dba23..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServer"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="ejb.SimpleServer"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
deleted file mode 100644
index cb7fbe0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServer</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml
deleted file mode 100644
index f42856d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SimpleHandlerEJB</ejb-name>
- <service-endpoint>ejb.SimpleServer</service-endpoint>
- <ejb-class>ejb.SimpleServerImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml
deleted file mode 100644
index a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index fdeffbe..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SimpleHandlerEJB</ejb-name>
- <jndi-name>SimpleHandlerEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <endpoint-address-uri>simplehandler</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml
deleted file mode 100644
index a688510..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/webservices.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServer</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServer.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SimpleHandlerEJB</ejb-link>
- </service-impl-bean>
- <handler>
- <handler-name>ejb.SimpleHandler</handler-name>
- <handler-class>ejb.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
deleted file mode 100644
index d2ac35b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package ejb;
-
-import java.util.Date;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.*;
-
-public class SimpleHandler extends GenericHandler {
-
- protected HandlerInfo info = null;
-
- public void init(HandlerInfo info) {
- this.info = info;
- }
-
- public boolean handleRequest(MessageContext context) {
- try {
- Date startTime = new Date();
- context.setProperty("startTime", startTime);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- try {
- Date startTime = (Date) context.getProperty("startTime");
- Date endTime = new Date();
- long elapsed = endTime.getTime() - startTime.getTime();
- System.out.println(" in handler, elapsed " + elapsed);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
deleted file mode 100644
index 653d44c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package ejb;
-
-import java.rmi.*;
-
-public interface SimpleServer extends Remote {
-
- public String sayHello(String source) throws RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
deleted file mode 100644
index 27b2aad..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package ejb;
-
-import java.rmi.*;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class SimpleServerImpl implements SessionBean {
- SessionContext sc;
-
- public String sayHello(String hello) throws RemoteException {
- return "salut " + hello;
- }
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
deleted file mode 100644
index 6c58733..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="jaxrpc-hello-ejb"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
-
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
deleted file mode 100644
index a5be6ef..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
+++ /dev/null
@@ -1,188 +0,0 @@
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
- <!ENTITY jaxrpctargets SYSTEM "../common/targets.xml">
- <!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
- <!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpc-hello-ejb" default="all" basedir=".">
-
- <property name="appname" value="MyHelloEJBService"/>
-
- <property environment="env" />
-
- <property file="${env.APS_HOME}/config.properties"/>
- <property file="samplebuild.properties"/>
-
- &jaxrpctargets;
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <path id="class.path">
- <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>
-
- </path>
-
- <target name="all" depends="clean,deploy,assemble-client,deploy-client,runtest,undeploy"/>
- <target name="create-ejb-jar" description="Packages the EJB JAR file">
- <echo message="Creating the EJB JAR...."/>
- <delete file="${assemble.ear}/${ejbjar.file}" />
- <delete dir="${assemble.ear}/META-INF" />
- <copy todir="${assemble.ear}">
- <fileset dir="${build}/"
- includes="**/*.class"
- excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
- </copy>
- <copy file="${build}/MyHelloService.wsdl" todir="${assemble.ear}/META-INF/wsdl" />
- <copy file="${build}/mapping.xml" todir="${assemble.ear}/${build}/" />
- <copy file="webservices.xml" todir="${assemble.ear}/META-INF" />
- <copy file="ejb-jar.xml" todir="${assemble.ear}/META-INF" />
- <copy file="sun-ejb-jar.xml" todir="${assemble.ear}/META-INF" />
- <jar destfile="${assemble.ear}/${ejbjar.file}"
- >
- <fileset dir="${assemble.ear}" includes="META-INF/**, build/**,helloservice/**" />
- </jar>
- <copy file="${assemble.ear}/${ejbjar.file}" todir="." />
- </target>
-
- <target name="build" depends="build-service"
- description="Executes the targets needed to build the service.">
- </target>
-
- <target name="create-ear" depends="create-ejb-jar"
- description="Executes the targets needed to create the ejb jar.">
- <jar destfile="${assemble.ear}/${ear.file}"
- >
- <fileset dir="${assemble.ear}" includes="${ejbjar.file}" />
- </jar>
- </target>
-
- <target name="deploy" depends="set-asadmin,build,create-ear">
- <echo message="admin password file ${admin.password.file}"/>
- <echo message="admin user ${admin.user}"/>
- <echo message="admin host ${admin.host}"/>
- <echo message="admin port ${admin.port}"/>
- <echo message="Deploying ${ear.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${assemble.ear}/${ear.name}"/>
- </exec>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir}/webclient/WEB-INF/classes -keep -s ${build.classes.dir}/webclient/WEB-INF/classes -classpath ${build.classes.dir}/webclient/WEB-INF/classes ${config.wsdl.file}"/>
- </antcall>
-
- <replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
-
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- includes="webclient/**">
- <classpath refid="class.path"/>
- </javac>
- <copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="build/mapping.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-mapping.xml"/>
- <copy file="build/MyHelloService.wsdl" tofile="${build.classes.dir}/webclient/WEB-INF/wsdl/hello.wsdl"/>
- <copy file="config-wsdl.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-config.xml"/>
-
-
-
-
- <copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
-
- <target name="deploy-client" depends="init-common">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying wsclient.war from ${assemble.dir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="undeploy-ear,undeploy-client"/>
-
-
- <target name="undeploy-ear" depends="init-common">
- <echo message="Undeploying ${ear.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${earname}"/>
- </exec>
- </target>
-
-
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
- </java>
-
- <!--restore the tokens back in file-->
- <replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
-
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml
deleted file mode 100644
index 000e376..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server
-9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-<sun-web-app>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
deleted file mode 100644
index dccfbc0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>A test application</description>
- <display-name>WebTier</display-name>
- <servlet>
- <display-name>centralServlet</display-name>
- <servlet-name>RequestProcessor</servlet-name>
- <servlet-class>client.Client</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RequestProcessor</servlet-name>
- <url-pattern>/RequestProcessor</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <service-ref>
- <service-ref-name>service/MyHelloService</service-ref-name>
- <service-interface>helloservice.MyHelloService</service-interface>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</web-app>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java
deleted file mode 100644
index 7628c1e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client/TestClient.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package client;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class TestClient {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public boolean found1 = false;
- public boolean found2 = false;
-
- public static void main (String[] args) {
- stat.addDescription("jaxrpc ejb");
- TestClient client = new TestClient();
- client.doTest(args);
- stat.printSummary("jaxrpc-ejb");
- }
-
- public void doTest(String[] args) {
-
- String url = args[0];
- try {
- int code = invokeServlet(url);
- report(code);
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private int invokeServlet(String url) throws Exception {
- log("Invoking url = " + url);
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while ((line = input.readLine()) != null) {
- log(line);
- if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
- if(line.indexOf("[Hello All]") != -1)
- found2 = true;
- }
- return code;
- }
-
- private void report(int code) {
- if(code != 200) {
- log("Incorrect return code: " + code);
- fail();
- }
- if(!found1) {
- fail();
- }
- if(!found2) {
- fail();
- }
- pass();
- }
-
- private void log(String message) {
- System.out.println("[client.TestClient]:: " + message);
- }
-
- private void pass() {
- stat.addStatus("jaxrpc-ejb", stat.PASS);
- }
-
- private void fail() {
- stat.addStatus("jaxrpc-ejb", stat.FAIL);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
deleted file mode 100644
index b13a575..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="helloservice">
- <interface name="helloservice.HelloIF"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
deleted file mode 100644
index 54a2454..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/config-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="build/MyHelloService.wsdl"
- packageName="helloservice"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml
deleted file mode 100644
index 097927e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" metadata-complete="false" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/ejb-jar_3_0.xsd">
-<enterprise-beans>
-<session>
-<display-name>HelloEJB</display-name>
-<ejb-name>HelloEJB</ejb-name>
-<service-endpoint>helloservice.HelloIF</service-endpoint>
-<ejb-class>helloservice.HelloImpl</ejb-class>
-<session-type>Stateless</session-type>
-<transaction-type>Container</transaction-type>
-</session>
-</enterprise-beans>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties
deleted file mode 100644
index 74f8a76..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/samplebuild.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-#
-# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-example=helloservice
-wsdl.file=MyHelloEJBService.wsdl
-ear.file=jaxrpc-hello-ejb.ear
-ejbjar.file=jaxrpc-hello-ejb.jar
-ear.name=jaxrpc-hello-ejb.ear
-earname=jaxrpc-hello-ejb
-
-config.interface.file=config-interface.xml
-config.wsdl.file=config-wsdl.xml
-mapping.file=mapping.xml
-build= build
-assemble=assemble
-assemble.war=${assemble}/war
-assemble.ear=${assemble}/ear
-
-
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java
deleted file mode 100644
index af0f518..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloIF.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package helloservice;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-
-public interface HelloIF extends Remote {
- public String sayHello(String s) throws RemoteException;
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java
deleted file mode 100644
index aede911..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/src/helloservice/HelloImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package helloservice;
-
-import java.io.*;
-
-
-public class HelloImpl implements HelloIF {
- public String message = "Hello ";
-
- public String sayHello(String s) {
- return message + s;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml
deleted file mode 100644
index 86b9714..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="no"?>
- <!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 9.0 EJB 3.0//EN" "http://www.sun.com/software/appserver/dtds/sun-ejb-jar_3_0-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>HelloEJB</ejb-name>
- <webservice-endpoint>
- <port-component-name>HelloIF</port-component-name>
- <endpoint-address-uri>/hello-jaxrpc-ejb/hello</endpoint-address-uri>
- <service-qname>
- <namespaceURI>urn:Foo</namespaceURI>
- <localpart>MyHelloService</localpart>
- </service-qname>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
deleted file mode 100644
index e48c475..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package client;
-
-import jakarta.servlet.*;
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.naming.InitialContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import javax.xml.rpc.Stub;
-import helloservice.*;
-
-
-public class Client extends HttpServlet {
-
-
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- doPost(req, resp);
- }
-
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- try {
- String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc-ejb/hello";//?wsdl
- InitialContext ic = new InitialContext();
-
- MyHelloService myHelloService =
- (MyHelloService) ic.lookup(
- "java:comp/env/service/MyHelloService");
-
- HelloIF helloPort = myHelloService.getHelloIFPort();
- ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- String ret= helloPort.sayHello("All");
-
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
- out.println("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF jaxrpc web SERVICE IS :");
- out.println("</p>");
- out.println("[" + ret + "]");
- out.println("</body>");
- out.println("</html>");
- out.flush();
- out.close();
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml
deleted file mode 100644
index 0e8a818..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webservices.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<display-name>MyHelloService</display-name>
-<webservice-description-name>MyHelloService</webservice-description-name>
-<wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
-<jaxrpc-mapping-file>build/mapping.xml</jaxrpc-mapping-file>
-<port-component>
-<display-name>HelloIF</display-name>
-<port-component-name>HelloIF</port-component-name>
-<wsdl-port xmlns:wsdl-port_ns__="urn:Foo">wsdl-port_ns__:HelloIFPort</wsdl-port>
-<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
-<service-impl-bean>
-<ejb-link>HelloEJB</ejb-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
deleted file mode 100644
index 9a608f5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
+++ /dev/null
@@ -1,44 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="jaxrpc-hello-web"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml"
- value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml"
- value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
-
-
-
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
deleted file mode 100644
index 448785b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
+++ /dev/null
@@ -1,227 +0,0 @@
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
- <!ENTITY jaxrpctargets SYSTEM "../common/targets.xml">
- <!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
- <!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
- <!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="jaxrpc-hello-web" default="all" basedir=".">
-
- <property name="appname" value="MyHelloService"/>
-
- <property environment="env" />
-
- <property file="${env.APS_HOME}/config.properties"/>
- <property file="samplebuild.properties"/>
-
- &jaxrpctargets;
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <path id="class.path">
- <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>
-
- </path>
-
- <target name="all" depends="clean,deploy,assemble-client,deploy-client,runtest,undeploy"/>
-
-
- <target name="create-war" description="Packages the WAR file">
- <echo message="Creating the WAR...."/>
- <delete file="${assemble.war}/${war.file}" />
- <delete dir="${assemble.war}/WEB-INF" />
- <copy todir="${assemble.war}/WEB-INF/classes/">
- <fileset dir="${build}/"
- includes="**/*.class"
- excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
- </copy>
- <copy file="${build}/MyHelloService.wsdl" todir="${assemble.war}/WEB-INF/wsdl" />
- <copy file="${build}/mapping.xml" todir="${assemble.war}/${build}/" />
- <copy file="sun-web.xml" todir="${assemble.war}/WEB-INF" />
- <copy file="webservices.xml" todir="${assemble.war}/WEB-INF" />
- <war destfile="${assemble.war}/${war.file}"
- webxml="./web.xml" filesonly="true" >
- <fileset dir="${assemble.war}" includes="WEB-INF/**, build/**" />
- </war>
- <copy file="${assemble.war}/${war.file}" todir="." />
- </target>
-
- <target name="build" depends="build-service"
- description="Executes the targets needed to build the service.">
- </target>
-
- <target name="deploy" depends="set-asadmin,build,create-war">
- <echo message="Deploying ${war.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${war.file}"/>
- </exec>
- </target>
-
-
-
- <target name="undeploy-war1" depends="init-common">
- <echo message="Undeploying ${war.file} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${warname}"/>
- </exec>
- </target>
-
-
- <!-- <target name="build-client" depends="build-static"
- description="Executes the targets needed to build a static stub client.">
- </target>
-
- <target name="runclient1" depends="run-client"
- description="Runs the client.">
- </target>
-
- <target name="run-client"
- description="Runs a stand-alone (non-J2EE) client">
- <java classname="${client.class}" fork="yes" >
- <arg line="${endpoint.address}" />
- <classpath refid="run.classpath" />
- </java>
- </target>
-
-
- <target name="generate-client-stubs"
- description="Runs wscompile to generate the client stub classes">
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir} -keep -s ${build.classes.dir} -classpath ${build.classes.dir} ${config.wsdl.file}"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common,generate-client-stubs">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${assemble.war}/WEB-INF/wsdl/MyHelloService.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="mapping.xml,META-INF/wsdl/**,helloservice/**,com/**" />
- </antcall>
-
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common,assemble-client">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/hello-jaxrpc/hello"/>
- </antcall>
- </target> -->
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <antcall target="run-wscompile">
- <param name="param1" value="-gen:client -d ${build.classes.dir}/webclient/WEB-INF/classes -keep -s ${build.classes.dir}/webclient/WEB-INF/classes -classpath ${build.classes.dir}/webclient/WEB-INF/classes ${config.wsdl.file}"/>
- </antcall>
- <replace file="webclient/Client.java" value="${http.host}" token="HTTP_HOST"/>
- <replace file="webclient/Client.java" value="${http.port}" token="HTTP_PORT"/>
-
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- includes="webclient/**">
- <classpath refid="class.path"/>
- </javac>
- <copy file="client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="build/mapping.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-mapping.xml"/>
- <copy file="build/MyHelloService.wsdl" tofile="${build.classes.dir}/webclient/WEB-INF/wsdl/hello.wsdl"/>
- <copy file="config-wsdl.xml" tofile="${build.classes.dir}/webclient/WEB-INF/hello-config.xml"/>
-
-
-
-
- <copy file="client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
-
- <target name="deploy-client" depends="init-common">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying wsclient.war from ${assemble.dir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="undeploy-war1,undeploy-client"/>
-
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
- </java>
-
-
- <!--restore the tokens back in file-->
- <replace file="webclient/Client.java" token="${http.host}" value="HTTP_HOST"/>
- <replace file="webclient/Client.java" token="${http.port}" value="HTTP_PORT"/>
- </target>
-
-
-
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml
deleted file mode 100644
index 000e376..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server
-9.0 Servlet 2.5//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_5-0.dtd">
-<sun-web-app>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
deleted file mode 100644
index dccfbc0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client-web.xml
+++ /dev/null
@@ -1,51 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:j2ee="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="2.5"
- xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
- http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
- <description>A test application</description>
- <display-name>WebTier</display-name>
- <servlet>
- <display-name>centralServlet</display-name>
- <servlet-name>RequestProcessor</servlet-name>
- <servlet-class>client.Client</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>RequestProcessor</servlet-name>
- <url-pattern>/RequestProcessor</url-pattern>
- </servlet-mapping>
-
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
- <service-ref>
- <service-ref-name>service/MyHelloService</service-ref-name>
- <service-interface>helloservice.MyHelloService</service-interface>
- <wsdl-file>WEB-INF/wsdl/hello.wsdl</wsdl-file>
- <jaxrpc-mapping-file>WEB-INF/hello-mapping.xml</jaxrpc-mapping-file>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-
-</web-app>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java
deleted file mode 100644
index 3354283..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/Client.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package client;
-
-/*import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import helloservice.*;
-import javax.xml.rpc.Service;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-*/
-public class Client {
-
- /* private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("jaxrpc-hello-web-client");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("jaxrpc-hello-web-client");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
- MyHelloService myHelloService =
- (MyHelloService) ic.lookup(
- "java:comp/env/service/helloservice");
-
- HelloIF helloPort = myHelloService.getHelloIFPort();
-
-
- ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
- System.out.println("Invocation returned " + helloPort.sayHello("All"));
- } catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus("jaxrpc-hello-web-client main", stat.FAIL);
- System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage());
- }
-
- stat.addStatus("jaxrpc-hello-web-client main", stat.PASS);
- }
-*/
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF
deleted file mode 100644
index 0fb13ca..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: client.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java
deleted file mode 100644
index 93aadd8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/client/TestClient.java
+++ /dev/null
@@ -1,98 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package client;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class TestClient {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public boolean found1 = false;
- public boolean found2 = false;
-
- public static void main (String[] args) {
- stat.addDescription("jaxrpc web");
- TestClient client = new TestClient();
- client.doTest(args);
- stat.printSummary("jaxrpc-web");
- }
-
- public void doTest(String[] args) {
-
- String url = args[0];
- try {
- int code = invokeServlet(url);
- report(code);
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private int invokeServlet(String url) throws Exception {
- log("Invoking url = " + url);
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while ((line = input.readLine()) != null) {
- log(line);
- if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
- if(line.indexOf("[Hello All]") != -1)
- found2 = true;
- }
- return code;
- }
-
- private void report(int code) {
- if(code != 200) {
- log("Incorrect return code: " + code);
- fail();
- }
- if(!found1) {
- fail();
- }
- if(!found2) {
- fail();
- }
- pass();
- }
-
- private void log(String message) {
- System.out.println("[client.TestClient]:: " + message);
- }
-
- private void pass() {
- stat.addStatus("jaxrpc-web", stat.PASS);
- }
-
- private void fail() {
- stat.addStatus("jaxrpc-web", stat.FAIL);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
deleted file mode 100644
index b13a575..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
- packageName="helloservice">
- <interface name="helloservice.HelloIF"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
deleted file mode 100644
index 54a2454..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/config-wsdl.xml
+++ /dev/null
@@ -1,24 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl location="build/MyHelloService.wsdl"
- packageName="helloservice"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
deleted file mode 100644
index 4083642..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my jaxrpc app client</description>
- <display-name>jaxrpcClient</display-name>
- <service-ref>
- <description>simple jaxrpc service ref</description>
- <service-ref-name>service/helloservice</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/MyHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:Foo">servicens:HelloIF</service-qname>
- <port-component-ref>
- <service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml
deleted file mode 100644
index d0bac8d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/helloservice</service-ref-name>
- <port-info>
- <service-endpoint-interface>helloservice.helloIF</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:Foo</namespaceURI>
- <localpart>HelloImpl</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties
deleted file mode 100644
index 2bc2a75..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/samplebuild.properties
+++ /dev/null
@@ -1,32 +0,0 @@
-#
-# Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-#
-# This program and the accompanying materials are made available under the
-# terms of the Eclipse Public License v. 2.0, which is available at
-# http://www.eclipse.org/legal/epl-2.0.
-#
-# This Source Code may also be made available under the following Secondary
-# Licenses when the conditions for such availability set forth in the
-# Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
-# version 2 with the GNU Classpath Exception, which is available at
-# https://www.gnu.org/software/classpath/license.html.
-#
-# SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-#
-
-example=helloservice
-assemble=assemble
-assemble.war=assemble
-wsdl.file=MyHelloService.wsdl
-warname=jaxrpc-hello-web
-war.file=jaxrpc-hello-web.war
-war.name=jaxrpc-hello-web.war
-
-client.src=client
-
-config.interface.file=config-interface.xml
-config.wsdl.file=config-wsdl.xml
-mapping.file=mapping.xml
-build= build
-
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java
deleted file mode 100644
index af0f518..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloIF.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package helloservice;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-
-public interface HelloIF extends Remote {
- public String sayHello(String s) throws RemoteException;
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java
deleted file mode 100644
index aede911..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/src/HelloImpl.java
+++ /dev/null
@@ -1,28 +0,0 @@
-/*
- * Copyright (c) 2006, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package helloservice;
-
-import java.io.*;
-
-
-public class HelloImpl implements HelloIF {
- public String message = "Hello ";
-
- public String sayHello(String s) {
- return message + s;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml
deleted file mode 100644
index 6c649bd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/sun-web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.0 Servlet 2.4//EN" "http://www.sun.com/software/appserver/dtds/sun-web-app_2_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>/hello-jaxrpc</context-root>
- <servlet>
- <servlet-name>HelloImpl</servlet-name>
- <webservice-endpoint>
- <port-component-name>HelloIF</port-component-name>
- <endpoint-address-uri>hello</endpoint-address-uri>
- </webservice-endpoint>
- </servlet>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml
deleted file mode 100644
index ac8a55d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/web.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app xmlns="http://java.sun.com/xml/ns/j2ee" version="2.4" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
-<display-name>MyHelloService</display-name>
-<servlet>
-<display-name>HelloImpl</display-name>
-<servlet-name>HelloImpl</servlet-name>
-<servlet-class>helloservice.HelloImpl</servlet-class>
-</servlet>
-<servlet-mapping>
-<servlet-name>HelloImpl</servlet-name>
-<url-pattern>/hello</url-pattern>
-</servlet-mapping>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
deleted file mode 100644
index fd8a8bc..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webclient/Client.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package client;
-
-import jakarta.servlet.*;
-import java.io.IOException;
-import java.io.PrintWriter;
-import javax.naming.InitialContext;
-import jakarta.servlet.ServletException;
-import jakarta.servlet.http.HttpServlet;
-import jakarta.servlet.http.HttpServletRequest;
-import jakarta.servlet.http.HttpServletResponse;
-import javax.xml.rpc.Stub;
-import helloservice.*;
-
-
-public class Client extends HttpServlet {
-
-
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- doPost(req, resp);
- }
-
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- try {
- String targetEndpointAddress = "http://HTTP_HOST:HTTP_PORT/hello-jaxrpc/hello";//?wsdl
- InitialContext ic = new InitialContext();
-
- MyHelloService myHelloService =
- (MyHelloService) ic.lookup(
- "java:comp/env/service/MyHelloService");
-
- HelloIF helloPort = myHelloService.getHelloIFPort();
- ((Stub)helloPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- String ret= helloPort.sayHello("All");
-
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
- out.println("<html>");
- out.println("<head>");
- out.println("<title>TestServlet</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF jaxrpc web SERVICE IS :");
- out.println("</p>");
- out.println("[" + ret + "]");
- out.println("</body>");
- out.println("</html>");
- out.flush();
- out.close();
- } catch(Exception e) {
- e.printStackTrace();
- }
- }
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml
deleted file mode 100644
index 664e057..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/webservices.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee" version="1.1" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<display-name>MyHelloService</display-name>
-<webservice-description-name>MyHelloService</webservice-description-name>
-<wsdl-file>WEB-INF/wsdl/MyHelloService.wsdl</wsdl-file>
-<jaxrpc-mapping-file>build/mapping.xml</jaxrpc-mapping-file>
-<port-component>
-<display-name>HelloIF</display-name>
-<port-component-name>HelloIF</port-component-name>
-<wsdl-port xmlns:wsdl-port_ns__="urn:Foo">wsdl-port_ns__:HelloIFPort</wsdl-port>
-<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
-<service-impl-bean>
-<servlet-link>HelloImpl</servlet-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
index 1f07b61..608a37f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.xml
@@ -34,117 +34,126 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**, webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/bare_doc_literal-se_consumer_se_provider/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**, webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="undeploy-app" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- <antcall target="undeploy-app"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**, client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ <antcall target="undeploy-app" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**, client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
index 3abc8bb..34ed13c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.xml
@@ -1,4 +1,4 @@
-<?xml version="1.0"?>
+<?xml version="1.0" encoding="UTF-8"?>
<!--
Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
@@ -34,102 +34,106 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorServicei?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>-->
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorServicei?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="deploy-jbi-component-su" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
index 793e527..482d5bd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.xml
@@ -35,291 +35,320 @@
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"/>
+ <target name="all"
+ depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-server" depends="assemble-ejb, deploy-app, start-consumer-jms-binding"/>
+ <target name="setup-server" depends="assemble-ejb, deploy-app, start-consumer-jms-binding" />
- <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding"/>
+ <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding" />
- <target name="cleanup-server" depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"/>
- <target name="cleanup-client" depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"/>
+ <target name="cleanup-server"
+ depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"
+ />
+ <target name="cleanup-client"
+ depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"
+ />
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="provider/endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="provider/endpoint" />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-consumer-su" depends="init-common">
- <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="deploying JMS Binding's consumer deployment "/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- <param name="jbi-component-su" value="${jms-consumer-su}"/>
- <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}"/>
- </antcall>
- </target>
+ <target name="deploy-consumer-su" depends="init-common">
+ <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"
+ />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="deploying JMS Binding's consumer deployment " />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ <param name="jbi-component-su" value="${jms-consumer-su}" />
+ <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="consumer"
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./consumer/client-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"
+ />
+ <copy file="./consumer/client-sun-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"
+ />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <echo message="Deploying the client application"/>
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
-
- <target name="deploy-provider-su" depends="init-common">
- <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="provideroutgoingqueue"/>
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="temporary_queue"/>
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Deploy JMS Binding provider deployment"/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jbi-component-su" value="${jms-provider-su}"/>
- <param name="jbi-component-su-dir" value="${jms-provider-su-dir}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
-
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
-
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
-
- <target name="runtest" depends="init-common">
- <echo message="Running the test client"/>
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="consumer/client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
-
-
- <target name="undeploy-consumer-su" depends="init-common">
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <!--<antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>-->
- <echo message="Undeploying JMS Binding consumer deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- </antcall>
- </target>
-
- <target name="undeploy-provider-su" depends="init-common">
- <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue"/>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue"/>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS Binding's provider deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
-
- <target name="create-domain2" depends="init-common">
- <property name="admin.command" value="create-domain"/>
- <property name="operand.props" value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"/>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${operand.props}" />
+ <target name="deploy-client" depends="assemble-client">
+ <echo message="Deploying the client application" />
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="${client.war}" />
</exec>
- </target>
+ </target>
- <target name="start-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-domain --user ${admin.user} ${domain.name}"/>
- </exec>
- </target>
+ <target name="deploy-provider-su" depends="init-common">
+ <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"
+ />
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider" />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue" />
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="provideroutgoingqueue" />
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="temporary_queue" />
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Deploy JMS Binding provider deployment" />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jbi-component-su" value="${jms-provider-su}" />
+ <param name="jbi-component-su-dir" value="${jms-provider-su-dir}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="create-physical-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="create-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"/>
- </exec>
- </target>
- <target name="create-jms-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="create-jms-connection-factory" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
- <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="runtest" depends="init-common">
+ <echo message="Running the test client" />
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="consumer/client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"
+ />
+ </java>
+ </target>
- <target name="delete-physical-queue" depends="init-common" >
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}" />
- </exec>
- </target>
- <target name="delete-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
- <target name="delete-appserver-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"/>
- </exec>
- </target>
+ <target name="undeploy-consumer-su" depends="init-common">
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Undeploying JMS Binding consumer deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ </antcall>
+ </target>
- <target name="delete-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="delete-domain domain2 " />
- </exec>
- </target>
- <target name="stop-provider-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-provider-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="stop-consumer-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-consumer-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
+ <target name="undeploy-provider-su" depends="init-common">
+ <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue" />
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue" />
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS Binding's provider deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
+
+ <target name="create-domain2" depends="init-common">
+ <property name="admin.command" value="create-domain" />
+ <property name="operand.props"
+ value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"
+ />
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="${admin.command} ${operand.props}" />
+ </exec>
+ </target>
+
+ <target name="start-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-domain --user ${admin.user} ${domain.name}" />
+ </exec>
+ </target>
+
+ <target name="create-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
+
+ <target name="create-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+ <target name="create-jms-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+
+ <target name="create-jms-connection-factory" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
+ <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+
+ <target name="delete-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
+
+ <target name="delete-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+ <target name="delete-appserver-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+
+ <target name="delete-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="delete-domain domain2 " />
+ </exec>
+ </target>
+ <target name="stop-provider-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-provider-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="stop-consumer-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-consumer-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
index 632eb41..1e8d845 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.xml
@@ -34,102 +34,111 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/AdderService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/AdderService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
+
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/AdderService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/AdderService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
+
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <!--<antcall target="configure-webservice-management"/>
<antcall target="asadmin-common">
<param name="admin.command" value="set"/>
<param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Adder.jbi-enabled=false"/>
</antcall>
<antcall target="deploy-jbi-component-su"/>-->
- </target>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Adder"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Adder" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
deleted file mode 100644
index 06556a7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/build.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-]>
-
-<project name="jsr208-integration-server" default="all" basedir=".">
-
-
- <target name="all">
- <ant dir="consumer" target="all"/>
- <ant dir="provider" target="all"/>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl
deleted file mode 100644
index 4dc31e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl
deleted file mode 100644
index 4783528..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterestNonHttpBC.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="InterestIF_calculateInterest">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="InterestIF_calculateInterestResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest" parameterOrder="double_1 double_2">
- <input message="tns:InterestIF_calculateInterest"/>
- <output message="tns:InterestIF_calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd
deleted file mode 100644
index fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties
deleted file mode 100644
index e6c5491..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_provider_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_provider_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
deleted file mode 100644
index 6816239..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/build.xml
+++ /dev/null
@@ -1,357 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, run-servlet-invoker, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
-
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- </copy>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.webinf}/WEB-INF/classes"/>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <fileset dir="${build.jars}" includes="*.jar,*.war" excludes="ejb.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.jars}/ejb.jar" />
- </exec>
-<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.ejb-module.ejb.web-service-endpoint.InterestIFPort.jbi-enabled=false"/>
- </antcall>
-
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="ejb" />
- </exec>
-
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <echo message="Executing an appclient"/>
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- </target>
-
- <target name="run-servlet-invoker" depends="init-common, compile">
- <echo message="Executing a Servlet invoker"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.dest}"/>
-
-<java classname="myclient.ServletInvoker">
- <classpath>
- <pathelement path="${build.dest}"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/FindInterestServlet/FindInterestClient"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="ejb#InterestIFPort"/>
- </antcall>
- </target>
-
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java
deleted file mode 100644
index 36ef163..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClient.java
+++ /dev/null
@@ -1,108 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClient {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
- private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
- public FindInterestClient() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClient client = new FindInterestClient();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public double doTest() {
-
- //String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
- return interest;
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- return -1;
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java
deleted file mode 100644
index 0ee7b94..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestClientNonHttpBC.java
+++ /dev/null
@@ -1,106 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClientNonHttpBC {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
- private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
- public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public double doTest() {
-
- String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
- return interest;
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- return -1;
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
deleted file mode 100644
index e260cc0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/FindInterestServletClient.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import jakarta.servlet.*;
-import jakarta.servlet.http.*;
-import java.io.Serializable;
-import java.io.PrintWriter;
-import java.rmi.RemoteException;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-
-public class FindInterestServletClient extends HttpServlet
- {
- HttpServletResponse resp;
- public FindInterestServletClient() {
- System.out.println("FindInterestServletImpl() instantiated");
- }
-
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- this.resp = resp;
- doPost(req, resp);
- }
-
- public void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
- try{
- this.resp = resp;
- calculateInterest();
- }catch(Exception e) {
- throw new jakarta.servlet.ServletException(e);
- }
-
- }
-
- public void calculateInterest() throws Exception {
- System.out.println("calculateInterest invoked from servlet ");
- FindInterestClient client = new FindInterestClient();
- double interest= client.doTest();
- PrintWriter out = resp.getWriter();
- resp.setContentType("text/html");
- out.println("<html>");
- out.println("<head>");
- out.println("<title>FindInterestServletClient</title>");
- out.println("</head>");
- out.println("<body>");
- out.println("<p>");
- out.println("So the RESULT OF FindInterest SERVICE IS :");
- out.println("</p>");
- out.println("[" + interest + "]");
- out.println("</body>");
- out.println("</html>");
- out.flush();
- out.close();
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java
deleted file mode 100755
index 3dfffb1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumer.java
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumer {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
- public SOAPEjbConsumer() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumer client = new SOAPEjbConsumer();
-
- client.doTest();
- }
-
- private void doTest() {
- //String targetEndpointAddress =
- // "http://localhost:8080/soap/web/findinterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java
deleted file mode 100755
index 87a75ed..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/SOAPEjbConsumerNonHttpBC.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumerNonHttpBC {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
- public SOAPEjbConsumerNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
- client.doTest();
- }
-
- private void doTest() {
- String targetEndpointAddress =
- "http://localhost:8080/soap/web/findinterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java
deleted file mode 100644
index f5687e7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/client/ServletInvoker.java
+++ /dev/null
@@ -1,100 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import java.io.BufferedReader;
-import java.io.InputStream;
-import java.io.InputStreamReader;
-import java.io.IOException;
-import java.net.HttpURLConnection;
-import java.net.URL;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class ServletInvoker {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public boolean found1 = false;
- public boolean found2 = false;
-
- private static String testId = "jbi-serviceengine/jax-rpc/consumer";
-
- public static void main (String[] args) {
- stat.addDescription(testId);
- ServletInvoker client = new ServletInvoker();
- client.doTest(args);
- stat.printSummary(testId);
- }
-
- public void doTest(String[] args) {
-
- String url = args[0];
- try {
- int code = invokeServlet(url);
- report(code);
- } catch (Exception e) {
- e.printStackTrace();
- fail();
- }
- }
-
- private int invokeServlet(String url) throws Exception {
- log("Invoking url = " + url);
- URL u = new URL(url);
- HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- int code = c1.getResponseCode();
- InputStream is = c1.getInputStream();
- BufferedReader input = new BufferedReader (new InputStreamReader(is));
- String line = null;
- while ((line = input.readLine()) != null) {
- log(line);
- if(line.indexOf("So the RESULT OF FindInterest SERVICE IS") != -1)
- found1 = true;
- if(line.indexOf("[105.0]") != -1)
- found2 = true;
- }
- return code;
- }
-
- private void report(int code) {
- if(code != 200) {
- log("Incorrect return code: " + code);
- fail();
- }
- if(!found1) {
- fail();
- }
- if(!found2) {
- fail();
- }
- pass();
- }
-
- private void log(String message) {
- System.out.println("[client.TestClient]:: " + message);
- }
-
- private void pass() {
- stat.addStatus(testId, stat.PASS);
- }
-
- private void fail() {
- stat.addStatus(testId, stat.FAIL);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml
deleted file mode 100644
index 34de701..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/application.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <web>
- <web-uri>web.war</web-uri>
- <context-root>FindInterestServlet</context-root>
- </web>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF
deleted file mode 100644
index 7cc1828..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: myclient.SOAPEjbConsumer
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml
deleted file mode 100644
index f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml
deleted file mode 100644
index a313c5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml
deleted file mode 100644
index 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml
deleted file mode 100644
index d23c426..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml
deleted file mode 100644
index f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
deleted file mode 100644
index 2b0cec3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- <port-info>
- <wsdl-port>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- <localpart>InterestIFPort</localpart>
-</wsdl-port>
- <stub-property name="jbi-enabled" value="true"/>
- </port-info>
- </service-ref>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml
deleted file mode 100644
index 0fc85ea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/descriptor/web/web.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServletClient</servlet-name>
- <servlet-class>myclient.FindInterestServletClient</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServletClient</servlet-name>
- <url-pattern>/FindInterestClient</url-pattern>
- </servlet-mapping>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
deleted file mode 100644
index b25badf..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/ejb/InterestEJB.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class InterestEJB implements SessionBean {
-
- private SessionContext sc;
-
- public InterestEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
- }
-
- public double calculateInterest(double balance, double period) {
- System.out.println(" Inside calculateInterest ");
- return (balance * period * 0.1);
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml
deleted file mode 100644
index 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml
deleted file mode 100644
index 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
deleted file mode 100755
index ac2e5e6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_provider_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>provider_for_ejb_jaxrpc</name>
- <description>provider service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_provider_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl
deleted file mode 100644
index f269b0e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:8080/findintr/FindInterest"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd
deleted file mode 100644
index fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
deleted file mode 100755
index 09720f7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version='1.0' ?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:javaesb="http://java.sun.com"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml
deleted file mode 100755
index 0c23185..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su-alaska/su/endpoints.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<portmaps>
-<portmap direction="outbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml
deleted file mode 100755
index 73efb32..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/assembly/META-INF/jbi.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_provider_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>provider_for_ejb_jaxrpc</name>
- <description>provider service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_provider_su.jar</artifacts-zip>
- <component-name>SunSOAPBinding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml
deleted file mode 100755
index 1d3719e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/META-INF/jbi.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' ?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
deleted file mode 100755
index 307693b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/soap-binding-su/su/endpoints.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <endpoint xmlns="http://www.sun.com/ns/jbi/component/soap/deploy"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
-<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
- </service-name>
- <endpoint-name>InterestIFPort</endpoint-name>
- <endpoint-role>provider</endpoint-role>
- <address-location>http://localhost:8080/findintr/FindInterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
- <operation>
- <name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
- <soapaction>""</soapaction>
- <input>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </input>
- <output>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
- </operation>
-</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
deleted file mode 100644
index 180f8fd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/web/FindInterestServletImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myweb;
-
-import java.util.Iterator;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import javax.naming.*;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.namespace.QName;
-import jakarta.servlet.SingleThreadModel;
-
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
-
- public FindInterestServletImpl() {
- System.out.println("FindInterestServletImpl() instantiated");
- }
-
- public void init(Object context) {
- System.out.println("Got ServiceLifecycle::init call " + context);
- }
-
- public void destroy() {
- System.out.println("Got ServiceLifecycle::destroy call");
- }
-
- public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*period;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
deleted file mode 100644
index c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
deleted file mode 100644
index 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/consumer/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl
deleted file mode 100644
index fd6d871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest.wsdl
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- </operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd
deleted file mode 100644
index 8490a84..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties
deleted file mode 100644
index ba6114f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
deleted file mode 100644
index 2e65e89..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/build.xml
+++ /dev/null
@@ -1,334 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "../../../../../config/properties.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, runclient, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
-<!--
- <fileset dir=".">
- <include name="FIMapping.xml" />
- </fileset>
--->
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrWebMapping.xml" />
- </fileset>
-
-<!--
- <fileset dir=".">
- <include name="FIMappingWeb.xml" />
- </fileset>
--->
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/webservices.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-<!--
- <fileset dir=".">
- <include name="FIMappingClient.xml" />
- </fileset>
--->
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
- <fileset dir="${build.jars}" includes="*.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrWebMapping.xml wscompile_config_web.xml
-" />
- </exec>
-
- </target>
- <!--<target name="deploy-soap-su" depends="init-common">
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su" value="${}"/>
- <param name="jbi-component-su" value="${}"/>
- </antcall>
- </target>-->
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java
deleted file mode 100644
index 91ae707..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClient.java
+++ /dev/null
@@ -1,103 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClient {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
-
- public FindInterestClient() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClient client = new FindInterestClient();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public void doTest() {
-
- //String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
-
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java
deleted file mode 100644
index 38fb9d9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/FindInterestClientNonHttpBC.java
+++ /dev/null
@@ -1,101 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClientNonHttpBC {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
-
- public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public void doTest() {
-
- String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
-
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java
deleted file mode 100755
index e536ed6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumer.java
+++ /dev/null
@@ -1,68 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumer {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
-
- public SOAPEjbConsumer() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumer client = new SOAPEjbConsumer();
-
- client.doTest();
- status.printSummary(testId);
- }
-
- private void doTest() {
- //String targetEndpointAddress =
- // "http://localhost:8080/soap/web/findinterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS);
-
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java
deleted file mode 100755
index 9bbacd5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/client/SOAPEjbConsumerNonHttpBC.java
+++ /dev/null
@@ -1,66 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumerNonHttpBC {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
-
- public SOAPEjbConsumerNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
- client.doTest();
- status.printSummary(testId);
- }
-
- private void doTest() {
- String targetEndpointAddress =
- "http://localhost:8080/soap/web/findinterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint Test", status.PASS);
-
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml
deleted file mode 100644
index abe9e08..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <ejb>ejb.jar</ejb>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF
deleted file mode 100644
index 7cc1828..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: myclient.SOAPEjbConsumer
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml
deleted file mode 100644
index f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml
deleted file mode 100644
index a313c5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml
deleted file mode 100644
index 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml
deleted file mode 100644
index d23c426..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml
deleted file mode 100644
index f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml
deleted file mode 100644
index 14674e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml
deleted file mode 100644
index 0203114..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServlet</servlet-name>
- <servlet-class>myweb.FindInterestServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServlet</servlet-name>
- <url-pattern>/FindInterest</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml
deleted file mode 100644
index 51cd5ac..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/descriptor/web/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrWebMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myweb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>FindInterestServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
deleted file mode 100644
index bf15003..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/ejb/InterestEJB.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class InterestEJB implements SessionBean {
-
- private SessionContext sc;
-
- public InterestEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
- }
-
- public void calculateInterest(double balance, double period) {
- System.out.println(" Inside calculateInterest interest is : " + (balance * period * 0.1));
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml
deleted file mode 100644
index 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml
deleted file mode 100644
index 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml
deleted file mode 100644
index fc8a3a8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/mapping/FIMappingWeb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myweb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
deleted file mode 100755
index f1b3f7a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl
deleted file mode 100644
index 4727803..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:12013/InterestIFPort"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd
deleted file mode 100644
index 8490a84..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
deleted file mode 100755
index beec080..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ /dev/null
@@ -1,27 +0,0 @@
-<?xml version='1.0' ?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- </services>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml
deleted file mode 100755
index 66627fd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/soap-binding-su-alaska/su/endpoints.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<portmaps>
-<portmap direction="inbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
deleted file mode 100644
index f9d56f5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
+++ /dev/null
@@ -1,49 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myweb;
-
-import java.util.Iterator;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import javax.naming.*;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.namespace.QName;
-import jakarta.servlet.SingleThreadModel;
-
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
-
- public FindInterestServletImpl() {
- System.out.println("FindInterestServletImpl() instantiated");
- }
-
- public void init(Object context) {
- System.out.println("Got ServiceLifecycle::init call " + context);
- }
-
- public void destroy() {
- System.out.println("Got ServiceLifecycle::destroy call");
- }
-
- public void calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint " + (0.2*balance*period));
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
deleted file mode 100644
index c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
deleted file mode 100644
index 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
deleted file mode 100644
index e8001cd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myweb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl
deleted file mode 100644
index 4dc31e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl
deleted file mode 100644
index 4783528..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterestNonHttpBC.wsdl
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="InterestIF_calculateInterest">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="InterestIF_calculateInterestResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest" parameterOrder="double_1 double_2">
- <input message="tns:InterestIF_calculateInterest"/>
- <output message="tns:InterestIF_calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_ADDRESS"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd
deleted file mode 100644
index fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties
deleted file mode 100644
index ba6114f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.properties
+++ /dev/null
@@ -1,24 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="findinterest"/>
-<property name="appname" value="${module}"/>
-<property name="jbi-component-su-assembly" value="ejb_findinterest_assembly"/>
-<property name="jbi-component-su" value="ejb_jaxrpc_consumer_su"/>
-<property name="jbi-component-su-dir" value="soap-binding-su-alaska"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
deleted file mode 100644
index fc952cb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/build.xml
+++ /dev/null
@@ -1,348 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY jbicommon SYSTEM "file:./../../jbi_commons.xml">
-<!ENTITY jbiproperties SYSTEM "file:./../../jbi_commons.properties">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<!-- targets: clean, setup, compile, jar, war, ear, deploy, undeploy, runclient -->
-
-<project name="findintr" default="all" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &jbicommon;
- &jbiproperties;
- &testproperties;
- <property environment="env" />
- <target name="all" depends="clean, setup, compile, ear, deploy, set-flag, runclient, undeploy"/>
- <target name="setup" depends="init-common">
- <property name="root.dir" value="." />
- <property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
-
- <property name="build.dir" value="${env.APS_HOME}/build/module" />
- <property name="build.repository" value="${build.dir}/buildears"/>
- <property name="build.appclient" value="${build.dir}/buildappclient"/>
- <property name="build.ejbsrc" value="${build.dir}/src/ejb" />
- <property name="build.websrc" value="${build.dir}/src/web" />
- <property name="build.clientsrc" value="${build.dir}/src/client" />
-
- <property name="build.dest" value="${build.dir}/classes" />
- <property name="build.mapping" value="${build.dir}/jaxrpc-mapping" />
- <property name="build.desc" value="${build.dir}/descriptor" />
- <property name="build.webinf" value="${build.dir}/webinf" />
- <property name="build.metainf" value="${build.dir}/metainf" />
- <property name="build.jars" value="${build.dir}/jars" />
- <property name="build.ear" value="${build.repository}/"/>
-
- <property name="debug" value="on" />
- </target>
-
- <target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
- <delete dir="${build.repository}"/>
- <delete dir="${build.appclient}"/>
- </target>
-
- <!-- target name="compile" depends="setup,clean" -->
- <target name="compile" depends="wscompile,setup" >
- <!-- ant target="makedirs"/ -->
- <!-- ant target="copyfiles"/ -->
- <javac srcdir="${build.ejbsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.websrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- <javac srcdir="${build.clientsrc}" destdir="${build.dest}"
- debug="${debug}" classpath="${s1astest.classpath}" />
- </target>
-
- <target name="jar" depends="compile">
- <jar jarfile="${build.jars}/ejb.jar" >
- <fileset dir="${build.dest}">
- <include name="myejb/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrEjbMapping.xml" />
- </fileset>
-<!--
- <fileset dir=".">
- <include name="FIMapping.xml" />
- </fileset>
--->
- <metainf dir="${build.desc}/ejb">
- <include name="ejb-jar.xml"/>
- <include name="webservices.xml"/>
- <include name="sun-ejb-jar.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <antcall target="copy-to-webinf" />
-
- <jar jarfile="${build.jars}/web.war" >
- <fileset dir="${build.webinf}">
- <include name="**/*.class"/>
- </fileset>
-
- <fileset dir="${build.mapping}">
- <include name="IntrWebMapping.xml" />
- </fileset>
-
-<!--
- <fileset dir=".">
- <include name="FIMappingWeb.xml" />
- </fileset>
--->
- <fileset dir="${build.webinf}">
- <include name="**/web.xml" />
- <include name="**/sun-web.xml" />
- <include name="**/webservices.xml" />
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
-
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
-<!--
- <fileset dir=".">
- <include name="FIMappingClient.xml" />
- </fileset>
--->
-
- <fileset dir="${build.mapping}">
- <include name="IntrClientMapping.xml" />
- </fileset>
-
- <fileset dir="${build.dest}">
- <include name="myclient/*.class"/>
- </fileset>
- <metainf dir="${build.desc}/client">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- </metainf>
- <fileset dir="${build.metainf}">
- <include name="**/FindInterest.wsdl" />
- <include name="**/FindInterest_Schema.xsd" />
- </fileset>
- </jar>
- </target>
-
- <target name="copy-to-webinf">
- <copy todir="${build.webinf}/WEB-INF/classes" filtering="on" overwrite="yes" >
- <fileset dir="${build.dest}">
- <include name="myweb/*.class"/>
- </fileset>
- </copy>
- </target>
-
- <target name="ear" depends="clean,jar">
- <ear earfile="${build.ear}/${appname}.ear"
- appxml="${build.desc}/application.xml"
- manifest="${build.desc}/MANIFEST.MF">
-
- <!--<fileset dir="${build.jars}" includes="*.jar,.war"/>-->
- <fileset dir="${build.jars}" includes="*.jar"/>
-
- <fileset dir="${env.APS_HOME}/lib">
- <include name="reporter.jar"/>
- </fileset>
- </ear>
- </target>
-
- <target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="deploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="--retrieve" />
- <arg value="${build.appclient}" />
- <arg value="${build.ear}/${appname}.ear" />
- </exec>
- <antcall target="deploy-jbi-component-su"/>
- </target>
-
- <target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
- <arg value="undeploy" />
- <arg value="--user" />
- <arg value="${admin.user}" />
- <arg value="--host" />
- <arg value="${admin.host}" />
- <arg value="--port" />
- <arg value="${admin.port}" />
- <arg value="${appname}" />
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
-
- <target name="runclient" depends="setup">
- <exec executable="${APPCLIENT}">
- <env key="VMARGS" value="-Dtest.results=${results.file}" />
- <arg value="-client" />
- <arg value="${build.appclient}/${appname}Client.jar"/>
- <arg value="-name" />
- <arg value="MyAppClient" />
- </exec>
- </target>
-
- <target name="makedirs">
- <mkdir dir="${build.dir}" />
- <mkdir dir="${build.repository}" />
- <mkdir dir="${build.appclient}" />
- <mkdir dir="${build.ejbsrc}" />
- <mkdir dir="${build.websrc}" />
- <mkdir dir="${build.clientsrc}" />
- <mkdir dir="${build.dest}" />
- <mkdir dir="${build.mapping}" />
- <mkdir dir="${build.desc}" />
- <mkdir dir="${build.desc}/META-INF"/>
- <mkdir dir="${build.desc}/ejb"/>
- <mkdir dir="${build.desc}/client"/>
- <mkdir dir="${build.jars}" />
- <mkdir dir="${build.webinf}" />
- <mkdir dir="${build.webinf}/WEB-INF" />
- <mkdir dir="${build.webinf}/WEB-INF/wsdl" />
- <mkdir dir="${build.webinf}/WEB-INF/classes" />
- <mkdir dir="${build.metainf}" />
- <mkdir dir="${build.metainf}/META-INF" />
- <mkdir dir="${build.metainf}/META-INF/wsdl" />
- <mkdir dir="${build.dir}/archive"/>
- </target>
-
- <target name="copyfiles">
-
- <copy todir="${build.webinf}/WEB-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/web" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/ejb" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/ejb" >
- <include name="*.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/client" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor/client" >
- <include name="*.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor" >
- <include name="application.xml" />
- <include name="MANIFEST.MF" />
- </fileset>
- </copy>
-
- <copy todir="${build.desc}/META-INF" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/descriptor">
- <include name="sun-j2ee-ri.xml" />
- </fileset>
- </copy>
-
- <copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/ejb" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.websrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/web" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.clientsrc}" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}/client" >
- <include name="**/*.java" />
- </fileset>
- </copy>
-
- <copy todir="${build.webinf}/WEB-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- <copy todir="${build.metainf}/META-INF/wsdl" filtering="on" overwrite="yes" >
- <fileset dir="${src.dir}" >
- <include name="FindInterest.wsdl" />
- <include name="FindInterest_Schema.xsd" />
- </fileset>
- </copy>
-
- </target>
-
- <target name="wscompile" depends="setup,makedirs,copyfiles">
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrEjbMapping.xml wscompile_config.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrClientMapping.xml wscompile_config_client.xml
-" />
- </exec>
-
- <exec executable="${WSCOMPILE}">
- <arg line="-source 1.1.2 -import -f:norpcstructures -keep -d ${build.dest} -s ${build.dest} -mapping ${build.mapping}/IntrWebMapping.xml wscompile_config_web.xml
-" />
- </exec>
-
- </target>
- <!--<target name="deploy-soap-su" depends="init-common">
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su" value="${}"/>
- <param name="jbi-component-su" value="${}"/>
- </antcall>
- </target>-->
-<!-- <target name="all" depends="clean,ear,deploy,runclient" />-->
-
- <target name="set-flag" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}#ejb.jar#InterestIFPort"/>
- </antcall>
-
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.j2ee-application.${appname}.web-service-endpoint.ejb\.jar#InterestIFPort.jbi-enabled=true"/>
- </antcall>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java
deleted file mode 100644
index f2c4d98..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClient.java
+++ /dev/null
@@ -1,107 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClient {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider";
-
- public FindInterestClient() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClient client = new FindInterestClient();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public void doTest() {
-
- //String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java
deleted file mode 100644
index 87688b5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/FindInterestClientNonHttpBC.java
+++ /dev/null
@@ -1,105 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-import com.sun.ejte.ccl .reporter.SimpleReporterAdapter;
-
-public class FindInterestClientNonHttpBC {
-
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider";
-
- public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- FindInterestClientNonHttpBC client = new FindInterestClientNonHttpBC();
-
- client.doTest();
- // client.doServletTest();
- }
-
- public void doTest() {
-
- String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-
- /* public void doServletTest() {
- try {
- String targetEndpointAddress =
- "http://localhost:8080/FindInterestServlet/FindInterest";
-
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period);
-
- System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 210.0) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
- }
- } catch (Exception ex) {
- status.addStatus(TEST_SUITE_ID+"2 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- status.printSummary("JSR109 - FindInterestTest");
- }*/
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java
deleted file mode 100755
index d26175a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumer.java
+++ /dev/null
@@ -1,71 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumer {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider";
-
- public SOAPEjbConsumer() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumer client = new SOAPEjbConsumer();
-
- client.doTest();
- status.printSummary(testId);
- }
-
- private void doTest() {
- //String targetEndpointAddress =
- // "http://localhost:8080/soap/web/findinterest";
- String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java
deleted file mode 100755
index a32d4ef..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/client/SOAPEjbConsumerNonHttpBC.java
+++ /dev/null
@@ -1,69 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myclient;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class SOAPEjbConsumerNonHttpBC {
- private double balance = 300.00;
- private double period = 3.5;
-
- private static SimpleReporterAdapter status = new SimpleReporterAdapter();
-
- private static String testId = "jbi-serviceengine/jax-rpc/provider";
-
- public SOAPEjbConsumerNonHttpBC() {
- status.addDescription(testId);
- }
-
- public static void main (String[] args) {
-
- SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
-
- client.doTest();
- status.printSummary(testId);
- }
-
- private void doTest() {
- String targetEndpointAddress =
- "http://localhost:8080/soap/web/findinterest";
-
- try {
- Context ic = new InitialContext();
- FindInterest findIntrService = (FindInterest)
- ic.lookup("java:comp/env/service/FindInterest");
-
- InterestIF interestIFPort = findIntrService.getInterestIFPort();
-
- ((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY, targetEndpointAddress);
-
- double interest = interestIFPort.calculateInterest(balance, period); System.out.println("Interest on $300 for a period of 3.5 years is "
- + interest);
-
- if (interest == 105.0) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.PASS);
- }
-
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint Test", status.FAIL);
- System.out.println("findintr client failed");
- ex.printStackTrace();
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml
deleted file mode 100644
index abe9e08..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application>
- <display-name>FindInterestApp</display-name>
- <module>
- <ejb>ejb.jar</ejb>
- </module>
- <module>
- <java>appclient.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF
deleted file mode 100644
index 7cc1828..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: myclient.SOAPEjbConsumer
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml
deleted file mode 100644
index f3268b8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my findintr app client</description>
- <display-name>MyAppClient</display-name>
- <service-ref>
- <description>findintr service ref</description>
- <service-ref-name>service/FindInterest</service-ref-name>
- <service-interface>myclient.FindInterest</service-interface>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml
deleted file mode 100644
index a313c5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/FindInterest</service-ref-name>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF
deleted file mode 100644
index d4ea871..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/MANIFEST.MF
+++ /dev/null
@@ -1,3 +0,0 @@
-Manifest-Version: 1.0
-Created-By: Ant 1.4.1
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml
deleted file mode 100644
index 4acc04c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>InterestEjb</display-name>
- <ejb-name>InterestEjb</ejb-name>
- <service-endpoint>myejb.InterestIF</service-endpoint>
- <ejb-class>myejb.InterestEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>InterestEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml
deleted file mode 100644
index d23c426..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>InterestEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>InterestIFPort</port-component-name>
- <endpoint-address-uri>findintr/FindInterest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml
deleted file mode 100644
index f2719c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrEjbMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myejb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>InterestEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml
deleted file mode 100644
index 14674e9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/sun-web.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>FindInterestServlet</context-root>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml
deleted file mode 100644
index 0203114..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/web.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <display-name>FindInterestApp</display-name>
- <servlet>
- <servlet-name>FindInterestServlet</servlet-name>
- <servlet-class>myweb.FindInterestServletImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>FindInterestServlet</servlet-name>
- <url-pattern>/FindInterest</url-pattern>
- </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml
deleted file mode 100644
index 51cd5ac..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/descriptor/web/webservices.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FindInterestServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/FindInterest.wsdl</wsdl-file>
- <jaxrpc-mapping-file>IntrWebMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>InterestIFPort</port-component-name>
- <wsdl-port xmlns:hellons="http://hello.org/wsdl">hellons:InterestIFPort
- </wsdl-port>
- <service-endpoint-interface>myweb.InterestIF
- </service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>FindInterestServlet</servlet-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
deleted file mode 100644
index b25badf..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/ejb/InterestEJB.java
+++ /dev/null
@@ -1,51 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class InterestEJB implements SessionBean {
-
- private SessionContext sc;
-
- public InterestEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
- }
-
- public double calculateInterest(double balance, double period) {
- System.out.println(" Inside calculateInterest ");
- return (balance * period * 0.1);
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml
deleted file mode 100644
index 4aa2bea..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMapping.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myejb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml
deleted file mode 100644
index 588fa00..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingClient.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myclient</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml
deleted file mode 100644
index fc8a3a8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/mapping/FIMappingWeb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<java-wsdl-mapping xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_jaxrpc_mapping_1_1.xsd"
- version="1.1">
- <package-mapping>
- <package-type>myweb</package-type>
- <namespaceURI>http://hello.org/wsdl</namespaceURI>
- </package-mapping>
-</java-wsdl-mapping>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
deleted file mode 100755
index f1b3f7a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>sun-http-binding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl
deleted file mode 100644
index 601e969..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="FindInterest" targetNamespace="http://hello.org/wsdl" xmlns:tns="http://hello.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
-<types>
- <xsd:schema>
- <xsd:import namespace="http://hello.org/wsdl" schemaLocation="FindInterest_Schema.xsd" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"/>
- </xsd:schema>
- </types>
-
- <message name="calculateInterest">
- <part name="parameters" element="tns:calculateInterest"/>
- </message>
- <message name="calculateInterestResponse">
- <part name="parameters" element="tns:calculateInterestResponse"/></message>
- <portType name="InterestIF">
- <operation name="calculateInterest">
- <input message="tns:calculateInterest"/>
- <output message="tns:calculateInterestResponse"/></operation></portType>
- <binding name="InterestIFBinding" type="tns:InterestIF">
- <operation name="calculateInterest">
- <input>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></input>
- <output>
- <soap:body use="literal" namespace="http://hello.org/wsdl"/></output>
- <soap:operation soapAction="urn:calculateInterest"/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="document"/></binding>
- <service name="FindInterest">
- <port name="InterestIFPort" binding="tns:InterestIFBinding">
- <soap:address location="http://localhost:12013/InterestIFPort"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd
deleted file mode 100644
index fc4c721..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/FindInterest_Schema.xsd
+++ /dev/null
@@ -1,39 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<xs:schema version="1.0" targetNamespace="http://hello.org/wsdl" xmlns:xs="http://www.w3.org/2001/XMLSchema">
-
- <xs:element name="calculateInterest" type="ns1:calculateInterest" xmlns:ns1="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterest">
- <xs:sequence>
- <xs:element name="arg0" type="xs:double"/>
- <xs:element name="arg1" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-
- <xs:element name="calculateInterestResponse" type="ns2:calculateInterestResponse" xmlns:ns2="http://hello.org/wsdl"/>
-
- <xs:complexType name="calculateInterestResponse">
- <xs:sequence>
- <xs:element name="return" type="xs:double"/>
- </xs:sequence>
- </xs:complexType>
-</xs:schema>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml
deleted file mode 100755
index e5a98e6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' ?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml
deleted file mode 100755
index 66627fd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su-alaska/su/endpoints.xml
+++ /dev/null
@@ -1,22 +0,0 @@
-<?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<portmaps>
-<portmap direction="inbound" endPoint="InterestIFPort" service="{http://hello.org/wsdl}FindInterest"/>
-</portmaps>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml
deleted file mode 100755
index 3891d55..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/assembly/META-INF/jbi.xml
+++ /dev/null
@@ -1,43 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!-- jbi.xml file for the SOAP binding deployments binding. -->
-<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
- <service-assembly>
- <identification>
- <!--alias>SoapBinding Deployments</alias -->
- <name>ejb_findinterest_assembly</name>
- <description>This is an AU for Soap Binding deployments</description>
- </identification>
- <service-unit>
- <identification>
- <name>consumer_for_ejb_jaxrpc</name>
- <description>consumer service to the soap binding</description>
- </identification>
- <target>
- <artifacts-zip>ejb_jaxrpc_consumer_su.jar</artifacts-zip>
- <component-name>SunSOAPBinding</component-name>
- </target>
- </service-unit>
- </service-assembly>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml
deleted file mode 100755
index 1d3719e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/META-INF/jbi.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version='1.0' ?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://hello.org/wsdl"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:FindInterestInterface"
- service-name="tns:FindInterest"
- endpoint-name="InterestIFPort"/>
- <artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
-</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
deleted file mode 100755
index 5ef965d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/soap-binding-su/su/endpoints.xml
+++ /dev/null
@@ -1,42 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
- <endpoint xmlns="http://www.sun.com/ns/jbi/component/soap/deploy"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://www.sun.com/ns/jbi/component/soap/deploy ./endpoints.xsd">
-<service-name>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- <local-part>FindInterest</local-part>
- </service-name>
- <endpoint-name>InterestIFPort</endpoint-name>
- <endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/web/findinterest</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
- <operation>
- <name>calculateInterest</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
- <soapaction>""</soapaction>
- <input>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </input>
- <output>
- <namespace-uri>http://hello.org/wsdl</namespace-uri>
- </output>
- </operation>
-</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
deleted file mode 100644
index 180f8fd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/web/FindInterestServletImpl.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package myweb;
-
-import java.util.Iterator;
-import java.net.URL;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Call;
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import javax.naming.*;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.namespace.QName;
-import jakarta.servlet.SingleThreadModel;
-
-public class FindInterestServletImpl implements
- SingleThreadModel, ServiceLifecycle {
-
- public FindInterestServletImpl() {
- System.out.println("FindInterestServletImpl() instantiated");
- }
-
- public void init(Object context) {
- System.out.println("Got ServiceLifecycle::init call " + context);
- }
-
- public void destroy() {
- System.out.println("Got ServiceLifecycle::destroy call");
- }
-
- public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*period;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
deleted file mode 100644
index c11b886..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
deleted file mode 100644
index 9c318c8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myclient"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
deleted file mode 100644
index e8001cd..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider/wscompile_config_web.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="FindInterest.wsdl"
- packageName="myweb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
index 1bfc164..fd0ca87 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.xml
@@ -34,101 +34,112 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/OneWayService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/OneWayService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.OneWay.jbi-enabled=true"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/OneWayService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/OneWayService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.OneWay.jbi-enabled=true"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#OneWay"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#OneWay" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
index dc2aad0..8e43b87 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.xml
@@ -34,123 +34,140 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
-
- <!-- Add the WSDL -->
- <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <copy file="${basedir}/wsdl/CalculatorService.wsdl" todir="${build.classes.dir}/tmp/WEB-INF/wsdl"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd"/>
- <include name="WEB-INF/wsdl/CalculatorService.wsdl"/>
- </fileset>
- </jar>
-
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**,webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <!-- Add the WSDL -->
+ <mkdir dir="${build.classes.dir}/tmp/WEB-INF/wsdl" />
+ <copy file="${basedir}/wsdl/CalculatorService_schema1.xsd"
+ todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
+ />
+ <copy file="${basedir}/wsdl/CalculatorService.wsdl"
+ todir="${build.classes.dir}/tmp/WEB-INF/wsdl"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="WEB-INF/wsdl/CalculatorService_schema1.xsd" />
+ <include name="WEB-INF/wsdl/CalculatorService.wsdl" />
+ </fileset>
+ </jar>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-bundled-wsdl/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**,webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**,client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**,client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
index 4cb08cf..ffbd6bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.xml
@@ -34,117 +34,126 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- <delete file="${basedir}/RepRunConf.txt"/>
- <delete dir="${basedir}/common:endpoint"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ <delete file="${basedir}/RepRunConf.txt" />
+ <delete dir="${basedir}/common:endpoint" />
+ </target>
- <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="clean, assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="common:endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="common:endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="common/**, webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/rpc-literal-generated-wsdl/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="common/**, webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="undeploy-app" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- <antcall target="undeploy-app"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="common/**, client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ <antcall target="undeploy-app" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="common/**, client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
index b62313f..f80c17d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.xml
@@ -34,129 +34,139 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="create-user" depends="init-common">
- <antcall target="create-user-common">
- <param name="user" value="${fileUser}"/>
- <param name="password" value="${fileUserPassword}"/>
- <param name="groups" value="${fileUserGroups}"/>
- </antcall>
- </target>
+ <target name="create-user" depends="init-common">
+ <antcall target="create-user-common">
+ <param name="user" value="${fileUser}" />
+ <param name="password" value="${fileUserPassword}" />
+ <param name="groups" value="${fileUserGroups}" />
+ </antcall>
+ </target>
- <target name="delete-user" depends="init-common">
- <antcall target="delete-user-common">
- <param name="user" value="${fileUser}"/>
- </antcall>
- </target>
+ <target name="delete-user" depends="init-common">
+ <antcall target="delete-user-common">
+ <param name="user" value="${fileUser}" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client, create-user">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client, create-user">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common, delete-user">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common, delete-user">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- <arg value="${fileUser}:${fileUserPassword}"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ <arg value="${fileUser}:${fileUserPassword}" />
+ </java>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
index 96dc0d9..f81e35a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client/TestClient.java
@@ -22,6 +22,8 @@
import java.io.IOException;
import java.net.HttpURLConnection;
import java.net.URL;
+import java.nio.charset.StandardCharsets;
+import java.util.Base64;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -57,7 +59,7 @@
private int invokeServlet(String url, String userPassword) throws Exception {
log("Invoking url = " + url+", password = " + userPassword);
URL u = new URL(url);
- String encoding = new sun.misc.BASE64Encoder().encode (userPassword.getBytes());
+ String encoding = Base64.getEncoder().encodeToString(userPassword.getBytes(StandardCharsets.UTF_8));;
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
c1.setRequestProperty ("Authorization", "Basic " + encoding);
int code = c1.getResponseCode();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
index f42d6d6..5e402eb 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stress.xml
@@ -33,64 +33,70 @@
&commonEjbAnnotationsBuild;
&jbiCommon;
&jbiBuild;
- <property name="src-name" value="endpoint/jaxws/HelloEJB.java"/>
- <property name="client-src-name" value="stressclient/StressSOAPEjbConsumer.java"/>
- <property name="pkg-name" value="endpoint/jaxws"/>
- <target name="all" depends="deploy-jbi-component-su, another_servlet, another_ejb, mytest-all, undeploy-jbi-component-su,undeploy-all,clean"/>
+ <property name="src-name" value="endpoint/jaxws/HelloEJB.java" />
+ <property name="client-src-name" value="stressclient/StressSOAPEjbConsumer.java" />
+ <property name="pkg-name" value="endpoint/jaxws" />
+ <target name="all"
+ depends="deploy-jbi-component-su, another_servlet, another_ejb, mytest-all, undeploy-jbi-component-su,undeploy-all,clean"
+ />
- <target name="mytest-all" >
- <basename file="${src-name}" property="server" suffix=".java"/>
- <dirname file="${src-name}" property="directory"/>
- <echo message="Starting Test ${directory}"/>
- <basename file="${directory}" property="pkg-name"/>
+ <target name="mytest-all">
+ <basename file="${src-name}" property="server" suffix=".java" />
+ <dirname file="${src-name}" property="directory" />
+ <echo message="Starting Test ${directory}" />
+ <basename file="${directory}" property="pkg-name" />
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
+ <param name="pkg-name" value="${pkg-name}" />
</antcall>
<condition property="deploy_succeeded">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed" />
</condition>
<condition property="deploy_failed">
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed"/>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployFailed" />
</condition>
- <fail message="Deployment failed" if="deploy_failed"/>
+ <fail message="Deployment failed" if="deploy_failed" />
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="HelloEJB"/>
+ <param name="server" value="${server}" />
+ <param name="port" value="HelloEJB" />
</antcall>
- <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:${env.APS_HOME}/build/module/classes/client"
- includes="${client-src-name}">
+ <javac srcdir="."
+ destdir="${env.APS_HOME}/build/module/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar:${env.APS_HOME}/build/module/classes/client"
+ includes="${client-src-name}"
+ >
</javac>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes"/>
- <copydir src="${env.APS_HOME}/build/module/classes/client/com" dest="${env.APS_HOME}/build/module/classes/com"/>
- <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="stressclient.StressSOAPEjbConsumer ${minutes}"/>
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${env.APS_HOME}/build/module/classes" />
+ <copydir src="${env.APS_HOME}/build/module/classes/client/com"
+ dest="${env.APS_HOME}/build/module/classes/com"
+ />
+ <exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
+ <arg line="stressclient.StressSOAPEjbConsumer ${minutes}" />
</exec>
- <echo message="Removing jar bundle ${server}.jar from autodeploy directory"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
- </target>
+ <echo message="Removing jar bundle ${server}.jar from autodeploy directory" />
+ <antcall target="undeploy" />
+ <antcall target="report" />
+ </target>
- <target name="another_ejb">
- <ant inheritAll="false" dir="./another_ejb"/>
- </target>
+ <target name="another_ejb">
+ <ant inheritAll="false" dir="./another_ejb" />
+ </target>
- <target name="another_servlet">
- <ant inheritAll="false" dir="./another_servlet"/>
- </target>
+ <target name="another_servlet">
+ <ant inheritAll="false" dir="./another_servlet" />
+ </target>
- <target name="undeploy-all">
- <ant inheritAll="false" dir="./another_ejb" target="custom-undeploy"/>
- <ant inheritAll="false" dir="./another_servlet" target="custom-undeploy"/>
- </target>
+ <target name="undeploy-all">
+ <ant inheritAll="false" dir="./another_ejb" target="custom-undeploy" />
+ <ant inheritAll="false" dir="./another_servlet" target="custom-undeploy" />
+ </target>
- <target name="report-success">
- <echo message="Test passed"/>
- </target>
+ <target name="report-success">
+ <echo message="Test passed" />
+ </target>
- <target name="report-failure">
- <echo message="Test failed"/>
- </target>
+ <target name="report-failure">
+ <echo message="Test failed" />
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
index f2b852b..64f32eb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.xml
@@ -34,109 +34,122 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/AddNumberService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/AddNumberService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/AddNumberService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/AddNumberService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#AddNumber"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#AddNumber" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
index a243147..a4a4f4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.xml
@@ -34,90 +34,101 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-app" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="deploy-app" depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}-web"/>
- </antcall>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${build.classes.dir}/webclient/META-INF"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="init-common">
- <mkdir dir="./temp"/>
- <copy file="${assemble.dir}/wsclient.war" todir="./temp"/>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-app" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="deploy-app" depends="init-common">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}-web" />
+ </antcall>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${build.classes.dir}/webclient/META-INF" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client-web/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="init-common">
+ <mkdir dir="./temp" />
+ <copy file="${assemble.dir}/wsclient.war" todir="./temp" />
+ <antcall target="deploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
index 9c55b6f..c321cf4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.xml
@@ -34,109 +34,122 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"/>
+ <target name="setup"
+ depends="assemble-web, deploy-jbi-component-su,assemble-client,deploy-client"
+ />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <echo message="classes dir = ${build.classes.dir}"/>
- <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- <!-- Add META-INF/jbi.xml to .war file -->
- <mkdir dir="${build.classes.dir}/tmp/META-INF"/>
- <echo message="created dir = ${build.classes.dir}/tmp/META-INF"/>
- <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml" tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"/>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}/tmp">
- <include name="META-INF/jbi.xml"/>
- </fileset>
- </jar>
- <!-- Copy the JavaEE app to the service assembly -->
- <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly"/>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/EndpointMappingService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client-web/webservice/EndpointMappingService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
- classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/j2ee.jar"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="classes dir = ${build.classes.dir}" />
+ <echo message="assemble.dir = ${assemble.dir}/${appname}-web.war" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ <!-- Add META-INF/jbi.xml to .war file -->
+ <mkdir dir="${build.classes.dir}/tmp/META-INF" />
+ <echo message="created dir = ${build.classes.dir}/tmp/META-INF" />
+ <copy file="${jbi-component-su-dir}/su/META-INF/jbi.xml"
+ tofile="${build.classes.dir}/tmp/META-INF/jbi.xml"
+ />
+ <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
+ <fileset dir="${build.classes.dir}/tmp">
+ <include name="META-INF/jbi.xml" />
+ </fileset>
+ </jar>
+ <!-- Copy the JavaEE app to the service assembly -->
+ <copy file="${assemble.dir}/${appname}-web.war" todir="${jbi-component-su-dir}/assembly" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/EndpointMappingService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client-web/webservice/EndpointMappingService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#EndpointMapping"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#EndpointMapping" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
index 6c6d910..9ff27cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.xml
@@ -34,90 +34,101 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-app, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-app" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="deploy-app" depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}-web"/>
- </antcall>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.EndpointMappingConsumer.jbi-enabled=false"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${build.classes.dir}/webclient/META-INF"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="init-common">
- <mkdir dir="./temp"/>
- <copy file="${assemble.dir}/wsclient.war" todir="./temp"/>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-app" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="deploy-app" depends="init-common">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}-web" />
+ </antcall>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.EndpointMappingConsumer.jbi-enabled=false"
+ />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${build.classes.dir}/webclient/META-INF" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes ./webclient/client/wsdl/EndpointMappingConsumerService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <copy file="./jbi.xml" tofile="${build.classes.dir}/webclient/META-INF/jbi.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#EndpointMappingConsumer"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="init-common">
+ <mkdir dir="./temp" />
+ <copy file="${assemble.dir}/wsclient.war" todir="./temp" />
+ <antcall target="deploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy-client" depends="init-common">
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#EndpointMappingConsumer" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
index 1dfb07e..8fc4607 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.properties
@@ -33,4 +33,4 @@
ejb.path=${domain.dir}/applications/j2ee-modules/${ejb.module}
output.dir=${serviceengine.dir}/workspace
asadmin.command=${server.dir}/bin/asadmin
-client.classpath=".:build:${env.S1AS_HOME}/lib/activation.jar:${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"
+client.classpath=".:build:${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-api-osgi.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
index bb98f0f..f52e674 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.xml
@@ -34,102 +34,113 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- <antcall target="deploy-jbi-component-su"/>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <antcall target="undeploy-jbi-component-su"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ <antcall target="configure-webservice-management" />
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="set" />
+ <param name="operand.props"
+ value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"
+ />
+ </antcall>
+ <antcall target="deploy-jbi-component-su" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <antcall target="undeploy-jbi-component-su" />
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
index d251b75..5d79bbd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.xml
@@ -34,102 +34,104 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/calc-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- <!--<antcall target="configure-webservice-management"/>
- <antcall target="asadmin-common">
- <param name="admin.command" value="set"/>
- <param name="operand.props" value="server.applications.web-module.${appname}-web.web-service-endpoint.Calculator.jbi-enabled=false"/>
- </antcall>
- <antcall target="deploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/calc-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
index 157e540..140bbee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.xml
@@ -35,289 +35,320 @@
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"/>
+ <target name="all"
+ depends="clean, setup-server, setup-client, deploy-provider-su, deploy-consumer-su, runtest, cleanup-client, cleanup-server"
+ />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-server" depends="assemble-web, deploy-app, start-consumer-jms-binding"/>
+ <target name="setup-server" depends="assemble-web, deploy-app, start-consumer-jms-binding" />
- <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding"/>
+ <target name="setup-client" depends="assemble-client,deploy-client, start-provider-jms-binding" />
- <target name="cleanup-server" depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"/>
- <target name="cleanup-client" depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"/>
+ <target name="cleanup-server"
+ depends="undeploy-app, undeploy-consumer-su,stop-consumer-jms-binding"
+ />
+ <target name="cleanup-client"
+ depends="undeploy-client, undeploy-provider-su,stop-provider-jms-binding"
+ />
- <target name="assemble-web" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="provider/endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="provider/endpoint" />
+ </antcall>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="deploy-consumer-su" depends="init-common">
- <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="deploying JMS Binding's consumer deployment "/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- <param name="jbi-component-su" value="${jms-consumer-su}"/>
- <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}"/>
- </antcall>
- </target>
+ <target name="deploy-consumer-su" depends="init-common">
+ <echo message="Creating QueueConnectionFactory for JMS Binding acting as a web service consumer"
+ />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="deploying JMS Binding's consumer deployment " />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ <param name="jbi-component-su" value="${jms-consumer-su}" />
+ <param name="jbi-component-su-dir" value="${jms-consumer-su-dir}" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/CalculatorServicei?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/CalculatorService?WSDL"/>
- </antcall>
- <javac srcdir="consumer" destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./consumer/client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./consumer/client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/CalculatorServicei?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="consumer"
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./consumer/client-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"
+ />
+ <copy file="./consumer/client-sun-web.xml"
+ tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"
+ />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <echo message="Deploying the client application"/>
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <echo message="Deploying the client application" />
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-provider-su" depends="init-common">
- <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider"/>
- <antcall target="create-jms-connection-factory">
- <param name="jms.cf.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="create-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.type" value="${QueueConnectionFactory}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue"/>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="provideroutgoingqueue"/>
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="create-jms-queue">
- <param name="jms.queue.name" value="temporary_queue"/>
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Deploy JMS Binding provider deployment"/>
- <antcall target="deploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jbi-component-su" value="${jms-provider-su}"/>
- <param name="jbi-component-su-dir" value="${jms-provider-su-dir}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
+ <target name="deploy-provider-su" depends="init-common">
+ <echo message="Creating physical destinations - queues : - provideroutgoingqueue and temporary_queue"
+ />
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Create QueueConnectionFactory for JMS Binding which is acting as a provider" />
+ <antcall target="create-jms-connection-factory">
+ <param name="jms.cf.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="create-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.type" value="${QueueConnectionFactory}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Create JMS resource for provideroutgoingqueue and temporary_queue" />
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="provideroutgoingqueue" />
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="create-jms-queue">
+ <param name="jms.queue.name" value="temporary_queue" />
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Deploy JMS Binding provider deployment" />
+ <antcall target="deploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jbi-component-su" value="${jms-provider-su}" />
+ <param name="jbi-component-su-dir" value="${jms-provider-su-dir}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${domain2.admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${domain2.admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-web"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-web" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <echo message="Running the test client"/>
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="consumer/client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <target name="runtest" depends="init-common">
+ <echo message="Running the test client" />
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="consumer/client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${domain2.instance.port}/wsclient/webclient/RequestProcessor"
+ />
+ </java>
+ </target>
- <target name="undeploy-consumer-su" depends="init-common">
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <!--<antcall target="delete-jms-resource">
+ <target name="undeploy-consumer-su" depends="init-common">
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <!--<antcall target="delete-jms-resource">
<param name="jms.resource.name" value="MyQueueConnectionFactory"/>
</antcall>-->
- <echo message="Undeploying JMS Binding consumer deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}"/>
- </antcall>
- </target>
+ <echo message="Undeploying JMS Binding consumer deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-consumer-assembly}" />
+ </antcall>
+ </target>
- <target name="undeploy-provider-su" depends="init-common">
- <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue"/>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS resource : MyQueueConnectionFactory"/>
- <antcall target="delete-appserver-jms-resource">
- <param name="domain.admin.port" value="${domain2.admin.port}"/>
- <param name="jms.res.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <antcall target="delete-jms-resource">
- <param name="jms.resource.name" value="MyQueueConnectionFactory"/>
- </antcall>
- <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue"/>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="provideroutgoingqueue"/>
- </antcall>
- <antcall target="delete-physical-queue">
- <param name="queue.name" value="temporary_queue"/>
- </antcall>
- <echo message="Undeploying JMS Binding's provider deployment"/>
- <antcall target="undeploy-jbi-component-su">
- <param name="jbi-component-su-assembly" value="${jms-provider-assembly}"/>
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- </antcall>
- </target>
+ <target name="undeploy-provider-su" depends="init-common">
+ <echo message="Undeploying JMS Resource :- provideroutgoingqueue and temporary_queue" />
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS resource : MyQueueConnectionFactory" />
+ <antcall target="delete-appserver-jms-resource">
+ <param name="domain.admin.port" value="${domain2.admin.port}" />
+ <param name="jms.res.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <antcall target="delete-jms-resource">
+ <param name="jms.resource.name" value="MyQueueConnectionFactory" />
+ </antcall>
+ <echo message="Deleting physical queues : provideroutgoingqueue , temporary_queue" />
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="provideroutgoingqueue" />
+ </antcall>
+ <antcall target="delete-physical-queue">
+ <param name="queue.name" value="temporary_queue" />
+ </antcall>
+ <echo message="Undeploying JMS Binding's provider deployment" />
+ <antcall target="undeploy-jbi-component-su">
+ <param name="jbi-component-su-assembly" value="${jms-provider-assembly}" />
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ </antcall>
+ </target>
- <target name="create-domain2" depends="init-common">
- <property name="admin.command" value="create-domain"/>
- <property name="operand.props" value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"/>
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="${admin.command} ${operand.props}" />
+ <target name="create-domain2" depends="init-common">
+ <property name="admin.command" value="create-domain" />
+ <property name="operand.props"
+ value="--adminport ${domain2.admin.port} --adminuser admin --passwordfile ${admin.password.file} --instanceport ${domain2.instance.port} --savemasterpassword=true --domainproperties domain.jmxPort=${domain2.jmx.port}:jms.port=${domain2.jms.port}:orb.listner.port=${domain2.orb.listner.port}:http.ssl.port=${domain2.http.ssl.port}:orb.mutualauth.port=${domain2.orb.mutualauth.port} ${domain.name}"
+ />
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="${admin.command} ${operand.props}" />
</exec>
- </target>
+ </target>
- <target name="start-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="start-domain --user ${admin.user} ${domain.name}"/>
- </exec>
- </target>
+ <target name="start-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="start-domain --user ${admin.user} ${domain.name}" />
+ </exec>
+ </target>
- <target name="create-physical-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"/>
- </exec>
- </target>
+ <target name="create-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="create dst -n ${queue.name} -t q -u admin -passfile ${broker.password.file} -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
- <target name="create-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"/>
- </exec>
- </target>
- <target name="create-jms-queue" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="create-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="create-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} --restype ${jms.res.type} ${jms.res.name}"
+ />
+ </exec>
+ </target>
+ <target name="create-jms-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="add -l "${jms.queue.name}" -t q -o "imqDestinationName=${queue.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
- <target name="create-jms-connection-factory" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
- <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
+ <target name="create-jms-connection-factory" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="true">
+ <arg line="add -f -l "${jms.cf.name}" -t qf -o "imqAddressList=mq://localhost:${imq.broker.port}/jms" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
- <target name="delete-physical-queue" depends="init-common" >
- <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
- <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}" />
- </exec>
- </target>
+ <target name="delete-physical-queue" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqcmd" failonerror="false">
+ <arg line="destroy dst -f -n ${queue.name} -t q -passfile ${broker.password.file} -u admin -b localhost:${imq.broker.port}"
+ />
+ </exec>
+ </target>
- <target name="delete-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
- <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""/>
- </exec>
- </target>
- <target name="delete-appserver-jms-resource" depends="init-common">
- <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
- <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"/>
- </exec>
- </target>
+ <target name="delete-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/imq/bin/imqobjmgr" failonerror="false">
+ <arg line="delete -f -l "${jms.resource.name}" -j "java.naming.factory.initial=com.sun.jndi.fscontext.RefFSContextFactory" -j "java.naming.provider.url=file:/tmp/imqobjects""
+ />
+ </exec>
+ </target>
+ <target name="delete-appserver-jms-resource" depends="init-common">
+ <exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="false">
+ <arg line="delete-jms-resource --user ${admin.user} --passwordfile ${admin.password.file} --port ${domain.admin.port} ${jms.res.name}"
+ />
+ </exec>
+ </target>
- <target name="delete-domain2" depends="init-common">
- <exec executable="${ASADMIN}" failonerror="true">
- <arg line="delete-domain domain2 " />
- </exec>
- </target>
- <target name="stop-provider-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-provider-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jmx.port" value="${domain2.jmx.port}"/>
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="stop-consumer-jms-binding" depends="init-common">
- <antcall target="stop-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
- <target name="start-consumer-jms-binding" depends="init-common">
- <antcall target="start-binding">
- <param name="jbi.component.name" value="SunJMSBinding"/>
- </antcall>
- </target>
+ <target name="delete-domain2" depends="init-common">
+ <exec executable="${ASADMIN}" failonerror="true">
+ <arg line="delete-domain domain2 " />
+ </exec>
+ </target>
+ <target name="stop-provider-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-provider-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jmx.port" value="${domain2.jmx.port}" />
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="stop-consumer-jms-binding" depends="init-common">
+ <antcall target="stop-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
+ <target name="start-consumer-jms-binding" depends="init-common">
+ <antcall target="start-binding">
+ <param name="jbi.component.name" value="SunJMSBinding" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
index fe23a88..d6039b3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.xml
@@ -34,97 +34,106 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client"/>
+ <target name="setup" depends="assemble-web, deploy-app,assemble-client,deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile">
- <antcall target="pkg-war">
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
-
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService?WSDL"/>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="assemble-web" depends="init-common, compile">
+ <antcall target="pkg-war">
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="undeploy-client" depends="init-common">
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- <!--<antcall target="undeploy-jbi-component-su"/>-->
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/jsr208-integration-web-client/webservice/CalculatorService?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-app">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-web"/>
- <param name="wsName" value="Calculator"/>
- <param name="module" value="web-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ <!--<antcall target="undeploy-jbi-component-su"/>-->
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-web" />
+ <param name="wsName" value="Calculator" />
+ <param name="module" value="web-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
+
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ <antcall target="undeploy-client" />
+ </target>
+
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
index 05ecd1e..56b6bc5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.xml
@@ -34,121 +34,131 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
index 05ecd1e..56b6bc5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.xml
@@ -34,121 +34,131 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
index 05ecd1e..56b6bc5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.xml
@@ -34,121 +34,131 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
index 05ecd1e..56b6bc5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.xml
@@ -34,121 +34,131 @@
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, setup, runtest, undeploy"/>
+ <target name="all" depends="clean, setup, runtest, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client"/>
+ <target name="setup" depends="assemble-ejb, deploy-app, assemble-client, deploy-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-ejb" depends="init-common, compile">
- <echo message="Assembling web service module"/>
- <mkdir dir="${assemble.dir}"/>
- <jar destfile="${assemble.dir}/${appname}-ejb.jar"
- basedir="${build.classes.dir}"
- includes="endpoint/**">
- </jar>
- </target>
+ <target name="assemble-ejb" depends="init-common, compile">
+ <echo message="Assembling web service module" />
+ <mkdir dir="${assemble.dir}" />
+ <jar destfile="${assemble.dir}/${appname}-ejb.jar"
+ basedir="${build.classes.dir}"
+ includes="endpoint/**"
+ >
+ </jar>
+ </target>
- <target name="assemble-client" depends="init-common">
- <echo message="Assembling web client"/>
- <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes"/>
- <mkdir dir="${assemble.dir}"/>
- <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/HelloEJBService/HelloEJB?WSDL"/>
- </antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/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"
- debug="on"
- includes="webclient/**"/>
- <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml"/>
- <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml"/>
- <jar destfile="${assemble.dir}/wsclient.war" basedir="${build.classes.dir}/webclient" includes="**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <echo message="Assembling web client" />
+ <mkdir dir="${build.classes.dir}/webclient/WEB-INF/classes" />
+ <mkdir dir="${assemble.dir}" />
+ <echo message="wsimport -keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://${http.host}:${http.port}/HelloEJBService/HelloEJB?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ classpath="${env.APS_HOME}/lib/reporter.jar:${env.S1AS_HOME}/lib/javaee.jar:${env.S1AS_HOME}/modules/webservices-osgi.jar"
+ debug="on"
+ includes="webclient/**"
+ />
+ <copy file="./client-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/web.xml" />
+ <copy file="./client-sun-web.xml" tofile="${build.classes.dir}/webclient/WEB-INF/sun-web.xml" />
+ <jar destfile="${assemble.dir}/wsclient.war"
+ basedir="${build.classes.dir}/webclient"
+ includes="**"
+ />
+ </target>
- <target name="deploy-client" depends="assemble-client">
- <property name="client.war" value="${assemble.dir}/wsclient.war"/>
- <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
- <exec executable="${ASADMIN}">
- <arg line="deploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${client.war}"/>
- </exec>
- </target>
+ <target name="deploy-client" depends="assemble-client">
+ <property name="client.war" value="${assemble.dir}/wsclient.war" />
+ <echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose" />
+ <exec executable="${ASADMIN}">
+ <arg line="deploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${client.war}" />
+ </exec>
+ </target>
- <target name="deploy-app">
- <echo message="Deploying the web service"/>
- <antcall target="deploy-jar-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
+ <target name="deploy-app">
+ <echo message="Deploying the web service" />
+ <antcall target="deploy-jar-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
- <antcall target="set-jbi-enabled">
- <param name="appName" value="${appname}-ejb"/>
- <param name="wsName" value="HelloEJB"/>
- <param name="module" value="ejb-module"/>
- <param name="flag" value="true"/>
- </antcall>
- </target>
+ <antcall target="set-jbi-enabled">
+ <param name="appName" value="${appname}-ejb" />
+ <param name="wsName" value="HelloEJB" />
+ <param name="module" value="ejb-module" />
+ <param name="flag" value="true" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-app"/>
- <antcall target="undeploy-client"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-app" />
+ <antcall target="undeploy-client" />
+ </target>
- <target name="undeploy-client" depends="init-common">
- <echo message="Undeploying client application"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="wsclient"/>
- </exec>
- </target>
+ <target name="undeploy-client" depends="init-common">
+ <echo message="Undeploying client application" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="wsclient" />
+ </exec>
+ </target>
- <target name="undeploy-app" depends="init-common">
- <echo message="Undeploying web service"/>
- <exec executable="${ASADMIN}">
- <arg line="undeploy"/>
- <arg line="--user ${admin.user}"/>
- <arg line="--passwordfile ${admin.password.file}"/>
- <arg line="--host ${admin.host}"/>
- <arg line="--port ${admin.port}"/>
- <arg line="${appname}-ejb"/>
- </exec>
- </target>
+ <target name="undeploy-app" depends="init-common">
+ <echo message="Undeploying web service" />
+ <exec executable="${ASADMIN}">
+ <arg line="undeploy" />
+ <arg line="--user ${admin.user}" />
+ <arg line="--passwordfile ${admin.password.file}" />
+ <arg line="--host ${admin.host}" />
+ <arg line="--port ${admin.port}" />
+ <arg line="${appname}-ejb" />
+ </exec>
+ </target>
- <target name="runtest" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
- includes="client/**"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
- <java classname="client.TestClient">
- <classpath>
- <pathelement path="${build.classes.dir}/client"/>
- </classpath>
- <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- </java>
- </target>
- <target name="configure-webservice-management" depends="init-common">
- <antcall target="asadmin-common">
- <param name="admin.command" value="configure-webservice-management"/>
- <param name="operand.props" value="${appname}-web#Calculator"/>
- </antcall>
- </target>
+ <target name="runtest" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <javac srcdir="."
+ destdir="${build.classes.dir}/client"
+ classpath="${env.APS_HOME}/lib/reporter.jar"
+ includes="client/**"
+ />
+ <unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client" />
+ <java classname="client.TestClient">
+ <classpath>
+ <pathelement path="${build.classes.dir}/client" />
+ </classpath>
+ <arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor" />
+ </java>
+ </target>
+ <target name="configure-webservice-management" depends="init-common">
+ <antcall target="asadmin-common">
+ <param name="admin.command" value="configure-webservice-management" />
+ <param name="operand.props" value="${appname}-web#Calculator" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
deleted file mode 100644
index 56a6149..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="signature"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
deleted file mode 100644
index 1473001..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
+++ /dev/null
@@ -1,132 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="wscompile-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -mapping SignatureMapping_appclient.xml -Xprintstacktrace -Xdebugmodel:appclient.model.txt wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/signature">
- <fileset dir="output/signature"
- includes="SignatureTestService.class, SignatureTest.class, MyDateValueType.class, MySecondDateValueType.class"/>
- </copy>
-<!--
- <delete dir="output"/>
--->
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="signatureejb"/>
- </antcall>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -classpath ${build.classes.dir} -mapping SignatureMapping_ejb.xml -Xprintstacktrace -Xdebugmodel:ejb.model.txt wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="SignatureTestService.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SignatureMapping_appclient.xml,META-INF/wsdl/**,signature/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="SignatureMapping_ejb.xml,META-INF/wsdl/**,signatureejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="signature"/>
- <delete file="SignatureMapping_ejb.xml"/>
- <delete file="SignatureMapping_appclient.xml"/>
- <delete file="SignatureTestService.wsdl"/>
- <delete file="jaxrpc.log"/>
- <delete file="ejb.model.txt"/>
- <delete file="appclient.model.txt"/>
- </target>
-
- <target name="run" depends="init-common">
- <exec executable="${APPCLIENT}" failonerror="false">
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
- <arg line="http://${http.host}:${http.port}/signatureejb/SignatureTest"/>
- </exec>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java
deleted file mode 100644
index a9447aa..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/Client.java
+++ /dev/null
@@ -1,116 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package signature;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import java.util.GregorianCalendar;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-signature");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-signatureID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- SignatureTestService testService =
- (SignatureTestService) ic.lookup("java:comp/env/service/signature");
- SignatureTest test = testService.getSignatureTestPort();
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
- stat.addStatus("signature client main", stat.PASS);
-
- try {
- String msg = test.sayHello("world");
- System.out.println("MSG: " + msg);
- stat.addStatus("signature SEI.sayHello(msg)", stat.PASS);
- } catch (Exception e1) {
- e1.printStackTrace();
- stat.addStatus("signature SEI.sayHello(msg)", stat.FAIL);
- }
-
-
-/* uncomment the following when the date->calendar is done
- MySecondDateValueType d =
- new MySecondDateValueType(new java.util.GregorianCalendar(), "Suck it up and do it!");
- MyDateValueType c = new MyDateValueType();
- c.setDate(new java.util.GregorianCalendar());
- c.setWhine("Stop Whining!!");
- c.setMySecondDateValueTypes(new MySecondDateValueType[0]);
-
- try {
- test.setTestDate(new java.util.GregorianCalendar());
- java.util.Calendar date1 = test.getTestDate();
- System.out.println("RETURNED LUCKY DATE = " + date1);
- stat.addStatus("signature SEI.setDate(java.util.Date)", stat.PASS);
- } catch (Exception e1) {
- stat.addStatus("signature SEI.setDate(java.util.Date)", stat.FAIL);
- }
-
- try {
- test.setMyDateValueType(c);
- MyDateValueType date2 = test.getMyDateValueType();
- System.out.println("RETURNED ANOTHER LUCKY DATE = "
- + date2.getDate() + "; with message = " + date2.getWhine());
- stat.addStatus("signature SEI.setValueTypeWithDate", stat.PASS);
-
- MySecondDateValueType[] seconddates = date2.getMySecondDateValueTypes();
- if (seconddates != null) {
- stat.addStatus("signature SEI.setSecondValueTypeArray", stat.PASS);
- } else {
- stat.addStatus("signature SEI.setSecondValueTypeArray", stat.FAIL);
- }
-
- } catch (Exception e2) {
- stat.addStatus("signature SEI.setValueTypeWithDate", stat.FAIL);
- }
-
- try {
- test.setMyDateValueTypes(new MyDateValueType[0]);
- MyDateValueType[] date3 = test.getMyDateValueTypes();
- System.out.println("RETURNED MULTIPLE LUCKY DATES.size = " + date3.length);
- stat.addStatus("signature SEI.setValueTypeWithDates", stat.PASS);
- } catch (Exception e2) {
- stat.addStatus("signature SEI.setValueTypeWithDates", stat.FAIL);
- }
-*/
- } catch (Exception ex) {
- System.out.println("signature client test failed");
- ex.printStackTrace();
- stat.addStatus("signature client main", stat.FAIL);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF
deleted file mode 100644
index 2ab99b6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: signature.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml
deleted file mode 100644
index 38b8d74..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="SignatureMapping_ejb.xml"
- wsdlLocation="SignatureTestService.wsdl"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
deleted file mode 100644
index dffacb6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my signature app client</description>
- <display-name>signatureClient</display-name>
- <service-ref>
- <description>signature service ref</description>
- <service-ref-name>service/signature</service-ref-name>
- <service-interface>signature.SignatureTestService</service-interface>
- <wsdl-file>META-INF/wsdl/SignatureTestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SignatureMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="http://signature.org/wsdl">servicens:SignatureTestService
- </service-qname>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml
deleted file mode 100644
index 0732035..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>SignatureApp</display-name>
- <module>
- <java>signature-client.jar</java>
- </module>
- <module>
- <ejb>signature-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml
deleted file mode 100644
index 41935d7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SignatureEjb</ejb-name>
- <service-endpoint>signatureejb.SignatureTest</service-endpoint>
- <ejb-class>signatureejb.SignatureEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>SignatureEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml
deleted file mode 100644
index 8b0c0a1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/signature</service-ref-name>
- <port-info>
- <service-endpoint-interface>signature.SignatureTest</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:SignatureTestService</namespaceURI>
- <localpart>SignatureTestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index aae303d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>SignatureEjb</ejb-name>
- <jndi-name>SignatureEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>SignatureTestPort</port-component-name>
- <endpoint-address-uri>signatureejb/SignatureTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml
deleted file mode 100644
index 5b94905..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SignatureWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SignatureTestService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SignatureMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SignatureTestPort</port-component-name>
- <wsdl-port xmlns:signaturens="http://signature.org/wsdl">signaturens:SignatureTestPort</wsdl-port>
- <service-endpoint-interface>signatureejb.SignatureTest</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SignatureEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java
deleted file mode 100644
index 5c864da..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MyDateValueType.java
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package signatureejb;
-
-import java.util.Date;
-
-public class MyDateValueType {
- protected java.util.Date date;
- protected String whine;
- protected MySecondDateValueType[] dates;
-
- public MyDateValueType() {}
-
- public MyDateValueType(Date date, java.lang.String whine,
- MySecondDateValueType[] dates) {
- this.date = date;
- this.whine = whine;
- this.dates = dates;
- }
-
- public java.util.Date getDate() {
- return date;
- }
-
- public void setDate(java.util.Date date) {
- this.date = date;
- }
-
- public java.lang.String getWhine() {
- return whine;
- }
-
- public void setWhine(java.lang.String whine) {
- this.whine = whine;
- }
-
- public MySecondDateValueType[] getMySecondDateValueTypes() {
- return dates;
- }
-
- public void setMySecondDateValueTypes(MySecondDateValueType[] dates) {
- this.dates = dates;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java
deleted file mode 100644
index 7b3f63a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/MySecondDateValueType.java
+++ /dev/null
@@ -1,48 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package signatureejb;
-
-import java.util.Date;
-
-public class MySecondDateValueType {
- protected java.util.Date date;
- protected String whine;
-
- public MySecondDateValueType() {
- }
-
- public MySecondDateValueType(Date date, java.lang.String whine) {
- this.date = date;
- this.whine = whine;
- }
-
- public java.util.Date getDate() {
- return date;
- }
-
- public void setDate(java.util.Date date) {
- this.date = date;
- }
-
- public java.lang.String getWhine() {
- return whine;
- }
-
- public void setWhine(java.lang.String whine) {
- this.whine = whine;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
deleted file mode 100644
index 78e834c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureEJB.java
+++ /dev/null
@@ -1,87 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package signatureejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-import javax.xml.rpc.handler.MessageContext;
-import java.util.Date;
-
-public class SignatureEJB implements SessionBean {
- private SessionContext sc;
-
- private java.util.Date date;
- private MyDateValueType myDate;
- private MyDateValueType[] myDates;
-
- public SignatureEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In SignatureEJB::ejbCreate !!");
- }
-
- public void SetTestDate(java.util.Date testDate) {
- System.out.println("In SignatureEJB::setTestDate = " + testDate);
- date = testDate;
- }
-
- public java.util.Date GetTestDate() {
- System.out.println("In SignatureEJB::getTestDate !!");
- return date;
- }
-
- public void setMyDateValueType(MyDateValueType mytestdate) {
- System.out.println("In SignatureEJB::setMyDateValueType: date = "
- + mytestdate.getDate() + " ; whine = " + mytestdate.getWhine());
- myDate = mytestdate;
- }
-
- public MyDateValueType getMyDateValueType() {
- System.out.println("In SignatureEJB::getMyDateValueType !!");
- return myDate;
- }
-
- public void setMyDateValueTypes(MyDateValueType[] mytestdates) {
- System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = "
- + mytestdates.length);
- myDates = mytestdates;
- }
-
- public MyDateValueType[] getMyDateValueTypes() {
- System.out.println("In SignatureEJB::getMyDateValueTypes !!");
- return myDates;
- }
-
- public String SayHello(String msg) {
- System.out.println("In SignatureEJB::SayHello !!");
- return "Hello! " + msg;
- }
-
- public void setSessionContext(SessionContext sc) {
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java
deleted file mode 100644
index d890e27..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/signatureejb/SignatureTest.java
+++ /dev/null
@@ -1,37 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package signatureejb;
-
-import java.util.Date;
-
-public interface SignatureTest extends java.rmi.Remote {
-
-/*
- public void SetTestDate(java.util.Date testDate) throws java.rmi.RemoteException;
- public java.util.Date GetTestDate() throws java.rmi.RemoteException;
-*/
-
-
-/*
- public void setMyDateValueType(MyDateValueType myDate) throws java.rmi.RemoteException;
- public MyDateValueType getMyDateValueType() throws java.rmi.RemoteException;
- public void setMyDateValueTypes(MyDateValueType[] myDate) throws java.rmi.RemoteException;
- public MyDateValueType[] getMyDateValueTypes() throws java.rmi.RemoteException;
-*/
-
- public String SayHello(String hello) throws java.rmi.RemoteException;
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
deleted file mode 100644
index cc694df..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="SignatureTestService.wsdl"
- packageName="signature"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml
deleted file mode 100644
index 771ca5b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,28 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="SignatureTestService"
- targetNamespace="http://signature.org/wsdl"
- typeNamespace="http://signature.org/types"
- packageName="signatureejb">
- <interface name="signatureejb.SignatureTest"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
index ab34c01..e1deff7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
@@ -51,8 +51,10 @@
<target name="setup" depends="init-common, check-nss">
<echo message="Creating the valid certificate in kestore.jks"/>
- <exec executable="${java.home}/bin/keytool" failonerror="false">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg value="-genkey"/>
+ <arg value="-keyalg" />
+ <arg value="RSA" />
<arg value="-alias"/>
<arg value="s1astester"/>
<arg value="-keypass"/>
@@ -65,8 +67,10 @@
<arg value="cn=Duke Smith, ou=Purchasing, o=BlueSoft, c=US"/>
</exec>
<echo message="Creating the invalid certificate in invalid_kestore.jks"/>
- <exec executable="${java.home}/bin/keytool" failonerror="false">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg value="-genkey"/>
+ <arg value="-keyalg" />
+ <arg value="RSA" />
<arg value="-alias"/>
<arg value="s1astester"/>
<arg value="-keypass"/>
@@ -89,7 +93,7 @@
<arg line="-export -alias s1as -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/keystore.jks -storepass ${ssl.password} -file appserver.cer"/>
</exec>
<echo message="Importing the Appserver certificate"/>
- <exec executable="${java.home}/bin/keytool" failonerror="true">
+ <exec executable="${java.home}/bin/keytool" failonerror="false"><!-- Could be already imported -->
<arg line="-import -noprompt -alias s1as -keystore cacerts.jks -storepass ${ssl.password} -file appserver.cer"/>
</exec>
<echo message="Extracting tester public key"/>
@@ -97,7 +101,7 @@
<arg line="-export -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
</exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
- <exec executable="${java.home}/bin/keytool" failonerror="true">
+ <exec executable="${java.home}/bin/keytool" failonerror="false">
<arg line="-import -noprompt -alias s1astester -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/cacerts.jks -storepass ${ssl.password} -file client.cer"/>
</exec>
<antcall target="restart-pe-server"/>
@@ -176,7 +180,6 @@
<target name="all">
<antcall target="setup"/>
- <ant dir="ejb_ssl_cacert" target="all"/>
<ant dir="ejb3_ssl_cacert" target="all"/>
<antcall target="unsetup"/>
</target>
@@ -185,15 +188,12 @@
<fileset dir="${basedir}"
includes="**.output, count.txt"/>
</delete>
- <ant dir="ejb_ssl_cacert" target="clean"/>
</target>
<target name="usage">
<echo>
Usage:
ant all (Executes all the webservice security tests)
-
- ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test)
</echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
index 1418c5c..86baf5a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/build.xml
@@ -51,6 +51,16 @@
<target name="test-deploy" depends="test-build">
<basename file="${src-name}" property="server" suffix=".java"/>
<basename file="${server}" property="port" suffix="EJB"/>
+ <!-- FIXME: Reproducer for the following exception:
+java.lang.NullPointerException
+at java.base/java.io.File.<init>(File.java:361)
+at org.glassfish.webservices.WebServicesDeployer.doWebServicesDeployment(WebServicesDeployer.java:612)
+at org.glassfish.webservices.WebServicesDeployer.prepare(WebServicesDeployer.java:167)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.prepareModule(ApplicationLifecycle.java:929)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.deploy(ApplicationLifecycle.java:414)
+at com.sun.enterprise.v3.server.ApplicationLifecycle.deploy(ApplicationLifecycle.java:199)
+at org.glassfish.deployment.admin.DeployCommand.execute(DeployCommand.java:467)
+ -->
<exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="true">
<arg line="deploy --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} ${env.APS_HOME}/build/module/archive/${server}.jar"/>
</exec>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
deleted file mode 100755
index e68c05b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.properties
+++ /dev/null
@@ -1,42 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="ws"/>
-<property name="appname" value="${module}-ejbtaxcal"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<!--property name="sun-application.xml" value="descriptor/sun-application.xml"/-->
-<property name="ejb-jar.xml" value="descriptor/ejb/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/ejb/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/client/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/client/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
-<property name="wsdl-file" value="wsdl/TaxCalEjbService.wsdl"/>
-<property name="client-mapping.xml" value="TaxCalClientMapping.xml"/>
-<property name="ejb-mapping.xml" value="TaxCalMapping.xml"/>
-<property name="webservices.xml" value="descriptor/ejb/webservices.xml"/>
-<property name="wsdlfile.location" value="wsdl"/>
-
-<!--- servlet based endpoint params -->
-<!--property name="mappingfile.location" value=""/-->
-<property name="wsdlfile.name" value="TaxCalculator.wsdl"/>
-<property name="wsdlfile.location" value="wsdl"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
deleted file mode 100755
index 663d467..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/build.xml
+++ /dev/null
@@ -1,184 +0,0 @@
-<?xml version="1.0" encoding="ISO-8859-1"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY commonSecurity SYSTEM "file:./../common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="EjbBasedWebService" default="usage" basedir=".">
-
- &commonSetup;
- &commonBuild;
- &commonSecurity;
- &testproperties;
-
- <target name="all"
- depends="clean, build, deploy, run, undeploy"/>
- <target name="run-test" depends="clean, build, deploy, run, undeploy"/>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="compile" depends="init-common,clean-common, generate-artifacts">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- </target>
-
- <target name="generate-artifacts">
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${ejb-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-ejb.xml"/>
- </antcall>
- <antcall target="import-wsdl">
- <param name="mapping.file"
- value="${client-mapping.xml}"/>
- <param name="config-wsdl.file"
- value="config/config-client.xml"/>
- </antcall>
- </target>
- <target name="ws-package-appclientjar-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${appclient.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${application-client.xml}"
- tofile="${build.classes.dir}/META-INF/application-client.xml"/>
- <copy file="${sun-application-client.xml}"
- tofile="${build.classes.dir}/META-INF/sun-application-client.xml"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"/>
- <jar jarfile="${appclient.jar}" basedir="${appclientjar.files}"
- update="true" includes="${appclientjar.classes}"
- manifest="./client/MANIFEST.MF">
-
- <fileset dir="${build.classes.dir}" includes="${client-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="application-client.xml"/>
- <include name="sun-application-client.xml"/>
- <include name="${wsdl-file}"/>
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF" failonerror="false"/>
- </target>
-
- <target name="ws-package-ejb-jar-common" depends="init-common">
- <mkdir dir="${assemble.dir}"/>
- <delete file="${ejb.jar}" failonerror="false"/>
- <mkdir dir="${build.classes.dir}/META-INF"/>
- <copy file="${ejb-jar.xml}"
- tofile="${build.classes.dir}/META-INF/ejb-jar.xml"/>
- <copy file="${sun-ejb-jar.xml}"
- tofile="${build.classes.dir}/META-INF/sun-ejb-jar.xml"/>
- <copy file="${webservices.xml}"
- tofile="${build.classes.dir}/META-INF/webservices.xml"/>
- <copy file="${sun-cmp-mappings.xml}"
- tofile="${build.classes.dir}/META-INF/sun-cmp-mappings.xml"
- failonerror="false"/>
- <copy file="${wsdl-file}"
- tofile="${build.classes.dir}/META-INF/${wsdl-file}"
- failonerror="false"/>
- <copy file="${dbschema}" todir="${build.classes.dir}" failonerror="false"/>
- <jar jarfile="${ejb.jar}" basedir="${ejbjar.files}" update="true"
- includes ="${ejbjar.classes}">
-
- <fileset dir="${build.classes.dir}" includes="${ejb-mapping.xml}"/>
- <metainf dir="${build.classes.dir}/META-INF">
- <include name="ejb-jar.xml"/>
- <include name="sun-ejb-jar.xml"/>
- <include name="sun-cmp-mappings.xml"/>
- <include name="webservices.xml"/>
- <include name="${wsdl-file}"/>
- <!--<include name="${dbschema}"/>-->
- </metainf>
- </jar>
- <delete dir="${build.classes.dir}/META-INF"
- failonerror="false"/>
- </target>
-
- <target name="build" depends="init-common,compile">
- <antcall target="ws-package-ejb-jar-common">
- <param name="ejbjar.classes"
- value="com/sun/s1peqe/webservices/ejb/taxcal/*.class" />
- <param name="ejbjar.files" value="${build.classes.dir}"/>
- <param name="ejb.jar" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
- <antcall target="ws-package-appclientjar-common">
- <param name="appclientjar.classes"
- value="com/sun/s1peqe/webservices/ejb/taxcal/client/*.class" />
- <param name="appclientjar.files"
- value="${build.classes.dir}"/>
- <param name="appclient.jar"
- value="${assemble.dir}/${appname}-client.jar"/>
- </antcall>
-
- <antcall target="ear-common"/>
- </target>
-
- <target name="deploy"
- depends="init-common, reconfig-common">
- <antcall target="deploy-common"/>
- </target>
-
-
- <target name="run" depends="init-common">
- <property name="statetax-ejb-endpoint-url"
- value="https://${http.host}:${https.port}/statetaxejb"/>
- <property name="fedtax-ejb-endpoint-url"
- value="https://${http.host}:${https.port}/fedtaxejb"/>
-
- <echo message="property statetax-ejb-endpoint-url is set to: ${statetax-ejb-endpoint-url}"/>
- <echo message="property fedtax-ejb-endpoint-url is set to: ${fedtax-ejb-endpoint-url}"/>
-
- <antcall target="runclient-secure">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} True True"/>
- </antcall>
- <antcall target="runclient-invalid-secure">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False True"/>
- </antcall>
- <antcall target="runclient-common">
- <param name="appclient.application.args"
- value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False False"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="usage">
- <antcall target="usage-common"/>
- </target>
-
- <!--
- =======================================================
- User Defined specific targets
- =======================================================
- -->
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF
deleted file mode 100644
index 65b3bd4..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java
deleted file mode 100755
index 798e262..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/client/TaxCalClient.java
+++ /dev/null
@@ -1,137 +0,0 @@
-/*
- * Copyright (c) 2003, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1peqe.webservices.ejb.taxcal.client;
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-
-
-public class TaxCalClient {
-
- private static SimpleReporterAdapter stat = new SimpleReporterAdapter();
- private static String stateTaxEndpoint = null;
- private static String fedTaxEndpoint = null;
- private static String testSuite = "TaxCalEjbbasedWS";
- private static String testCase = null;
- private static TaxCalEjbService taxCalService = null;
-
- public static void main(String[] args) {
-
- boolean stateTaxIntendedResult=true;
- boolean fedTaxIntendedResult=true;
-
- if(args[0] == null || args[1] == null){
- System.out.println("TaxCal client: Argument missing. Please provide target" +
- "endpoint address as argument");
- System.exit(1);
- } else {
- stateTaxEndpoint = args[0];
- fedTaxEndpoint = args[1];
- if (args.length>2) {
- stateTaxIntendedResult = (new Boolean(args[2])).booleanValue();
- fedTaxIntendedResult = (new Boolean(args[3])).booleanValue();
- }
- }
-
- stat.addDescription("This is to test ejb based webservice");
- try {
- TaxCalClient client = new TaxCalClient();
- Context ic = new InitialContext();
- taxCalService = (TaxCalEjbService)
- ic.lookup("java:comp/env/service/TaxCalEjbService");
-
- client.callStateTaxService(stateTaxIntendedResult);
- client.callFedTaxService(fedTaxIntendedResult);
- }catch(Exception e){
- e.printStackTrace();
- }
-
- stat.printSummary(testSuite);
- }
-
- public void callStateTaxService(boolean intendedResult) {
- double income = 85000.00;
- double deductions = 5000.00;
-
- //String targetEndpointAddress =
- // "http://localhost:1024/taxcalculator";
-
- try {
-
- StateTaxIF taxCalIFPort = taxCalService.getStateTaxIFPort();
-
- ((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- stateTaxEndpoint);
-
- double stateTax = taxCalIFPort.getStateTax(income, deductions);
- System.out.println("State tax from ejb based TaxCalService :" + stateTax);
-
- if(stateTax == 24000.00 && intendedResult)
- stat.addStatus(testSuite + " StateTaxPort", stat.PASS);
- else {
- System.out.println("Call succeeded while it should have failed");
- stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
- }
-
- } catch (Exception ex) {
- if (intendedResult) {
- System.out.println("TaxCalEjbWebservice client failed");
- stat.addStatus(testSuite + " StateTaxPort", stat.FAIL);
- ex.printStackTrace();
- } else {
- System.out.println("Expected Exception caught :");
- System.out.println(ex.getMessage());
- ex.printStackTrace();
- stat.addStatus(testSuite + "StateTaxPort", stat.PASS);
- }
- }
- }
-
- public void callFedTaxService(boolean intendedResult) {
- double income = 97000.00;
- double deductions = 7000.00;
- try {
-
- FedTaxIF taxCalIFPort = taxCalService.getFedTaxIFPort();
- ((Stub)taxCalIFPort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- fedTaxEndpoint);
-
- double fedTax = taxCalIFPort.getFedTax(income, deductions);
- System.out.println("Fed tax from Ejb based TaxCalService :" + fedTax);
-
- if(fedTax == 18000.00 && intendedResult)
- stat.addStatus(testSuite + " FedTaxPort", stat.PASS);
- else {
- System.out.println("Call succeeded while it should have failed");
- stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
- }
- } catch (Exception ex) {
- if (intendedResult) {
- System.out.println("TaxCalEjbWebService client failed");
- stat.addStatus(testSuite + " FedTaxPort", stat.FAIL);
- ex.printStackTrace();
- } else {
- System.out.println("Expected Exception caught :");
- System.out.println(ex.getMessage());
- stat.addStatus(testSuite + "FedTaxPort", stat.PASS);
- }
- }
- }
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
deleted file mode 100755
index e55096d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal.client"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save
deleted file mode 100755
index 9df53d2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-client.xml.save
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal.client"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
deleted file mode 100755
index 2afdcaa..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="wsdl/TaxCalEjbService.wsdl"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
deleted file mode 100755
index da00336..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/config/config-sei.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service name="TaxCalEjbService"
- targetNamespace="http://tax.org/wsdl"
- typeNamespace="http://tax.org/types"
- packageName="com.sun.s1peqe.webservices.ejb.taxcal">
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb"/>
- <interface name="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF"
- servantName="com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb">
- </interface>
- </service>
-</configuration>
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml
deleted file mode 100755
index b1a0453..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE application PUBLIC "-//Sun Microsystems, Inc.//DTD J2EE Application 1.3//EN" "http://java.sun.com/dtd/application_1_3.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application>
- <display-name>TaxCalculatorApp</display-name>
- <module>
- <ejb>ws-ejbtaxcal-ejb.jar</ejb>
- </module>
- <module>
- <java>ws-ejbtaxcal-client.jar</java>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml
deleted file mode 100755
index e6a5aa9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/application-client.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>app client dd for taxcalculator</description>
- <display-name>ws-ejbtaxcalClient</display-name>
- <service-ref>
- <description>taxcal service ref</description>
- <service-ref-name>service/TaxCalEjbService</service-ref-name>
- <service-interface>com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalEjbService</service-interface>
- <wsdl-file>META-INF/wsdl/TaxCalEjbService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalClientMapping.xml</jaxrpc-mapping-file>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml
deleted file mode 100755
index cd48c1f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/client/sun-application-client.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/TaxCalEjbService</service-ref-name>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml
deleted file mode 100755
index 6aa66a0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/ejb-jar.xml
+++ /dev/null
@@ -1,64 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <display-name>TaxCalEjb</display-name>
- <ejb-name>StateTaxEjb</ejb-name>
- <service-endpoint>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF</service-endpoint>
- <ejb-class>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxEjb</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- <session>
- <display-name>TaxCalEjb</display-name>
- <ejb-name>FedTaxEjb</ejb-name>
- <service-endpoint>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF</service-endpoint>
- <ejb-class>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxEjb</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- <security-identity>
- <use-caller-identity/>
- </security-identity>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>StateTaxEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- <container-transaction>
- <method>
- <ejb-name>FedTaxEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
deleted file mode 100755
index ae28a32..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
+++ /dev/null
@@ -1,47 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <name>ws-taxcal-ejb.jar</name>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>StateTaxEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>StateTaxIFPort</port-component-name>
- <endpoint-address-uri>statetaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
- </webservice-endpoint>
- </ejb>
- <ejb>
- <ejb-name>FedTaxEjb</ejb-name>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>FedTaxIFPort</port-component-name>
- <endpoint-address-uri>fedtaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml
deleted file mode 100755
index 3b66b4f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/webservices.xml
+++ /dev/null
@@ -1,53 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>TaxcalculatorEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/TaxCalEjbService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>TaxCalMapping.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>StateTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:StateTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1peqe.webservices.ejb.taxcal.StateTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>StateTaxEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- <port-component>
- <description>port component description</description>
- <port-component-name>FedTaxIFPort</port-component-name>
- <wsdl-port xmlns:taxns="http://tax.org/wsdl">taxns:FedTaxIFPort
- </wsdl-port>
- <service-endpoint-interface>com.sun.s1peqe.webservices.ejb.taxcal.FedTaxIF
- </service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>FedTaxEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml
deleted file mode 100755
index 19eecca..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/sun-application.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 J2EE Application 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application_1_4-1.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application>
- <unique-id>0</unique-id>
- <security-role-mapping>
- <role-name>users</role-name>
- <principal-name>dilbert</principal-name>
- <principal-name>
- CN=Dilbert, OU=Comic Division, O=Sun Solarsystems Inc, C=US
- </principal-name>
- </security-role-mapping>
-</sun-application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
deleted file mode 100755
index 48a86b3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxEjb.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1peqe.webservices.ejb.taxcal;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class FedTaxEjb implements SessionBean {
-
- private SessionContext sc;
-
- public FedTaxEjb(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In FedTaxEjb::ejbCreate !!");
- }
-
- public double getFedTax(double income, double deductions) {
- return ((income - deductions) * 0.2);
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java
deleted file mode 100755
index 3a099d5..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/FedTaxIF.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1peqe.webservices.ejb.taxcal;
-
-import java.rmi.RemoteException;
-import java.rmi.Remote;
-
-
-public interface FedTaxIF extends Remote{
-
- public double getFedTax(double income, double deductions) throws RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
deleted file mode 100755
index d99c7f9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxEjb.java
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1peqe.webservices.ejb.taxcal;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-
-public class StateTaxEjb implements SessionBean {
-
- private SessionContext sc;
-
- public StateTaxEjb(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In StateTaxEjb::ejbCreate !!");
- }
-
- public double getStateTax(double income, double deductions) {
- return ((income - deductions) * 0.3);
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java
deleted file mode 100755
index 38a1531..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/ejb/StateTaxIF.java
+++ /dev/null
@@ -1,27 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package com.sun.s1peqe.webservices.ejb.taxcal;
-
-import java.rmi.RemoteException;
-import java.rmi.Remote;
-
-
-public interface StateTaxIF extends Remote{
-
- public double getStateTax(double income, double deductions) throws RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl
deleted file mode 100755
index 62dbdf8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/wsdl/TaxCalEjbService.wsdl
+++ /dev/null
@@ -1,60 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="TaxCalEjbService" targetNamespace="http://tax.org/wsdl" xmlns:tns="http://tax.org/wsdl" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types/>
- <message name="FedTaxIF_getFedTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="FedTaxIF_getFedTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTax">
- <part name="double_1" type="xsd:double"/>
- <part name="double_2" type="xsd:double"/></message>
- <message name="StateTaxIF_getStateTaxResponse">
- <part name="result" type="xsd:double"/></message>
- <portType name="FedTaxIF">
- <operation name="getFedTax" parameterOrder="double_1 double_2">
- <input message="tns:FedTaxIF_getFedTax"/>
- <output message="tns:FedTaxIF_getFedTaxResponse"/></operation></portType>
- <portType name="StateTaxIF">
- <operation name="getStateTax" parameterOrder="double_1 double_2">
- <input message="tns:StateTaxIF_getStateTax"/>
- <output message="tns:StateTaxIF_getStateTaxResponse"/></operation></portType>
- <binding name="FedTaxIFBinding" type="tns:FedTaxIF">
- <operation name="getFedTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <binding name="StateTaxIFBinding" type="tns:StateTaxIF">
- <operation name="getStateTax">
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="http://tax.org/wsdl"/></output>
- <soap:operation soapAction=""/></operation>
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/></binding>
- <service name="TaxCalEjbService">
- <port name="FedTaxIFPort" binding="tns:FedTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port>
- <port name="StateTaxIFPort" binding="tns:StateTaxIFBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
deleted file mode 100644
index 389b69b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="simpleservlethandler"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
deleted file mode 100644
index 3d01eba..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
+++ /dev/null
@@ -1,109 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-
- <target name="all" depends="clean, assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="servlet"/>
- </antcall>
- </target>
-
- <target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SimpleHandlerMapping_servlet.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/WEB-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="SimpleHandlerMapping_servlet.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}/WEB-INF/wsdl"/>
- <param name="wsdlfile.name" value="SimpleHandlerServlet.wsdl"/>
- <param name="webwar.classes" value="servlet/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <copy file="${build.classes.dir}/WEB-INF/wsdl/SimpleHandlerServlet.wsdl" todir="${build.classes.dir}/META-INF/wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/ServletHandlerTest/ServletHandlerTest"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
deleted file mode 100644
index e9d91ec..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
+++ /dev/null
@@ -1,65 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package simplehandler;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import javax.xml.rpc.Service;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import servlet.*;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-simple-soapfault");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-soapfaultID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- Service testService = (Service) ic.lookup("java:comp/env/service/simplehandler");
- SimpleServer test = (SimpleServer)
- testService.getPort(SimpleServer.class);
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
- System.out.println("Invocation returned " + test.sayHello("jerome"));
- } catch (Exception ex) {
- ex.printStackTrace();
- stat.addStatus("soapfaultsclient main", stat.FAIL);
- System.out.println("CAUGHT UNEXPECTED EXCEPTION: " + ex.getMessage());
- }
-
- stat.addStatus("soapfaultsclient main", stat.PASS);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF
deleted file mode 100644
index 5085a53..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: simplehandler.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
deleted file mode 100644
index 4b08059..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
- packageName="handlertest">
- <interface name="servlet.SimpleServer"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
deleted file mode 100644
index d2d8301..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my handler app client</description>
- <display-name>handlerClient</display-name>
- <service-ref>
- <description>simple handler service ref</description>
- <service-ref-name>service/simplehandler</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
- <port-component-ref>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml
deleted file mode 100644
index a4ce49f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/simplehandler</service-ref-name>
- <port-info>
- <service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:HandlerTest</namespaceURI>
- <localpart>SimpleHandlerServer</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml
deleted file mode 100644
index f96bc1b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/sun-web.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Application Server 9.0 Servlet 2.5//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_5-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>ServletHandlerTest</context-root>
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- <property name="prop1" value="value1"/>
- <property name="prop2" value="value2"/>
- </webservice-endpoint>
- </servlet>
- </sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml
deleted file mode 100644
index 7649ec2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/web.xml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <servlet>
- <servlet-name>ServletHandlerTest</servlet-name>
- <servlet-class>servlet.ServletHandlerTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>ServletHandlerTest</servlet-name>
- <url-pattern>/ServletHandlerTest</url-pattern>
- </servlet-mapping>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml
deleted file mode 100644
index 7f873e1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/webservices.xml
+++ /dev/null
@@ -1,44 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SimpleHandlerServlet</webservice-description-name>
- <wsdl-file>WEB-INF/wsdl/SimpleHandlerServlet.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SimpleHandlerMapping_servlet.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:HandlerTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>servlet.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <servlet-link>ServletHandlerTest</servlet-link>
- </service-impl-bean>
- <handler>
- <handler-name>SimpleHandler</handler-name>
- <handler-class>servlet.SimpleHandler</handler-class>
- </handler>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README
deleted file mode 100644
index 1ac4e4f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/docroot/README
+++ /dev/null
@@ -1,2 +0,0 @@
-this is a fake directory to work around the
-quicklook hardness problem.
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
deleted file mode 100644
index 891d555..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.rmi.*;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-
-public class ServletHandlerTestImpl implements SessionBean {
- SessionContext sc;
-
- public String sayHello(String hello) throws RemoteException {
- return "salut " + hello;
- }
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In SimpleServer:::ejbCreate !!");
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
deleted file mode 100644
index c985152..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
+++ /dev/null
@@ -1,56 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.util.Date;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.handler.*;
-
-public class SimpleHandler extends GenericHandler {
-
- protected HandlerInfo info = null;
-
- public void init(HandlerInfo info) {
- this.info = info;
- }
-
- public boolean handleRequest(MessageContext context) {
- try {
- Date startTime = new Date();
- context.setProperty("startTime", startTime);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public boolean handleResponse(MessageContext context) {
- try {
- Date startTime = (Date) context.getProperty("startTime");
- Date endTime = new Date();
- long elapsed = endTime.getTime() - startTime.getTime();
- System.out.println(" in handler, elapsed " + elapsed);
- } catch(Exception e) {
- e.printStackTrace();
- }
- return true;
- }
-
- public QName[] getHeaders() {
- return new QName[0];
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
deleted file mode 100644
index 0675cd2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package servlet;
-
-import java.rmi.*;
-
-public interface SimpleServer extends Remote {
-
- public String sayHello(String source) throws RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl
deleted file mode 100644
index c511855..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceServletTest.wsdl
+++ /dev/null
@@ -1,46 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="WebServiceServletTest" targetNamespace="urn:WebServiceTest" xmlns:tns="urn:WebServiceTest" xmlns="http://schemas.xmlsoap.org/wsdl/" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/">
- <types>
- <schema targetNamespace="urn:WebServiceTest" xmlns:tns="urn:WebServiceTest" xmlns:soap11-enc="http://schemas.xmlsoap.org/soap/encoding/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/" xmlns="http://www.w3.org/2001/XMLSchema">
- <import namespace="http://schemas.xmlsoap.org/soap/encoding/"/>
- <complexType name="ArrayOfstring">
- <complexContent>
- <restriction base="soap11-enc:Array">
- <attribute ref="soap11-enc:arrayType" wsdl:arrayType="string[]"/></restriction></complexContent></complexType></schema></types>
- <message name="WebServiceTest_doTest">
- <part name="arrayOfString_1" type="tns:ArrayOfstring"/></message>
- <message name="WebServiceTest_doTestResponse">
- <part name="result" type="xsd:string"/></message>
- <portType name="WebServiceTest">
- <operation name="doTest" parameterOrder="arrayOfString_1">
- <input message="tns:WebServiceTest_doTest"/>
- <output message="tns:WebServiceTest_doTestResponse"/></operation></portType>
- <binding name="WebServiceTestBinding" type="tns:WebServiceTest">
- <soap:binding transport="http://schemas.xmlsoap.org/soap/http" style="rpc"/>
- <operation name="doTest">
- <soap:operation soapAction=""/>
- <input>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="urn:WebServiceTest"/></input>
- <output>
- <soap:body encodingStyle="http://schemas.xmlsoap.org/soap/encoding/" use="encoded" namespace="urn:WebServiceTest"/></output></operation></binding>
- <service name="WebServiceServletTest">
- <port name="WebServiceTestPort" binding="tns:WebServiceTestBinding">
- <soap:address location="REPLACE_WITH_ACTUAL_URL"/></port></service></definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java
deleted file mode 100644
index 1c74d61..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTest.java
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package test.webservice;
-
-import java.rmi.*;
-
-public interface WebServiceTest extends Remote {
-
- public String doTest(String[] params) throws RemoteException;
-}
-
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
deleted file mode 100644
index 965eeac..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
+++ /dev/null
@@ -1,67 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package test.webservice;
-
-import java.rmi.*;
-import javax.xml.rpc.server.ServiceLifecycle;
-import javax.xml.rpc.server.ServletEndpointContext;
-
-public class WebServiceTestImpl implements ServiceLifecycle, WebServiceTest {
-
- WebServiceTest delegate;
-
- public void destroy() {
- System.out.println("Driver servlet destroyed");
- }
-
- public void init(Object context) {
- ServletEndpointContext seContext = (ServletEndpointContext) context;
- String testClassName = seContext.getServletContext().getInitParameter("testclassname");
- if (testClassName==null) {
- System.out.println("Error : no delegate servlet provided for test");
- return;
- }
- try {
- Class clazz = Class.forName(testClassName);
- if (clazz==null) {
- System.out.println("Error : cannot load delegate " + testClassName);
- return;
- }
- Object o = clazz.newInstance();
- if (o instanceof WebServiceTest) {
- delegate = (WebServiceTest) o;
- } else {
- System.out.println("Error : delegate not of type WebServiceTest");
- }
- } catch(ClassNotFoundException cnfe) {
- System.out.println("Error : cannot load delegate " + testClassName);
- } catch(InstantiationException ie) {
- System.out.println("Error : cannot instantiate " + testClassName);
- } catch(Exception e) {
- System.out.println("Error : cannot load delegate " + testClassName + " " + e.getMessage());
- }
- }
-
- public String doTest(String[] params) throws RemoteException {
-
- if (delegate!=null) {
- return delegate.doTest(params);
- } else {
- throw new RemoteException("No delegate for test harness");
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml b/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
deleted file mode 100644
index 21c84b0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceServletTest"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
- packageName="test.webservice">
- <interface name="test.webservice.WebServiceTest"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml
deleted file mode 100644
index 3f3b49e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/webservices.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices version="1.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd">
-<webservice-description>
-<webservice-description-name>WebServiceServletTest</webservice-description-name>
-<wsdl-file>WEB-INF/wsdl/WebServiceServletTest.wsdl</wsdl-file>
-<jaxrpc-mapping-file>WebServiceTestMapping.xml</jaxrpc-mapping-file>
-<port-component>
-<port-component-name>Port</port-component-name>
-<wsdl-port xmlns:tns="urn:WebServiceTest">tns:WebServiceTestPort</wsdl-port>
-<service-endpoint-interface>test.webservice.WebServiceTest</service-endpoint-interface>
-<service-impl-bean>
-<servlet-link>WebServiceTestServlet</servlet-link>
-</service-impl-bean>
-</port-component>
-</webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
deleted file mode 100644
index f62be9f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="simplesoapfault"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
deleted file mode 100644
index 9933ebe..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
+++ /dev/null
@@ -1,104 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="Simple Soap fault test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SoapFaultMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/ejb/*.class"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="gen-ejb-wsdl"/>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/**,com/**" />
- </antcall>
- <antcall target="deploy-client-common"/>
- <move file="${assemble.dir}/${appname}-clientClient.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfault/SimpleSoapFault"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- <antcall target="undeploy-client-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
deleted file mode 100644
index b232739..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package soapfault;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.namespace.QName;
-import javax.xml.rpc.Stub;
-import javax.xml.rpc.Service;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-import soapfault.ejb.*;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-simple-soapfault");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-soapfaultID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- Service testService = (Service) ic.lookup("java:comp/env/service/soapfault");
- SimpleSoapFaultSEI test = (SimpleSoapFaultSEI)
- testService.getPort(new QName("urn:SoapFaultTest", "SimpleSoapFaultSEIPort"),
- SimpleSoapFaultSEI.class);
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
-
- try {
- String ret = test.simpleMethod();
- } catch (SimpleSoapException ex) {
- System.out.println("CAUGHT EXPECTED EXCEPTION: FaultOne: " + ex.getReason());
- }
-
- stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
- System.out.println("soapfaults client test failed");
- ex.printStackTrace();
- stat.addStatus("soapfaultsclient main", stat.FAIL);
- //System.exit(15);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF
deleted file mode 100644
index ff21673..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: soapfault.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
deleted file mode 100644
index 8bef265..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SoapFaultService"
- targetNamespace="urn:SoapFaultTest"
- typeNamespace="urn:SoapFaultTest"
- packageName="soapfault">
- <interface name="soapfault.ejb.SimpleSoapFaultSEI"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
deleted file mode 100644
index 87ba024..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
+++ /dev/null
@@ -1,34 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my soapfaults app client</description>
- <display-name>soapfaultsClient</display-name>
- <service-ref>
- <description>simple soapfault service ref</description>
- <service-ref-name>service/soapfault</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SoapFaultMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:SoapFaultTest">servicens:SoapFaultService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml
deleted file mode 100644
index 8bea6aa..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SimpleSoapFaultEJB</ejb-name>
- <service-endpoint>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint>
- <ejb-class>soapfault.ejb.SimpleSoapFaultImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml
deleted file mode 100644
index fc41541..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/soapfault</service-ref-name>
- <port-info>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:SoapFaultTest</namespaceURI>
- <localpart>SoapFaultService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 8f7d0ab..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SimpleSoapFaultEJB</ejb-name>
- <jndi-name>SimpleSoapFaultEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleSoapFaultSEIPort</port-component-name>
- <endpoint-address-uri>soapfault/SimpleSoapFault</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml
deleted file mode 100644
index 11c892a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SoapFaultService</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SoapFaultService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SoapFaultMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleSoapFaultSEIPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:SoapFaultTest">servicens:SimpleSoapFaultSEIPort</wsdl-port>
- <service-endpoint-interface>soapfault.ejb.SimpleSoapFaultSEI</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SimpleSoapFaultEJB</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
deleted file mode 100644
index 0c58545..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
+++ /dev/null
@@ -1,30 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package soapfault.ejb;
-
-public class SimpleSoapException extends Exception {
-
- private String reason;
-
- public SimpleSoapException(String reason) {
- this.reason = reason;
- }
-
- public String getReason() {
- return reason;
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
deleted file mode 100644
index 1b4ebc7..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
+++ /dev/null
@@ -1,62 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * SimpleServerImpl.java
- *
- * Created on September 13, 2004, 11:24 AM
- */
-
-package soapfault.ejb;
-
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author dochez
- */
-public class SimpleSoapFaultImpl implements SessionBean {
-
- SessionContext sc;
-
- /** Creates a new instance of SimpleServerImpl */
- public SimpleSoapFaultImpl() {
- }
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
-}
-
- public String simpleMethod()
- throws SimpleSoapException, RemoteException {
-
- throw new SimpleSoapException("I only raise exceptions !");
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
deleted file mode 100644
index 113d8f1..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
+++ /dev/null
@@ -1,26 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package soapfault.ejb;
-
-import java.rmi.Remote;
-import java.rmi.RemoteException;
-
-public interface SimpleSoapFaultSEI extends Remote {
-
- public String simpleMethod() throws SimpleSoapException, RemoteException;
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
deleted file mode 100644
index 5bddbff..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="soapfaults"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
deleted file mode 100644
index 90c19d0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
+++ /dev/null
@@ -1,172 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/soapfaults">
- <fileset dir="output/soapfaults"
- includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/soapfaultsejb">
- <fileset dir="output/soapfaultsejb"
- includes="TestService.class, Test.class, Test1RequestType.class, Test2RequestType.class, Test1ResponseType.class, FaultOne.class, FaultTwo.class, FaultThree.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="soapfaults.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="mapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="mapping_appclient.xml,META-INF/wsdl/**,soapfaults/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="mapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="mapping_ejb.xml,META-INF/wsdl/**,soapfaultsejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="out"/>
- <delete dir="output"/>
- <delete dir="soapfaults"/>
- <delete dir="soapfaultsejb"/>
- <delete file="mapping.xml"/>
- <delete file="mapping_ejb.xml"/>
- <delete file="mapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- <delete file="good.debugModel.txt"/>
- <delete file="bad.debugModel.txt"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/soapfaultsejb/SoapFaultsTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -mapping mapping_appclient.xml -f:explicitcontext wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -mapping mapping_ejb.xml -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="mapping" depends="init-common">
- <delete dir="out"/>
- <mkdir dir="out"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:good.debugModel.txt -mapping mapping.xml -f:explicitcontext wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="genall" depends="init-common, mapping">
- <delete dir="out"/>
- <mkdir dir="out"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen:both -cp . -keep -d out -Xprintstacktrace -Xdebugmodel:bad.debugModel.txt -f:explicitcontext config.xml"/>
- </antcall>
- </target>
-
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
deleted file mode 100644
index bce2079..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
+++ /dev/null
@@ -1,82 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package soapfaults;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-soapfaults");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-soapfaultsID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- TestService testService =
- (TestService) ic.lookup("java:comp/env/service/soapfaults");
- Test test = testService.getTestPort();
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
-
- Test2RequestType c = new Test2RequestType("recess", "weekender");
-
- try {
- Test1ResponseType ret = test.test1("1", "test fault one", c);
- } catch (FaultOne ex) {
- System.out.println("CAUGHT EXPECTED EXCEPTION: FaultOne: " + ex.getMessage1());
- }
-
- try {
- Test1ResponseType ret = test.test1("2", "test fault two", c);
- } catch (FaultTwo ex) {
- System.out.println("CAUGHT EXPECTED EXCEPTION: FaultTwo: " + ex.getMessage2());
- }
-
- try {
- Test1ResponseType ret = test.test1("3", "test fault three", c);
- } catch (FaultThree ex) {
- System.out.println("CAUGHT EXPECTED EXCEPTION: FaultThree: " + ex.getMessage3());
- }
-
- stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
- System.out.println("soapfaults client test failed");
- ex.printStackTrace();
- stat.addStatus("soapfaultsclient main", stat.FAIL);
- //System.exit(15);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF
deleted file mode 100644
index 6eea9a6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: soapfaults.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml
deleted file mode 100644
index b8e05e2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="mapping.xml"
- wsdlLocation="soapfaults.wsdl"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
deleted file mode 100644
index 9ec3319..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my soapfaults app client</description>
- <display-name>soapfaultsClient</display-name>
- <service-ref>
- <description>soapfaults service ref</description>
- <service-ref-name>service/soapfaults</service-ref-name>
- <service-interface>soapfaults.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/soapfaults.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml
deleted file mode 100644
index 33626f9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>App</display-name>
- <module>
- <java>soapfaults-client.jar</java>
- </module>
- <module>
- <ejb>soapfaults-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml
deleted file mode 100644
index a93c3c0..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <service-endpoint>soapfaultsejb.Test</service-endpoint>
- <ejb-class>soapfaultsejb.SoapFaultsEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml
deleted file mode 100644
index 0dc6db9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/soapfaults</service-ref-name>
- <port-info>
- <service-endpoint-interface>soapfaults.Test</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 3d93db3..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>SoapFaultsEjb</ejb-name>
- <jndi-name>SoapFaultsEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>soapfaultsejb/SoapFaultsTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml
deleted file mode 100644
index e74d8dc..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SoapFaultsWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/soapfaults.wsdl</wsdl-file>
- <jaxrpc-mapping-file>mapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:myns="urn:test">myns:TestPort</wsdl-port>
- <service-endpoint-interface>soapfaultsejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SoapFaultsEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
deleted file mode 100644
index 77c5ed2..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
+++ /dev/null
@@ -1,80 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package soapfaultsejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-import javax.xml.rpc.handler.MessageContext;
-
-public class SoapFaultsEJB implements SessionBean {
- private SessionContext sc;
-
- public SoapFaultsEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In SoapFaultsEJB::ejbCreate !!");
- }
-
- public Test1ResponseType test1(String a, String b,
- Test2RequestType c)
- throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException
- {
- MessageContext msgContext = sc.getMessageContext();
- System.out.println("msgContext = " + msgContext);
-
- System.out.println("SoapFaultsEJB.test1() called with ");
- System.out.println("a = " + a);
- System.out.println("b = " + b);
-
- System.out.println("Test2RequestType.a = " + c.getTest2RequestParamA());
- System.out.println("Test2RequestType.b = " + c.getTest2RequestParamB());
-
- if ("1".equals(a)) {
- System.out.println("SoapFaultsEJB... throwing FaultOne Exception");
- throw new FaultOne("1", "I need a life.");
- }
-
- if ("2".equals(a)) {
- System.out.println("SoapFaultsEJB... throwing FaultTwo Exception");
- throw new FaultTwo("2", "I am so tired");
- }
-
- if ("3".equals(a)) {
- System.out.println("SoapFaultsEJB... throwing FaultThree Exception");
- throw new FaultThree("3", "I love fortune cookies");
- }
-
- Test1ResponseType t = new Test1ResponseType(1,2);
- return t;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl
deleted file mode 100644
index 8ad5e8a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/soapfaults.wsdl
+++ /dev/null
@@ -1,139 +0,0 @@
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions
- name="HelloTest"
- targetNamespace="urn:test"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ttns="urn:test:types"
- xmlns:tns="urn:test">
-
- <types>
- <xsd:schema targetNamespace="urn:test:types">
-
- <xsd:element name="Test1Request" type="ttns:Test1RequestType"/>
- <xsd:complexType name="Test1RequestType">
- <xsd:sequence>
- <xsd:element name="test1RequestParamA" type="xsd:string"/>
- <xsd:element name="test1RequestParamB" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test2Request" type="ttns:Test2RequestType"/>
- <xsd:complexType name="Test2RequestType">
- <xsd:sequence>
- <xsd:element name="test2RequestParamA" type="xsd:string"/>
- <xsd:element name="test2RequestParamB" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test1Response" type="ttns:Test1ResponseType"/>
- <xsd:complexType name="Test1ResponseType">
- <xsd:sequence>
- <xsd:element name="test1ResponseParamA" type="xsd:int"/>
- <xsd:element name="test1ResponseParamB" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultOneReason" type="ttns:FaultOne"/>
- <xsd:complexType name="FaultOne">
- <xsd:sequence>
- <xsd:element name="messageID1" type="xsd:string"/>
- <xsd:element name="message1" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultTwoReason" type="ttns:FaultTwo"/>
- <xsd:complexType name="FaultTwo">
- <xsd:sequence>
- <xsd:element name="messageID2" type="xsd:string"/>
- <xsd:element name="message2" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="FaultThreeReason" type="ttns:FaultThree"/>
- <xsd:complexType name="FaultThree">
- <xsd:sequence>
- <xsd:element name="messageID3" type="xsd:string"/>
- <xsd:element name="message3" type="xsd:string"/>
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
-
- </types>
-
- <message name="Test1Request">
- <part name="params1" element="ttns:Test1Request"/>
- </message>
-
- <message name="Test2Request">
- <part name="params2" element="ttns:Test2Request"/>
- </message>
-
- <message name="Test1Response">
- <part name="result" element="ttns:Test1Response"/>
- </message>
-
- <message name="FaultOne">
- <part name="reason1" element="ttns:FaultOneReason"/>
- <part name="reason3" element="ttns:FaultThreeReason"/>
- </message>
-
- <message name="FaultTwo">
- <part name="reason" element="ttns:FaultTwoReason"/>
- </message>
-
-
- <portType name="Test">
- <operation name="test1">
- <input message="tns:Test1Request"/>
- <output message="tns:Test1Response"/>
- <fault name="FaultTwo" message="tns:FaultTwo"/>
- </operation>
- </portType>
-
- <binding name="TestBinding" type="tns:Test">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="test1">
- <soap:operation soapAction=""/>
- <input>
- <soap:body use="literal" part="params1"/>
- <soap:header message="tns:Test2Request" part="params2" use="literal">
- <soap:headerfault message="tns:FaultOne" part="reason1" use="literal"/>
- <soap:headerfault message="tns:FaultOne" part="reason3" use="literal"/>
- </soap:header>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- <fault name="FaultTwo">
- <soap:fault name="FaultTwo" use="literal"/>
- </fault>
- </operation>
- </binding>
-
- <service name="TestService">
- <port name="TestPort" binding="tns:TestBinding">
- <soap:address location="http://test.org/test"/>
- </port>
- </service>
-
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
deleted file mode 100644
index 20a2fdf..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="soapfaults.wsdl"
- packageName="soapfaults"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
deleted file mode 100644
index bb3634b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="soapfaults.wsdl"
- packageName="soapfaultsejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
deleted file mode 100644
index ffdf922..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
+++ /dev/null
@@ -1,37 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="stubproperties"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="web.xml" value="descriptor/web.xml"/>
-<property name="ejbjar.files" value="${build.classes.dir}"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="webservices.xml" value="webservices.xml"/>
-<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
deleted file mode 100644
index 48f3172..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
+++ /dev/null
@@ -1,148 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="JAXRPC Stub Properties test" default="all" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
-<!-- NOTE. the simple mapping test and full mapping test can
- only be run one at a time, I didn't want to set up two
- tests for this. -->
-<!--
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
--->
-
- <target name="all" depends="assemble, deploy, run, undeploy"/>
-
- <target name="compile" depends="compile-web">
- <antcall target="compile-common">
- <param name="src" value="stubprops"/>
- </antcall>
- </target>
-
- <target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/SayHelloMapping_ejb.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir}/META-INF/wsdl config-interface.xml"/>
- </antcall>
- </target>
-
- <target name="assemble-ejb" depends="init-common, compile, gen-ejb-wsdl">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
- <copy todir="${build.classes.dir}/WEB-INF/wsdl"
- file="${build.classes.dir}/META-INF/wsdl/SayHelloService.wsdl"/>
- <copy todir="." file="descriptor/webservices.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes" value="SayHelloMapping_ejb.xml,META-INF/wsdl/**,stubprops/Simple*.class"/>
- </antcall>
- <delete file="webservices.xml"/>
- </target>
-
-
- <target name="assemble-web" depends="init-common, compile, gen-web-wsdl">
- <copy todir="." file="../shared/war/webservices.xml"/>
- <copy todir="${build.classes.dir}/WEB-INF" file="${sun-web.xml}"/>
- <replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webHost@" value="${http.host}"/>
- <replace file="${build.classes.dir}/WEB-INF/sun-web.xml" token="@webPort@" value="${http.port}"/>
- <antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
- <param name="sun-web.xml" value="${build.classes.dir}/WEB-INF/sun-web.xml"/>
- <param name="mappingfile.location" value="${build.classes.dir}"/>
- <param name="mappingfile.name" value="WebServiceTestMapping.xml"/>
- <param name="wsdlfile.location" value="${build.classes.dir}"/>
- <param name="wsdlfile.name" value="WebServiceServletTest.wsdl"/>
- <param name="webwar.classes" value="SayHelloMapping_ejb.xml,WebServiceTestMapping.xml,WEB-INF/wsdl/**,stubprops/TestServlet.class, test/*.class"/>
- </antcall>
- <jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <fileset dir="${build.classes.dir}" casesensitive="yes">
- <include name="WEB-INF/wsdl/SayHelloService.wsdl"/>
- <include name="SayHelloMapping_ejb.xml"/>
- </fileset>
- </jar>
- <delete file="webservices.xml"/>
- </target>
-
- <target name="compile-web" depends="">
- <antcall target="compile-common">
- <param name="src" value="../shared/war"/>
- </antcall>
- </target>
-
- <target name="gen-web-wsdl" depends="init-common">
- <!--<mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/> -->
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-define -mapping ${build.classes.dir}/WebServiceTestMapping.xml -cp ${build.classes.dir} -keep -d ${build.classes.dir} ../shared/war/config.xml"/>
- </antcall>
- </target>
-
- <target name="assemble" depends="assemble-ejb, assemble-web, assemble-client"/>
-
- <target name="assemble-client" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <unjar src="${env.APS_HOME}/lib/reporter.jar"
- dest="${build.classes.dir}"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="Client.class, test/**,com/**" />
- </antcall>
- <move file="${assemble.dir}/${appname}-client.jar" toFile="${assemble.dir}/${appname}AppClient.jar"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/WebServiceTestServlet/WebServiceTestService"/>
- </antcall>
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-jar-common"/>
- <antcall target="deploy-war-common">
- <param name="contextroot" value="WebServiceTestServlet"/>
- </antcall>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- <antcall target="undeploy-jar-common"/>
- </target>
-
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
deleted file mode 100644
index 11a1660..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-import java.net.URL;
-import javax.xml.rpc.ServiceFactory;
-import javax.xml.rpc.Service;
-import javax.xml.rpc.Call;
-import javax.xml.namespace.QName;
-
-
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-import test.webservice.WebServiceTest;
-
-/**
- *
- * @author dochez
- */
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main(String[] args) {
- stat.addDescription("webservices-web-stubs-properties");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-web-stubs-properties");
- }
-
- public void doTest(String[] args) {
- try {
- dynamic(args);
- stat.addStatus("web-stubs-properties Dynamic Proxy", stat.PASS);
- } catch(Exception e) {
- System.out.println("Failure " + e.getMessage());
- e.printStackTrace();
- stat.addStatus("web-stubs-properties Dynamic Proxy", stat.FAIL);
- }
- }
-
- public void dynamic(String[] args) throws Exception {
- String endpoint = args[0];
- System.out.println("Invoking dynamic proxies with endpoint at " + endpoint);
- URL wsdlURL = new URL(endpoint+"?WSDL");
- ServiceFactory factory = ServiceFactory.newInstance();
- Service service = factory.createService(wsdlURL,
- new QName("urn:WebServiceTest","WebServiceServletTest"));
- System.out.println("Obtained Service");
- WebServiceTest intf = (WebServiceTest) service.getPort(
- new QName("urn:WebServiceTest","WebServiceTestPort"),
- WebServiceTest.class);
- String[] params = new String[1];
- params[0] = " from client";
- System.out.println(intf.doTest(params));
- }
-
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF
deleted file mode 100644
index cc0dbf6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: Client
\ No newline at end of file
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
deleted file mode 100644
index 5c9ef91..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
- packageName="stubprops">
- <interface name="stubprops.SimpleServer"/>
- </service>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml
deleted file mode 100644
index 7171984..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/application-client.xml
+++ /dev/null
@@ -1,23 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my web stub properties test app client</description>
- <display-name>WebStubProperties</display-name>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml
deleted file mode 100644
index b2bbfeb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>SayHelloEJB</ejb-name>
- <service-endpoint>stubprops.SimpleServer</service-endpoint>
- <ejb-class>stubprops.SimpleServerImpl</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 6fe5532..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,33 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <ejb>
- <ejb-name>SayHelloEJB</ejb-name>
- <jndi-name>SayHelloEJB</jndi-name>
- <webservice-endpoint>
- <port-component-name>SimpleServerPort</port-component-name>
- <endpoint-address-uri>simpleserver/SimpleServer</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
deleted file mode 100644
index 36605da..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/sun-web.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-web-app PUBLIC '-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Servlet 2.4//EN' 'http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-0.dtd'>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-web-app>
- <context-root>WebServiceTestServlet</context-root>
- <servlet>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <webservice-endpoint>
- <port-component-name>Port</port-component-name>
- <debugging-enabled>true</debugging-enabled>
- </webservice-endpoint>
- </servlet>
- <service-ref>
- <service-ref-name>service/SimpleServiceReference</service-ref-name>
- <port-info>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- <stub-property>
- <name>javax.xml.rpc.service.endpoint.address</name>
- <value>http://@webHost@:@webPort@/simpleserver/SimpleServer </value>
- </stub-property>
- </port-info>
- </service-ref>
-</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
deleted file mode 100644
index 283ad48..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
+++ /dev/null
@@ -1,45 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<web-app version="2.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd">
- <context-param>
- <param-name>testclassname</param-name>
- <param-value>stubprops.TestServlet</param-value>
- </context-param>
- <servlet>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <servlet-class>test.webservice.WebServiceTestImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
- <servlet-mapping>
- <servlet-name>test.webservice.WebServiceTestImpl</servlet-name>
- <url-pattern>/WebServiceTestService</url-pattern>
- </servlet-mapping>
- <service-ref>
- <description>service ref for ejb endpoint</description>
- <service-ref-name>service/SimpleServiceReference</service-ref-name>
- <service-interface>javax.xml.rpc.Service</service-interface>
- <wsdl-file>WEB-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SayHelloMapping_ejb.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:WebServiceTest">servicens:SayHelloService</service-qname>
- <port-component-ref>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- </port-component-ref>
- </service-ref>
-</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml
deleted file mode 100644
index 680e350..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>SayHelloService</webservice-description-name>
- <wsdl-file>META-INF/wsdl/SayHelloService.wsdl</wsdl-file>
- <jaxrpc-mapping-file>SayHelloMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>SimpleServerPort</port-component-name>
- <wsdl-port xmlns:servicens="urn:WebServiceTest">servicens:SimpleServerPort</wsdl-port>
- <service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>SayHelloEJB</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README
deleted file mode 100644
index 1ac4e4f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/docroot/README
+++ /dev/null
@@ -1,2 +0,0 @@
-this is a fake directory to work around the
-quicklook hardness problem.
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
deleted file mode 100644
index 8c189bc..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
+++ /dev/null
@@ -1,36 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * SimpleServer.java
- *
- * Created on September 13, 2004, 11:23 AM
- */
-
-package stubprops;
-
-import java.rmi.RemoteException;
-import java.rmi.Remote;
-
-/**
- * Simple WebServices Interface
- *
- * @author Jerome Dochez
- */
-public interface SimpleServer extends Remote {
-
- public String sayHello(String who) throws RemoteException;
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
deleted file mode 100644
index 21e33bb..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
+++ /dev/null
@@ -1,60 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * SimpleServerImpl.java
- *
- * Created on September 13, 2004, 11:24 AM
- */
-
-package stubprops;
-
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
-
-/**
- *
- * @author dochez
- */
-public class SimpleServerImpl implements SessionBean {
-
- SessionContext sc;
-
- /** Creates a new instance of SimpleServerImpl */
- public SimpleServerImpl() {
- }
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
-}
-
- public String sayHello(String who) throws RemoteException {
- return "hello" + who;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
deleted file mode 100644
index 94706ff..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
+++ /dev/null
@@ -1,78 +0,0 @@
-/*
- * Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-/*
- * TestServlet.java
- *
- * Created on September 13, 2004, 3:16 PM
- */
-
-package stubprops;
-
-import test.webservice.WebServiceTest;
-import java.rmi.RemoteException;
-import javax.naming.InitialContext;
-import javax.xml.rpc.Service;
-
-
-/**
- *
- * @author dochez
- */
-public class TestServlet implements WebServiceTest {
-
- SimpleServer port;
-
- /** Creates a new instance of TestServlet */
- public TestServlet() {
- System.out.println("Test servlet instantiated");
- }
-
- public String doTest(String[] parameters) throws RemoteException {
-
- System.out.println("Test servlet invoked");
- Service ref;
- try {
- InitialContext ic = new InitialContext();
- ref = (Service) ic.lookup("java:comp/env/service/SimpleServiceReference");
- } catch(javax.naming.NamingException e) {
- e.printStackTrace();
- return "Failed - " + e.getMessage();
- }
- if (ref==null) {
- System.out.println("failure : cannot get service ref");
- return "Failed - Cannot get ref";
- }
- try {
- java.util.Iterator itr = ref.getPorts();
- while (itr.hasNext()) {
- System.out.println(itr.next());
-
- }
-
- port = (SimpleServer) ref.getPort(SimpleServer.class);
- } catch(javax.xml.rpc.ServiceException e) {
- e.printStackTrace();
- System.out.println("Failed - Cannot get port");
- return "Failed - " + e.getMessage();
- }
- if (port==null) {
- System.out.println("failure : cannot get port");
- return "Failed - Cannot get port";
- }
- return port.sayHello(parameters[0]);
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
index 348af5c..10b344b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.xml
@@ -33,51 +33,54 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy"/>
+ <target name="all" depends="clean, setup-ejb, assemble-client, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar"/>
+ <target name="setup-ejb" depends="assemble-ejb, deploy-ejb-jar" />
- <target name="assemble-ejb" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
+ <target name="assemble-ejb" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
- <antcall target="pkg-ejb-jar">
- <param name="jar.classes" value="endpoint"/>
- <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar"/>
- </antcall>
+ <antcall target="pkg-ejb-jar">
+ <param name="jar.classes" value="endpoint" />
+ <param name="jar.file" value="${assemble.dir}/${appname}-ejb.jar" />
+ </antcall>
- </target>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL"/>
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -p wls_dd.service_endpoint_address.client -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/service?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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -p wls_dd.service_endpoint_address.client -d ${build.classes.dir}/client http://${http.host}:${http.port}/${appname}/service?WSDL"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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-ejb-jar">
- <antcall target="deploy-jar-common"/>
- </target>
+ <target name="deploy-ejb-jar">
+ <antcall target="deploy-jar-common" />
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-jar-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-jar-common" />
+ </target>
- <target name="runclient">
- <antcall target="run-client">
- <param name="client-class" value="wls_dd.service_endpoint_address.client.Client"/>
- <param name="other-args" value="async-ejb-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="wls_dd.service_endpoint_address.client.Client" />
+ <param name="other-args" value="async-ejb-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
index 78d64b5..11fb537 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.xml
@@ -33,69 +33,71 @@
&testproperties;
&jaxwsTools;
- <target name="all" depends="clean, setup, runclient, undeploy"/>
+ <target name="all" depends="clean, setup, runclient, undeploy" />
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- </target>
+ <target name="clean" depends="init-common">
+ <antcall target="clean-common" />
+ </target>
- <target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
+ <target name="setup" depends="assemble-web, deploy-app, assemble-client" />
- <target name="compile" depends="init-common">
- <antcall target="compile-common">
- <param name="src" value="endpoint"/>
- </antcall>
- </target>
+ <target name="compile" depends="init-common">
+ <antcall target="compile-common">
+ <param name="src" value="endpoint" />
+ </antcall>
+ </target>
- <target name="assemble-web" depends="init-common, compile">
+ <target name="assemble-web" depends="init-common, compile">
- <copy file="weblogic-webservices.xml.template" tofile="weblogic-webservices.xml"/>
- <property name="localwsdldir" value="${build.classes.dir}/client" />
- <replace file="${basedir}/weblogic-webservices.xml">
- <replacefilter token="%TOKEN%" value="${localwsdldir}"/>
- </replace>
+ <copy file="weblogic-webservices.xml.template" tofile="weblogic-webservices.xml" />
+ <property name="localwsdldir" value="${build.classes.dir}/client" />
+ <replace file="${basedir}/weblogic-webservices.xml">
+ <replacefilter token="%TOKEN%" value="${localwsdldir}" />
+ </replace>
- <antcall target="pkg-war">
- <param name="wsdlfile.location" value="${basedir}"/>
- <param name="wsdlfile.name" value="AddNumbersService.wsdl"/>
- <param name="schemafile.location" value="${basedir}"/>
- <param name="schemafile.name" value="schema1.xsd"/>
+ <antcall target="pkg-war">
+ <param name="wsdlfile.location" value="${basedir}" />
+ <param name="wsdlfile.name" value="AddNumbersService.wsdl" />
+ <param name="schemafile.location" value="${basedir}" />
+ <param name="schemafile.name" value="schema1.xsd" />
- <param name="war.classes" value="${build.classes.dir}"/>
- <param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
- </antcall>
- </target>
+ <param name="war.classes" value="${build.classes.dir}" />
+ <param name="war.file" value="${assemble.dir}/${appname}-web.war" />
+ </antcall>
+ </target>
- <target name="assemble-client" depends="init-common">
- <mkdir dir="${build.classes.dir}/client"/>
- <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL"/>
- <property name="localwsdldir" value="${build.classes.dir}/client" />
- <antcall target="wsimport">
- <param name="wsimport.args"
- value="-keep -p wls_dd.${ant.project.name}.client -d ${build.classes.dir}/client ${localwsdldir}/AddNumbersService.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/**"/>
- </target>
+ <target name="assemble-client" depends="init-common">
+ <mkdir dir="${build.classes.dir}/client" />
+ <echo message="wsimporting http://${http.host}:${http.port}/${appname}/service?WSDL" />
+ <property name="localwsdldir" value="${build.classes.dir}/client" />
+ <antcall target="wsimport">
+ <param name="wsimport.args"
+ value="-keep -p wls_dd.${ant.project.name}.client -d ${build.classes.dir}/client ${localwsdldir}/AddNumbersService.wsdl"
+ />
+ </antcall>
+ <javac srcdir="."
+ destdir="${build.classes.dir}/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">
- <antcall target="deploy-war-common">
- <param name="contextroot" value="${appname}"/>
- </antcall>
- </target>
+ <target name="deploy-app">
+ <antcall target="deploy-war-common">
+ <param name="contextroot" value="${appname}" />
+ </antcall>
+ </target>
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy" depends="init-common">
+ <antcall target="undeploy-war-common" />
+ </target>
- <target name="runclient">
- <!--property name="endpoint.address" value="http://${http.host}:${http.port}/${appname}/service"/-->
- <antcall target="run-client">
- <param name="client-class" value="wls_dd.${ant.project.name}.client.Client"/>
- <param name="other-args" value="async-web-svc-test"/>
- </antcall>
- </target>
+ <target name="runclient">
+ <antcall target="run-client">
+ <param name="client-class" value="wls_dd.${ant.project.name}.client.Client" />
+ <param name="other-args" value="async-web-svc-test" />
+ </antcall>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/README b/appserver/tests/appserv-tests/devtests/webservice/wsi/README
deleted file mode 100644
index 07e7f94..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/README
+++ /dev/null
@@ -1,9 +0,0 @@
-
-this directory contains some unit tests that are meant to touch
-some wsi compliant areas wrt faultcode.
-
-we now have rpc/literal style only.
-
-since CTS does not have any tests on faultcode handling using
-an ejb endpoint, we will exclusive test out just web services
-with ejb endpoints
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
deleted file mode 100644
index 34fd60d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="faultcode"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
deleted file mode 100644
index f3ad3d4..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="faultcode test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/faultcode">
- <fileset dir="output/faultcode"
- includes="SimpleTestService.class, SimpleTest.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/faultcodeejb">
- <fileset dir="output/faultcodeejb"
- includes="SimpleTestService.class, SimpleTest.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="faultcode.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="FaultCodeMapping_appclient.xml,META-INF/wsdl/**,faultcode/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="FaultCodeMapping_ejb.xml,META-INF/wsdl/**,faultcodeejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="faultcode"/>
- <delete dir="faultcodeejb"/>
- <delete file="FaultCodeMapping_ejb.xml"/>
- <delete file="FaultCodeMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/faultcodeejb/FaultCodeTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping FaultCodeMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping FaultCodeMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
deleted file mode 100644
index 4db8f10..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
+++ /dev/null
@@ -1,75 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package faultcode;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-faultcode");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-faultcodeID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- SimpleTestService testService =
- (SimpleTestService) ic.lookup("java:comp/env/service/faultcode");
- SimpleTest test = testService.getSimpleTest();
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
-
- //SingleWildcardType c = new SingleWildcardType(8, "Single", new SOAPElement());
-/*
- SingleWildcardType c = new SingleWildcardType(8, "Single", "BUGGGY how to do single soapelement");
-
- String[] dd = new String[2];
- dd[0] = "wild";
- dd[1] = "card";
- RepeatedWildcardType d = new RepeatedWildcardType(88, "Repeated", new SOAPElement[0]);
-
- int ret = test.test1(888, c, d);
-
- System.out.println("RETURN LUCKY NUMBER = " + ret);
-*/
- stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
- System.out.println("xsdany client test failed");
- ex.printStackTrace();
- stat.addStatus("xsdanyclient main", stat.FAIL);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF
deleted file mode 100644
index cb2a281..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: xsdany.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml
deleted file mode 100644
index 2bfe80e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="XsdAnyMapping_ejb.xml"
- wsdlLocation="xsdany.wsdl"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
deleted file mode 100644
index 1ccab9c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my faultcode app client</description>
- <display-name>faultcodeClient</display-name>
- <service-ref>
- <description>faultcode service ref</description>
- <service-ref-name>service/faultcode</service-ref-name>
- <service-interface>faultcode.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/faultcode.wsdl</wsdl-file>
- <jaxrpc-mapping-file>FaultCodeMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml
deleted file mode 100644
index 645b137..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>FaultCodeApp</display-name>
- <module>
- <java>faultcode-client.jar</java>
- </module>
- <module>
- <ejb>faultcode-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml
deleted file mode 100644
index 0717702..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>FaultCodeEjb</ejb-name>
- <service-endpoint>faultcodeejb.Test</service-endpoint>
- <ejb-class>faultcodeejb.FaultCodeEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>FaultCodeEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml
deleted file mode 100644
index 5a9d210..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,36 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/faultcode</service-ref-name>
- <port-info>
- <service-endpoint-interface>faultcode.Test</service-endpoint-interface>
- <stub-property>
- <name>com.sun.enterprise.webservice.client.transport.log</name>
- <value>file:jaxrpc.log</value>
- </stub-property>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 01e36b6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>FaultCodeEjb</ejb-name>
- <jndi-name>FaultCodeEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>faultcode/FaultCodeTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml
deleted file mode 100644
index a796148..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>FaultCodeWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/faultcode.wsdl</wsdl-file>
- <jaxrpc-mapping-file>FaultCodeMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:faultcodens="urn:test">faultcodens:TestPort</wsdl-port>
- <service-endpoint-interface>faultcodeejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>FaultCodeEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
deleted file mode 100644
index 55734c9..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
+++ /dev/null
@@ -1,52 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package faultcodeejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-import javax.xml.rpc.handler.MessageContext;
-
-public class FaultCodeEJB implements SessionBean {
- private SessionContext sc;
-
- public FaultCodeEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In FaultCodeEJB::ejbCreate !!");
- }
-
- public String echoString(String body) {
- System.out.println("In FaultCodeEJB:: echoString = " + body);
- return body;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl
deleted file mode 100644
index c04d055..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/faultcode.wsdl
+++ /dev/null
@@ -1,61 +0,0 @@
-<?xml version="1.0"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions name="urn:SimpleTest"
- targetNamespace="urn:SimpleTest"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soapenc="http://schemas.xmlsoap.org/soap/encoding/"
- xmlns:tns="urn:SimpleTest"
- xmlns:s="http://SimpleTest.org/xsd"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/">
-
- <types/>
-
- <message name="echoString">
- <part name="body" type="xsd:string"/>
- </message>
- <message name="echoStringResponse">
- <part name="return" type="xsd:string"/>
- </message>
-
- <portType name="SimpleTest">
- <operation name="echoString" parameterOrder="body" >
- <input message="tns:echoString"/>
- <output message="tns:echoStringResponse"/>
- </operation>
- </portType>
-
- <binding name="SimpleTestBinding" type="tns:SimpleTest">
- <soap:binding style="rpc"
- transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="echoString">
- <soap:operation soapAction="http://SimpleTest.org/"/>
- <input> <soap:body use="literal" namespace="http://SimpleTest.org/xsd"/> </input>
- <output> <soap:body use="literal" namespace="http://SimpleTest.org/xsd"/> </output>
- </operation>
- </binding>
-
- <service name="SimpleTestService">
- <port name="SimpleTest" binding="tns:SimpleTestBinding">
- <soap:address location="http://localhost:1024/rpclit/SimpleTest"/>
- </port>
- </service>
-</definitions>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
deleted file mode 100644
index 1dde122..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="faultcode.wsdl"
- packageName="faultcode"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
deleted file mode 100644
index af5e53f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="faultcode.wsdl"
- packageName="faultcodeejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
deleted file mode 100644
index 458c819..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
+++ /dev/null
@@ -1,33 +0,0 @@
-<!--
-
- Copyright (c) 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-
-<property name="module" value="xsdany"/>
-<property name="appname" value="${module}"/>
-<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client" value="Client"/>
-<property name="application.xml" value="descriptor/application.xml"/>
-<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="ejb-jar.xml" value="descriptor/ejb-jar.xml"/>
-<property name="webservices.xml" value="descriptor/webservices.xml"/>
-<property name="sun-ejb-jar.xml" value="descriptor/sun-ejb-jar.xml"/>
-<property name="application-client.xml" value="descriptor/application-client.xml"/>
-<property name="sun-application-client.xml" value="descriptor/sun-application-client.xml"/>
-<property name="appclientjar.files" value="${build.classes.dir}"/>
-<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
-<property name="app.type" value="application"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
deleted file mode 100644
index fc34f06..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
+++ /dev/null
@@ -1,149 +0,0 @@
-<!--
-
- Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<!DOCTYPE project [
-<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
-<!ENTITY testproperties SYSTEM "file:./build.properties">
-]>
-
-<project name="xsd test" default="usage" basedir=".">
-
- <!-- include common.xml and testcommon.xml -->
- &commonSetup;
- &commonBuild;
- &testproperties;
-
- <target name="all" depends="clean,build,deploy,run,undeploy"/>
-
-
- <target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
- </target>
-
- <target name="compile" depends="">
- <antcall target="compile-common">
- <param name="src" value="client"/>
- </antcall>
- <antcall target="compile-common">
- <param name="src" value="ejb"/>
- </antcall>
- </target>
-
- <target name="build" depends="init-common, clean">
- <antcall target="gen-mapping-appclient"/>
- <antcall target="gen-mapping-ejb"/>
- <antcall target="wscompile-appclient"/>
- <antcall target="wscompile-ejb"/>
- <antcall target="assemble"/>
- </target>
-
- <target name="wscompile-appclient" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_appclient.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/xsdany">
- <fileset dir="output/xsdany"
- includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="wscompile-ejb" depends="init-common">
- <mkdir dir="output"/>
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-import -keep -d output -s output -classpath . wscompile_config_ejb.xml"/>
- </antcall>
- <copy todir="${build.classes.dir}/xsdanyejb">
- <fileset dir="output/xsdanyejb"
- includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
- </copy>
- <delete dir="output"/>
- </target>
-
- <target name="assemble" depends="init-common, compile">
- <copy todir="${build.classes.dir}/META-INF/wsdl"
- file="xsdany.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_appclient.xml"/>
- <antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
- value="XsdAnyMapping_appclient.xml,META-INF/wsdl/**,xsdany/*.class" />
-
- </antcall>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_ejb.xml"/>
- <antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
- value="XsdAnyMapping_ejb.xml,META-INF/wsdl/**,xsdanyejb/*.class" />
-
- </antcall>
- <antcall target="ear-common" />
- </target>
-
- <target name="deploy"
- depends="init-common">
- <antcall target="deploy-common"/>
- </target>
-
- <target name="clean" depends="init-common">
- <antcall target="clean-common"/>
- <delete dir="output"/>
- <delete dir="xsdany"/>
- <delete dir="xsdanyejb"/>
- <delete file="XsdAnyMapping_ejb.xml"/>
- <delete file="XsdAnyMapping_appclient.xml"/>
- <delete file="jaxrpc.log"/>
- </target>
-
- <target name="run" depends="init-common">
- <antcall target="runclient-common">
- <param name="appclient.application.args" value="http://${http.host}:${http.port}/xsdanyejb/XsdAnyTest"/>
- </antcall>
- </target>
-
- <target name="undeploy" depends="init-common">
- <antcall target="undeploy-common"/>
- </target>
-
- <target name="gen-mapping-appclient" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping XsdAnyMapping_appclient.xml wscompile_config_appclient.xml"/>
- </antcall>
- </target>
-
- <target name="gen-mapping-ejb" depends="init-common">
- <antcall target="run.wscompile">
- <param name="wscompile.command"
- value="-gen -cp . -mapping XsdAnyMapping_ejb.xml wscompile_config_ejb.xml"/>
- </antcall>
- </target>
-
- <target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
- </target>
-</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
deleted file mode 100644
index 696658d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
+++ /dev/null
@@ -1,73 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package xsdany;
-
-import java.io.*;
-import java.util.*;
-import javax.naming.*;
-import javax.xml.rpc.Stub;
-import jakarta.xml.soap.SOAPElement;
-import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-
-public class Client {
-
- private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
-
- public static void main (String[] args) {
- stat.addDescription("webservices-xsdany");
- Client client = new Client();
- client.doTest(args);
- stat.printSummary("webservices-xsdanyID");
- }
-
- public void doTest(String[] args) {
- try {
-
- String targetEndpointAddress = args[0];
-
- Context ic = new InitialContext();
-
- TestService testService =
- (TestService) ic.lookup("java:comp/env/service/xsdany");
- Test test = testService.getTestPort();
-
- ((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
-
- System.out.println("endpoint address = " + targetEndpointAddress);
-
- //SingleWildcardType c = new SingleWildcardType(8, "Single", new SOAPElement());
- SingleWildcardType c = new SingleWildcardType(8, "Single", "BUGGGY how to do single soapelement");
-
- String[] dd = new String[2];
- dd[0] = "wild";
- dd[1] = "card";
- RepeatedWildcardType d = new RepeatedWildcardType(88, "Repeated", new SOAPElement[0]);
-
- int ret = test.test1(888, c, d);
-
- System.out.println("RETURN LUCKY NUMBER = " + ret);
- stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
- System.out.println("xsdany client test failed");
- ex.printStackTrace();
- stat.addStatus("xsdanyclient main", stat.FAIL);
- }
- }
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF
deleted file mode 100644
index cb2a281..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/MANIFEST.MF
+++ /dev/null
@@ -1,2 +0,0 @@
-Manifest-Version: 1.0
-Main-Class: xsdany.Client
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml
deleted file mode 100644
index 2bfe80e..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/config.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <j2eeMappingFile
- location="XsdAnyMapping_ejb.xml"
- wsdlLocation="xsdany.wsdl"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
deleted file mode 100644
index f018ec8..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application-client version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application-client_1_4.xsd">
- <description>This is my xsdany app client</description>
- <display-name>xsdanyClient</display-name>
- <service-ref>
- <description>xsdany service ref</description>
- <service-ref-name>service/xsdany</service-ref-name>
- <service-interface>xsdany.TestService</service-interface>
- <wsdl-file>META-INF/wsdl/xsdany.wsdl</wsdl-file>
- <jaxrpc-mapping-file>XsdAnyMapping_appclient.xml</jaxrpc-mapping-file>
- <service-qname xmlns:servicens="urn:test">servicens:TestService
- </service-qname>
- </service-ref>
-</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml
deleted file mode 100644
index 9329a49..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application.xml
+++ /dev/null
@@ -1,29 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<application version="1.4" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/application_1_4.xsd">
- <description>Application description</description>
- <display-name>XsdAnyApp</display-name>
- <module>
- <java>xsdany-client.jar</java>
- </module>
- <module>
- <ejb>xsdany-ejb.jar</ejb>
- </module>
-</application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml
deleted file mode 100644
index e09a41c..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/ejb-jar.xml
+++ /dev/null
@@ -1,41 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<ejb-jar version="2.1" xmlns="http://java.sun.com/xml/ns/j2ee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/ejb-jar_2_1.xsd">
- <display-name>Ejb1</display-name>
- <enterprise-beans>
- <session>
- <ejb-name>XsdAnyEjb</ejb-name>
- <service-endpoint>xsdanyejb.Test</service-endpoint>
- <ejb-class>xsdanyejb.XsdAnyEJB</ejb-class>
- <session-type>Stateless</session-type>
- <transaction-type>Container</transaction-type>
- </session>
- </enterprise-beans>
- <assembly-descriptor>
- <container-transaction>
- <method>
- <ejb-name>XsdAnyEjb</ejb-name>
- <method-intf>ServiceEndpoint</method-intf>
- <method-name>*</method-name>
- </method>
- <trans-attribute>Required</trans-attribute>
- </container-transaction>
- </assembly-descriptor>
-</ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml
deleted file mode 100644
index 6c87a9d..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-application-client.xml
+++ /dev/null
@@ -1,32 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-application-client PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 Application Client 1.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-application-client_1_4-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-application-client>
- <service-ref>
- <service-ref-name>service/xsdany</service-ref-name>
- <port-info>
- <service-endpoint-interface>xsdany.Test</service-endpoint-interface>
- </port-info>
- <service-qname>
- <namespaceURI>urn:TestService</namespaceURI>
- <localpart>TestService</localpart>
- </service-qname>
- </service-ref>
-</sun-application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml
deleted file mode 100644
index 33e357f..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/sun-ejb-jar.xml
+++ /dev/null
@@ -1,37 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!DOCTYPE sun-ejb-jar PUBLIC "-//Sun Microsystems, Inc.//DTD Sun ONE Application Server 8.0 EJB 2.1//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-ejb-jar_2_1-0.dtd">
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<sun-ejb-jar>
- <enterprise-beans>
- <unique-id>0</unique-id>
- <ejb>
- <ejb-name>XsdAnyEjb</ejb-name>
- <jndi-name>XsdAnyEjb</jndi-name>
- <pass-by-reference>false</pass-by-reference>
- <is-read-only-bean>false</is-read-only-bean>
- <refresh-period-in-seconds>-1</refresh-period-in-seconds>
- <gen-classes/>
- <webservice-endpoint>
- <port-component-name>TestPort</port-component-name>
- <endpoint-address-uri>xsdanyejb/XsdAnyTest</endpoint-address-uri>
- </webservice-endpoint>
- </ejb>
- </enterprise-beans>
-</sun-ejb-jar>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml
deleted file mode 100644
index 121427a..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/webservices.xml
+++ /dev/null
@@ -1,40 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<webservices xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
- http://www.ibm.com/webservices/xsd/j2ee_web_services_1_1.xsd"
- version="1.1">
- <description>desc</description>
- <webservice-description>
- <webservice-description-name>XsdAnyWebServiceEjb</webservice-description-name>
- <wsdl-file>META-INF/wsdl/xsdany.wsdl</wsdl-file>
- <jaxrpc-mapping-file>XsdAnyMapping_ejb.xml</jaxrpc-mapping-file>
- <port-component>
- <description>port component description</description>
- <port-component-name>TestPort</port-component-name>
- <wsdl-port xmlns:xsdanyns="urn:test">xsdanyns:TestPort</wsdl-port>
- <service-endpoint-interface>xsdanyejb.Test</service-endpoint-interface>
- <service-impl-bean>
- <ejb-link>XsdAnyEjb</ejb-link>
- </service-impl-bean>
- </port-component>
- </webservice-description>
-</webservices>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
deleted file mode 100644
index 9488540..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
+++ /dev/null
@@ -1,72 +0,0 @@
-/*
- * Copyright (c) 2002, 2018 Oracle and/or its affiliates. All rights reserved.
- *
- * This program and the accompanying materials are made available under the
- * terms of the Eclipse Public License v. 2.0, which is available at
- * http://www.eclipse.org/legal/epl-2.0.
- *
- * This Source Code may also be made available under the following Secondary
- * Licenses when the conditions for such availability set forth in the
- * Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- * version 2 with the GNU Classpath Exception, which is available at
- * https://www.gnu.org/software/classpath/license.html.
- *
- * SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
- */
-
-package xsdanyejb;
-
-import java.io.Serializable;
-import java.rmi.RemoteException;
-import jakarta.ejb.SessionBean;
-import jakarta.ejb.SessionContext;
-import jakarta.ejb.EJBException;
-import javax.naming.*;
-import javax.xml.rpc.handler.MessageContext;
-
-public class XsdAnyEJB implements SessionBean {
- private SessionContext sc;
-
- public XsdAnyEJB(){}
-
- public void ejbCreate() throws RemoteException {
- System.out.println("In XsdAnyEJB::ejbCreate !!");
- }
-
- public int test1(int a,
- xsdanyejb.SingleWildcardType c,
- xsdanyejb.RepeatedWildcardType d)
- throws java.rmi.RemoteException
- {
- MessageContext msgContext = sc.getMessageContext();
- System.out.println("msgContext = " + msgContext);
-
- System.out.println("XsdAnyEJB.test1() called with ");
- System.out.println("a = " + a);
-
- System.out.println("SingleWildcardType.foo = " + c.getFoo());
- System.out.println("SingleWildcardType.bar = " + c.getBar());
- //System.out.println("SingleWildcardType._any = " + c.get_any());
- System.out.println("SingleWildcardType._any = " + c.getVoo());
-
- System.out.println("RepeatedWildcardType.foo = " + d.getFoo());
- System.out.println("RepeatedWildcardType.bar = " + d.getBar());
- System.out.println("RepeatedWildcardType._any = " + d.get_any());
-
- System.out.println("GoogleEJB returning " + a);
-
- return a;
- }
-
- public void setSessionContext(SessionContext sc) {
-
- this.sc = sc;
- }
-
- public void ejbRemove() throws RemoteException {}
-
- public void ejbActivate() {}
-
- public void ejbPassivate() {}
-
-}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
deleted file mode 100644
index bcb953b..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="xsdany.wsdl"
- packageName="xsdany"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
deleted file mode 100644
index cc2b737..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
+++ /dev/null
@@ -1,25 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
- location="xsdany.wsdl"
- packageName="xsdanyejb"/>
-</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl b/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl
deleted file mode 100644
index 6f44fc6..0000000
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/xsdany.wsdl
+++ /dev/null
@@ -1,116 +0,0 @@
-<!--
-
- Copyright (c) 2017, 2018 Oracle and/or its affiliates. All rights reserved.
-
- This program and the accompanying materials are made available under the
- terms of the Eclipse Public License v. 2.0, which is available at
- http://www.eclipse.org/legal/epl-2.0.
-
- This Source Code may also be made available under the following Secondary
- Licenses when the conditions for such availability set forth in the
- Eclipse Public License v. 2.0 are satisfied: GNU General Public License,
- version 2 with the GNU Classpath Exception, which is available at
- https://www.gnu.org/software/classpath/license.html.
-
- SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-
--->
-
-<definitions
- name="HelloTest"
- targetNamespace="urn:test"
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:ttns="urn:test:types"
- xmlns:tns="urn:test">
-
- <types>
- <xsd:schema targetNamespace="urn:test:types">
-
- <xsd:element name="Test1Request" type="ttns:Test1RequestType"/>
- <xsd:complexType name="Test1RequestType">
- <xsd:sequence>
- <xsd:element name="a" type="xsd:int"/>
-<!-- XXX BUG. Can't handle this
- <xsd:element name="b" type="ttns:ComplexTypeSimpleContentType"/>
--->
- <xsd:element name="c" type="ttns:SingleWildcardType"/>
- <xsd:element name="d" type="ttns:RepeatedWildcardType"/>
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:element name="Test1Response" type="ttns:Test1ResponseType"/>
- <xsd:complexType name="Test1ResponseType">
- <xsd:sequence>
- <xsd:element name="a" type="xsd:int"/>
- </xsd:sequence>
- </xsd:complexType>
-
-<!-- XXX BUG. Can't handle this.
- <xsd:complexType name="ComplexTypeSimpleContentType">
- <xsd:simpleContent>
- <xsd:extension base="xsd:string">
- <xsd:attribute name="foo" type="xsd:int"/>
- </xsd:extension>
- </xsd:simpleContent>
- </xsd:complexType>
--->
-
- <xsd:complexType name="SingleWildcardType">
- <xsd:sequence>
- <xsd:element name="foo" type="xsd:int"/>
- <xsd:element name="bar" type="xsd:string"/>
- <xsd:element name="voo" type="xsd:string"/>
-<!-- XXX BUG. How to write the client??
- <xsd:any namespace="##other" processContents="lax"/>
--->
- </xsd:sequence>
- </xsd:complexType>
-
- <xsd:complexType name="RepeatedWildcardType">
- <xsd:sequence>
- <xsd:element name="foo" type="xsd:int"/>
- <xsd:element name="bar" type="xsd:string"/>
- <xsd:any namespace="##other" minOccurs="0" maxOccurs="unbounded" processContents="lax"/>
- </xsd:sequence>
- </xsd:complexType>
-
- </xsd:schema>
- </types>
-
- <message name="Test1Request">
- <part name="params" element="ttns:Test1Request"/>
- </message>
-
- <message name="Test1Response">
- <part name="result" element="ttns:Test1Response"/>
- </message>
-
- <portType name="Test">
- <operation name="test1">
- <input message="tns:Test1Request"/>
- <output message="tns:Test1Response"/>
- </operation>
- </portType>
-
- <binding name="TestBinding" type="tns:Test">
- <soap:binding style="document" transport="http://schemas.xmlsoap.org/soap/http"/>
- <operation name="test1">
- <soap:operation soapAction="urn:test:hello"/>
- <input>
- <soap:body use="literal"/>
- </input>
- <output>
- <soap:body use="literal"/>
- </output>
- </operation>
- </binding>
-
- <service name="TestService">
- <port name="TestPort" binding="tns:TestBinding">
- <soap:address location="http://test.org/test"/>
- </port>
- </service>
-
-</definitions>
