Trimming trailing spaces, removing tabs by a script
- using tab width of 4 spaces
- trailing space in property files is converted to unicode, so it is
visible in sources
- bat files use CRLF
- all other text files use just LF
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 fe4aaf9..e6fb687 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/annotations-common.xml
@@ -17,7 +17,7 @@
-->
<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property file="${env.APS_HOME}/config.properties"/>
<target name="all" depends="clean, compile, run, undeploy, report"/>
@@ -39,21 +39,21 @@
<target name="compile">
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<property name="class-name" value="${pkg-name}/${server}.class"/>
<echo message="Compiling into ${pkg-name}/${server}.class"/>
- <javac srcdir="." destdir="${env.S1AS_HOME}/domains/domain1/autodeploy"
+ <javac srcdir="." destdir="${env.S1AS_HOME}/domains/domain1/autodeploy"
includes="${src-name}">
<classpath refid="classpath"/>
</javac>
</target>
<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"
+ <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"
includes="${client-src-name}"/>
</target>
@@ -64,7 +64,7 @@
<target name="undeploy">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<property name="class-name" value="${pkg-name}/${server}.class"/>
<echo message="Removing file ${class-name} from autodeploy directory"/>
<delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}"/>
@@ -83,7 +83,7 @@
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
</target>
<target name="run">
@@ -108,17 +108,17 @@
<target name="internal-run" if="deploy_succeeded">
<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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
<echo message="wsimporting http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
- <antcall target="compile-client"/>
+ <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="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
index b084c54..3175825 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="asyncservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 817d668..36dfdfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/build.xml
@@ -63,8 +63,8 @@
<param name="wsimport.args"
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"
+ <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>
@@ -77,7 +77,7 @@
<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"/>
@@ -85,7 +85,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
index 6515a93..c895282 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/client/Client.java
@@ -37,23 +37,23 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("async-service");
+ stat.addDescription("async-service");
Client client = new Client();
client.doSyncTest();
client.doASyncPollTest();
client.doASyncCallBackTest();
- stat.printSummary("async-service");
+ stat.printSummary("async-service");
}
public void doSyncTest() {
try {
AddNumbersImpl port = service.getAddNumbersImplPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-sync-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-sync-test", stat.PASS);
} catch(Exception e) {
@@ -70,11 +70,11 @@
Thread.sleep (2000);
AddNumbersResponse output = resp.get();
int ret = output.getReturn();
- if(ret!=(1234+5678)) {
+ if(ret!=(1234+5678)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-poll-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-poll-test", stat.PASS);
} catch(Exception e) {
@@ -92,11 +92,11 @@
Thread.sleep (2000);
AddNumbersResponse output = cbh.getResponse ();
int ret = output.getReturn();
- if(ret!=(9876+5432)) {
+ if(ret!=(9876+5432)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-service-callbackhandler-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-service-callbackhandler-test", stat.PASS);
} catch(Exception e) {
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 f30c7ae..dfd257c 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
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/asyncservice/webservice/AsyncService?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
index e667727..64faaf9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/async/web.xml
@@ -18,17 +18,17 @@
-->
<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>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AsyncService</url-pattern>
- </servlet-mapping>
+ 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>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AsyncService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
index ff5e0a8..a655b9b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/build.xml
@@ -21,46 +21,46 @@
]>
<project name="servlet endpoint annotations" default="all" basedir=".">
<target name="all">
- <ant dir="noname" target="all"/>
- <ant dir="noname2" target="all"/>
- <!--ant dir="externalwsdl" target="all"/-->
+ <ant dir="noname" target="all"/>
+ <ant dir="noname2" target="all"/>
+ <!--ant dir="externalwsdl" target="all"/-->
- <ant dir="dol-override-1" target="all"/>
+ <ant dir="dol-override-1" target="all"/>
<ant dir="webservices13-addressing" target="all"/>
<ant dir="webserviceref-lookup" target="all"/>
<ant dir="webservices13-addressing-2" target="all"/>
- <ant dir="provider" target="all"/>
- <ant dir="svchandler-1" target="all"/>
- <ant dir="svchandler-2" target="all"/>
- <ant dir="svchandler-3" target="all"/>
- <ant dir="svchandler-4" target="all"/>
- <ant dir="client-handler-1" target="all"/>
- <ant dir="client-handler-2" target="all"/>
- <ant dir="mtom" target="all"/>
- <ant dir="containerresolver" target="all"/>
- <ant dir="endpointaddress" target="all"/>
- <ant dir="fault" target="all"/>
- <ant dir="webservicerefs" target="all"/>
- <ant dir="warservice" target="all"/>
- <ant dir="wsdltojava" target="all"/>
- <ant dir="wsctxt" target="all"/>
- <ant dir="soap12" target="all"/>
- <ant dir="oneway" target="all"/>
- <ant dir="msgctxt" target="all"/>
- <ant dir="nowebxml" target="all"/>
+ <ant dir="provider" target="all"/>
+ <ant dir="svchandler-1" target="all"/>
+ <ant dir="svchandler-2" target="all"/>
+ <ant dir="svchandler-3" target="all"/>
+ <ant dir="svchandler-4" target="all"/>
+ <ant dir="client-handler-1" target="all"/>
+ <ant dir="client-handler-2" target="all"/>
+ <ant dir="mtom" target="all"/>
+ <ant dir="containerresolver" target="all"/>
+ <ant dir="endpointaddress" target="all"/>
+ <ant dir="fault" target="all"/>
+ <ant dir="webservicerefs" target="all"/>
+ <ant dir="warservice" target="all"/>
+ <ant dir="wsdltojava" target="all"/>
+ <ant dir="wsctxt" target="all"/>
+ <ant dir="soap12" target="all"/>
+ <ant dir="oneway" target="all"/>
+ <ant dir="msgctxt" target="all"/>
+ <ant dir="nowebxml" target="all"/>
<ant dir="webservices13-respectbinding" target="all"/>
- <ant dir="async" target="all"/>
- <ant dir="restful" target="all"/>
- <ant dir="restful-2" target="all"/>
- <ant dir="pkgedwarservice" target="all"/>
- <ant dir="mappedname" target="all"/>
- <!--<ant dir="mbyte" target="all"/>-->
- <ant dir="postconstruct" target="all"/>
-<!-- <ant dir="jaxrpcinjection" target="all"/>
- <ant dir="providerhandler" target="all"/>
- <ant dir="prepkged-svc-1" target="all"/>
- <ant dir="libdependent" target="all"/>
- <ant dir="soaptcp" target="all"/>
+ <ant dir="async" target="all"/>
+ <ant dir="restful" target="all"/>
+ <ant dir="restful-2" target="all"/>
+ <ant dir="pkgedwarservice" target="all"/>
+ <ant dir="mappedname" target="all"/>
+ <!--<ant dir="mbyte" target="all"/>-->
+ <ant dir="postconstruct" target="all"/>
+<!-- <ant dir="jaxrpcinjection" target="all"/>
+ <ant dir="providerhandler" target="all"/>
+ <ant dir="prepkged-svc-1" target="all"/>
+ <ant dir="libdependent" target="all"/>
+ <ant dir="soaptcp" target="all"/>
<ant dir="webservices13-addressing-appclient" target="all"/>
-->
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties
index 77b0a22..08e2c88 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="client-handler-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 9772067..ee5b26f 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
@@ -127,11 +127,11 @@
<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"
+ <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">
@@ -141,7 +141,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
index d8aa2e5..4dc8be1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
index a6b5f5d..1966bea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1109]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
index 398727a..47ea30d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
index 1f79a94..9506719 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef(wsdlLocation="WEB-INF/wsdl/SubtractNumbers.wsdl") SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
index 35d7053..c53b22d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-1/webclient/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -50,7 +50,7 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
@@ -59,7 +59,7 @@
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -69,11 +69,11 @@
}
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties
index 0a7695c..9c5519a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="client-handler-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 7bc8506..b13b122 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
@@ -87,7 +87,7 @@
<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"
- classpathref="class.path"
+ classpathref="class.path"
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"/>
@@ -129,11 +129,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <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">
@@ -143,7 +143,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
index 1860549..9e6865e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1115]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
index 6ee7a2c..4427216 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/endpoint/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,16 +44,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's SERVER SIDE TEST HANDLER CALLED");
+ System.out.println("VIJ's SERVER SIDE TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
index d01ea45..b4f63bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
index 4a6ad5f..4840de5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/client-handler-2/webclient/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,16 +44,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's CLIENT SIDE TEST HANDLER CALLED");
+ System.out.println("VIJ's CLIENT SIDE TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
index 7c3fa86..18d096c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/build.xml
@@ -21,12 +21,12 @@
]>
<project name="servlet endpoint annotations" default="all" basedir=".">
<target name="all">
- <ant dir="svc1" target="setup"/>
- <ant dir="svc2" target="setup"/>
- <ant dir="client" target="setup"/>
- <ant dir="client" target="runtest"/>
- <ant dir="svc1" target="cleanup"/>
- <ant dir="svc2" target="cleanup"/>
- <ant dir="client" target="cleanup"/>
+ <ant dir="svc1" target="setup"/>
+ <ant dir="svc2" target="setup"/>
+ <ant dir="client" target="setup"/>
+ <ant dir="client" target="runtest"/>
+ <ant dir="svc1" target="cleanup"/>
+ <ant dir="svc2" target="cleanup"/>
+ <ant dir="client" target="cleanup"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties
index 2d5952e..b1aecda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="containerresolver-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 901335b..323c00e 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
@@ -68,7 +68,7 @@
<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="classpath"/>
</javac>
@@ -103,8 +103,8 @@
<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"
+ <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">
@@ -115,7 +115,7 @@
</java>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
index 67a0c45..6deec3b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,11 +63,11 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello2 Hi]") != -1)
- found2 = true;
+ found2 = true;
if(line.indexOf("[WebSvcTest-Hello1 Hi]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
index f06c11c..7a05d3a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/client/webclient/Client.java
@@ -31,8 +31,8 @@
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/containerresolver-app1/Hello1Service?wsdl") Hello1Service service1;
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/containerresolver-app2/Hello2Service?wsdl") Hello2Service service2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
index bf02654..d2da424 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="containerresolver-app1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
index 6eee595..faae129 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/build.xml
@@ -65,6 +65,6 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
index 691c398..4a464f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc1/endpoint1/Hello1.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello1"
)
public class Hello1 {
- public Hello1() {}
+ public Hello1() {}
- @WebMethod(operationName="sayHello1", action="urn:SayHello1")
- public String sayHello1(String who) {
- return "WebSvcTest-Hello1 " + who;
- }
+ @WebMethod(operationName="sayHello1", action="urn:SayHello1")
+ public String sayHello1(String who) {
+ return "WebSvcTest-Hello1 " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
index e3b2809..3ce7127 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="containerresolver-app2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
index 1081db4..baa6d5e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/build.xml
@@ -65,6 +65,6 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
index c32fe7d..2593132 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/containerresolver/svc2/endpoint2/Hello2.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello2"
)
public class Hello2 {
- public Hello2() {}
+ public Hello2() {}
- @WebMethod(operationName="sayHello2", action="urn:SayHello2")
- public String sayHello2(String who) {
- return "WebSvcTest-Hello2 " + who;
- }
+ @WebMethod(operationName="sayHello2", action="urn:SayHello2")
+ public String sayHello2(String who) {
+ return "WebSvcTest-Hello2 " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties
index 4567ab9..9466587 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="dol-override-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 8f96454..4b99e1e 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
@@ -66,7 +66,7 @@
value="-wsdllocation WEB-INF/wsdl/SubtractNumbers.wsdl -b custom-server.xml -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/dol-override-1/SubtractNumbers.wsdl"/>
</antcall>
<antcall target="compile"/>
- <copy file="SubtractNumbers.wsdl" todir="${env.APS_HOME}/build/localwsdl"/>
+ <copy file="SubtractNumbers.wsdl" todir="${env.APS_HOME}/build/localwsdl"/>
<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"/>
@@ -137,11 +137,11 @@
<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"
+ <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">
@@ -151,7 +151,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
index e0e93d0..5b181b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
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 dc8a230..9a9fdfc 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
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
index c8c150d..05bc92b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/dol-override-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
index f55a53f..d261049 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="endpointaddress"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
index dceb7c8..32a704a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/build.xml
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
index 3268526..b890709 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("endpointaddress");
+ stat.addDescription("endpointaddress");
Client client = new Client();
client.doTest(args);
- stat.printSummary("endpointaddress");
+ stat.printSummary("endpointaddress");
}
public void doTest(String[] args) {
@@ -41,17 +41,17 @@
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("href="))>0){
- String url = inputLine.substring(index+1);
+ String url = inputLine.substring(index+1);
if (url.indexOf("http:")>0) {
stat.addStatus("endpointaddress", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
index c5727b2..14b6e0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/endpoint/Hello.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/endpointaddress/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
index 058f961..15325a6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="externalwsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./test-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
index 3ae546d..a521f6e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/client/Client.java
@@ -28,15 +28,15 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
- @WebServiceRef
- static HelloService service;
+
+ @WebServiceRef
+ static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -44,16 +44,16 @@
Hello port = service.getHello();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
index 7475c65..1257a98 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/endpoint/Hello.java
@@ -26,10 +26,10 @@
wsdlLocation="http://localhost:8080/wsdl/HelloService.wsdl"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
index 729b013..209b2d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/host-web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.5"
- xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/javaee"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>externalwsdl</display-name>
<welcome-file-list>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
index 5b6bfca..558094a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/externalwsdl/test-web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>HelloService</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>HelloService</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>HelloService</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>HelloService</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
index e26ecfd..e52099f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="fault"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
index afbba3b..eb9041e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/build.xml
@@ -72,14 +72,14 @@
<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="webservice-with-fault"/>
</antcall>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
index bc2a69b..03d7aaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/client/Client.java
@@ -33,10 +33,10 @@
static MyService service;
public static void main(String[] args) {
- stat.addDescription("webservices-fault");
+ stat.addDescription("webservices-fault");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-fault");
+ stat.printSummary("webservices-fault");
}
public void doTest(String[] args) {
@@ -62,16 +62,16 @@
}
try {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
index 454b3ce..b6a460e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/Hello.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) throws MyException {
- if(who == null)
- throw new MyException("INPUT IS NULL");
- else
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) throws MyException {
+ if(who == null)
+ throw new MyException("INPUT IS NULL");
+ else
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
index 99449b3..a2f1d63 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/endpoint/MyException.java
@@ -17,15 +17,15 @@
package endpoint;
public class MyException extends Exception {
- private String message = "";
+ private String message = "";
- public MyException(String message) {
- super(message);
- this.message = message;
- }
+ public MyException(String message) {
+ super(message);
+ this.message = message;
+ }
- public String getMessage() {
- return message;
- }
+ public String getMessage() {
+ return message;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
index 0708c5c..5f1b973 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/fault/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>MyHello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>MyHello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>MyHello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>MyHello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
index 1bb25b3..fc71ce4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.properties
@@ -15,26 +15,26 @@
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="appname" value="${module}"/> \u0020
<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="ejbjar.files" value="${build.classes.dir}"/> \u0020
<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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index 7b069f8..d482196 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="${wscompile.command}" />
+ </exec>
</target>
<!-- NOTE. the simple mapping test and full mapping test can
@@ -46,53 +46,53 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
+ <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"/>
+ <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>
+
<target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
+ <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>
+ </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"/>
+ </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"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
+ </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>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
+ <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>
@@ -100,10 +100,10 @@
<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>
-
+ </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
index 369f484..d73f52f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/client/Client.java
@@ -30,28 +30,28 @@
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 {
-
+ 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) {
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
index 07e1cb0..4b08059 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServlet"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="servlet.SimpleServer"/>
</service>
-</configuration>
+</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
index c14bb7a..d2d8301 100644
--- 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
@@ -24,11 +24,11 @@
<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>
+ <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>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
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
index 336e4f8..f9f2117 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/ServletHandlerTestImpl.java
@@ -22,23 +22,23 @@
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 !!");
+ 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() {}
+
+ 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
index ed9ce1d..5a81f19 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleHandler.java
@@ -22,9 +22,9 @@
import jakarta.annotation.Resource;
public class SimpleHandler extends GenericHandler {
-
+
protected HandlerInfo info = null;
-
+
/*
@Resource(name="stringValue")
String injectedString = "undefined";
@@ -33,7 +33,7 @@
public void init(HandlerInfo info) {
this.info = info;
}
-
+
public boolean handleRequest(MessageContext context) {
/*
if ("undefined".equals(injectedString)) {
@@ -50,7 +50,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -62,7 +62,7 @@
}
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
index dc5cf26..0675cd2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxrpcinjection/servlet/SimpleServer.java
@@ -19,7 +19,7 @@
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 b6b0b34..9a5eaca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/jaxwstools.xml
@@ -47,7 +47,7 @@
<param name="wsimport.args"
value="-keep -Xendorsed -d ${build.classes.dir}/client http://${http.host}:${http.port}/${test-wsdl-uri}"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
includes="${client-src}/**">
<classpath refid="classpath"/>
</javac>
@@ -56,8 +56,8 @@
<target name="run-client">
<unjar src="${env.APS_HOME}/lib/reporter.jar" dest="${build.classes.dir}/client"/>
<exec executable="${APPCLIENT}" dir="${build.classes.dir}/client">
- <arg value="${client-class}"/>
- <arg value="${other-args}"/>
+ <arg value="${client-class}"/>
+ <arg value="${other-args}"/>
</exec>
</target>
@@ -75,7 +75,7 @@
<copy verbose="true" toDir="${build.classes.dir}/tmp/WEB-INF/">
<fileset dir="${basedir}" includes="weblogic-webservices.xml"/>
</copy>
-
+
<copy file="${wsdlfile.location}/${wsdlfile.name}"
tofile="${build.classes.dir}/tmp/WEB-INF/wsdl/${wsdlfile.name}"
failonerror="false"/>
@@ -106,7 +106,7 @@
<include name="WEB-INF/web.xml"/>
<include name="WEB-INF/sun-web.xml"/>
<include name="WEB-INF/webservices.xml"/>
- <include name="WEB-INF/weblogic-webservices.xml"/>
+ <include name="WEB-INF/weblogic-webservices.xml"/>
<include name="WEB-INF/jax-ws-catalog.xml"/>
<include name="WEB-INF/wsdl/${wsdlfile.name}"/>
<include name="WEB-INF/wsdl/${schemafile.name}"/>
@@ -137,5 +137,5 @@
<fileset dir="${build.classes.dir}/tmp/wsit/ejb" casesensitive="yes">
<include name="META-INF/**"/>
</fileset>
- </jar>
+ </jar>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
index a7236f8..3cb9e52 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 31c8a26..bace84a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/build.xml
@@ -97,7 +97,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
index e71362b..46d2938 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/client/Client.java
@@ -33,10 +33,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -44,16 +44,16 @@
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
RetVal ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.getRetVal().indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.getRetVal().indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.getRetVal().indexOf(args[0]) == -1) {
+ }
+ if(ret.getRetVal().indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
index d49f158..55bfc74 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/endpoint/Hello.java
@@ -27,9 +27,9 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- public RetVal sayHello(String who) {
- return new RetVal("WebSvcTest-Hello " + who);
- }
+ public RetVal sayHello(String who) {
+ return new RetVal("WebSvcTest-Hello " + who);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/libdependent/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties
index 3942031..e2dc62e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mappedname"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
index 8efe2f1..2b8daf5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/build.xml
@@ -47,7 +47,7 @@
<param name="src" value="endpoint"/>
</antcall>
</target>
-
+
<target name="deploy-app">
<antcall target="deploy-war-common">
<param name="contextroot" value="${appname}"/>
@@ -106,7 +106,7 @@
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
@@ -120,7 +120,7 @@
<arg value="http://${http.host}:${http.port}/endpointaddress/HelloService"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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"/>
<replace file="client/Client.java" token="${http.host}" value="HTTP_HOST"/>
@@ -168,7 +168,7 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
+ </target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
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 987d857..9dc9c89 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
@@ -30,37 +30,37 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-mapped-name");
+ stat.addDescription("webservices-mapped-name");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-mapped-name");
+ stat.printSummary("webservices-mapped-name");
}
public void doTest(String[] args) {
- boolean gotEx = false;
+ boolean gotEx = false;
try {
- javax.naming.InitialContext ic = new javax.naming.InitialContext();
- Object res = ic.lookup("java:comp/env/ignoredName");
- } catch(Exception ex) {
- System.out.println("Caught Expected exception - " + ex.getMessage());
- gotEx = true;
- }
- if(!gotEx) {
- System.out.println("Mapped name not mapped as expected");
+ javax.naming.InitialContext ic = new javax.naming.InitialContext();
+ Object res = ic.lookup("java:comp/env/ignoredName");
+ } catch(Exception ex) {
+ System.out.println("Caught Expected exception - " + ex.getMessage());
+ gotEx = true;
+ }
+ if(!gotEx) {
+ System.out.println("Mapped name not mapped as expected");
stat.addStatus("Simple-mapped-name", stat.FAIL);
- return;
- }
+ return;
+ }
try {
- javax.naming.InitialContext ic = new javax.naming.InitialContext();
- Object res = ic.lookup("java:comp/env/MyMappedName");
+ javax.naming.InitialContext ic = new javax.naming.InitialContext();
+ Object res = ic.lookup("java:comp/env/MyMappedName");
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("Simple-mapped-name", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
index 70f0ad2..7758d44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
index f2ecc93..e1fd1f7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/endpoint/Hello.java
@@ -20,8 +20,8 @@
@WebService
public class Hello {
-
+
public String sayHello(String param) {
- return "Hello " + param;
+ return "Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
index a326225..78be6a8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mappedname/webclient/Client.java
@@ -30,8 +30,8 @@
@WebServiceRef(name="ignoredName", mappedName="MyMappedName", wsdlLocation="http://HTTP_HOST:HTTP_PORT/mappedname/HelloService?WSDL")
HelloService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
index 9cc3607..ada723e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mbyte"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
index 90c48f6..ce1839b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/build.xml
@@ -70,7 +70,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
index 53665a5..ff84d37 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/client/Client.java
@@ -32,38 +32,38 @@
static HelloîService service;
public static void main(String[] args) {
- stat.addDescription("service-with-mbyte-char");
+ stat.addDescription("service-with-mbyte-char");
Client client = new Client();
client.doTest(args);
- stat.printSummary("service-with-mbyte-char");
+ stat.printSummary("service-with-mbyte-char");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
ret = port.sayDoubleHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
index a00d18a..6e81ac0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mbyte/endpoint/Hello.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
- @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
- public String sayDoubleHello(String who) {
- return "WebSvcTest-Double-Hello " + who + " AND " + who;
- }
+ @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
+ public String sayDoubleHello(String who) {
+ return "WebSvcTest-Double-Hello " + who + " AND " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties
index 2e64961..cc742a1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="msgctxt"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
index 203a74d..076e106 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/build.xml
@@ -69,7 +69,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
index d903e9e..467e6b9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
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 HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
index 8b12109..160c5bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/endpoint/Hello.java
@@ -22,7 +22,7 @@
@WebService
public class Hello {
-
+
@Resource WebServiceContext wsc;
public String sayHello(String param) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
index d4ee4b5..27f9f21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
index 168756d..03133c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/msgctxt/webclient/Client.java
@@ -31,7 +31,7 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -39,7 +39,7 @@
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
@@ -62,7 +62,7 @@
out.close();
} catch(Exception e) {
e.printStackTrace();
-
+
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties
index 62bc087..74b052a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="mtom"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 5d582f6..74f9e12 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/build.xml
@@ -131,11 +131,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
index aca69ab..b08ff82 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
index c58ee53..c31c778 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[11111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
index dc8a230..9a9fdfc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", portName="SubtractNumbersPortType", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
index 361a0b7..38207db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
index f8ca485..8423366 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/mtom/webservices.xml
@@ -29,7 +29,7 @@
<port-component-name>SubtractNumbersImpl</port-component-name>
<wsdl-service xmlns:wsdl-port_ns__="http://duke.org">wsdl-port_ns__:SubtractNumbersService</wsdl-service>
<wsdl-port xmlns:wsdl-port_ns__="http://duke.org">wsdl-port_ns__:SubtractNumbersPortType</wsdl-port>
- <enable-mtom>true</enable-mtom>
+ <enable-mtom>true</enable-mtom>
<service-endpoint-interface>endpoint.SubtractNumbersPortType</service-endpoint-interface>
<service-impl-bean>
<servlet-link>SubtractNumbersService</servlet-link>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
index b84ec23..7bf7432 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="multiport"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 1ca5214..c3ec9e9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/build.xml
@@ -69,8 +69,8 @@
<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"
+ <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>
@@ -83,7 +83,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
index f35cddb..08e982d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/client/Client.java
@@ -22,50 +22,50 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = new HttpTestService().getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp.getString().indexOf("Hello1") != -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp.getString().indexOf("Hello1") != -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
Hello1 port1 = service.getHello1Port();
- Hello1Request req1 = new Hello1Request();
- req1.setString("From Vijay ");
- Hello1Response resp1 = port1.hello1(req1);
- if(resp1.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp1.getString().indexOf("Hello1") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp1.getString());
- stat.addStatus(args[0], stat.PASS);
+ Hello1Request req1 = new Hello1Request();
+ req1.setString("From Vijay ");
+ Hello1Response resp1 = port1.hello1(req1);
+ if(resp1.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp1.getString().indexOf("Hello1") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp1.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
index 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customclient.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
index 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/customservice.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
index a551c23..2658611 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/Hello1Impl.java
@@ -38,8 +38,8 @@
public Hello1Response hello1(Hello1Request req) {
System.out.println("Hello1, " + req.getString() + "!");
- Hello1Response resp = new Hello1Response();
- resp.setString("Hello1, " + req.getString() + "!");
+ Hello1Response resp = new Hello1Response();
+ resp.setString("Hello1, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
index 82f4efe..20e1e59 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/service/HelloImpl.java
@@ -38,8 +38,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
index f3b6cc6..af8248b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/multiport/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>WSW2JRLHttpTestApp</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties
index 6ef513a..4bc9eab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="noname"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
index e752c92..71f6512 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/build.xml
@@ -47,7 +47,7 @@
<param name="contextroot" value="${appname}"/>
</antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
@@ -131,6 +131,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
index e7ee4a2..60df76e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("WebSvcTest-Hello All") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
index 24a78d1..5466edb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/endpoint/Hello.java
@@ -20,8 +20,8 @@
@WebService
public class Hello {
-
+
public String sayHello(String param) {
- return "WebSvcTest-Hello " + param;
+ return "WebSvcTest-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
index 1972c59..c021625 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties
index ad2d4ca..7895e2f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="noname2"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
index 227aea4..38106b8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/build.xml
@@ -68,7 +68,7 @@
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
@@ -141,5 +141,5 @@
</project>
-
-
+
+
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
index 6a9a5ba..7f13e95 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
index 4aef922..705bcda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/endpoint/Hello2.java
@@ -24,8 +24,8 @@
portName="Hello"
)
public class Hello2 {
-
+
public String sayHello(String param) {
- return "WebSvcTest-Hello " + param;
+ return "WebSvcTest-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
index 0c458f4..a82dcc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello2</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello2</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
index fd7bd60..17ab244 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/noname2/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHello();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
index 91e9125..44e682a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="nowebxml"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
index 5bd34fd..5a436e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/build.xml
@@ -73,7 +73,7 @@
<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"/>
@@ -81,7 +81,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
index 0f67fd2..dcb4fe8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/client/Client.java
@@ -32,38 +32,38 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("service-with-no-webxml");
+ stat.addDescription("service-with-no-webxml");
Client client = new Client();
client.doTest(args);
- stat.printSummary("service-with-no-webxml");
+ stat.printSummary("service-with-no-webxml");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
ret = port.sayDoubleHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Double-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
index 2e0e0ae..94f1021 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/nowebxml/endpoint/Hello.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
- @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
- public String sayDoubleHello(String who) {
- return "WebSvcTest-Double-Hello " + who + " AND " + who;
- }
+ @WebMethod(operationName="sayDoubleHello", action="urn:SayHello")
+ public String sayDoubleHello(String who) {
+ return "WebSvcTest-Double-Hello " + who + " AND " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties
index 7338cee..6b93650 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="oneway"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
index a5df82c..d4aea3b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/build.xml
@@ -68,7 +68,7 @@
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
@@ -154,7 +154,7 @@
<target name="run-client">
<echo message="Deployed passed"/>
- </target>
+ </target>
<target name="report-success">
<echo message="Test PASSED"/>
@@ -162,7 +162,7 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
-->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
index 615876c..d3e39b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
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 HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
index d4ee4b5..27f9f21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
index 5337236..3e7b88b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/oneway/webclient/Client.java
@@ -31,7 +31,7 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -39,7 +39,7 @@
throws jakarta.servlet.ServletException {
String ret="Oneway works";
try {
-
+
Hello port = service.getHelloPort();
port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties
index 2dc16cd..7b0770c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="pkghello"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
index c185234..2ede6d8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/build.xml
@@ -88,14 +88,14 @@
<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="war-with-packaged-wsdl-and-schema"/>
</antcall>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
index c270648..2a95096 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/client/Client.java
@@ -32,10 +32,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -43,16 +43,16 @@
Hello port = service.getMyPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
index 58f2336..127bcc0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/endpoint/Hello.java
@@ -27,10 +27,10 @@
wsdlLocation="WEB-INF/wsdl/HelloService.wsdl"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/pkgedwarservice/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties
index c944cbc..e4076da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="postconstruct"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
index 6a52c3f..d3cc1af 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/build.xml
@@ -69,7 +69,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
@@ -202,7 +202,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
index e458f36..90bf18f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -60,7 +60,7 @@
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 HELLO SERVICE IS") != -1)
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
index 8faeb07..37e2797 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
index 5d8ee12..5840ca1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/postconstruct/webclient/Client.java
@@ -31,14 +31,14 @@
HelloService service;
public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try {
-
+
Hello port = service.getHelloPort();
String ret = port.sayHello("All");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
index 39c1b93..341ee6b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/appclient/Client.java
@@ -30,10 +30,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -41,7 +41,7 @@
AddNumbersPortType port = service.getAddNumbersPortType();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://localhost:8080/prepkged-svc-1/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("pre-pkged-appclient", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties
index 3f670b4..9b24732 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="prepkged-svc-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 a5efa8b..60f53c4 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
@@ -83,7 +83,7 @@
<param name="wsimport.args"
value="-b custom-client.xml -keep -d ${build.classes.dir}/webclient/WEB-INF/classes ${env.APS_HOME}/devtests/webservice/annotations/prepkged-svc-1/AddNumbers.wsdl"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
+ <javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
</javac>
@@ -103,7 +103,7 @@
<param name="wsimport.args"
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"
+ <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"/>
@@ -162,11 +162,11 @@
<antcall target="undeploy-client"/>
<antcall target="undeploy-client-common"/>
</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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
index e691a89..963f6ae 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
index 11392d9..44f7cbc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF ADD SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[300]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
index 6a135ad..fe3f736 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
index 4cfbb59..e6bb237 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
index e7bda7c..30ac699 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/endpoint/AddNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPortType", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
index 045248a..dc5bb70 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/prepkged-svc-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef(name="service/MyService") AddNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
index f534777..4f83195 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/build.xml
@@ -28,7 +28,7 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
@@ -37,9 +37,9 @@
<war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war" needxmlfile="false">
<webinf dir="${pkg-name}"
includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
+ <classes dir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/**"/>
- </war>
+ </war>
<waitfor maxwait="100" maxwaitunit="second">
<or>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
@@ -56,7 +56,7 @@
<fail if="deploy_failed" message="Deployment failed"/>
<antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
<antcall target="internal-run"/>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
index 37ed2af..5c82531 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider-ejbinweb/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -41,11 +41,11 @@
HelloImpl port = new HelloImplService().getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
index 82d33ce..3bcc8d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/build.xml
@@ -28,25 +28,25 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
</exec>
- <antcall target="test-compile"/>
- <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
- webxml="web.xml">
- <webinf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/**"/>
- </war>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
+ <antcall target="test-compile"/>
+ <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
+ webxml="web.xml">
+ <webinf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ <classes dir="${env.APS_HOME}/build/module/classes"
+ includes="${pkg-name}/**"/>
+ </war>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployFailed"/>
- </or>
- </waitfor>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
</condition>
@@ -55,14 +55,14 @@
</condition>
<fail if="deploy_failed" message="Deployment failed"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
- <antcall target="internal-run"/>
+ <antcall target="internal-run"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.war"/>
+ <param name="filename" value="${server}.war"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -71,14 +71,14 @@
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed"/>
</condition>
<fail if="undeploy_failed" message="undeployment failed"/>
- <antcall target="report"/>
+ <antcall target="report"/>
</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"/>
+ <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-success">
@@ -87,6 +87,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
index 37ed2af..5c82531 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -41,11 +41,11 @@
HelloImpl port = new HelloImplService().getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
index 7c525b4..8a96ff5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -41,11 +41,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -53,27 +53,27 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -81,9 +81,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
index 5b8db0c..fbf2ed6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/provider/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <servlet-class>endpoint.HelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <servlet-class>endpoint.HelloImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <url-pattern>/HelloImplService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <url-pattern>/HelloImplService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
index 82d33ce..3bcc8d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/build.xml
@@ -28,25 +28,25 @@
<property name="client-src-name" value="client/Client.java"/>
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<target name="all" depends="clean">
<exec executable="${env.S1AS_HOME}/bin/wsimport">
<arg line="-keep -d ${env.APS_HOME}/build/module/classes endpoint/wsdl/HelloImplService.wsdl"/>
</exec>
- <antcall target="test-compile"/>
- <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
- webxml="web.xml">
- <webinf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- <classes dir="${env.APS_HOME}/build/module/classes"
- includes="${pkg-name}/**"/>
- </war>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
- <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
+ <antcall target="test-compile"/>
+ <war destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war"
+ webxml="web.xml">
+ <webinf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ <classes dir="${env.APS_HOME}/build/module/classes"
+ includes="${pkg-name}/**"/>
+ </war>
+ <waitfor maxwait="100" maxwaitunit="second">
+ <or>
+ <available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployFailed"/>
- </or>
- </waitfor>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.war_deployed"/>
</condition>
@@ -55,14 +55,14 @@
</condition>
<fail if="deploy_failed" message="Deployment failed"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
+ <arg line="-keep -d ${env.APS_HOME}/build/module/classes http://${http.host}:${http.port}/${server}/${server}Service?WSDL"/>
</exec>
<antcall target="unjar-client-utils"/>
- <antcall target="internal-run"/>
+ <antcall target="internal-run"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.war"/>
+ <param name="filename" value="${server}.war"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -71,14 +71,14 @@
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployFailed"/>
</condition>
<fail if="undeploy_failed" message="undeployment failed"/>
- <antcall target="report"/>
+ <antcall target="report"/>
</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"/>
+ <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-success">
@@ -87,6 +87,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
index a5a4a01..eee6926 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("servlet-provider-annotation");
+ stat.addDescription("servlet-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("servlet-provider-annotation");
+ stat.printSummary("servlet-provider-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("injectedValue Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("servlet-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
index 4b47fc1..0c9d954 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -42,11 +42,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -54,28 +54,28 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
System.out.println(jaxbContext.createUnmarshaller().unmarshal(source));
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -83,9 +83,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
index fba6051..649457e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,33 +50,33 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
paramElement.setValue(injectedString + " " + paramElement.getValue());
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
index 22e5c8b..a1717d7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/providerhandler/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <servlet-class>endpoint.HelloImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <servlet-class>endpoint.HelloImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.HelloImpl</servlet-name>
- <url-pattern>/HelloImplService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.HelloImpl</servlet-name>
+ <url-pattern>/HelloImplService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
<env-entry>
<env-entry-name>stringValue</env-entry-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
index 4f5df04..f05063c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 1f6648f..713874b 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
@@ -59,8 +59,8 @@
<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"
+ <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>
@@ -73,14 +73,14 @@
<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>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
index b4b3356..06d2601 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/client/Client.java
@@ -53,7 +53,7 @@
private static String queryString = "num1=30&num2=20";
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
+ stat.addDescription("webservices-simple-restful-svc");
Client client = new Client();
Service service = client.createService();
URI endpointURI = new URI(endpointAddress);
@@ -72,7 +72,7 @@
System.out.println ("Invoking Restful GET Request with query string " + queryString);
Source result = d.invoke(null);
printSource(result);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private Service createService() {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
index 0faaab2..3728c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/endpoint/AddNumbersImpl.java
@@ -60,7 +60,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -76,5 +76,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
index 2ff674f..93baf24 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful-2/web.xml
@@ -18,23 +18,23 @@
-->
<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">
+ 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>WebTier for the Restful Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Restful Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
index eed198b..a1ec113 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 0c7b5c7..85852de 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/build.xml
@@ -58,8 +58,8 @@
<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"
+ <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/**"/>
@@ -74,7 +74,7 @@
<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"/>
@@ -82,7 +82,7 @@
</antcall>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
index 7fd67de..2e5cef7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/client/Client.java
@@ -40,13 +40,13 @@
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
- String endpointAddress =
+ stat.addDescription("webservices-simple-restful-svc");
+ String endpointAddress =
"http://HTTP_HOST:HTTP_PORT/restful/webservice/AddNumbersService";
URL url = new URL(endpointAddress+"?num1=10&num2=20");
System.out.println ("Invoking URL="+url);
process(url, args);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private static void process(URL url, String[] args) throws Exception {
@@ -64,12 +64,12 @@
oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
trans.setOutputProperties(oprops);
trans.transform(source, sr);
- String resp = bos.toString();
+ String resp = bos.toString();
System.out.println("**** Response ******"+resp);
bos.close();
- if(resp.indexOf("<ns:return>30</ns:return>") != -1)
+ if(resp.indexOf("<ns:return>30</ns:return>") != -1)
stat.addStatus(args[0], stat.PASS);
- else
+ else
stat.addStatus(args[0], stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
index 0faaab2..3728c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/endpoint/AddNumbersImpl.java
@@ -60,7 +60,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -76,5 +76,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
index 2ff674f..93baf24 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/restful/web.xml
@@ -18,23 +18,23 @@
-->
<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">
+ 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>WebTier for the Restful Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Restful Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>endpoint.AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>endpoint.AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
index 1154d3e..3cb717d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/appclient/Client.java
@@ -30,10 +30,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -41,7 +41,7 @@
AddNumbersPortType port = service.getAddNumbersPort();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://HTTP_HOST:HTTP_PORT/soap12/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("soap12", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties
index d496838..f0c1c06 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="soap12"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 555790c..ef09191 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/build.xml
@@ -74,7 +74,7 @@
</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"
+ <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"/>
@@ -108,7 +108,7 @@
<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}"/>
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 6a135ad..fe3f736 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 4cfbb59..e6bb237 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
index 374f5bd..c3d2b99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/endpoint/AddNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.xml.ws.BindingType(jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPort", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soap12/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties
index 3b23424..fa8a750 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="soaptcp"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="ejb.wsit.descriptors" value="./etc/ejb"/>
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 e4f0916..db63bb5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/build.xml
@@ -26,13 +26,13 @@
]>
<project name="webservicerefs" default="all" basedir=".">
-
+
&commonSetup;
&commonBuild;
&commonRun;
&testproperties;
&jaxwsTools;
-
+
<path id="client-classpath">
<pathelement path="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/j2ee.jar"/>
@@ -41,16 +41,16 @@
<pathelement path="${env.S1AS_HOME}/lib/activation.jar"/>
<pathelement path="${env.S1AS_HOME}/lib/appserv-rt.jar"/>
</path>
-
+
<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="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"/>
@@ -63,7 +63,7 @@
<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"/>
@@ -73,7 +73,7 @@
<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"/>
@@ -86,7 +86,7 @@
<param name="wsimport.args"
value="-keep -d ${build.classes.dir}/client http://${http.host}:${http.port}/WSHelloEJBService/WSHelloEJB?WSDL"/>
</antcall>
- <javac srcdir="." destdir="${build.classes.dir}/client"
+ <javac srcdir="." destdir="${build.classes.dir}/client"
includes="client/**">
<classpath refid="client-classpath"/>
</javac>
@@ -94,22 +94,22 @@
<fileset dir="${client.wsit.descriptors}"/>
</copy>
</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="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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
index 66ddd09..54a8bfd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/client/Client.java
@@ -38,15 +38,15 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
public class Client {
-
+
@Resource
static jakarta.transaction.UserTransaction ut;
-
+
public static final int TIME_OUT = 1000 * 60;
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String[] args) {
stat.addDescription("soaptcp-test");
String host = "localhost";
@@ -54,12 +54,12 @@
if (args.length == 1) { // run with appclient?
args = args[0].split(" ");
}
-
+
if (args.length >= 2) {
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
System.out.println("Connecting to host: " + host + " port: " + port);
Client client = new Client();
if (client.doPortUnificationTest(host, port)) {
@@ -72,12 +72,12 @@
stat.printSummary("soaptcp-test");
}
-
+
public void doServletTest() {
try {
ServletHelloService svc = new ServletHelloService();
ServletHello port = svc.getServletHelloPort();
-
+
for (int i=0;i<10;i++) {
String ret = port.sayServletHello("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
@@ -93,7 +93,7 @@
stat.addStatus("SOAP/TCP-Servlet-Endpoint", stat.FAIL);
}
}
-
+
public void doEjbTest() {
try {
WSHelloEJBService svc = new WSHelloEJBService();
@@ -114,7 +114,7 @@
stat.addStatus("SOAP/TCP-EJB-Endpoint", stat.FAIL);
}
}
-
+
public boolean doPortUnificationTest(String host, int port) {
try {
Socket s = new Socket("localhost", 8080);
@@ -122,24 +122,24 @@
final VersionController versionController = VersionController.getInstance();
final Version framingVersion = versionController.getFramingVersion();
final Version connectionManagementVersion = versionController.getConnectionManagementVersion();
-
+
final OutputStream outputStream = s.getOutputStream();
outputStream.write(TCPConstants.PROTOCOL_SCHEMA.getBytes("US-ASCII"));
-
+
DataInOutUtils.writeInts4(outputStream, framingVersion.getMajor(),
framingVersion.getMinor(),
connectionManagementVersion.getMajor(),
connectionManagementVersion.getMinor());
outputStream.flush();
-
+
final InputStream inputStream = s.getInputStream();
final int[] versionInfo = new int[4];
-
+
DataInOutUtils.readInts4(inputStream, versionInfo, 4);
-
+
final Version serverFramingVersion = new Version(versionInfo[0], versionInfo[1]);
final Version serverConnectionManagementVersion = new Version(versionInfo[2], versionInfo[3]);
-
+
final boolean success = versionController.isVersionSupported(serverFramingVersion, serverConnectionManagementVersion);
if (success) {
stat.addStatus("SOAP/TCP-PortUnification", stat.PASS);
@@ -153,7 +153,7 @@
e.printStackTrace();
stat.addStatus("SOAP/TCP-PortUnification", stat.FAIL);
}
-
+
return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
index 34ce41f..fae3b40 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/client/wsit-client.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="mainclientconfig"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="mainclientconfig"
>
<import location="ServiceChannelWSImpl.wsdl" namespace="http://servicechannel.tcp.transport.ws.xml.sun.com/"/>
<import location="ServletHelloService.wsdl" namespace="http://servlet_endpoint/"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
index 641a670..b29d2e5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/ejb/wsit-ejb_endpoint.WSHelloEJB.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="WSHelloEJBService" targetNamespace="http://ejb_endpoint/" xmlns:tns="http://ejb_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="WSHelloEJBService" targetNamespace="http://ejb_endpoint/" xmlns:tns="http://ejb_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
>
<portType name="WSHelloEJB"/>
<binding name="WSHelloEJBPortBinding" type="tns:WSHelloEJB">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
index 4a63f76..efc46b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/etc/web/wsit-servlet_endpoint.ServletHello.xml
@@ -18,10 +18,10 @@
-->
<definitions
- xmlns="http://schemas.xmlsoap.org/wsdl/"
- xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
- xmlns:xsd="http://www.w3.org/2001/XMLSchema"
- xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="ServletHelloService" targetNamespace="http://servlet_endpoint/" xmlns:tns="http://servlet_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
+ xmlns="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
+ xmlns:xsd="http://www.w3.org/2001/XMLSchema"
+ xmlns:soap="http://schemas.xmlsoap.org/wsdl/soap/" name="ServletHelloService" targetNamespace="http://servlet_endpoint/" xmlns:tns="http://servlet_endpoint/" xmlns:wsp="http://schemas.xmlsoap.org/ws/2004/09/policy" xmlns:wsu="http://docs.oasis-open.org/wss/2004/01/oasis-200401-wss-wssecurity-utility-1.0.xsd" xmlns:wsaws="http://www.w3.org/2005/08/addressing" xmlns:tcp="http://java.sun.com/xml/ns/wsit/2006/09/policy/soaptcp/service"
>
<portType name="ServletHello"/>
<binding name="ServletHelloPortBinding" type="tns:ServletHello">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
index 79b0725..e931bd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/servlet_endpoint/ServletHello.java
@@ -20,8 +20,8 @@
@WebService
public class ServletHello {
-
+
public String sayServletHello(String param) {
- return "WebSvcTest-Servlet-Hello " + param;
+ return "WebSvcTest-Servlet-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
index f06f74c..0add81d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/soaptcp/web.xml
@@ -18,25 +18,25 @@
-->
<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">
+ 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>WebTier for the Servlet Hello Service</description>
- <display-name>Servlet HelloWAR</display-name>
+ <description>WebTier for the Servlet Hello Service</description>
+ <display-name>Servlet HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Servlet Hello Web Service</description>
- <display-name>ServletHelloWebService</display-name>
- <servlet-name>ServletHello</servlet-name>
- <servlet-class>servlet_endpoint.ServletHello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Servlet Hello Web Service</description>
+ <display-name>ServletHelloWebService</display-name>
+ <servlet-name>ServletHello</servlet-name>
+ <servlet-class>servlet_endpoint.ServletHello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>ServletHello</servlet-name>
- <url-pattern>/webservice/ServletHelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServletHello</servlet-name>
+ <url-pattern>/webservice/ServletHelloService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties
index 5c1b4ab..6228337 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="svchandler-1"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 4a7a61d..1188534 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
@@ -83,7 +83,7 @@
<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"
- classpathref="class.path"
+ classpathref="class.path"
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"/>
@@ -124,11 +124,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
index b893b9a..1494959 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
index 659c48e..8101459 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
index e0a5767..469d6bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.annotation.PostConstruct;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -49,7 +49,7 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
@@ -59,7 +59,7 @@
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -67,16 +67,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
index 8f43a6d..ce6cd23 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
<env-entry>
<env-entry-name>stringValue</env-entry-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
index 1502ffd..b79fc8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-1/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties
index 4ddb9df..1459562 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="svchandler-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 77b2277..4931caf 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
@@ -87,7 +87,7 @@
<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"
- classpathref="class.path"
+ classpathref="class.path"
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"/>
@@ -133,11 +133,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <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">
@@ -147,7 +147,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
index d033c31..9f7003b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
index f908128..36087ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,17 +50,17 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -68,16 +68,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
index 54d20c4..6ccb50c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+
<env-entry>
<env-entry-name>stringValue</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
index a51166f..8a636df 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-2/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties
index e0d0521..e94e814 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="svchandler-3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 f559505..e72a881 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
@@ -85,7 +85,7 @@
<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"
- classpathref="class.path"
+ classpathref="class.path"
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"/>
@@ -126,11 +126,11 @@
<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"
+ <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">
@@ -141,7 +141,7 @@
</java>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
index 56549fa..4d6026c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1111]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
index 2de4c99..2966c4a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/endpoint/TestHandler.java
@@ -26,17 +26,17 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
public boolean handleMessage(SOAPMessageContext context) {
try {
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -44,14 +44,14 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
index 51277cb..43f60b3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-3/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties
index b8724bc..0212ecd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="svchandler-4"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 4de419f..1606289 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
@@ -130,11 +130,11 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
- <javac srcdir="." destdir="${build.classes.dir}/client"
- classpath="${env.APS_HOME}/lib/reporter.jar"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
index 61bc820..6690ee7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[1113]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 839fcb1..48f1716 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,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="SubtractNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</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 170d667..0988122 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,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
index f607e62..5e05099 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/SubtractNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.jws.HandlerChain(name="some name", file="myhandler.xml")
@jakarta.jws.WebService (serviceName="junkjunkjunk", endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl implements SubtractNumbersPortType {
-
+
public int subtractNumbers (int number1, int number2) {
System.out.println("I got n1 = " + number1 + " and n2 = " + number2);
return number1 - number2;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
index f908128..36087ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,17 +50,17 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
int number = Integer.parseInt(paramElement.getValue());
@@ -68,16 +68,16 @@
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
index 54d20c4..6ccb50c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
-
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
+
<env-entry>
<env-entry-name>stringValue</env-entry-name>
<env-entry-type>java.lang.String</env-entry-type>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
index 4e2b758..a419b13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/svchandler-4/webclient/Client.java
@@ -27,8 +27,8 @@
@WebServiceRef SubtractNumbersService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
index 8326c83..2471559 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="warservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
index 83dd39d..04725f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/build.xml
@@ -73,7 +73,7 @@
<antcall target="restart-server-instance-common"/>
<antcall target="runclient"/>
- <!--restore the tokens back in file-->
+ <!--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>
@@ -81,7 +81,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
index 00a2aaa..0f9a47e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/client/Client.java
@@ -32,10 +32,10 @@
static HelloService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
@@ -43,16 +43,16 @@
Hello port = service.getHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !" + args[0]);
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
- if(ret.indexOf(args[0]) == -1) {
+ }
+ if(ret.indexOf(args[0]) == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(args[0], stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(args[0], stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
index c5727b2..14b6e0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/endpoint/Hello.java
@@ -25,10 +25,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
index 37ce182..cc6411f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/warservice/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/webservice/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/webservice/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties
index 209d951..a501470 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="${ant.project.name}"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 5d003d2..f1f48e9 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
@@ -122,11 +122,11 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
index 0fb0f1b..01549ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-cobundle/web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties
index b469bab..1705d29 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webserviceref-lookup"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 d2a8f72..4210493 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
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<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"/>
@@ -124,11 +124,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
index 0def70d..ce82592 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
index 49cd203..1ef2021 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webserviceref-lookup/webclient/Client.java
@@ -27,14 +27,14 @@
public class Client extends HttpServlet {
@jakarta.xml.ws.WebServiceRef(name="foo/bar" )
- @Addressing
+ @Addressing
SubtractNumbersService service;
@jakarta.xml.ws.WebServiceRef(lookup="java:comp/env/foo/bar")
SubtractNumbersService service2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
index 58c6cb7..032e613 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservicerefs"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 e1c0513..8aca3eb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/build.xml
@@ -78,8 +78,8 @@
<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"
+ <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>
@@ -97,7 +97,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
index 70a6d40..7cbb799 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/client/Client.java
@@ -36,11 +36,11 @@
new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
- stat.addDescription("webservicerefs-test");
+ stat.addDescription("webservicerefs-test");
Client client = new Client();
client.doServletTest();
client.doEjbTest();
- stat.printSummary("webservicerefs-test");
+ stat.printSummary("webservicerefs-test");
}
public void doServletTest() {
@@ -50,11 +50,11 @@
ServletHello port = svc.getServletHelloPort();
for (int i=0;i<10;i++) {
String ret = port.sayServletHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Servlet-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("WebServiceRefs-Servlet-Endpoint", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("WebServiceRefs-Servlet-Endpoint", stat.PASS);
@@ -71,11 +71,11 @@
WSHello port = svc.getWSHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayEjbHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-EJB-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-EJB-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("WebServiceRefs-EJB-Endpoint", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("WebServiceRefs-EJB-Endpoint", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
index 73d3a54..bb2fa72 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/ejb_endpoint/WSHello.java
@@ -21,5 +21,5 @@
@WebService
public interface WSHello {
- public String sayEjbHello(String who);
+ public String sayEjbHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
index 79b0725..e931bd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/servlet_endpoint/ServletHello.java
@@ -20,8 +20,8 @@
@WebService
public class ServletHello {
-
+
public String sayServletHello(String param) {
- return "WebSvcTest-Servlet-Hello " + param;
+ return "WebSvcTest-Servlet-Hello " + param;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
index f06f74c..0add81d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservicerefs/web.xml
@@ -18,25 +18,25 @@
-->
<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">
+ 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>WebTier for the Servlet Hello Service</description>
- <display-name>Servlet HelloWAR</display-name>
+ <description>WebTier for the Servlet Hello Service</description>
+ <display-name>Servlet HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Servlet Hello Web Service</description>
- <display-name>ServletHelloWebService</display-name>
- <servlet-name>ServletHello</servlet-name>
- <servlet-class>servlet_endpoint.ServletHello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Servlet Hello Web Service</description>
+ <display-name>ServletHelloWebService</display-name>
+ <servlet-name>ServletHello</servlet-name>
+ <servlet-class>servlet_endpoint.ServletHello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>ServletHello</servlet-name>
- <url-pattern>/webservice/ServletHelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>ServletHello</servlet-name>
+ <url-pattern>/webservice/ServletHelloService</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties
index e46a810..99c4c7e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservices13-addressing-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 6389e73..0961163 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
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<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"/>
@@ -124,11 +124,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
index 2a92e35..3ce871b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
index a478d81..3debd3d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-2/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(name="foo/bar" ,value =SubtractNumbersService.class)
@Addressing (enabled=false)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
index 97bd436..798cf0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/appclient/Client.java
@@ -32,10 +32,10 @@
@WebServiceRef(name="service/MyService") static AddNumbersService service;
public static void main(String[] args) {
- stat.addDescription("webservices13-addressing-appclient test");
+ stat.addDescription("webservices13-addressing-appclient test");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices13-addressing-appclientID");
+ stat.printSummary("webservices13-addressing-appclientID");
}
public void doTest(String[] args) {
@@ -45,7 +45,7 @@
AddNumbersPortType port = service.getAddNumbersPort();
((BindingProvider)port).getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,"http://localhost:8080/webservices13-addressing-appclient/webservice/AddNumbersService?WSDL");
int ret = port.addNumbers(100, 200);
- if(ret != 300) {
+ if(ret != 300) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("webservices13-addressing-appclient", stat.FAIL);
return;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties
index 019c686..5c739c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservices13-addressing-appclient"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
index 7ffa7b0..3920cfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/build.xml
@@ -109,7 +109,7 @@
<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}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
index 6a135ad..fe3f736 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-client.xml
@@ -17,12 +17,12 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="AddNumbers.wsdl"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ xmlns="http://java.sun.com/xml/ns/jaxws">
<bindings node="ns1:definitions" xmlns:ns1="http://schemas.xmlsoap.org/wsdl/">
<package name="client"/>
</bindings>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
index 4cfbb59..e6bb237 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/custom-server.xml
@@ -17,7 +17,7 @@
-->
-<bindings
+<bindings
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:jaxb="http://java.sun.com/xml/ns/jaxb"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
index 374f5bd..c3d2b99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/endpoint/AddNumbersImpl.java
@@ -19,7 +19,7 @@
@jakarta.xml.ws.BindingType(jakarta.xml.ws.soap.SOAPBinding.SOAP12HTTP_BINDING)
@jakarta.jws.WebService (wsdlLocation="WEB-INF/wsdl/AddNumbers.wsdl", serviceName="AddNumbersService", targetNamespace="http://duke.org", portName="AddNumbersPort", endpointInterface="endpoint.AddNumbersPortType")
public class AddNumbersImpl implements AddNumbersPortType {
-
+
public int addNumbers (int number1, int number2) {
return number1 + number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
index 6256153..1889eb4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing-appclient/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>AddNumbers Service</description>
+ <description>AddNumbers Service</description>
- <servlet>
- <description>Endpoint for AddNumbers Web Service</description>
- <display-name>AddNumbersWebService</display-name>
- <servlet-name>AddNumbersImpl</servlet-name>
- <servlet-class>endpoint.AddNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumbers Web Service</description>
+ <display-name>AddNumbersWebService</display-name>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <servlet-class>endpoint.AddNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/webservice/AddNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/webservice/AddNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties
index 80bb1c1..b711cb3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservices13-addressing"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 bccc7ab..4ae3018 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
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<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"/>
@@ -124,11 +124,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
index 2d1571d..35b7a1a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
index 55f405f..fddb240 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-addressing/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties
index 05ee829..376f59f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservices13-clientdds"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 e85eb0d..8ef10aa 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
@@ -64,7 +64,7 @@
<antcall target="wsimport">
<param name="wsimport.args"
value=" -Xendorsed -p endpoint -keep -d ${build.classes.dir} ${env.APS_HOME}/devtests/webservice/annotations/webservices13-clientdds/SubtractNumbers.wsdl"/>
- </antcall>
+ </antcall>
<antcall target="compile"/>
<antcall target="pkg-war">
<param name="wsdlfile.location" value="${env.APS_HOME}/devtests/webservice/annotations/webservices13-clientdds"/>
@@ -83,7 +83,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<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"/>
@@ -125,11 +125,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
index fbd3af2..2ed3a91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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 8d10efd..4c9bc4e 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
@@ -26,7 +26,7 @@
endpointInterface="endpoint.SubtractNumbersPortType")
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
index 21087d2..8fad0d4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-clientdds/webclient/Client.java
@@ -28,11 +28,11 @@
//@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersPortType port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties
index 9f0eb51..55dcf0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="webservices13-respectbinding"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 a86a237..12922e9 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
@@ -86,7 +86,7 @@
<javac srcdir="." destdir="${build.classes.dir}/webclient/WEB-INF/classes"
includes="webclient/**">
<classpath refid="classpath"/>
-
+
</javac>
<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"/>
@@ -127,11 +127,11 @@
<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"
+ <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">
@@ -141,7 +141,7 @@
<arg value="http://${http.host}:${http.port}/wsclient/RequestProcessor"/>
</java>
-<!--restore the tokens back in file-->
+<!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
index 987551d..77e2cab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF SUBTRACT SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[5555]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
index 4d63392..ad9f791 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/endpoint/SubtractNumbersImpl.java
@@ -18,7 +18,7 @@
@jakarta.jws.WebService
public class SubtractNumbersImpl {
-
+
public int subtractNumbers (int number1, int number2) {
return number1 - number2;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
index 4342434..4a1b283 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/web.xml
@@ -18,29 +18,29 @@
-->
<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">
+ 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>SubtractNumbers Service</description>
+ <description>SubtractNumbers Service</description>
- <servlet>
- <description>Endpoint for SubtractNumbers Web Service</description>
- <display-name>SubtractNumbersWebService</display-name>
- <servlet-name>SubtractNumbersService</servlet-name>
- <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for SubtractNumbers Web Service</description>
+ <display-name>SubtractNumbersWebService</display-name>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <servlet-class>endpoint.SubtractNumbersImpl</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>SubtractNumbersService</servlet-name>
- <url-pattern>/webservice/SubtractNumbersService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>SubtractNumbersService</servlet-name>
+ <url-pattern>/webservice/SubtractNumbersService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
index 2c75f33..2421143 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/webservices13-respectbinding/webclient/Client.java
@@ -28,11 +28,11 @@
@jakarta.xml.ws.WebServiceRef(SubtractNumbersService.class)
//@Addressing (required = true,enabled=true ,responses=AddressingFeature.Responses.NON_ANONYMOUS)
- //@Addressing
+ //@Addressing
SubtractNumbersImpl port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties
index cef48f8..73df654 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsctx"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
index 4e70668..97c8198 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/build.xml
@@ -56,12 +56,12 @@
</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"/>
@@ -78,7 +78,7 @@
<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="init-common">
<property name="client.war" value="${assemble.dir}/wsclient.war"/>
<echo message="Deploying ${wsdl.war} from ${basedir}." level="verbose"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
index 557110f..083dc69 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello AllHelloWAR]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
index 4af6b43..b2dd71c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/endpoint/Hello.java
@@ -26,20 +26,20 @@
@WebService
public class Hello {
-
+
@Resource WebServiceContext wsc;
public String sayHello(String param) {
- System.out.println("wsctxt-servlet wsc = " + wsc);
- if(wsc != null) {
+ System.out.println("wsctxt-servlet wsc = " + wsc);
+ if(wsc != null) {
ServletContext sc =
(ServletContext)wsc.getMessageContext().get(MessageContext.SERVLET_CONTEXT);
String a = null;
if (sc!= null ) {
a = sc.getServletContextName();
}
- return "Hello " + param +a;
+ return "Hello " + param +a;
}
- return "WebService Context injection failed";
+ return "WebService Context injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
index f51ccc0..564cd4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Hello Service</description>
- <display-name>HelloWAR</display-name>
+ <description>WebTier for the Hello Service</description>
+ <display-name>HelloWAR</display-name>
- <servlet>
- <description>Endpoint for Hello Web Service</description>
- <display-name>HelloWebService</display-name>
- <servlet-name>Hello</servlet-name>
- <servlet-class>endpoint.Hello</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Hello Web Service</description>
+ <display-name>HelloWebService</display-name>
+ <servlet-name>Hello</servlet-name>
+ <servlet-class>endpoint.Hello</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Hello</servlet-name>
- <url-pattern>/HelloService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Hello</servlet-name>
+ <url-pattern>/HelloService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
index 40fc285..95cb73f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsctxt/webclient/Client.java
@@ -29,8 +29,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
index 55de93a..efbd7ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsdltojava"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 e5499f5..7c41604 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/build.xml
@@ -71,8 +71,8 @@
<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"
+ <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>
@@ -85,14 +85,14 @@
<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>
- <!--restore the tokens back in file-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
index e544de5..47200d0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/client/Client.java
@@ -22,33 +22,33 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
- stat.addStatus(args[0], stat.PASS);
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
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 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customclient.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
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 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/customservice.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
index a93d8d1..654ce72 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/service/HelloImpl.java
@@ -38,8 +38,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
index 640433a..95665f8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/annotations/wsdltojava/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="2.5" xmlns="http://java.sun.com/xml/ns/javaee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd">
<display-name>WSW2JRLHttpTestApp</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
index 2529bc1..0a50676 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/build.xml
@@ -39,10 +39,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant doclit
- ant all
- </echo>
+ <echo>
+ Usage:
+ ant doclit
+ ant all
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
index 31029ff..dc3f633 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="doclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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/anonymous/doclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
index 648ec53..95d9412 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/doclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build" depends="init-common, clean">
@@ -61,7 +61,7 @@
<target name="gen-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping.xml ${features} config.xml"/>
</antcall>
</target>
@@ -70,7 +70,7 @@
<!-- NO feature flags as mapping file should contain enough info -->
<target name="gen-non-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:both -cp . -f:wsi mapping.config.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
index b375f50..8c339e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.properties
@@ -15,22 +15,22 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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/anonymous/rpclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
index c74260a..e36baee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/anonymous/rpclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="build" depends="init-common, clean">
@@ -61,7 +61,7 @@
<target name="gen-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping.xml ${features} config.xml"/>
</antcall>
</target>
@@ -70,7 +70,7 @@
<!-- NO feature flags as mapping file should contain enough info -->
<target name="gen-non-portable" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-gen:both -cp . -f:wsi mapping.config.xml"/>
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/build.xml
index c60dc4f..6e5faaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/build.xml
@@ -39,16 +39,16 @@
<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="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="annotations" target="all"/>
- <ant dir="ejb_annotations" target="all"/>
+<!-- <ant dir="simplefault" target="all"/>
+ <ant dir="handler" target="all"/>
+ <ant dir="webstub_properties" target="all"/>
+ <ant dir="servlethandler" 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 -->
@@ -87,24 +87,24 @@
<target name="clean">
<delete>
- <fileset dir="${basedir}"
+ <fileset dir="${basedir}"
includes="**.output, count.txt"/>
</delete>
<ant dir="google" target="clean"/>
<ant dir="xsdany" target="clean"/>
<ant dir="mapping/j2w/signature" target="clean"/>
<ant dir="webstub_properties" target="clean"/>
- <ant dir="filter_urlhandling" target="clean"/>
+ <ant dir="filter_urlhandling" target="clean"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes all the webservice tests)
+ <echo>
+ Usage:
+ ant all (Executes all the webservice tests)
- ant google (Executes the google tests)
- ant xsdany (Executes the xsdany tests)
- </echo>
+ ant google (Executes the google tests)
+ ant xsdany (Executes the xsdany tests)
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
index e7f211e..d6dea53 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/common/targets.xml
@@ -84,14 +84,14 @@
</target>
-
-
+
+
<target name="clean" >
<delete dir="${build}" />
<delete dir="${env.APS_HOME}/build" />
- <delete dir="${dist}" />
+ <delete dir="${dist}" />
<delete dir="${assemble}" />
<delete dir="${assemble.dir}" />
<delete file="${ear.name}" />
@@ -191,7 +191,7 @@
onerror="abort" >
<transaction src="${sql.script}"/>
</sql>
- </target>
+ </target>
<target name="delete-db"
description="Deletes the database tables." >
@@ -221,39 +221,39 @@
<equals arg1="${db.ping.result}" arg2="0" />
</condition>
</target>
-
+
<target name="start-db"
unless="db.running"
description="Starts the Derby databse server."
depends="ping-db">
-
+
<sun-appserv-admin
explicitcommand="start-database" />
</target>
-
+
<target name="stop-db"
description="Stops the Derby database server."
depends="ping-db"
if="db.running">
<sun-appserv-admin
explicitcommand="stop-database" />
- </target>
-
+ </target>
+
<target name="admin_command_common">
<echo message="Doing admin task ${admin.command}"/>
- <sun-appserv-admin
+ <sun-appserv-admin
command="${admin.command}"
- user="${admin.user}"
- passwordfile="${admin.password.file}"
- host="${admin.host}"
- port="${admin.port}"
+ user="${admin.user}"
+ passwordfile="${admin.password.file}"
+ host="${admin.host}"
+ port="${admin.port}"
asinstalldir="${j2ee.home}" />
</target>
-
+
<target name="create-jdbc-resource_common">
<antcall target="admin_command_common">
<param name="admin.command"
- value="create-jdbc-resource
+ value="create-jdbc-resource
--connectionpoolid ${conpool.name} ${jdbc.resource.name}" />
</antcall>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties
index e86f005..e9ff113 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="doclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
index 7b31edf..6c45a06 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -52,16 +52,16 @@
<target name="assemble" depends="init-common, build, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="DocLitMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="DocLitMapping.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="DocLitMapping.xml,META-INF/wsdl/**,doclit/*.class" />
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -75,19 +75,19 @@
<target name="run" depends="init-common">
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
- </target>
+ </target>
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/doclit">
- <fileset dir="output/doclit"
+ <fileset dir="output/doclit"
includes="SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -98,23 +98,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model DocLitMapping.xml wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model DocLitMapping.xml wscompile_config.xml"/>
<!-- use mapping -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
-->
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
index e6e100e..36597bb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/doclit/SimpleTestImpl.java
@@ -15,7 +15,7 @@
*/
/*
- * @(#)SimpleTestImpl.java 1.3 02/04/05
+ * @(#)SimpleTestImpl.java 1.3 02/04/05
*/
package doclit;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
index db0451e..a7cee02 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/doclit/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="doclit"/>
</configuration>
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 743a418..82e6172 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
@@ -17,16 +17,16 @@
-->
<property environment="env"/>
-<property file="${env.APS_HOME}/config.properties"/>
+<property file="${env.APS_HOME}/config.properties"/>
<target name="test-all" depends="clean">
<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"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="deploy">
- <param name="pkg-name" value="${pkg-name}"/>
- </antcall>
+ <param name="pkg-name" value="${pkg-name}"/>
+ </antcall>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
@@ -42,11 +42,11 @@
</target>
<target name="clean">
- <echo message="Clean from ${ant.file}"/>
+ <echo message="Clean from ${ant.file}"/>
<delete dir="${env.APS_HOME}/build/module/classes"/>
- <delete dir="${env.APS_HOME}/build/module/archive"/>
- <mkdir dir="${env.APS_HOME}/build/module/classes"/>
- <mkdir dir="${env.APS_HOME}/build/module/archive"/>
+ <delete dir="${env.APS_HOME}/build/module/archive"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes"/>
+ <mkdir dir="${env.APS_HOME}/build/module/archive"/>
</target>
<path id="classpath">
@@ -68,14 +68,14 @@
<target name="test-compile">
<echo message="Compiling into ${pkg-name}/${server}.class"/>
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/*.java">
<classpath refid="classpath"/>
</javac>
</target>
<target name="compile-client">
- <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
+ <javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="${client-src-name}">
<classpath refid="classpath"/>
</javac>
@@ -84,15 +84,15 @@
<target name="build">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="test-compile"/>
<echo message="Building with package ${pkg-name}"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar"
basedir="${env.APS_HOME}/build/module/classes"
includes="${pkg-name}/**">
- <metainf dir="${pkg-name}"
- includes="*.xml **/*.wsdl **/*.xsd"/>
- </jar>
+ <metainf dir="${pkg-name}"
+ includes="*.xml **/*.wsdl **/*.xsd"/>
+ </jar>
</target>
<target name="deploy">
@@ -109,7 +109,7 @@
<target name="undeploy">
<basename file="${src-name}" property="server" suffix=".java"/>
<antcall target="autoundeploy-file">
- <param name="filename" value="${server}.jar"/>
+ <param name="filename" value="${server}.jar"/>
</antcall>
<condition property="undeploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_undeployed"/>
@@ -132,7 +132,7 @@
</target>
<target name="report" depends="internal-report-success, internal-report-failure">
- <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
+ <delete file="${env.S1AS_HOME}/domains/domain1/autodeploy/${class-name}_*"/>
</target>
<target name="run">
@@ -145,7 +145,7 @@
</condition>
<antcall target="prepare-client"/>
<antcall target="internal-run"/>
-<!--restore the tokens back in file-->
+<!--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>
@@ -159,7 +159,7 @@
</target>
<target name="configurable-wsdl-import">
- <echo message="wsimporting ${protocol}://${host-name}:${host-port}/${server}Service/${port}?WSDL; special args are ${wsimport-special-args}"/>
+ <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"/>
</exec>
@@ -169,13 +169,13 @@
<!--basename file="${server}" property="port" suffix="EJB"/-->
<basename file="${server}" property="port"/>
<antcall target="wsdl-import">
- <param name="server" value="${server}"/>
- <param name="port" value="${port}"/>
+ <param name="server" value="${server}"/>
+ <param name="port" value="${port}"/>
</antcall>
<replace file="client/Client.java" value="${http.host}" token="HTTP_HOST"/>
<replace file="client/Client.java" value="${http.port}" token="HTTP_PORT"/>
- <antcall target="compile-client"/>
+ <antcall target="compile-client"/>
<antcall target="unjar-client-utils"/>
</target>
@@ -186,11 +186,11 @@
<target name="internal-run" if="deploy_succeeded">
<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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
<echo message="Running appclient with ${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
<exec executable="${env.S1AS_HOME}/bin/appclient" dir="${env.APS_HOME}/build/module/classes">
- <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
+ <arg line="${client-pkg-name}.${client} ${app-client-parameters} ${app-client-extra-parameters}"/>
</exec>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
index e909636..c49e40e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="async"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 d3e3a28..e02613e 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
@@ -60,8 +60,8 @@
<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"
+ <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>
@@ -72,13 +72,13 @@
<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-->
+ <!--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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
index b92f35b..66fe8d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/async/client/Client.java
@@ -37,23 +37,23 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("async-ejb-service");
+ stat.addDescription("async-ejb-service");
Client client = new Client();
client.doSyncTest();
client.doASyncPollTest();
client.doASyncCallBackTest();
- stat.printSummary("async-ejb-service");
+ stat.printSummary("async-ejb-service");
}
public void doSyncTest() {
try {
AddNumbersImpl port = service.getAddNumbersImplPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-sync-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-sync-test", stat.PASS);
} catch(Exception e) {
@@ -70,11 +70,11 @@
Thread.sleep (2000);
AddNumbersResponse output = resp.get();
int ret = output.getReturn();
- if(ret!=(1234+5678)) {
+ if(ret!=(1234+5678)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-poll-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-poll-test", stat.PASS);
} catch(Exception e) {
@@ -92,11 +92,11 @@
Thread.sleep (2000);
AddNumbersResponse output = cbh.getResponse ();
int ret = output.getReturn();
- if(ret!=(9876+5432)) {
+ if(ret!=(9876+5432)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("async-ejb-service-callbackhandler-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-ejb-service-callbackhandler-test", stat.PASS);
} catch(Exception e) {
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 633f712..0e3aca6 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
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/AddNumbersImplService/AddNumbersImpl?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ 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>
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 d0669de..1c9b9fd 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
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,18 +32,18 @@
<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>
+ <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"/>
+ <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">
@@ -54,10 +54,10 @@
<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>
+ 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>
@@ -68,20 +68,20 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <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}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
-<!--restore the tokens back in file-->
+<!--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>
@@ -92,6 +92,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
index 372facd..4ca9ba4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,25 +27,25 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("async-ejb-client");
+ stat.addDescription("async-ejb-client");
Client client = new Client();
client.doSyncTest();
client.doAsyncPollTest();
client.doAsyncCallbackTest();
- stat.printSummary("async-ejb-client");
+ stat.printSummary("async-ejb-client");
}
public void doSyncTest() {
try {
String ret = hello.invokeSync("Hello Tester !");
- if(ret.indexOf("SYNC CALL") == -1) {
+ if(ret.indexOf("SYNC CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-sync-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-sync-ejb-client", stat.PASS);
} catch(Exception e) {
@@ -57,11 +57,11 @@
public void doAsyncPollTest() {
try {
String ret = hello.invokeAsyncPoll("Hello Tester !");
- if(ret.indexOf("ASYNC POLL CALL") == -1) {
+ if(ret.indexOf("ASYNC POLL CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-poll-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-poll-ejb-client", stat.PASS);
} catch(Exception e) {
@@ -73,11 +73,11 @@
public void doAsyncCallbackTest() {
try {
String ret = hello.invokeAsyncCallBack("Hello Tester !");
- if(ret.indexOf("ASYNC CALL BACK CALL") == -1) {
+ if(ret.indexOf("ASYNC CALL BACK CALL") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("async-callback-ejb-client", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("async-callback-ejb-client", stat.PASS);
} catch(Exception e) {
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 8857cca..67df59b 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
@@ -21,7 +21,7 @@
xmlns:xsd="http://www.w3.org/2001/XMLSchema"
xmlns:wsdl="http://schemas.xmlsoap.org/wsdl/"
wsdlLocation="http://HTTP_HOST:HTTP_PORT/WebServiceEJBService/WebServiceEJB?WSDL"
- xmlns="http://java.sun.com/xml/ns/jaxws">
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
index 2baa0f0..5907284 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/Hello.java
@@ -20,7 +20,7 @@
@Remote
public interface Hello {
- public String invokeSync(String msg);
- public String invokeAsyncPoll(String msg);
- public String invokeAsyncCallBack(String msg);
+ public String invokeSync(String msg);
+ public String invokeAsyncPoll(String msg);
+ public String invokeAsyncCallBack(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
index 3fe23ee..c897330 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/asyncejbclient/ejb/HelloEJB.java
@@ -27,24 +27,24 @@
import endpoint.SayHelloResponse;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invokeSync(String string) {
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- return ejb.sayHello("SYNC CALL" + string);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ return ejb.sayHello("SYNC CALL" + string);
}
public String invokeAsyncPoll(String msg) {
try {
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
Response<SayHelloResponse> resp = ejb.sayHelloAsync("ASYNC POLL CALL" + msg);
- Thread.sleep (2000);
- SayHelloResponse out = resp.get();
+ Thread.sleep (2000);
+ SayHelloResponse out = resp.get();
return(out.getReturn());
} catch(Throwable t) {
return(t.getMessage());
@@ -52,9 +52,9 @@
}
public String invokeAsyncCallBack(String msg) {
- try {
+ try {
System.out.println("VIJ - invoking async call back");
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
MyCallBackHandler cbh = new MyCallBackHandler();
Future<?> response =
ejb.sayHelloAsync("ASYNC CALL BACK CALL" + msg, cbh);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
index 25afd85..4f9b61e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="bigint"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 c4bd333..5a88fc3 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
@@ -51,7 +51,7 @@
<jar destfile="${assemble.dir}/${appname}-ejb.jar"
basedir="${build.classes.dir}"
includes="**">
- </jar>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
@@ -61,8 +61,8 @@
<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"
+ <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>
@@ -75,7 +75,7 @@
<arg line="${as.props}"/>
<arg line="--upload=true"/>
<arg line="--dropandcreatetables"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-ejb.jar"/>
</exec>
</target>
@@ -86,14 +86,14 @@
<arg line="${as.props}"/>
<arg line="--droptables=true"/>
<arg line="--cascade=true"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
index 27427f1..c448b8c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/bigint/endpoint/CustomerManager.java
@@ -47,6 +47,6 @@
System.out.println("removeCustomer");
String ejbQL = "DELETE FROM Customer c WHERE c.name = \""+id+"\"";
int ret = em.createQuery( ejbQL ).executeUpdate();
- return ret;
+ return ret;
}
}
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 036906a..5d4a26a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/build.xml
@@ -24,41 +24,41 @@
<target name="all">
<ant dir="noname" target="all"/>
<ant dir="nointf" target="all"/>
- <ant dir="security" target="all"/>
- <!--ant dir="provider" target="all"/-->
- <ant dir="oneway" target="all"/>
- <ant dir="wsctxtinterceptor" target="all"/>
+ <ant dir="security" target="all"/>
+ <!--ant dir="provider" target="all"/-->
+ <ant dir="oneway" target="all"/>
+ <ant dir="wsctxtinterceptor" target="all"/>
<ant dir="ejbclient" target="all"/>
- <ant dir="msgctxt" target="all"/>
- <ant dir="asyncejbclient" target="all"/>
+ <ant dir="msgctxt" target="all"/>
+ <ant dir="asyncejbclient" target="all"/>
<ant dir="serviceejbclient" target="all"/>
- <ant dir="portejbclient" target="all"/>
- <ant dir="localremoteejbwebservice" target="all"/>
- <ant dir="libdependent" target="all"/>
- <ant dir="messagectxt" target="all"/>
- <ant dir="singleton" target="all"/>
- <ant dir="msgctxinterceptor" target="all"/>
- <ant dir="ejbwebservicesinwar" target="all"/>
- <ant dir="ejbwebservicesinwar-2" target="all"/>
- <ant dir="ejbwebservicesinwar-3" target="all"/>
- <ant dir="ejbwebservicesinwar-sessioncontext" target="all"/>
- <ant dir="ejbwebservicesinwar-interceptor" target="all"/>
+ <ant dir="portejbclient" target="all"/>
+ <ant dir="localremoteejbwebservice" target="all"/>
+ <ant dir="libdependent" target="all"/>
+ <ant dir="messagectxt" target="all"/>
+ <ant dir="singleton" target="all"/>
+ <ant dir="msgctxinterceptor" target="all"/>
+ <ant dir="ejbwebservicesinwar" target="all"/>
+ <ant dir="ejbwebservicesinwar-2" target="all"/>
+ <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="async" target="all"/>
- <!--<ant dir="bigint" target="all"/>-->
- <ant dir="libdependent" target="all"/>
- <ant dir="libdependent-2" target="all"/>
+ <ant dir="async" target="all"/>
+ <!--<ant dir="bigint" target="all"/>-->
+ <ant dir="libdependent" target="all"/>
+ <ant dir="libdependent-2" target="all"/>
<ant dir="svchandler" target="all"/>
- <ant dir="wsctxt" target="all"/>
- <ant dir="sessionctx" target="all"/>
- <ant dir="wsnameejbname" target="all"/>
- <ant dir="dependencynoinjection" target="all"/>
- <ant dir="exception" target="all"/>
- <ant dir="methodinjection" target="all"/>
- <ant dir="invalidmethodinjection" target="all"/>
+ <ant dir="wsctxt" target="all"/>
+ <ant dir="sessionctx" target="all"/>
+ <ant dir="wsnameejbname" target="all"/>
+ <ant dir="dependencynoinjection" target="all"/>
+ <ant dir="exception" target="all"/>
+ <ant dir="methodinjection" target="all"/>
+ <ant dir="invalidmethodinjection" target="all"/>
<ant dir="portdependencynoinjection" target="all"/>
- <ant dir="portfieldinjection" target="all"/>
- <ant dir="portmethodinjection" target="all"/>
+ <ant dir="portfieldinjection" target="all"/>
+ <ant dir="portmethodinjection" target="all"/>
<ant dir="wsRef-webservice-features" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
index 7abf638..5461e1e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/dependencynoinjection/client/Client.java
@@ -34,22 +34,22 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-dependency-no-injection");
+ stat.addDescription("ws-dependency-no-injection");
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
- } catch(Throwable t) {
- t.printStackTrace();
- System.out.println("Dependency lookup failed : " + t.getMessage());
- stat.addStatus("ws-dependency-no-injection", stat.FAIL);
- }
- System.out.println("Service is " + service);
- if (service!=null) {
- Client client = new Client();
- client.doTest(args);
- }
- stat.printSummary("ws-dependency-no-injection");
+ service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+ } catch(Throwable t) {
+ t.printStackTrace();
+ System.out.println("Dependency lookup failed : " + t.getMessage());
+ stat.addStatus("ws-dependency-no-injection", stat.FAIL);
+ }
+ System.out.println("Service is " + service);
+ if (service!=null) {
+ Client client = new Client();
+ client.doTest(args);
+ }
+ stat.printSummary("ws-dependency-no-injection");
}
public void doTest(String[] args) {
@@ -57,11 +57,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-method-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-dependency-no-injection", stat.PASS);
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 f7ca438..6dd0dfe 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
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,30 +32,30 @@
<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>
+ <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>
+ <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>
+ 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>
@@ -66,17 +66,17 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <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}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
index 76dbcd0..fdaf43d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,24 +27,24 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("ejbclient-annotation");
+ stat.addDescription("ejbclient-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbclient-annotation");
+ stat.printSummary("ejbclient-annotation");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = hello.invoke("Hello Tester !");
- if(ret.indexOf("Hello Tester") == -1) {
+ if(ret.indexOf("Hello Tester") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejbclient-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
index 86ad44f..86ed68d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/Hello.java
@@ -20,5 +20,5 @@
@Remote
public interface Hello {
- public String invoke(String msg);
+ public String invoke(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
index d95f391..9507f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbclient/ejb/HelloEJB.java
@@ -22,18 +22,18 @@
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invoke(String string) {
- System.out.println("invoked with " + string);
- System.out.println("getting the port now from " + webService);
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- System.out.println("got " + ejb);
- return ejb.sayHello(string);
+ System.out.println("invoked with " + string);
+ System.out.println("getting the port now from " + webService);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ System.out.println("got " + ejb);
+ return ejb.sayHello(string);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties
index b1fdcaf..2f15d15 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbservletwebservicesinwar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 b653900..23fc718 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -114,7 +114,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -140,6 +140,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
index 0fb0f1b..01549ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
index e422760..b8e8dfa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
index f3ca33c..4505052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloEjb.java
@@ -33,10 +33,10 @@
@Resource
private SessionContext sc;
- public HelloEjb() {}
+ public HelloEjb() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "EJB WS:" + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "EJB WS:" + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
index 1b4927e..ab0854f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/endpoint/HelloWS.java
@@ -28,10 +28,10 @@
)
public class HelloWS {
- public HelloWS() {}
+ public HelloWS() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Servlet WS:" + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Servlet WS:" + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
index 3797941..38c8dda 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbservletwebservicesinwar/webclient/Client.java
@@ -32,8 +32,8 @@
@jakarta.xml.ws.WebServiceRef(webclient.HelloService.class)
webclient.Hello hiport2;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties
index 18538d4..e8334a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 731cc5f..f788575 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
index d5a7ae8..4e2a65c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/endpoint/Hello.java
@@ -32,10 +32,10 @@
//@Resource
// private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-2/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties
index d8f481b..701cb87 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar-3"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 731cc5f..f788575 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
index e1665b3..c1b7dab 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
index d964e8f..ab85c81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/endpoint/Hello.java
@@ -33,10 +33,10 @@
@Resource
private WebServiceContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-3/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties
index 8fa0abb..eaf46d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar-interceptor"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 731cc5f..f788575 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
index 4c025d9..a52c9cf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[sayHello]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
index a044778..e0bec45 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/endpoint/Hello.java
@@ -32,12 +32,12 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
@jakarta.interceptor.Interceptors(SimpleInterceptor.class)
- public String sayHello(Object who) {
- return "Hello " + who ;
+ public String sayHello(Object who) {
+ return "Hello " + who ;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-interceptor/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties
index 581af77..345bd48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar-sessioncontext"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 731cc5f..f788575 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -109,7 +109,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -135,6 +135,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
index a39ce27..e329882 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
index 86fa82c..32321fe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/endpoint/Hello.java
@@ -32,11 +32,11 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who ;
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who ;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
index b263ee0..8943a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar-sessioncontext/webclient/Client.java
@@ -28,8 +28,8 @@
@jakarta.xml.ws.WebServiceRef(HelloService.class)
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
index 18b4ccc..1d3953d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwebservicesinwar"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
index 14cc5fd..10b6a4c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/build.xml
@@ -75,7 +75,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
-
+
<target name="runclient" depends="init-common">
<mkdir dir="${build.classes.dir}/client"/>
<javac srcdir="." destdir="${build.classes.dir}/client"
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
index 77dfd07..d032934 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("ejbwebservicesinwar");
+ stat.addDescription("ejbwebservicesinwar");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbwebservicesinwar");
+ stat.printSummary("ejbwebservicesinwar");
}
public void doTest(String[] args) {
@@ -41,17 +41,17 @@
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("message="))>0){
- String url = inputLine.substring(index+7);
+ String url = inputLine.substring(index+7);
if (url.indexOf("sayHello")>0) {
stat.addStatus("ejbwebservicesinwar", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
index 665690a..2be69f2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/endpoint/Hello.java
@@ -33,10 +33,10 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwebservicesinwar/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
index fde379a..d2623f4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="ejbwsinwarwithwsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
index 88cc758..e93c0ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/build.xml
@@ -48,7 +48,7 @@
value="-wsdllocation WEB-INF/wsdl/HelloService.wsdl -keep -d ${build.classes.dir} HelloService.wsdl"/>
</antcall>
</target>
-
+
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="endpoint"/>
@@ -97,6 +97,6 @@
<param name="other-args" value="ejbwsinwarwithwsdl"/>
</antcall>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
index c2770e3..691a012 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/client/Client.java
@@ -30,10 +30,10 @@
public static void main(String[] args) {
- stat.addDescription("ejbwsinwarwithwsdl");
+ stat.addDescription("ejbwsinwarwithwsdl");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejbwsinwarwithwsdl");
+ stat.printSummary("ejbwsinwarwithwsdl");
}
public void doTest(String[] args) {
@@ -50,17 +50,17 @@
/*
URL serviceInfo = new URL (args[0]);
URLConnection con = serviceInfo.openConnection();
- BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
+ BufferedReader in = new BufferedReader(new InputStreamReader(con.getInputStream()));
String inputLine;
- int index=0;
+ int index=0;
while ((inputLine = in.readLine()) != null) {
if ((index= inputLine.indexOf("href="))>0){
- String url = inputLine.substring(index+1);
+ String url = inputLine.substring(index+1);
if (url.indexOf("http:")>0) {
stat.addStatus("ejbwsinwarwithwsdl", stat.PASS);
- }
+ }
System.out.println(inputLine);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
index 34ab65f..5c64053 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/endpoint/Hello.java
@@ -30,9 +30,9 @@
@Resource
private SessionContext sc;
- public Hello() {}
+ public Hello() {}
- public String sayHello(String who) {
- return "WebSvcTest-Hello " + who;
- }
+ public String sayHello(String who) {
+ return "WebSvcTest-Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/ejbwsinwarwithwsdl/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
index ac6e3bd..b8e90be 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-exception");
+ stat.addDescription("ejb-exception");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-exception");
+ stat.printSummary("ejb-exception");
}
public void doTest(String[] args) {
@@ -43,15 +43,15 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
- // we were supposed to fail !
+ // we were supposed to fail !
stat.addStatus("ejb-exception", stat.FAIL);
} catch(Exception e) {
System.out.println("Got expected exception " + e.getMessage());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
index 70084ac..a8f7b13 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/exception/endpoint/HelloImpl.java
@@ -24,6 +24,6 @@
public class HelloImpl {
public String sayHello(String who) {
- throw new RuntimeException("I am a bad bad ejb endpoint");
+ throw new RuntimeException("I am a bad bad ejb endpoint");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
index 8b2f576..a5451a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
index 0a1ed84..fa63782 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/invalidmethodinjection/client/Client.java
@@ -29,28 +29,28 @@
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void setService(HelloImplService s) {
-
- System.out.println("Injection sucessful with "+s.getClass().toString());
- service = s;
- }
+ static void setService(HelloImplService s) {
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static int setFoo(HelloImplService s) {
- service1 = s;
- return 0;
- }
+ System.out.println("Injection sucessful with "+s.getClass().toString());
+ service = s;
+ }
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void myService(String foo, HelloImplService s) {
- service2 = s;
- }
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static int setFoo(HelloImplService s) {
+ service1 = s;
+ return 0;
+ }
+
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static void myService(String foo, HelloImplService s) {
+ service2 = s;
+ }
@WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- void setMyService(HelloImplService s) {
-
- service3 = s;
- }
+ void setMyService(HelloImplService s) {
+
+ service3 = s;
+ }
static HelloImplService service1=null;
@@ -63,28 +63,28 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-ejb-invalidmethodinjection");
+ stat.addDescription("ws-ejb-invalidmethodinjection");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ws-ejb-invalidmethodinjection");
+ stat.printSummary("ws-ejb-invalidmethodinjection");
}
public void doTest(String[] args) {
try {
- if (service1!=null || service2!=null || service3!=null) {
- System.out.println("Failed : invalid injection method got injected !");
+ if (service1!=null || service2!=null || service3!=null) {
+ System.out.println("Failed : invalid injection method got injected !");
stat.addStatus("ws-ejb-invalidmethodinjection", stat.FAIL);
} else {
- System.out.println("Success : invalid references were not injected");
- }
+ System.out.println("Success : invalid references were not injected");
+ }
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-invalidmethodinjection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-ejb-invalidmethodinjection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
index daa8e10..a1d0b2d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent-2"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 48199dc..911c65c 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
@@ -70,8 +70,8 @@
<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"
+ <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>
@@ -82,7 +82,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
index 9995186..61afa16 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent-2/client/Client.java
@@ -37,21 +37,21 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-libdependent-2-service");
+ stat.addDescription("ejb-libdependent-2-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-libdependent-2-service");
+ stat.printSummary("ejb-libdependent-2-service");
}
public void doSyncTest() {
try {
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi LibDependent");
- if(ret.getRetVal().indexOf("LibDep") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("LibDep") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-libdependent-2-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-libdependent-2-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
index 0850852..0417354 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="libdependent"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 9a37d58..995cdb6 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
@@ -69,8 +69,8 @@
<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"
+ <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>
@@ -86,7 +86,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
index dadba66..3510374 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/libdependent/client/Client.java
@@ -37,10 +37,10 @@
// static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-libdependent-service");
+ stat.addDescription("ejb-libdependent-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-libdependent-service");
+ stat.printSummary("ejb-libdependent-service");
}
public void doSyncTest() {
@@ -48,11 +48,11 @@
HelloImplService service = new HelloImplService();
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi LibDependent");
- if(ret.getRetVal().indexOf("LibDep") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("LibDep") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-libdependent-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-libdependent-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
index f7ca438..6dd0dfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/build.xml
@@ -22,7 +22,7 @@
]>
<project name="Hello" default="core" basedir=".">
-
+
&commonBuild;
<property name="src-name" value="endpoint/WebServiceEJB.java"/>
@@ -32,30 +32,30 @@
<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>
+ <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>
+ <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>
+ 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>
@@ -66,17 +66,17 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="compile-client"/>
+ <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}"/>
+ <arg value="-Dorg.omg.CORBA.ORBInitialPort=${orb.port}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
@@ -86,6 +86,6 @@
<target name="report-failure">
<echo message="Test FAILED"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
index 1ef7a13..e878e7c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/client/Client.java
@@ -17,7 +17,7 @@
package client;
import jakarta.ejb.EJB;
-import ejb.Hello;
+import ejb.Hello;
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
@@ -27,24 +27,24 @@
new SimpleReporterAdapter("appserv-tests");
@EJB(mappedName="ejb.Hello")
- static Hello hello;
+ static Hello hello;
public static void main(String[] args) {
- stat.addDescription("localremoteejbwebservice-issue");
+ stat.addDescription("localremoteejbwebservice-issue");
Client client = new Client();
client.doTest(args);
- stat.printSummary("localremoteejbwebservice-issue");
+ stat.printSummary("localremoteejbwebservice-issue");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = hello.invoke("Hello Tester !");
- if(ret.indexOf("Hello Tester") == -1) {
+ if(ret.indexOf("Hello Tester") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("localremoteejbwebservice-issue", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
index 86ad44f..86ed68d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/Hello.java
@@ -20,5 +20,5 @@
@Remote
public interface Hello {
- public String invoke(String msg);
+ public String invoke(String msg);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
index d95f391..9507f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/ejb/HelloEJB.java
@@ -22,18 +22,18 @@
import endpoint.WebServiceEJBService;
import endpoint.WebServiceEJB;
-@Stateless
+@Stateless
public class HelloEJB implements Hello {
@WebServiceRef
WebServiceEJBService webService;
-
+
public String invoke(String string) {
- System.out.println("invoked with " + string);
- System.out.println("getting the port now from " + webService);
- WebServiceEJB ejb = webService.getWebServiceEJBPort();
- System.out.println("got " + ejb);
- return ejb.sayHello(string);
+ System.out.println("invoked with " + string);
+ System.out.println("getting the port now from " + webService);
+ WebServiceEJB ejb = webService.getWebServiceEJBPort();
+ System.out.println("got " + ejb);
+ return ejb.sayHello(string);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
index b9b572f..9e6a9b4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanLocal.java
@@ -24,6 +24,6 @@
*/
@Local
public interface NewSessionBeanLocal {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
index 6344440..02f9256 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/localremoteejbwebservice/endpoint/NewSessionBeanRemote.java
@@ -24,6 +24,6 @@
*/
@Remote
public interface NewSessionBeanRemote {
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
index 9837456..e79cebc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-msgctxt");
+ stat.addDescription("webservices-ejb-msgctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-msgctxt");
+ stat.printSummary("webservices-ejb-msgctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-msgctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-msgctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
index 91f6459..56c7d39 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/messagectxt/endpoint/HelloImpl.java
@@ -30,11 +30,11 @@
public String sayHello(String who) {
- if(ejbsc != null) {
+ if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
//System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
- return "WebSvcTest-Hello " + who;
+ return "WebSvcTest-Hello " + who;
}
else {
// System.out.println("NNN " + ejbsc.getMessageContext().getClass());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
index 1818949..e0ca532 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/methodinjection/client/Client.java
@@ -28,18 +28,18 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
- static void setService(HelloImplService s) {
- service = s;
- }
+ @WebServiceRef(wsdlLocation="http://HTTP_HOST:HTTP_PORT/HelloImplService/HelloImpl?WSDL")
+ static void setService(HelloImplService s) {
+ service = s;
+ }
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ws-ejb-method-injection");
+ stat.addDescription("ws-ejb-method-injection");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ws-ejb-method-injection");
+ stat.printSummary("ws-ejb-method-injection");
}
public void doTest(String[] args) {
@@ -47,11 +47,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-ejb-method-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-ejb-method-injection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
index d455c3a..2aca292 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/client/Client.java
@@ -32,21 +32,21 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("msgctxt-invocationhandlerctxt");
+ stat.addDescription("msgctxt-invocationhandlerctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("msgctxt-invocationhandlerctxt");
+ stat.printSummary("msgctxt-invocationhandlerctxt");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloEJBPort();
String ret = port.sayHello("Appserver Tester !");
- if(ret == null) {
+ if(ret == null) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("msgctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("msgctxt-invocationhandlerctxt", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
index 1020a1b..11aa2b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxinterceptor/endpoint/HelloEJB.java
@@ -40,7 +40,7 @@
@AroundInvoke
private Object interceptBusinessMethod(InvocationContext invCtx) {
- try {
+ try {
System.out.println("ContextData" + invCtx.getContextData());
//This is just to get the invocation trace
//remove once bug is fixed
@@ -53,7 +53,7 @@
} else {
return null;
}
- } catch(Throwable t) { t.printStackTrace();}
+ } catch(Throwable t) { t.printStackTrace();}
return null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
index 9837456..e79cebc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-msgctxt");
+ stat.addDescription("webservices-ejb-msgctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-msgctxt");
+ stat.printSummary("webservices-ejb-msgctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-msgctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-msgctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
index c06f183..7d7075e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/msgctxt/endpoint/HelloImpl.java
@@ -28,12 +28,12 @@
@Resource WebServiceContext ejbsc;
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- jakarta.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
- if(m == null)
- return "WebService Context injection failed";
- if(ejbsc != null)
- return "WebSvcTest-Hello " + who;
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ jakarta.xml.ws.handler.MessageContext m = ejbsc.getMessageContext();
+ if(m == null)
+ return "WebService Context injection failed";
+ if(ejbsc != null)
+ return "WebSvcTest-Hello " + who;
return "EJB WebServiceContext injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
index fb51256..311dd7b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="multiport"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 b8c5424..cfd00f4 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
@@ -63,11 +63,11 @@
<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"/>
+ <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>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
@@ -77,15 +77,15 @@
<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"
+ <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="undeploy" depends="init-common">
<antcall target="undeploy-jar-common"/>
</target>
-
+
<target name="run">
<antcall target="run-client">
<param name="client-class" value="client.Client"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
index 2015dec..b9c5e21 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/client/Client.java
@@ -22,50 +22,50 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@WebServiceRef static HttpTestService service;
public static void main(String[] args) {
- stat.addDescription("webservices-simple-annotation");
+ stat.addDescription("webservices-simple-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-annotation");
+ stat.printSummary("webservices-annotation");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloPort();
- HelloRequest req = new HelloRequest();
- req.setString("From Vijay ");
- HelloResponse resp = port.hello(req);
- if(resp.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp.getString().indexOf("Hello1") != -1) {
- System.out.println("Unexpected greeting " + resp.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp.getString());
+ HelloRequest req = new HelloRequest();
+ req.setString("From Vijay ");
+ HelloResponse resp = port.hello(req);
+ if(resp.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp.getString().indexOf("Hello1") != -1) {
+ System.out.println("Unexpected greeting " + resp.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp.getString());
Hello1 port1 = service.getHello1Port();
- Hello1Request req1 = new Hello1Request();
- req1.setString("From Vijay ");
- Hello1Response resp1 = port1.hello1(req1);
- if(resp1.getString().indexOf("From Vijay") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- if(resp1.getString().indexOf("Hello1") == -1) {
- System.out.println("Unexpected greeting " + resp1.getString());
- stat.addStatus(args[0], stat.FAIL);
- }
- System.out.println(resp1.getString());
- stat.addStatus(args[0], stat.PASS);
+ Hello1Request req1 = new Hello1Request();
+ req1.setString("From Vijay ");
+ Hello1Response resp1 = port1.hello1(req1);
+ if(resp1.getString().indexOf("From Vijay") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ if(resp1.getString().indexOf("Hello1") == -1) {
+ System.out.println("Unexpected greeting " + resp1.getString());
+ stat.addStatus(args[0], stat.FAIL);
+ }
+ System.out.println(resp1.getString());
+ stat.addStatus(args[0], stat.PASS);
} catch(Exception e) {
e.printStackTrace();
- stat.addStatus(args[0], stat.FAIL);
+ stat.addStatus(args[0], stat.FAIL);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
index 7c3372f..99df632 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customclient.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
index 242611b..58c55e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/customservice.xml
@@ -23,9 +23,9 @@
<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/">
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
index eb847ca..9a44ec4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/Hello1Impl.java
@@ -39,8 +39,8 @@
public Hello1Response hello1(Hello1Request req) {
System.out.println("Hello1, " + req.getString() + "!");
- Hello1Response resp = new Hello1Response();
- resp.setString("Hello1, " + req.getString() + "!");
+ Hello1Response resp = new Hello1Response();
+ resp.setString("Hello1, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
index 67df4bb..7c6ab0e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/multiport/service/HelloImpl.java
@@ -39,8 +39,8 @@
public HelloResponse hello(HelloRequest req) {
System.out.println("Hello, " + req.getString() + "!");
- HelloResponse resp = new HelloResponse();
- resp.setString("Hello, " + req.getString() + "!");
+ HelloResponse resp = new HelloResponse();
+ resp.setString("Hello, " + req.getString() + "!");
return resp;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
index 188105e..55de671 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/nointf/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-nointf-annotation");
+ stat.addDescription("webservices-ejb-nointf-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-nointf-annotation");
+ stat.printSummary("webservices-ejb-nointf-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-nointf-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
index 29c4421..7da92ba 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/client/Client.java
@@ -32,10 +32,10 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-noname-annotation");
+ stat.addDescription("webservices-ejb-noname-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-noname-annotation");
+ stat.printSummary("webservices-ejb-noname-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
Hello port = service.getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-noname-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/noname/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
index 5deb6d2..3c420fd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/client/Client.java
@@ -32,10 +32,10 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("ejb-oneway-annotation");
+ stat.addDescription("ejb-oneway-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-oneway-annotation");
+ stat.printSummary("ejb-oneway-annotation");
}
public void doTest(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
index 01cef46..7d5c431 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/oneway/endpoint/Hello.java
@@ -25,5 +25,5 @@
@WebMethod
@Oneway
- public void sayHello(String who);
+ public void sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
index 7fd8907..d1899e6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portdependencynoinjection/client/Client.java
@@ -34,33 +34,33 @@
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription("ws-portdependency-no-injection");
+ stat.addDescription("ws-portdependency-no-injection");
try {
- Context ic = new InitialContext();
+ Context ic = new InitialContext();
- port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
- } catch(Throwable t) {
- t.printStackTrace();
- System.out.println("Dependency lookup failed : " + t.getMessage());
- stat.addStatus("ws-dependency-no-injection", stat.FAIL);
- }
- System.out.println("Port is " + port);
- if (port!=null) {
- Client client = new Client();
- client.doTest(args);
- }
- stat.printSummary("ws-portdependency-no-injection");
+ port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
+ } catch(Throwable t) {
+ t.printStackTrace();
+ System.out.println("Dependency lookup failed : " + t.getMessage());
+ stat.addStatus("ws-dependency-no-injection", stat.FAIL);
+ }
+ System.out.println("Port is " + port);
+ if (port!=null) {
+ Client client = new Client();
+ client.doTest(args);
+ }
+ stat.printSummary("ws-portdependency-no-injection");
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ws-portdependency-no-injection", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ws-portdependency-no-injection", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
index d763632..d429b22 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/build.xml
@@ -24,31 +24,31 @@
<project name="methodinjection" default="core" basedir=".">
&commonBuild;
- <property file="${env.APS_HOME}/config.properties"/>
+ <property file="${env.APS_HOME}/config.properties"/>
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<target name="all" depends="clean, private-deploy, private-run, private-undeploy, report"/>
<target name="private-deploy">
- <antcall target="deploy"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="HelloImpl"/>
- <param name="port" value="HelloImpl"/>
- </antcall>
+ <antcall target="deploy"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="HelloImpl"/>
+ <param name="port" value="HelloImpl"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/GatewayImpl.java">
<classpath refid="classpath"/>
</javac>
- <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
- <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
+ <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**">
- <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
- </jar>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**">
+ <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
+ </jar>
+ <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>
@@ -59,30 +59,30 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
</target>
<target name="private-run">
<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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="GatewayImpl"/>
- <param name="port" value="GatewayImpl"/>
- </antcall>
- <antcall target="compile-client"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="GatewayImpl"/>
+ <param name="port" value="GatewayImpl"/>
+ </antcall>
+ <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="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
<target name="private-undeploy">
<antcall target="undeploy"/>
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
</target>
<target name="report-success">
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
index 7fa7620..f57d574 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/client/Client.java
@@ -28,43 +28,43 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-field-injection";
+ private final static String desc = "ws-ejb-port-field-injection";
- @WebServiceRef(GatewayImplService.class)
+ @WebServiceRef(GatewayImplService.class)
static GatewayImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
- System.out.println("Method injected reference test...");
+ System.out.println("Method injected reference test...");
String ret = port.invokeMethod("Appserver Tester !");
- if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Field injected reference test...");
+ System.out.println("Field injected reference test...");
ret = port.invokeField("Appserver Tester !");
- if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Dependency jndi looup reference test...");
+ System.out.println("Dependency jndi looup reference test...");
ret = port.invokeDependency("Appserver Tester !");
- if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
stat.addStatus(desc, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
index 099d530..c1dd371 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portejbclient/ejb/GatewayImpl.java
@@ -39,16 +39,16 @@
HelloImpl portMethod=null;
- // method injection has to be private to avoid being part of the
+ // method injection has to be private to avoid being part of the
// web service interface.
@WebServiceRef(HelloImplService.class)
private void setPort(HelloImpl port) {
- portMethod = port;
+ portMethod = port;
}
@WebMethod
public String invokeMethod(String who) {
- return "METHOD " + portMethod.sayHello(who);
+ return "METHOD " + portMethod.sayHello(who);
}
@WebMethod
@@ -58,17 +58,17 @@
@WebMethod
public String invokeDependency(String who) {
- try {
- Context ic = new InitialContext();
-// HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
-// HelloImpl port = service.getPort(HelloImpl.class);
-// System.out.println("From service... " + port.sayHello(who));
- HelloImpl port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
- return "JNDI " + port.sayHello(who);
- } catch(Throwable t) {
- t.printStackTrace();
- return "FAILED";
- }
+ try {
+ Context ic = new InitialContext();
+// HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+// HelloImpl port = service.getPort(HelloImpl.class);
+// System.out.println("From service... " + port.sayHello(who));
+ HelloImpl port = (HelloImpl) ic.lookup("java:comp/env/service/helloport");
+ return "JNDI " + port.sayHello(who);
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return "FAILED";
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
index 0c0651e..7e4db1c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portfieldinjection/client/Client.java
@@ -28,27 +28,27 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-field-injection";
+ private final static String desc = "ws-ejb-port-field-injection";
- @WebServiceRef(HelloImplService.class)
+ @WebServiceRef(HelloImplService.class)
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(desc, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
index a94fb52..c9977a4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
index 6706171..dbb6a5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/portmethodinjection/client/Client.java
@@ -28,31 +28,31 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-port-method-injection";
+ private final static String desc = "ws-ejb-port-method-injection";
- @WebServiceRef(HelloImplService.class)
- static void setPort(HelloImpl s) {
- port = s;
- }
+ @WebServiceRef(HelloImplService.class)
+ static void setPort(HelloImpl s) {
+ port = s;
+ }
static HelloImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(desc, stat.PASS);
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 825066a..1894e3e 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
@@ -27,28 +27,28 @@
<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"/>
+ <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>
+ </or>
+ </waitfor>
<condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
-
+
<antcall target="run"/>
- <antcall target="undeploy"/>
- <antcall target="report"/>
+ <antcall target="undeploy"/>
+ <antcall target="report"/>
</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"/>
+ <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-success">
@@ -57,6 +57,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </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 d265bb5..fb5ff25 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
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-provider-annotation");
+ stat.addDescription("ejb-provider-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("ejb-provider-annotation");
+ stat.printSummary("ejb-provider-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImpl();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("Simple-Annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-provider-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
index 5a28123..a5c09ef 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/provider/endpoint/HelloImpl.java
@@ -21,7 +21,7 @@
import jakarta.xml.ws.Provider;
import jakarta.xml.ws.WebServiceProvider;
import jakarta.xml.ws.ServiceMode;
-import jakarta.xml.ws.Service ;
+import jakarta.xml.ws.Service ;
import jakarta.xml.soap.SOAPMessage;
import jakarta.ejb.Stateless;
@@ -43,11 +43,11 @@
private static final JAXBContext jaxbContext = createJAXBContext();
private int combo;
private int bodyIndex;
-
+
public jakarta.xml.bind.JAXBContext getJAXBContext(){
return jaxbContext;
}
-
+
private static jakarta.xml.bind.JAXBContext createJAXBContext(){
try{
return jakarta.xml.bind.JAXBContext.newInstance(ObjectFactory.class);
@@ -55,28 +55,28 @@
throw new WebServiceException(e.getMessage(), e);
}
}
-
-
+
+
public Source invoke(Source request) {
try {
recvBean(request);
return sendBean();
} catch(Exception e) {
e.printStackTrace();
- throw new WebServiceException("Provider endpoint failed", e);
+ throw new WebServiceException("Provider endpoint failed", e);
}
}
-
+
private void recvBean(Source source) throws Exception {
System.out.println("**** recvBean ******");
System.out.println(jaxbContext.createUnmarshaller().unmarshal(source));
JAXBElement element = (JAXBElement) jaxbContext.createUnmarshaller().unmarshal(source);
- System.out.println("name="+element.getName()+ " value=" + element.getValue());
+ System.out.println("name="+element.getName()+ " value=" + element.getValue());
if (element.getValue() instanceof SayHello) {
- SayHello hello = (SayHello) element.getValue();
+ SayHello hello = (SayHello) element.getValue();
System.out.println("Say Hello from " + hello.getArg0());
}
-
+
}
private Source sendBean() throws Exception {
@@ -84,9 +84,9 @@
SayHelloResponse resp = new SayHelloResponse();
resp.setReturn("WebSvcTest-Hello");
ByteArrayOutputStream bout = new ByteArrayOutputStream();
- ObjectFactory factory = new ObjectFactory();
+ ObjectFactory factory = new ObjectFactory();
jaxbContext.createMarshaller().marshal(factory.createSayHelloResponse(resp), bout);
return new StreamSource(new ByteArrayInputStream(bout.toByteArray()));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
index 47dbabd..d03760d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="restful-ejb"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 76c64d2..df6e1f3 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
@@ -57,8 +57,8 @@
<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"
+ <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>
@@ -69,7 +69,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
index f6d7eca..6757071 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/client/Client.java
@@ -40,13 +40,13 @@
new SimpleReporterAdapter("appserv-tests");
public static void main (String[] args) throws Exception {
- stat.addDescription("webservices-simple-restful-svc");
- String endpointAddress =
+ stat.addDescription("webservices-simple-restful-svc");
+ String endpointAddress =
"http://localhost:8080/AddNumbersImplService/endpoint.AddNumbersImpl";
URL url = new URL(endpointAddress+"?num1=10&num2=20");
System.out.println ("Invoking URL="+url);
process(url, args);
- stat.printSummary("webservices-simple-restful-svc");
+ stat.printSummary("webservices-simple-restful-svc");
}
private static void process(URL url, String[] args) throws Exception {
@@ -64,12 +64,12 @@
oprops.put(OutputKeys.OMIT_XML_DECLARATION, "yes");
trans.setOutputProperties(oprops);
trans.transform(source, sr);
- String resp = bos.toString();
+ String resp = bos.toString();
System.out.println("**** Response ******"+resp);
bos.close();
- if(resp.indexOf("<ns:return>30</ns:return>") != -1)
+ if(resp.indexOf("<ns:return>30</ns:return>") != -1)
stat.addStatus(args[0], stat.PASS);
- else
+ else
stat.addStatus(args[0], stat.FAIL);
} catch(Exception e) {
e.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
index cb4b41f..0300a51 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/restful-ejb/endpoint/AddNumbersImpl.java
@@ -62,7 +62,7 @@
throw new HTTPException(500);
}
}
-
+
private Source createSource(String str) {
StringTokenizer st = new StringTokenizer(str, "=&/");
String token = st.nextToken();
@@ -78,5 +78,5 @@
new ByteArrayInputStream(body.getBytes()));
return source;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
index 446c584..abd0ef2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/build.xml
@@ -29,9 +29,9 @@
<property name="client-src-name" value="client/Client.java"/>
<property name="app-client-parameters" value="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<target name="all" depends="clean">
- <antcall target="deploy"/>
- <basename file="${src-name}" property="server" suffix=".java"/>
- <condition property="deploy_succeeded">
+ <antcall target="deploy"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <condition property="deploy_succeeded">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/${server}.jar_deployed"/>
</condition>
<condition property="deploy_failed">
@@ -39,39 +39,39 @@
</condition>
<fail message="Deployment failed" if="deploy_failed"/>
<echo message="Deployment passed ${deploy_succeeded}"/>
- <echo message="ALL WEBSERVICE INVOCATION SHOULD FAIL..."/>
+ <echo message="ALL WEBSERVICE INVOCATION SHOULD FAIL..."/>
<antcall target="run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass"/>
</antcall>
- <echo message="CREATING USERS..."/>
+ <echo message="CREATING USERS..."/>
<copy file="${admin.password.file}" tofile="./passwordfile" overwrite="true"/>
<echo file="./passwordfile" append="true">
AS_ADMIN_USERPASSWORD=tester
</echo>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester --authrealmname file webservicetester"/>
- </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester --authrealmname file webservicetester"/>
+ </exec>
<copy file="${admin.password.file}" tofile="./passwordfile" overwrite="true"/>
<echo file="./passwordfile" append="true">
AS_ADMIN_USERPASSWORD=tester2
</echo>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester2 --authrealmname file webservicetester2"/>
- </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="create-file-user --port ${admin.port} --user ${admin.user} --passwordfile ./passwordfile --groups webservicetester2 --authrealmname file webservicetester2"/>
+ </exec>
<antcall target="internal-run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester tester"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester tester"/>
</antcall>
<antcall target="internal-run">
- <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester2 tester2 FAILURE"/>
- </antcall>
- <echo message="DELETING USERS..."/>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester"/>
- </exec>
- <exec executable="${env.S1AS_HOME}/bin/asadmin">
- <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester2"/>
- </exec>
- <antcall target="undeploy"/>
+ <param name="app-client-extra-parameters" value="-user nouser -password nopass webservicetester2 tester2 FAILURE"/>
+ </antcall>
+ <echo message="DELETING USERS..."/>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester"/>
+ </exec>
+ <exec executable="${env.S1AS_HOME}/bin/asadmin">
+ <arg line="delete-file-user --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} --authrealmname file webservicetester2"/>
+ </exec>
+ <antcall target="undeploy"/>
</target>
<target name="report-success">
@@ -80,6 +80,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
index 93137a5..953d14c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/client/Client.java
@@ -38,26 +38,26 @@
String password=null;
boolean successExpected=true;
String description;
- if (args.length>1) {
+ if (args.length>1) {
username=args[0];
password=args[1];
- description="webservices-ejb-rolesAllowed-annotation-positive";
+ description="webservices-ejb-rolesAllowed-annotation-positive";
if (args.length>2) {
description="webservices-ejb-rolesAllowed-annotation-negative-2";
successExpected = !(args[2].equalsIgnoreCase("FAILURE"));
- }
+ }
} else {
successExpected = false;
- description="webservices-ejb-rolesAllowed-annotation-negative";
- }
- stat.addDescription(description);
+ description="webservices-ejb-rolesAllowed-annotation-negative";
+ }
+ stat.addDescription(description);
Client client = new Client();
client.doTest(description, username, password, successExpected);
- stat.printSummary(description);
+ stat.printSummary(description);
}
public void doTest(String desc, String username, String password, boolean successExpected) {
-
+
try {
HelloImpl port = service.getHelloImplPort();
if (username!=null && password!=null) {
@@ -66,7 +66,7 @@
requestContext.put("jakarta.xml.ws.security.auth.username",username);
requestContext.put("jakarta.xml.ws.security.auth.password",password);
}
-
+
// @PermitAll invocation, it should always work
try {
String ret = port.permitAll("Appserver Tester !");
@@ -81,10 +81,10 @@
System.out.println("@PermitAll method invocation failed - TEST FAILED");
stat.addStatus(desc, stat.FAIL);
} else {
- System.out.println("@PermitAll method invocation failed - good...");
+ System.out.println("@PermitAll method invocation failed - good...");
}
}
-
+
// @DenyAll invocation, it should always faile
try {
String ret = port.denyAll("Appserver Tester !");
@@ -96,7 +96,7 @@
} catch(Exception e) {
System.out.println("@DenyAll method invocation failed - good...");
}
-
+
// role based invocation
String ret = port.roleBased("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Hello") == -1) {
@@ -105,19 +105,19 @@
return;
}
System.out.println(ret);
- if (successExpected)
- stat.addStatus(desc, stat.PASS);
- else
- stat.addStatus(desc, stat.FAIL);
-
+ if (successExpected)
+ stat.addStatus(desc, stat.PASS);
+ else
+ stat.addStatus(desc, stat.FAIL);
+
} catch(Throwable t) {
- if (successExpected) {
- t.printStackTrace();
- stat.addStatus(desc, stat.FAIL);
- } else {
- System.out.println("Got expected failure " + t.getMessage());
- stat.addStatus(desc, stat.PASS);
- }
+ if (successExpected) {
+ t.printStackTrace();
+ stat.addStatus(desc, stat.FAIL);
+ } else {
+ System.out.println("Got expected failure " + t.getMessage());
+ stat.addStatus(desc, stat.PASS);
+ }
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
index adc9bfc..bdac44f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/HelloImpl.java
@@ -30,7 +30,7 @@
public String roleBased(String who) {
return "WebSvcTest-Hello " + who;
}
-
+
@DenyAll
public String denyAll(String who) {
return "WebSvcTest-Hello " + who;
@@ -39,5 +39,5 @@
@PermitAll
public String permitAll(String who) {
return "WebSvcTest-Hello " + who;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
index d9ae964..0b4ef0d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/security/roles/endpoint/sun-ejb-jar.xml
@@ -27,10 +27,10 @@
<ejb>
<ejb-name>HelloImpl</ejb-name>
<webservice-endpoint>
- <port-component-name>HelloImpl</port-component-name>
- <login-config>
- <auth-method>BASIC</auth-method>
- </login-config>
+ <port-component-name>HelloImpl</port-component-name>
+ <login-config>
+ <auth-method>BASIC</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
</enterprise-beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
index d763632..d429b22 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/build.xml
@@ -24,31 +24,31 @@
<project name="methodinjection" default="core" basedir=".">
&commonBuild;
- <property file="${env.APS_HOME}/config.properties"/>
+ <property file="${env.APS_HOME}/config.properties"/>
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<target name="all" depends="clean, private-deploy, private-run, private-undeploy, report"/>
<target name="private-deploy">
- <antcall target="deploy"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="HelloImpl"/>
- <param name="port" value="HelloImpl"/>
- </antcall>
+ <antcall target="deploy"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="HelloImpl"/>
+ <param name="port" value="HelloImpl"/>
+ </antcall>
<javac srcdir="." destdir="${env.APS_HOME}/build/module/classes"
includes="ejb/GatewayImpl.java">
<classpath refid="classpath"/>
</javac>
- <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
- <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
+ <mkdir dir="${env.APS_HOME}/build/module/classes/wsdl/wsdl"/>
+ <get src="http://${http.host}:${http.port}/HelloImplService/HelloImpl?WSDL" dest="${env.APS_HOME}/build/module/classes//wsdl/wsdl/HelloImplService.wsdl"/>
<jar destfile="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar"
- basedir="${env.APS_HOME}/build/module/classes"
- includes="ejb/**,endpoint/**">
- <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
- </jar>
- <waitfor maxwait="100" maxwaitunit="second">
- <or>
+ basedir="${env.APS_HOME}/build/module/classes"
+ includes="ejb/**,endpoint/**">
+ <metainf dir="${env.APS_HOME}/build/module/classes/wsdl"/>
+ </jar>
+ <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>
@@ -59,30 +59,30 @@
<condition property="deploy_failed">
<available file="${env.S1AS_HOME}/domains/domain1/autodeploy/EjbClient.jar_deployFailed"/>
</condition>
- <fail if="deploy_failed" message="Deployment failed"/>
+ <fail if="deploy_failed" message="Deployment failed"/>
</target>
<target name="private-run">
<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"/>
+ <basename file="${client-directory}" property="client-pkg-name"/>
<property name="client-class-name" value="${client-pkg-name}/${client}.class"/>
- <antcall target="clean"/>
- <antcall target="wsdl-import">
- <param name="server" value="GatewayImpl"/>
- <param name="port" value="GatewayImpl"/>
- </antcall>
- <antcall target="compile-client"/>
+ <antcall target="clean"/>
+ <antcall target="wsdl-import">
+ <param name="server" value="GatewayImpl"/>
+ <param name="port" value="GatewayImpl"/>
+ </antcall>
+ <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="${client-pkg-name}.${client}"/>
+ <arg value="${client-pkg-name}.${client}"/>
</exec>
</target>
<target name="private-undeploy">
<antcall target="undeploy"/>
- <antcall target="autoundeploy-file">
- <param name="filename" value="EjbClient.jar"/>
- </antcall>
+ <antcall target="autoundeploy-file">
+ <param name="filename" value="EjbClient.jar"/>
+ </antcall>
</target>
<target name="report-success">
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
index 03e9b67..0c260df 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/client/Client.java
@@ -28,43 +28,43 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private final static String desc = "ws-ejb-sevice-field-injection";
+ private final static String desc = "ws-ejb-sevice-field-injection";
- @WebServiceRef(GatewayImplService.class)
+ @WebServiceRef(GatewayImplService.class)
static GatewayImpl port;
public static void main(String[] args) {
- stat.addDescription(desc);
+ stat.addDescription(desc);
Client client = new Client();
client.doTest(args);
- stat.printSummary(desc);
+ stat.printSummary(desc);
}
public void doTest(String[] args) {
try {
- System.out.println("Method injected reference test...");
+ System.out.println("Method injected reference test...");
String ret = port.invokeMethod("Appserver Tester !");
- if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("METHOD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Field injected reference test...");
+ System.out.println("Field injected reference test...");
ret = port.invokeField("Appserver Tester !");
- if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("FIELD WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
- System.out.println("Dependency jndi looup reference test...");
+ System.out.println("Dependency jndi looup reference test...");
ret = port.invokeDependency("Appserver Tester !");
- if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("JNDI WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(desc, stat.FAIL);
return;
- }
+ }
System.out.println("Server returned " + ret + " : PASSED");
stat.addStatus(desc, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
index a0403dc..15acef6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/serviceejbclient/ejb/GatewayImpl.java
@@ -38,38 +38,38 @@
HelloImplService serviceMethod=null;
- // method injection has to be private to avoid being part of the
+ // method injection has to be private to avoid being part of the
// web service interface.
@WebServiceRef()
private void setService(HelloImplService service) {
- serviceMethod = service;
+ serviceMethod = service;
}
@WebMethod
public String invokeMethod(String who) {
- HelloImpl port = serviceMethod.getPort(HelloImpl.class);
- return "METHOD " + port.sayHello(who);
+ HelloImpl port = serviceMethod.getPort(HelloImpl.class);
+ return "METHOD " + port.sayHello(who);
}
@WebMethod
public String invokeField(String who) {
- HelloImpl port = serviceField.getPort(HelloImpl.class);
+ HelloImpl port = serviceField.getPort(HelloImpl.class);
return "FIELD " + port.sayHello(who);
}
@WebMethod
public String invokeDependency(String who) {
String result = null;
- try {
- Context ic = new InitialContext();
- HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
- HelloImpl port = service.getPort(HelloImpl.class);
+ try {
+ Context ic = new InitialContext();
+ HelloImplService service = (HelloImplService) ic.lookup("java:comp/env/service/helloservice");
+ HelloImpl port = service.getPort(HelloImpl.class);
result = "JNDI " + port.sayHello(who);
- System.out.println(result);
- } catch(Throwable t) {
- t.printStackTrace();
- return "FAILED";
- }
+ System.out.println(result);
+ } catch(Throwable t) {
+ t.printStackTrace();
+ return "FAILED";
+ }
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
index daf2dee..8de7817 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-sessionctx");
+ stat.addDescription("webservices-ejb-sessionctx");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-sessionctx");
+ stat.printSummary("webservices-ejb-sessionctx");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello ANONYMOUS") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello ANONYMOUS") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-sessionctx", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-sessionctx", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
index 5ecbcb1..1ae195f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/sessionctx/endpoint/HelloImpl.java
@@ -30,9 +30,9 @@
@Resource SessionContext ejbsc;
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- if(ejbsc != null)
- return "WebSvcTest-Hello " + ejbsc.getCallerPrincipal();
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ if(ejbsc != null)
+ return "WebSvcTest-Hello " + ejbsc.getCallerPrincipal();
return "EJB WebServiceContext injection failed";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
index 11e4d4e..bd3fde7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="singleton"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 f029ea3..563bed3 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
@@ -69,8 +69,8 @@
<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"
+ <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>
@@ -86,7 +86,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
index 8ceb062..846cd3a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/singleton/client/Client.java
@@ -37,10 +37,10 @@
// static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("ejb-singleton-service");
+ stat.addDescription("ejb-singleton-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("ejb-singleton-service");
+ stat.printSummary("ejb-singleton-service");
}
public void doSyncTest() {
@@ -48,11 +48,11 @@
HelloImplService service = new HelloImplService();
HelloImpl port = service.getHelloImplPort();
RetVal ret = port.sayHello("Hi Singleton");
- if(ret.getRetVal().indexOf("Sing") == -1) {
- System.out.println("WRONG GREETING " + ret.getRetVal());
+ if(ret.getRetVal().indexOf("Sing") == -1) {
+ System.out.println("WRONG GREETING " + ret.getRetVal());
stat.addStatus("ejb-singleton-service-test", stat.FAIL);
- return;
- }
+ return;
+ }
System.out.println(ret);
System.out.println(ret.getRetVal());
stat.addStatus("ejb-singleton-service-test", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
index 46618ec..c874b31 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/client/Client.java
@@ -32,10 +32,10 @@
//static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("handler-chain-annotation");
+ stat.addDescription("handler-chain-annotation");
Client client = new Client();
client.doTest(args);
- stat.printSummary("handler-chain-annotation");
+ stat.printSummary("handler-chain-annotation");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
Hello port =new HelloEJBService().getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello injectedValue") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello injectedValue") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("handler-chain-annotation", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("handler-chain-annotation", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
index fba6051..649457e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/svchandler/endpoint/TestHandler.java
@@ -28,11 +28,11 @@
import jakarta.xml.soap.*;
public class TestHandler implements SOAPHandler<SOAPMessageContext> {
-
+
public Set<QName> getHeaders() {
return null;
}
-
+
String postConstString = "NOT_INITIALIZED";
@PostConstruct
public void init() {
@@ -40,8 +40,8 @@
}
@Resource(name="stringValue")
- String injectedString = "undefined";
-
+ String injectedString = "undefined";
+
public boolean handleMessage(SOAPMessageContext context) {
try {
if ("PROPERLY_INITIALIZED".equals(postConstString)) {
@@ -50,33 +50,33 @@
System.out.println("Handler PostConstruct not called property");
System.out.println("postConstString = " + postConstString);
return false;
- }
+ }
if ("undefined".equals(injectedString)) {
System.out.println("Handler not injected property");
return false;
} else {
System.out.println("injectedString = " + injectedString);
- }
+ }
SOAPMessageContext smc = (SOAPMessageContext) context;
SOAPMessage message = smc.getMessage();
SOAPBody body = message.getSOAPBody();
-
+
SOAPElement paramElement =
(SOAPElement) body.getFirstChild().getFirstChild();
paramElement.setValue(injectedString + " " + paramElement.getValue());
} catch (SOAPException e) {
e.printStackTrace();
}
- System.out.println("VIJ's TEST HANDLER CALLED");
+ System.out.println("VIJ's TEST HANDLER CALLED");
return true;
}
-
+
public boolean handleFault(SOAPMessageContext context) {
return true;
}
-
+
public void destroy() {}
-
+
public void close(MessageContext context) {}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties
index 2e76a39..026aa44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsRef-webservice-features"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
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 71c7167..6acf7fe 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
@@ -33,7 +33,7 @@
&testproperties;
&jaxwsTools;
-
+
<path id="classpath">
<fileset dir="${env.S1AS_HOME}/modules">
<include name="*.jar"/>
@@ -115,7 +115,7 @@
<arg line="--port ${admin.port}"/>
<arg line="${client.war}"/>
</exec>
- </target>
+ </target>
<target name="undeploy-client" depends="init-common">
<exec executable="${ASADMIN}">
@@ -141,6 +141,6 @@
<antcall target="undeploy-client"/>
</target>
-
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
index 027dfce..b4bbf5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
index ffd76f5..30f95e0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/client/TestClient.java
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF HELLO SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
index 93b799c..408ce48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/endpoint/Hello.java
@@ -26,10 +26,10 @@
targetNamespace="http://example.com/Hello"
)
public class Hello {
- public Hello() {}
+ public Hello() {}
- @WebMethod(operationName="sayHello", action="urn:SayHello")
- public String sayHello(String who) {
- return "Hello " + who;
- }
+ @WebMethod(operationName="sayHello", action="urn:SayHello")
+ public String sayHello(String who) {
+ return "Hello " + who;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
index aae527e..fba0902 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/web.xml
@@ -18,10 +18,10 @@
-->
<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">
+ 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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
index 8052095..5f3c809 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsRef-webservice-features/webclient/Client.java
@@ -30,11 +30,11 @@
@MTOM(enabled=true)
@RespectBinding
@Addressing (required = false,enabled=true)
-
+
Hello hiport;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
index 30494f7..6aa2011 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
index 89ad876..6ef77aa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/client/Client.java
@@ -32,10 +32,10 @@
static HelloImplService service;
public static void main(String[] args) {
- stat.addDescription("webservices-ejb-wsctxt");
+ stat.addDescription("webservices-ejb-wsctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-ejb-wsctxt");
+ stat.printSummary("webservices-ejb-wsctxt");
}
public void doTest(String[] args) {
@@ -43,11 +43,11 @@
HelloImpl port = service.getHelloImplPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("ejb-wsctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus("ejb-wsctxt", stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
index ca8dd25..4909c71 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxt/endpoint/HelloImpl.java
@@ -31,8 +31,8 @@
public String sayHello(String who) {
- System.out.println("EJB WSCTXT wsc = " + ejbsc);
- if(ejbsc != null) {
+ System.out.println("EJB WSCTXT wsc = " + ejbsc);
+ if(ejbsc != null) {
System.out.println(ejbsc.getMessageContext());
if (ejbsc.getMessageContext() instanceof jakarta.xml.ws.handler.MessageContext){
System.out.println("YYYYY" +ejbsc.getMessageContext().getClass());
@@ -41,9 +41,9 @@
System.out.println("NNN " + ejbsc.getMessageContext().getClass());
}
- return "WebSvcTest-Hello " + who;
+ return "WebSvcTest-Hello " + who;
}
-/* if(sc != null) {
+/* if(sc != null) {
System.out.println(sc.getContextData().getClass());
System.out.println(sc.getContextData());
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
index 06c7acc..a4fbc48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/build.xml
@@ -34,6 +34,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
index 7c86441..1abf4b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/client/Client.java
@@ -32,31 +32,31 @@
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription("wsctxt-invocationhandlerctxt");
+ stat.addDescription("wsctxt-invocationhandlerctxt");
Client client = new Client();
client.doTest(args);
- stat.printSummary("wsctxt-invocationhandlerctxt");
+ stat.printSummary("wsctxt-invocationhandlerctxt");
}
public void doTest(String[] args) {
try {
Hello port = service.getHelloEJBPort();
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("1234") == -1) {
+ if(ret.indexOf("1234") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
- if(ret.indexOf("45") == -1) {
+ }
+ if(ret.indexOf("45") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ }
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("wsctxt-invocationhandlerctxt", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
index dd4b642..4b8f9ee 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/Hello.java
@@ -21,5 +21,5 @@
@WebService
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
index b82bcfa..159b305 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsctxtinterceptor/endpoint/HelloEJB.java
@@ -40,12 +40,12 @@
@AroundInvoke
private Object interceptBusinessMethod(InvocationContext invCtx) {
- try {
+ try {
Map<String, Object> map = invCtx.getContextData();
map.put("intVal", new Integer(45));
map.put("longVal", new Long(1234));
return invCtx.proceed();
- } catch(Throwable t) {}
+ } catch(Throwable t) {}
return null;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
index 500709c..c67ca0d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/build.properties
@@ -15,8 +15,8 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsnameejbname"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
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 d81e8f4..6435ae1 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
@@ -58,8 +58,8 @@
<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"
+ <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>
@@ -70,7 +70,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
index 7e37fcf..d0d60be 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/ejb_annotations/wsnameejbname/client/Client.java
@@ -37,21 +37,21 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wsname-ejbname-service");
+ stat.addDescription("wsname-ejbname-service");
Client client = new Client();
client.doSyncTest();
- stat.printSummary("wsname-ejbname-service");
+ stat.printSummary("wsname-ejbname-service");
}
public void doSyncTest() {
try {
ThisShouldBeIgnored port = service.getThisShouldBeIgnoredPort();
int ret = port.addNumbers(2222, 1234);
- if(ret!=(2222+1234)) {
+ if(ret!=(2222+1234)) {
System.out.println("Unexpected add result " + ret);
stat.addStatus("wsname-ejbname-service-test", stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus("wsname-ejbname-service-test", stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
index 318ded3..03ee86a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/build.xml
@@ -18,7 +18,7 @@
<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "file:./../../../config/properties.xml">
-<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
+<!ENTITY commonBuild SYSTEM "file:./../../../config/common.xml">
]>
<project name="Filter URL handling test" default="all" basedir=".">
@@ -34,7 +34,7 @@
<param name="src" value="client"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="client.Client">
<arg value="http://${http.host}:${http.port}/"/>
@@ -42,11 +42,11 @@
<pathelement path="${build.classes.dir}"/>
<pathelement location="${env.APS_HOME}/lib/reporter.jar"/>
</classpath>
- </java>
+ </java>
</target>
-
+
<target name="clean">
<antcall target="clean-common"/>
</target>
</project>
-
+
diff --git a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
index 9352f74..f11d135 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/filter_urlhandling/client/Client.java
@@ -30,20 +30,20 @@
*/
public class Client {
-
+
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ new SimpleReporterAdapter("appserv-tests");
public static void main(String[] args) {
stat.addDescription("webservices-filter-url-handling");
Client client = new Client();
client.doTest(args);
- stat.printSummary("webservices-filter-url-handling");
+ stat.printSummary("webservices-filter-url-handling");
}
public void doTest(String[] args) {
try {
- String webURL = args[0];
+ String webURL = args[0];
URL url = new URL(args[0] + "//");
System.out.println("Invoking " + url.toExternalForm());
HttpURLConnection connection = (HttpURLConnection) url.openConnection();
@@ -59,7 +59,7 @@
if (HttpURLConnection.HTTP_INTERNAL_ERROR == responseCode) {
// server not started
System.out.println("Error, server is down ?");
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
return;
}
if (HttpURLConnection.HTTP_OK == responseCode) {
@@ -68,23 +68,23 @@
int length = connection.getContentLength();
System.out.println("Content-length " + length);
if (length==-1) {
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
} else {
- stat.addStatus("webservice filter url handling", stat.PASS);
+ stat.addStatus("webservice filter url handling", stat.PASS);
}
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
} else {
System.out.println("ERROR - Unknow return code " + responseCode);
Map map = connection.getHeaderFields();
for (Iterator itr=map.keySet().iterator();itr.hasNext();) {
String header = (String) itr.next();
System.out.println("Header " + header + "-->" + map.get(header));
- }
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ }
+ stat.addStatus("webservice filter url handling", stat.FAIL);
}
} catch(Exception e) {
System.out.println("Errror - exception " + e.getMessage());
- stat.addStatus("webservice filter url handling", stat.FAIL);
+ stat.addStatus("webservice filter url handling", stat.FAIL);
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties b/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties
index c4f85ea..35acf49 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/gf_dd/endpoint_address_uri/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="service_endpoint_address"/>
<property name="appname" value="${module}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
index 6eb75c3..b687d6b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/build.properties
@@ -15,22 +15,22 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index ad7fd49..1c2d2f7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -43,7 +43,7 @@
<param name="src" value="client"/>
</antcall>
<antcall target="compile-common">
- <param name="src" value="mejbclient"/>
+ <param name="src" value="mejbclient"/>
</antcall>
<antcall target="compile-common">
<param name="src" value="ejb"/>
@@ -61,11 +61,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/google"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -74,11 +74,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/googleejb"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -87,35 +87,35 @@
<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"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="GoogleMapping_appclient.xml,META-INF/wsdl/**,google/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="GoogleMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="build-mejb" depends="init-common, compile">
+ <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>
+ <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"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -131,13 +131,13 @@
</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>
+ <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">
@@ -145,10 +145,10 @@
<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>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -158,23 +158,23 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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>
+ <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
index bd8c242..a24ea6c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/client/Client.java
@@ -26,7 +26,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private String googleKey;
public static void main (String[] args) {
@@ -35,23 +35,23 @@
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();
-
-
+ 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 =
+ GoogleSearchPort googlePort =
googleSearchService.getGoogleSearchPort();
-
+
((Stub)googlePort)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
System.out.println("Contacting google for a spelling suggestion at " + targetEndpointAddress);
@@ -63,11 +63,11 @@
stat.addStatus("googleclient main", stat.PASS);
- } catch (Exception ex) {
+ } 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/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
index 94cf733..5590d34 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/descriptor/application-client.xml
@@ -32,6 +32,6 @@
<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-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
index 1bb0adf..e82ea0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/ejb/GoogleEJB.java
@@ -17,7 +17,7 @@
package googleejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -29,18 +29,18 @@
private SessionContext sc;
public GoogleEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In GoogleEJB::ejbCreate !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -53,9 +53,9 @@
} catch(Exception e) {
EJBException ejbEx = new EJBException("getCallerPrincipal exception");
ejbEx.initCause(e);
- throw ejbEx;
+ throw ejbEx;
}
-
+
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -68,20 +68,20 @@
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/mejbclient/MEJBClient.java b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
index 5ffa564..ba83503 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/mejbclient/MEJBClient.java
@@ -31,11 +31,11 @@
// private SimpleReporterAdapter stat =
// new SimpleReporterAdapter("appserv-tests");
- public static void main(String[] args) {
- MEJBClient client = new MEJBClient();
+ public static void main(String[] args) {
+ MEJBClient client = new MEJBClient();
// run the tests
- client.runTestClient();
+ client.runTestClient();
}
public void runTestClient() {
@@ -48,78 +48,78 @@
ex.printStackTrace();
}
}
-
+
public void test01() {
-
- // instanciate the mejb
- try {
-
- Context ic = new InitialContext();
- System.out.println("***Created initial context");
-
- java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
- System.out.println("***Looked up ManagementHome!!");
- ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
- objref, ManagementHome.class);
- System.out.println("***Narrowed ManagementHome!!");
+ // instanciate the mejb
+ try {
- Management mejb = home.create();
- System.out.println("***Got the MEJB!!");
+ Context ic = new InitialContext();
+ System.out.println("***Created initial context");
- String domain = mejb.getDefaultDomain();
- System.out.println("***MEJB default domain = "+domain);
- int mbeanCount = mejb.getMBeanCount().intValue();
- System.out.println("***MBeanCount = "+mbeanCount);
+ java.lang.Object objref = ic.lookup("ejb/mgmt/MEJB");
+ System.out.println("***Looked up ManagementHome!!");
- // Print attributes of all MBeans
+ ManagementHome home = (ManagementHome)PortableRemoteObject.narrow(
+ objref, ManagementHome.class);
+ System.out.println("***Narrowed ManagementHome!!");
+
+ Management mejb = home.create();
+ System.out.println("***Got the MEJB!!");
+
+ String domain = mejb.getDefaultDomain();
+ System.out.println("***MEJB default domain = "+domain);
+ int mbeanCount = mejb.getMBeanCount().intValue();
+ System.out.println("***MBeanCount = "+mbeanCount);
+
+ // Print attributes of all MBeans
ObjectName query = new ObjectName("*:j2eeType=J2EEApplication,name=googleApp,*");
- Set mbeanNames = mejb.queryNames(query, null);
- if ( mbeanNames.size() != 1 ) {
- System.out.println("***ERROR: mbeans returned by query is "
+ Set mbeanNames = mejb.queryNames(query, null);
+ if ( mbeanNames.size() != 1 ) {
+ System.out.println("***ERROR: mbeans returned by query is "
+mbeanNames.size() + " it should be 1");
- }
-
- Iterator it = mbeanNames.iterator();
- ObjectName name = (ObjectName)it.next();
- System.out.println("Obtained jsr77 mbean for googleApp = "+name);
+ }
- // Get attr values from MEJB and print them
- try{
+ Iterator it = mbeanNames.iterator();
+ ObjectName name = (ObjectName)it.next();
+ System.out.println("Obtained jsr77 mbean for googleApp = "+name);
+
+ // Get attr values from MEJB and print them
+ try{
Object attr = mejb.getAttribute(name, "hasWebServices");
- boolean hasWebServices=false;
- if (attr instanceof Boolean) {
- hasWebServices = ((Boolean) attr).booleanValue();
- }
-
- System.out.println("For HasWebServices "+hasWebServices);
+ boolean hasWebServices=false;
+ if (attr instanceof Boolean) {
+ hasWebServices = ((Boolean) attr).booleanValue();
+ }
+
+ System.out.println("For HasWebServices "+hasWebServices);
attr = mejb.getAttribute(name, "endpointAddresses");
- if (attr instanceof String[]) {
- String[] addresses = (String[]) attr;
- for (int i=0;i<addresses.length;i++) {
- System.out.println("Registered addresses " + addresses[i]);
+ if (attr instanceof String[]) {
+ String[] addresses = (String[]) attr;
+ for (int i=0;i<addresses.length;i++) {
+ System.out.println("Registered addresses " + addresses[i]);
- // retrieve the wsdl file
- URL url = new URL("http://localhost:8080/"+addresses[i]+"?wsdl");
- HttpURLConnection connection = (HttpURLConnection) url.openConnection();
- connection.setRequestMethod("GET");
- connection.connect();
- int responseCode = connection.getResponseCode();
- if (responseCode!=HttpURLConnection.HTTP_OK) {
- System.out.println("Cannot retrieve wsdl for " + addresses[i] + " error is " + connection.getResponseMessage());
- } else {
- InputStream is = new BufferedInputStream(connection.getInputStream());
- byte[] buffer = new byte[100];
- int read;
- do {
- read = is.read(buffer,0, 100);
- System.out.println(new String(buffer,0, read));
- } while(read==100 && read!=-1);
- }
- }
- }
-
+ // retrieve the wsdl file
+ URL url = new URL("http://localhost:8080/"+addresses[i]+"?wsdl");
+ HttpURLConnection connection = (HttpURLConnection) url.openConnection();
+ connection.setRequestMethod("GET");
+ connection.connect();
+ int responseCode = connection.getResponseCode();
+ if (responseCode!=HttpURLConnection.HTTP_OK) {
+ System.out.println("Cannot retrieve wsdl for " + addresses[i] + " error is " + connection.getResponseMessage());
+ } else {
+ InputStream is = new BufferedInputStream(connection.getInputStream());
+ byte[] buffer = new byte[100];
+ int read;
+ do {
+ read = is.read(buffer,0, 100);
+ System.out.println(new String(buffer,0, read));
+ } while(read==100 && read!=-1);
+ }
+ }
+ }
+
}
catch(Exception exp){
//exp.printStackTrace();
@@ -127,14 +127,14 @@
"accessing mbean details: Keep continuing\n");
}
- mejb.remove();
+ mejb.remove();
- } catch(NamingException ne){
+ } catch(NamingException ne){
System.out.println("***Exception while initializing context.\n");
ne.printStackTrace();
- } catch(Exception re) {
+ } catch(Exception re) {
re.printStackTrace();
- }
+ }
}
}
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
index 98c8655..5298488 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index cd7bcec..beb846c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/google/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="GoogleSearch.wsdl"
packageName="googleejb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
index fb29dce..af79035 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.properties
@@ -15,23 +15,23 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
index 05d12b0..60d9f17 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/build.xml
@@ -35,9 +35,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -66,11 +66,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/googleclient"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchService.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<!-- <delete dir="output"/> -->
@@ -79,11 +79,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/googleserver"
includes="DirectoryCategory.class, GoogleSearchResult.class, GoogleSearchPort.class, ResultElement.class"/>
</copy>
<delete dir="output"/>
@@ -92,37 +92,37 @@
<target name="wscompile-web" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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
+ <!--
+ 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"/>
+ <copy todir="${build.classes.dir}"
+ file="GoogleMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="GoogleMapping_ejb.xml,META-INF/wsdl/**,googleserver/*.class" />
</antcall>
- <!--
- War module creation
+ <!--
+ War module creation
-->
<antcall target="build-war-file"/>
- <!--
- AppClient module creation
+ <!--
+ AppClient module creation
-->
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="GoogleSearch.wsdl"/>
@@ -130,36 +130,36 @@
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"/>
+ <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"
+ <param name="appclientjar.classes"
value="googleclient.model,GoogleMapping_appclient.xml,META-INF/wsdl/**,googleclient/*.class" />
</antcall>
- <!--
- EAR file creation
+ <!--
+ 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">
+ <jar destfile = "${assemble.dir}/${appname}App.ear"
+ update="true">
<fileset dir="${build.classes.dir}">
- <include name="META-INF/sun-application.xml"/>
+ <include name="META-INF/sun-application.xml"/>
</fileset>
</jar>
-
- </target>
+
+ </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}"/>
+ <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"
@@ -173,10 +173,10 @@
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"
+ 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"/>
@@ -186,12 +186,12 @@
<fileset dir="${build.classes.dir}/tmp" casesensitive="yes">
<include name="**/**"/>
</fileset>
- </jar>
+ </jar>
<delete dir="${build.classes.dir}/tmp"/>
</target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -222,7 +222,7 @@
<target name="build-standalone" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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">
@@ -242,7 +242,7 @@
<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="${env.APS_HOME}/lib/reporter.jar"/>
<pathelement location="${build.classes.dir}"/>
</classpath>
@@ -250,10 +250,10 @@
<sysproperty key="http.proxyPort" value="8080"/>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="contactgoogle">
<antcall target="runclient-common">
@@ -263,34 +263,34 @@
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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"
+ <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"/>
+ <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">
@@ -303,10 +303,10 @@
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant contactgoogle (Executes the appclient contacting the Google.com WebServices)
- </echo>
+ <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
index bdde202..4d7f7db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/Client.java
@@ -29,10 +29,10 @@
public class Client {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static final QName PORT_QNAME =
+ private static final QName PORT_QNAME =
new QName("urn:GoogleSearch", "GoogleSearchPort");
private static final QName OPERATION_QNAME =
new QName("urn:GoogleSearch", "doSpellingSuggestion");
@@ -42,12 +42,12 @@
public static void main (String[] args) {
- stat.addDescription("googleserver appclient");
+ 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;
@@ -55,7 +55,7 @@
public void doTest() {
- try {
+ try {
Context ic = new InitialContext();
String googleKey = (String)
ic.lookup("java:comp/env/googlekey");
@@ -80,7 +80,7 @@
doDynamicProxyTest(googleSearchService, googleKey);
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
doSpellingSuggestion(googleSearchPort, googleKey,
targetEndpointAddress);
@@ -106,7 +106,7 @@
partialWsdlServiceGeneric.getPort(GoogleSearchPort.class);
googleSearch.doSpellingSuggestion(googleKey, word);
-/** GoogleSearchService partialWsdlServiceGenerated =
+/** GoogleSearchService partialWsdlServiceGenerated =
(GoogleSearchService)
ic.lookup("java:comp/env/service/partialGenerated");
googleSearch = partialWsdlServiceGenerated.getGoogleSearchPort();
@@ -115,17 +115,17 @@
stat.addStatus("appclient main", stat.PASS);
- } catch (Exception ex) {
+ } 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)
+ String endpointAddress)
throws Exception {
if( endpointAddress != null ) {
@@ -142,7 +142,7 @@
System.out.println("Contacting google for spelling " +
"suggestion at " + endpointAddress);
-
+
String spellingSuggestion =
googleSearchPort.doSpellingSuggestion(googleKey, word);
System.out.println("Gave google the word '" + word + "' ... " +
@@ -155,21 +155,21 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
if( targetEndpointAddress != null ) {
- c3.setTargetEndpointAddress(targetEndpointAddress);
- }
+ 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)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -182,18 +182,18 @@
System.out.println("Calling oneway operation");
Call oneway = service.createCall(PORT_QNAME, "helloOneWay");
if( targetEndpointAddress != null ) {
- oneway.setTargetEndpointAddress(targetEndpointAddress);
- }
+ oneway.setTargetEndpointAddress(targetEndpointAddress);
+ }
long oneWayMethodWaitTimeInMillis = 7000;
- Date before = new Date();
- oneway.invokeOneWay(new Object[]
+ 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 +
+ 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 ");
@@ -204,7 +204,7 @@
// 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");
@@ -260,7 +260,7 @@
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) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
index f7105c9..36d7960 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/client/ClientHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class ClientHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In ClientHandler::destroy()");
}
@@ -40,17 +40,17 @@
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 {
@@ -60,9 +60,9 @@
} catch(Exception e) {
e.printStackTrace();
}
-
+
System.out.println("Handler init params = " +
config.getHandlerConfig());
- }
-
+ }
+
}
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
index cc01ca2..4e7445a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/application-client.xml
@@ -90,7 +90,7 @@
</service-endpoint-interface>
<port-component-link>googleserver-web.war#GoogleSearchPort</port-component-link>
</port-component-ref>
- </service-ref>
+ </service-ref>
<!-- <service-ref>
<description>partial wsdl test google service ref</description>
<service-ref-name>service/partialGenerated</service-ref-name>
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
index 21cde76..c534d78 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/descriptor/sun-application.xml
@@ -33,5 +33,5 @@
<group-name>eng</group-name>
<group-name>mgr</group-name>
<group-name>guest</group-name>
- </security-role-mapping>
+ </security-role-mapping>
</sun-application>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
index ffb61f5..abe2723 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
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 {
@@ -60,9 +60,9 @@
} 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
index 6b935cb..3186ace 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/ejb/GoogleEJB.java
@@ -24,7 +24,7 @@
import javax.xml.rpc.Service;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,24 +33,24 @@
public class GoogleEJB implements SessionBean {
private SessionContext sc;
- private static final QName PORT_QNAME =
+ 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 !!");
+ System.out.println("In GoogleEJB::ejbCreate !!");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
{
try {
@@ -75,9 +75,9 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught - ", ex);
}
-
+
try {
boolean result = sc.isCallerInRole("foo");
System.out.println(
@@ -87,7 +87,7 @@
}
} catch (Exception ex) {
ex.printStackTrace();
- throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
+ throw new EJBException("GoogleEJB.doSpellingSuggestion():Unexpected exception caught in isCallerInRole(foo) call ", ex);
}
String returnValue = "spelling suggestion from ejb";
@@ -96,10 +96,10 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/WebDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort webPort = (GoogleSearchPort)
+ GoogleSearchPort webPort = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
returnValue = webPort.doSpellingSuggestion(key, phrase);
} catch(Exception e) {
@@ -111,7 +111,7 @@
System.out.println("GoogleEJB returning " + returnValue);
return returnValue;
}
-
+
public void helloOneWay(String s1) {
System.out.println("In GoogleEJB::helloOneWay. param = " +
@@ -131,16 +131,16 @@
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 {
@@ -148,14 +148,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -164,7 +164,7 @@
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
index 08f27fb..20c866b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/standalone/StandAloneClient.java
@@ -24,7 +24,7 @@
public class StandAloneClient {
- private static SimpleReporterAdapter stat =
+ private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private String word;
@@ -32,12 +32,12 @@
private String googleKey;
public static void main (String[] args) {
- stat.addDescription("googleserver standalone");
+ 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) ?
@@ -47,11 +47,11 @@
}
public void doTest() {
- try {
- GoogleSearchService googleSearchService =
+ try {
+ GoogleSearchService googleSearchService =
new GoogleSearchService_Impl();
- GoogleSearchPort googleSearchPort =
+ GoogleSearchPort googleSearchPort =
googleSearchService.getGoogleSearchPort();
((Stub)googleSearchPort)._setProperty
@@ -72,15 +72,15 @@
spellingSuggestion + "'");
stat.addStatus("appclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } 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
index 7a51507..cbe53ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/FooHandler.java
@@ -27,7 +27,7 @@
import javax.naming.InitialContext;
public class FooHandler extends GenericHandler {
-
+
public void destroy() {
System.out.println("In FooHandler::destroy()");
}
@@ -40,17 +40,17 @@
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 {
@@ -60,9 +60,9 @@
} 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
index 916f52e..b41c202 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/web/GoogleServletImpl.java
@@ -22,7 +22,7 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import javax.naming.*;
import javax.xml.rpc.Service;
import javax.xml.rpc.server.ServiceLifecycle;
@@ -30,11 +30,11 @@
public class GoogleServletImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
- private static final QName PORT_QNAME =
+ 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() {
@@ -50,9 +50,9 @@
System.out.println("Got ServiceLifecycle::destroy call");
}
- public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
- {
- return null;
+ public byte[] doGetCachedPage(java.lang.String key, java.lang.String url)
+ {
+ return null;
}
public void helloOneWay(String s1) {
@@ -71,8 +71,8 @@
new Date());
}
- public String doSpellingSuggestion(java.lang.String key,
- java.lang.String phrase)
+ public String doSpellingSuggestion(java.lang.String key,
+ java.lang.String phrase)
throws RemoteException {
System.out.println("GoogleServletImpl.doSpellingSuggestion() " +
@@ -88,22 +88,22 @@
Service genericServiceWithWSDL = null;
try {
InitialContext ic = new InitialContext();
- Service service = (Service)
+ Service service = (Service)
ic.lookup("java:comp/env/service/EjbDIIReference");
doDynamicProxyTest(service);
- GoogleSearchPort ejbPort = (GoogleSearchPort)
+ 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;
}
@@ -113,14 +113,14 @@
Call c1 = service.createCall();
Call c2 = service.createCall(PORT_QNAME);
Call c3 = service.createCall(PORT_QNAME, OPERATION_QNAME);
- Call c4 = service.createCall(PORT_QNAME,
+ Call c4 = service.createCall(PORT_QNAME,
OPERATION_QNAME.getLocalPart());
Call[] calls = service.getCalls(PORT_QNAME);
// container-managed port selection
- GoogleSearchPort sei = (GoogleSearchPort)
+ GoogleSearchPort sei = (GoogleSearchPort)
service.getPort(GoogleSearchPort.class);
- sei = (GoogleSearchPort)
+ sei = (GoogleSearchPort)
service.getPort(PORT_QNAME, GoogleSearchPort.class);
QName serviceName = service.getServiceName();
@@ -129,7 +129,7 @@
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
index 5ffdeb9..5634c14 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index cc7a838..f1a8116 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index d9ccfe6..99ad91c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_standalone.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index dd6e766..db0ca77 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/googleserver/wscompile_config_web.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 54bd850..f9520dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/build.properties
@@ -15,26 +15,26 @@
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="appname" value="${module}"/> \u0020
<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="ejbjar.files" value="${build.classes.dir}"/> \u0020
<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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index ef05dd5..af798a8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <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
@@ -49,45 +49,45 @@
<param name="src" value="ejb"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <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"/>
+ <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>
+
<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>
<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"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_ejb.xml,META-INF/wsdl/**,simplehandler/**,ejb/SimpleServer.class,com/**" />
- </antcall>
+ </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>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -95,10 +95,10 @@
<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>
-
+ </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
index fb00f88..f8201a2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/client/Client.java
@@ -30,28 +30,28 @@
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 {
-
+ 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) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
index 3054949..d7dba23 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServer"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServer"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="ejb.SimpleServer"/>
</service>
-</configuration>
+</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
index 8e5029d..cb7fbe0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<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>
+ <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>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServer</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
index 74dd711..d2ac35b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleHandler.java
@@ -21,13 +21,13 @@
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();
@@ -37,7 +37,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -49,7 +49,7 @@
}
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
index b78fa62..653d44c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServer.java
@@ -19,7 +19,7 @@
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
index b34ce51..97ed2c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/handler/ejb/SimpleServerImpl.java
@@ -22,23 +22,23 @@
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 !!");
+ 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() {}
+
+ 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
index 4f9cc4c..83eb713 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.properties
@@ -15,7 +15,7 @@
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}"/>
@@ -30,11 +30,11 @@
<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"/>
+ value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
<property name="sun-application.xml"
- value="descriptor/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
index c0c8c27..a5be6ef 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/build.xml
@@ -56,8 +56,8 @@
<delete file="${assemble.ear}/${ejbjar.file}" />
<delete dir="${assemble.ear}/META-INF" />
<copy todir="${assemble.ear}">
- <fileset dir="${build}/"
- includes="**/*.class"
+ <fileset dir="${build}/"
+ includes="**/*.class"
excludes="**/*Client.class, **/*.wsdl, **/*mapping.xml"/>
</copy>
<copy file="${build}/MyHelloService.wsdl" todir="${assemble.ear}/META-INF/wsdl" />
@@ -65,7 +65,7 @@
<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}"
+ <jar destfile="${assemble.ear}/${ejbjar.file}"
>
<fileset dir="${assemble.ear}" includes="META-INF/**, build/**,helloservice/**" />
</jar>
@@ -78,7 +78,7 @@
<target name="create-ear" depends="create-ejb-jar"
description="Executes the targets needed to create the ejb jar.">
- <jar destfile="${assemble.ear}/${ear.file}"
+ <jar destfile="${assemble.ear}/${ear.file}"
>
<fileset dir="${assemble.ear}" includes="${ejbjar.file}" />
</jar>
@@ -120,7 +120,7 @@
-
+
<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="**"/>
@@ -183,6 +183,6 @@
<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-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/client-web.xml
index 4c2b3b1..dccfbc0 100644
--- 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
@@ -20,7 +20,7 @@
<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
+ 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>
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
index f93a1d5..506218c 100644
--- 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
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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
index 5416691..b13a575 100644
--- 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
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="MyHelloService"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="helloservice">
<interface name="helloservice.HelloIF"/>
</service>
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
index 3d1440f..0c1bbbb 100644
--- 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
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ 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/webclient/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-ejb/webclient/Client.java
index b6e2784..559fdbe 100644
--- 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
@@ -31,8 +31,8 @@
public class Client extends HttpServlet {
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
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
index fff8fac..79ce40d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.properties
@@ -15,7 +15,7 @@
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}"/>
@@ -30,11 +30,11 @@
<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"/>
+ value="descriptor/application-client.xml"/>
<property name="sun-application-client.xml"
- value="descriptor/sun-application-client.xml"/>
+ value="descriptor/sun-application-client.xml"/>
<property name="sun-application.xml"
- value="descriptor/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
index 8efec2b..448785b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jaxrpc-hello-web/build.xml
@@ -51,22 +51,22 @@
</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"
+ <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}"
+ <war destfile="${assemble.war}/${war.file}"
webxml="./web.xml" filesonly="true" >
<fileset dir="${assemble.war}" includes="WEB-INF/**, build/**" />
</war>
@@ -102,7 +102,7 @@
<arg line="${warname}"/>
</exec>
</target>
-
+
<!-- <target name="build-client" depends="build-static"
description="Executes the targets needed to build a static stub client.">
@@ -133,7 +133,7 @@
<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"/>
+ <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">
@@ -201,7 +201,7 @@
</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"
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
index 4c2b3b1..dccfbc0 100644
--- 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
@@ -20,7 +20,7 @@
<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
+ 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>
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
index 90c5f6e..9ce543f 100644
--- 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
@@ -31,30 +31,30 @@
/* 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 {
-
+ 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) {
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
index 2029adb..d1bf354 100644
--- 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
@@ -46,7 +46,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -63,9 +63,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF jaxrpc web SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[Hello All]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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
index 5416691..b13a575 100644
--- 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
@@ -19,10 +19,10 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="MyHelloService"
- targetNamespace="urn:Foo"
- typeNamespace="urn:Foo"
+ <service
+ name="MyHelloService"
+ targetNamespace="urn:Foo"
+ typeNamespace="urn:Foo"
packageName="helloservice">
<interface name="helloservice.HelloIF"/>
</service>
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
index 3d1440f..0c1bbbb 100644
--- 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
@@ -18,7 +18,7 @@
-->
<configuration
- xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
+ 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
index eb9e97d..4083642 100644
--- 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
@@ -24,11 +24,11 @@
<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>
+ <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>
+ <service-qname xmlns:servicens="urn:Foo">servicens:HelloIF</service-qname>
<port-component-ref>
<service-endpoint-interface>helloservice.HelloIF</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
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
index c712efe..4e12afb 100644
--- 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
@@ -31,8 +31,8 @@
public class Client extends HttpServlet {
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties
index 7dda984..091806f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="bare_doc_literal-bc_consumer_se_provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
index 2e58611..f5916ad 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/build.xml
@@ -34,7 +34,7 @@
&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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
index 449840b..6b8e459 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/client/SOAPWebConsumer.java
@@ -28,41 +28,41 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 500 + 50 = " + port.add(50));
- stat.addStatus(testId, stat.PASS);
- System.out.println(" No Exception thrown");
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 500 + 50 = " + port.add(50));
+ stat.addStatus(testId, stat.PASS);
+ System.out.println(" No Exception thrown");
- } catch(Exception e) {
- //e.printStackTrace();
- if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
- stat.addStatus(testId, stat.FAIL);
- else {
- stat.addStatus(testId, stat.FAIL);
- System.out.println(" SOAPFaultException Not thrown");
- }
- }
+ } catch(Exception e) {
+ //e.printStackTrace();
+ if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
+ stat.addStatus(testId, stat.FAIL);
+ else {
+ stat.addStatus(testId, stat.FAIL);
+ System.out.println(" SOAPFaultException Not thrown");
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
index a4da07d..34c9263 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/endpoint/Calculator.java
@@ -26,16 +26,16 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod
- public int add(
- @WebParam(name = "number1", targetNamespace = "http://example.com/Calculator", partName = "part1")
- int j
- ) throws Exception {
- int i = 500;
+ @WebMethod
+ public int add(
+ @WebParam(name = "number1", targetNamespace = "http://example.com/Calculator", partName = "part1")
+ int j
+ ) throws Exception {
+ int i = 500;
int k = i +j ;
System.out.println("JBI Test :: bare-rpc-literal bc_consumer_se_provider : " + i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/bc_consumer_se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties
index 3081195..a50ac89 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="bare_doc_literal-se_consumer_se_provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 8c715f1..4f46f61 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
@@ -38,9 +38,9 @@
<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"/>
+ <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"/>
@@ -52,8 +52,8 @@
</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"/>
+ <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"/>
@@ -69,7 +69,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/j2ee.jar"
+ 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"/>
@@ -125,11 +125,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
index 076c17f..bab63ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/bare_doc_literal/se_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/bare_doc_literal/se_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,8 +45,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -57,15 +57,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
index fd53726..0f7fdcd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/endpoint/Calculator.java
@@ -28,20 +28,20 @@
)
@SOAPBinding(parameterStyle = SOAPBinding.ParameterStyle.BARE)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod
- public int add(
- /*
- @WebParam(name = "number1", targetNamespace = "http://example.web.service/Calculator", partName = "part1")
- int i , */
- @WebParam(name = "number2", targetNamespace = "http://example.web.service/Calculator", partName = "part2")
- int j
- ) throws Exception {
- int i = 50;
+ @WebMethod
+ public int add(
+ /*
+ @WebParam(name = "number1", targetNamespace = "http://example.web.service/Calculator", partName = "part1")
+ int i , */
+ @WebParam(name = "number2", targetNamespace = "http://example.web.service/Calculator", partName = "part2")
+ int j
+ ) throws Exception {
+ int i = 50;
int k = i +j ;
System.out.println("JBI Test :: bare-rpc-literal se_consumer_se_provider : " + i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
index c6abd3c..1c486bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/bare_doc_literal/se_consumer_se_provider/webclient/client/Client.java
@@ -30,38 +30,38 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- int k = port.add(505);
- printSuccess("SUCCESS :: Sum of 505 and 50 is : ", out,k);
+ int k = port.add(505);
+ printSuccess("SUCCESS :: Sum of 505 and 50 is : ", out,k);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -74,13 +74,13 @@
}
public void printSuccess(String message, PrintWriter out, long result) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
}
public void printSuccess(String message, PrintWriter out, String result) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
index 0060f08..5ce3ca2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/build.xml
@@ -33,7 +33,7 @@
<delete file="${env.APS_HOME}/test_results.xml"/>
<record name="jbi-serviceengine.output" action="start" />
<ant dir="server" target="all"/>
- <ant dir="client" target="all"/>
+ <ant dir="client" target="all"/>
<ant dir="jax-rpc" target="all"/>
<ant dir="soapfault" target="all"/>
<ant dir="oneway" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties
index 3f83010..e302d5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 3f1cac9..3abc8bb 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -110,11 +110,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
index aae9cb4..dd4e70c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/client/web";
+ private static String testId = "jbi-serviceengine/client/web";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
index d5d9d09..9e6cf3e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
index ea2027c..483c557 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
index 2484752..f641655 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
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://example.web.service/Calculator</namespace-uri>
- <local-part>CalculatorService</local-part>
+ <namespace-uri>http://example.web.service/Calculator</namespace-uri>
+ <local-part>CalculatorService</local-part>
</service-name>
<endpoint-name>CalculatorPort</endpoint-name>
<endpoint-role>provider</endpoint-role>
- <address-location>http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/jsr208-integration-web-client/webservice/CalculatorService</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>add</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://example.web.service/Calculator</namespace-uri>
</input>
<output>
<namespace-uri>http://example.web.service/Calculator</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
index e653d46..b38ca7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/client/web/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties
index d40be86..863c93c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value=".consumer//web.xml"/>
<property name="sun-web.xml" value="./consumer/sun-web.xml"/>
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 4f8dd0b..7522344 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
@@ -54,10 +54,10 @@
<mkdir dir="${assemble.dir}"/>
<jar destfile="${assemble.dir}/${appname}-ejb.jar"
basedir="${build.classes.dir}"
- includes="endpoint/**">
+ includes="endpoint/**">
</jar>
</target>
-
+
<target name="compile" depends="init-common">
<antcall target="compile-common">
<param name="src" value="provider/endpoint"/>
@@ -99,8 +99,8 @@
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"
+ 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"/>
@@ -178,12 +178,12 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
index d6e89dc..d4a0f3e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-sun-web.xml
@@ -26,12 +26,12 @@
<port-info>
<service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
<wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
</wsdl-port>
<stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
+ <name>jbi-enabled</name>
+ <value>true</value>
</stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
index 10c3295..19c131c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
index 271281d..17bdb07 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
index d3211f6..16580c8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_ejb_consumer_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_ejb_consumer_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
index a19cedf..11dbddd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/jms-binding-su/su/META-INF/jbi.xml
@@ -27,6 +27,6 @@
<consumes interface-name="tns:Hello"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
index b0c8667..5cdb041 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/consumer/webclient/client/Client.java
@@ -29,8 +29,8 @@
@WebServiceRef(name="sun-web.serviceref/HelloEJBService")
HelloEJBService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -38,7 +38,7 @@
throws jakarta.servlet.ServletException {
try {
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
+ Hello port = service.getHelloEJBPort();
// Get Stub
/*
BindingProvider stub = (BindingProvider)port;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
index afab69f..eff66a1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/endpoint/ejb/HelloEJB.java
@@ -25,7 +25,7 @@
public class HelloEJB implements Hello {
public String sayHello(String who) {
- System.out.println("**** EJB Called");
+ System.out.println("**** EJB Called");
return "WebSvcTest-Hello " + who;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
index a7b7b55..0727c38 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_ejb_provider_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_ejb_provider_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
index a479d41..c68eac2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/ejb-jmsbc/provider/jms-binding-su/su/META-INF/jbi.xml
@@ -27,6 +27,6 @@
<provides interface-name="tns:Hello"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ <javaesb:artifactstype>WSDL11</javaesb:artifactstype>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 dc63f00..632eb41 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -116,11 +116,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
index 2701365..e342175 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/client/TestClient.java
@@ -32,7 +32,7 @@
public boolean found1 = false;
- private static String testId = "jbi-serviceengine/inout-sample";
+ private static String testId = "jbi-serviceengine/inout-sample";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,13 +45,13 @@
String url = args[0];
try {
- //for(int i=0; i<1000; i++) {
+ //for(int i=0; i<1000; i++) {
int code = invokeServlet(url);
- //System.out.println("client ID : " + i);
+ //System.out.println("client ID : " + i);
report(code);
- //}
- } catch (Exception e) {
- fail();
+ //}
+ } catch (Exception e) {
+ fail();
}
}
@@ -66,7 +66,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Value is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
index 4fc103f..9f835ac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/endpoint/Adder.java
@@ -26,17 +26,17 @@
targetNamespace="http://example.web.service/Adder"
)
public class Adder {
- public Adder() {}
+ public Adder() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i -j ;
System.err.println(i + "-" + j +" = " + k);
- return k;
+ return k;
- /*
- if(i == 101)
- throw new RuntimeException("This is my exception in add ...");
- */
- }
+ /*
+ if(i == 101)
+ throw new RuntimeException("This is my exception in add ...");
+ */
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
index 7bb96bc..70b9ea1 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/Adder"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:AdderServiceInterface"
+ 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://example.web.service/Adder"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:AdderServiceInterface"
service-name="tns:AdderService"
endpoint-name="AdderPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
index da86bf4..e532ce1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Adder Service</description>
- <display-name>AdderWAR</display-name>
+ <description>WebTier for the Adder Service</description>
+ <display-name>AdderWAR</display-name>
- <servlet>
- <description>Endpoint for Adder Web Service</description>
- <display-name>AdderWebService</display-name>
- <servlet-name>Adder</servlet-name>
- <servlet-class>endpoint.Adder</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Adder Web Service</description>
+ <display-name>AdderWebService</display-name>
+ <servlet-name>Adder</servlet-name>
+ <servlet-class>endpoint.Adder</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Adder</servlet-name>
- <url-pattern>/webservice/AdderService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Adder</servlet-name>
+ <url-pattern>/webservice/AdderService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
index cffbfe9..2fdd8dd 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/inout-sample/webclient/client/Client.java
@@ -28,39 +28,39 @@
@WebServiceRef(name="sun-web.serviceref/adder") AdderService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Adder port = service.getAdderPort();
System.out.println("port is : " + port);
int result = port.add(101, 2);
System.out.println("result is : " + result);
- //printFailure(out);
- printSuccess(out, result);
+ //printFailure(out);
+ printSuccess(out, result);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- //printSuccess(out);
- printFailure(out);
+ e.printStackTrace();
+ //printSuccess(out);
+ printFailure(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -73,7 +73,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
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
index 9f4f161..4bbfc2b 100644
--- 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
@@ -25,6 +25,6 @@
<target name="all">
<ant dir="consumer" target="all"/>
- <ant dir="provider" target="all"/>
+ <ant dir="provider" target="all"/>
</target>
</project>
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
index c2a4564..d41ec0c 100644
--- 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
@@ -15,10 +15,10 @@
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="appname" value="${module}"/> \u0020
<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
index c39b0c0..26f5936 100644
--- 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
@@ -39,7 +39,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -58,13 +58,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <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"/ -->
@@ -96,8 +96,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -106,7 +106,7 @@
<fileset dir="${build.mapping}">
<include name="IntrClientMapping.xml" />
</fileset>
-
+
<fileset dir="${build.webinf}">
<include name="**/web.xml" />
@@ -116,8 +116,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<fileset dir="${build.mapping}">
<include name="IntrClientMapping.xml" />
@@ -138,18 +138,18 @@
</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>
+ <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">
+ <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"/>
@@ -158,9 +158,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -171,7 +171,7 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
@@ -192,9 +192,9 @@
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -203,7 +203,7 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </exec>
<exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
@@ -222,10 +222,10 @@
<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" />
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
</exec>
</target>
@@ -266,14 +266,14 @@
<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" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -286,7 +286,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
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
index 927d54a..52152c9 100644
--- 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
@@ -30,7 +30,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -40,15 +40,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public double doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -56,29 +56,29 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
- }
+ + 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);
+ } 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -87,22 +87,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index 2214af5..4a58b80 100644
--- 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
@@ -30,7 +30,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/consumer";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -40,13 +40,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public double doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -54,29 +54,29 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
- }
+ + 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);
+ } 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -85,22 +85,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index 08c0656..86c89e1 100644
--- 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
@@ -20,12 +20,12 @@
import jakarta.servlet.http.*;
import java.io.Serializable;
import java.io.PrintWriter;
-import java.rmi.RemoteException;
+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");
@@ -36,7 +36,7 @@
this.resp = resp;
doPost(req, resp);
}
-
+
public void doPost(HttpServletRequest req, HttpServletResponse resp)
throws jakarta.servlet.ServletException {
try{
@@ -49,9 +49,9 @@
}
public void calculateInterest() throws Exception {
- System.out.println("calculateInterest invoked from servlet ");
+ System.out.println("calculateInterest invoked from servlet ");
FindInterestClient client = new FindInterestClient();
- double interest= client.doTest();
+ double interest= client.doTest();
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
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
index 079755b..3dfffb1 100755
--- 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
@@ -23,19 +23,19 @@
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();
}
@@ -44,23 +44,23 @@
// "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");
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
index 7c4bfbb..87a75ed 100755
--- 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
@@ -23,42 +23,42 @@
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");
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
index 6a8ba34..502a10e 100644
--- 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
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF FindInterest SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[105.0]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
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
index 3542c06..2b0cec3 100644
--- 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
@@ -26,7 +26,7 @@
<wsdl-port>
<namespaceURI>http://hello.org/wsdl</namespaceURI>
<localpart>InterestIFPort</localpart>
-</wsdl-port>
+</wsdl-port>
<stub-property name="jbi-enabled" value="true"/>
</port-info>
</service-ref>
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
index d6f94af..8d70941 100644
--- 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
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public double calculateInterest(double balance, double period) {
@@ -39,13 +39,13 @@
}
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/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
index a1e9ffa..ac2e5e6 100755
--- 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
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
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
index c4f6ccb..3df5914 100755
--- 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
@@ -18,15 +18,15 @@
-->
<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"
+ 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>
+ </services>
</jbi>
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
index 1acec95..73efb32 100755
--- 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
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
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
index 1610dee..762ce45 100755
--- 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
@@ -18,14 +18,14 @@
-->
<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"
+ 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>
+ </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
index 9b0812b..a4da6aa 100755
--- 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
@@ -21,22 +21,22 @@
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>
+ <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>
+ <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>
+ <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>
+ </output>
</operation>
-</endpoint>
+</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
index df6620d..49ed367 100644
--- 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
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+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 class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,7 +44,7 @@
}
public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*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
index 4cfb954..c11b886 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index ebff69c..9c318c8 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myclient"/>
</configuration>
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
index ed94c05..d7cd8c0 100644
--- 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
@@ -15,10 +15,10 @@
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="appname" value="${module}"/> \u0020
<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
index 486b684..cf9cd0c 100644
--- 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
@@ -37,7 +37,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -56,13 +56,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <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"/ -->
@@ -99,8 +99,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -125,8 +125,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<!--
<fileset dir=".">
<include name="FIMappingClient.xml" />
@@ -152,17 +152,17 @@
</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>
+ <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">
+ <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"/>
@@ -172,9 +172,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -185,12 +185,12 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -199,18 +199,18 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </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>
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
+ </exec>
</target>
<target name="makedirs">
@@ -250,14 +250,14 @@
<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" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -270,7 +270,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
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
index e08f586..1537c1a 100644
--- 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
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,15 +41,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -57,23 +57,23 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ interestIFPort.calculateInterest(balance, period);
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -82,22 +82,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index ee2f42a..293a5cb 100644
--- 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
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider-oneway";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,13 +41,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -55,23 +55,23 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- interestIFPort.calculateInterest(balance, period);
-
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.PASS);
+ interestIFPort.calculateInterest(balance, period);
- } catch (Exception ex) {
- status.addStatus(testId + "1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -80,22 +80,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index fa02d5f..e536ed6 100755
--- 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
@@ -23,19 +23,19 @@
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);
}
@@ -45,20 +45,20 @@
// "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");
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
index 2b59393..9bbacd5 100755
--- 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
@@ -23,19 +23,19 @@
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);
}
@@ -43,20 +43,20 @@
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);
-
+
+ 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");
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
index 4d1f19f..42dbc5a 100644
--- 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
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public void calculateInterest(double balance, double period) {
@@ -38,13 +38,13 @@
}
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/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
index d16c157..f1b3f7a 100755
--- 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
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
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
index f73203b..cd67dfe 100755
--- 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
@@ -18,10 +18,10 @@
-->
<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>
+ 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/web/FindInterestServletImpl.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jax-rpc/provider-oneway/web/FindInterestServletImpl.java
index 67f2288..df397b7 100644
--- 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
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+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 class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,6 +44,6 @@
}
public void calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint " + (0.2*balance*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
index 4cfb954..c11b886 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index ebff69c..9c318c8 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 9d1e12f..e8001cd 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myweb"/>
</configuration>
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
index ed94c05..d7cd8c0 100644
--- 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
@@ -15,10 +15,10 @@
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="appname" value="${module}"/> \u0020
<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
index ef9df39..359671c 100644
--- 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
@@ -39,7 +39,7 @@
<target name="setup" depends="init-common">
<property name="root.dir" value="." />
<property name="src.dir" value="." />
- <property name="appname" value="FindInterestApp" />
+ <property name="appname" value="FindInterestApp" />
<property name="build.dir" value="${env.APS_HOME}/build/module" />
<property name="build.repository" value="${build.dir}/buildears"/>
@@ -58,13 +58,13 @@
<property name="debug" value="on" />
</target>
-
+
<target name="clean" depends="setup">
- <delete dir="${build.dir}"/>
+ <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"/ -->
@@ -101,8 +101,8 @@
<include name="**/FindInterest_Schema.xsd" />
</fileset>
</jar>
-
- <antcall target="copy-to-webinf" />
+
+ <antcall target="copy-to-webinf" />
<jar jarfile="${build.jars}/web.war" >
<fileset dir="${build.webinf}">
@@ -127,8 +127,8 @@
</fileset>
</jar>
- <jar jarfile="${build.jars}/appclient.jar"
- manifest="${build.desc}/client/MANIFEST.MF">
+ <jar jarfile="${build.jars}/appclient.jar"
+ manifest="${build.desc}/client/MANIFEST.MF">
<!--
<fileset dir=".">
<include name="FIMappingClient.xml" />
@@ -154,17 +154,17 @@
</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>
+ <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">
+ <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"/>
@@ -174,9 +174,9 @@
</fileset>
</ear>
</target>
-
+
<target name="deploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="deploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -187,12 +187,12 @@
<arg value="--retrieve" />
<arg value="${build.appclient}" />
<arg value="${build.ear}/${appname}.ear" />
- </exec>
+ </exec>
<antcall target="deploy-jbi-component-su"/>
</target>
-
+
<target name="undeploy" depends="setup">
- <exec executable="${ASADMIN}">
+ <exec executable="${ASADMIN}">
<arg value="undeploy" />
<arg value="--user" />
<arg value="${admin.user}" />
@@ -201,18 +201,18 @@
<arg value="--port" />
<arg value="${admin.port}" />
<arg value="${appname}" />
- </exec>
+ </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>
+ <arg value="-client" />
+ <arg value="${build.appclient}/${appname}Client.jar"/>
+ <arg value="-name" />
+ <arg value="MyAppClient" />
+ </exec>
</target>
<target name="makedirs">
@@ -252,14 +252,14 @@
<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" />
+ <include name="MANIFEST.MF" />
</fileset>
</copy>
-
+
<copy todir="${build.desc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/descriptor" >
<include name="application.xml" />
@@ -272,7 +272,7 @@
<include name="sun-j2ee-ri.xml" />
</fileset>
</copy>
-
+
<copy todir="${build.ejbsrc}" filtering="on" overwrite="yes" >
<fileset dir="${src.dir}/ejb" >
<include name="**/*.java" />
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
index c73a5d0..559eb3e 100644
--- 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
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public FindInterestClient() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,15 +41,15 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
//String targetEndpointAddress =
- // "http://localhost:8080/findintr/FindInterest";
+ // "http://localhost:8080/findintr/FindInterest";
String targetEndpointAddress =
- "http://localhost:12013/InterestIFPort";
+ "http://localhost:12013/InterestIFPort";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -57,27 +57,27 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
- }
+ + interest);
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -86,22 +86,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index 8b9660c..c4e6df0 100644
--- 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
@@ -31,7 +31,7 @@
private static String testId = "jbi-serviceengine/jax-rpc/provider";
public FindInterestClientNonHttpBC() {
- status.addDescription(testId);
+ status.addDescription(testId);
}
public static void main (String[] args) {
@@ -41,13 +41,13 @@
client.doTest();
// client.doServletTest();
}
-
+
public void doTest() {
String targetEndpointAddress =
- "http://localhost:8080/findintr/FindInterest";
+ "http://localhost:8080/findintr/FindInterest";
- try {
+ try {
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
ic.lookup("java:comp/env/service/FindInterest");
@@ -55,27 +55,27 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
- }
+ + interest);
- } catch (Exception ex) {
- status.addStatus(testId +"1 : EJB Endpoint and Servlet Endpoint Test", status.FAIL);
+ 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";
+ try {
+ String targetEndpointAddress =
+ "http://localhost:8080/FindInterestServlet/FindInterest";
Context ic = new InitialContext();
FindInterest findIntrService = (FindInterest)
@@ -84,22 +84,22 @@
InterestIF interestIFPort = findIntrService.getInterestIFPort();
((Stub)interestIFPort)._setProperty (Stub.ENDPOINT_ADDRESS_PROPERTY,
- targetEndpointAddress);
+ targetEndpointAddress);
- double interest = interestIFPort.calculateInterest(balance, period);
+ 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);
+ + 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");
+ }
+ 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
index e123fea..d26175a 100755
--- 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
@@ -23,19 +23,19 @@
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);
}
@@ -45,23 +45,23 @@
// "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");
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
index 52ddb6f..a32d4ef 100755
--- 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
@@ -23,19 +23,19 @@
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);
}
@@ -43,23 +43,23 @@
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");
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
index d6f94af..8d70941 100644
--- 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
@@ -17,7 +17,7 @@
package myejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class InterestEJB implements SessionBean {
private SessionContext sc;
-
+
public InterestEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In InterestEJB::ejbCreate !!");
+ System.out.println("In InterestEJB::ejbCreate !!");
}
public double calculateInterest(double balance, double period) {
@@ -39,13 +39,13 @@
}
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/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
index d16c157..f1b3f7a 100755
--- 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
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
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
index e08915c..bee67a9 100755
--- 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
@@ -18,14 +18,14 @@
-->
<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"
+ 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>
+ </services>
</jbi>
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
index fcc0007..3891d55 100755
--- 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
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
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
index 1610dee..762ce45 100755
--- 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
@@ -18,14 +18,14 @@
-->
<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"
+ 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>
+ </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
index 0a7869d..2a2654d 100755
--- 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
@@ -21,22 +21,22 @@
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>
+ <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>
+ <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>
+ <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>
+ </output>
</operation>
-</endpoint>
+</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
index df6620d..49ed367 100644
--- 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
@@ -21,15 +21,15 @@
import javax.xml.namespace.QName;
import javax.xml.rpc.Call;
import java.io.Serializable;
-import java.rmi.RemoteException;
+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 class FindInterestServletImpl implements
+ SingleThreadModel, ServiceLifecycle {
public FindInterestServletImpl() {
System.out.println("FindInterestServletImpl() instantiated");
@@ -44,7 +44,7 @@
}
public double calculateInterest(double balance, double period) {
- System.out.println("calculateInterest invoked from servlet endpoint");
- return 0.2*balance*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
index 4cfb954..c11b886 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index ebff69c..9c318c8 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 9d1e12f..e8001cd 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="FindInterest.wsdl"
packageName="myweb"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
index 02e8c57..f33335c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/jbi_commons.xml
@@ -30,7 +30,7 @@
<target name="deploy-service-assembly" depends="init-common">
<property name="base-dir" value="."/>
<property name="temp" value="${base-dir}/temp" />
- <property name="su-dir" value="${base-dir}/${jbi-component-su-dir}"/>
+ <property name="su-dir" value="${base-dir}/${jbi-component-su-dir}"/>
<mkdir dir="${temp}"/>
<jar basedir="${su-dir}/su" destfile="${temp}/${jbi-component-su}.jar"/>
<copy todir="${temp}">
@@ -50,7 +50,7 @@
<antcall target="shut-down-service-assembly"/>
<antcall target="undeploy-service-assembly"/>
</target>
-
+
<target name="stop-service-assembly" depends="init-common">
<ant dir="${jbi-installation}/bin" antfile="${jbi-installation}/bin/jbi_admin.xml" target=
"stop-service-assembly">
@@ -92,12 +92,12 @@
</ant>
</target>
- <!--
- Arguments to this target are-
- appName - application name
- wsName - web service name
- module - ejb-module|web-module|j2ee-application.ejb-module|j2ee-application.web-module
- flag - true|false
+ <!--
+ Arguments to this target are-
+ appName - application name
+ wsName - web service name
+ module - ejb-module|web-module|j2ee-application.ejb-module|j2ee-application.web-module
+ flag - true|false
-->
<target name="set-jbi-enabled" depends="init-common">
<antcall target="asadmin-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties
index 579dec6..5ed0eb7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 a2e7360..1bfc164 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -109,11 +109,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
index d7662ef..da7cc17 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/oneway";
+ private static String testId = "jbi-serviceengine/oneway";
public boolean found1 = false;
public static void main (String[] args) {
@@ -44,12 +44,12 @@
String url = args[0];
try {
- //for(int i=0; i<100; i++) {
+ //for(int i=0; i<100; i++) {
int code = invokeServlet(url);
report(code);
- //}
- } catch (Exception e) {
- fail();
+ //}
+ } catch (Exception e) {
+ fail();
}
}
@@ -65,7 +65,7 @@
log(line);
//if(line.indexOf("Exception thrown Successfully") != -1)
if(line.indexOf("Endpoint is invoked successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
index f09b38b..082b475 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/endpoint/OneWay.java
@@ -26,20 +26,20 @@
targetNamespace="http://example.web.service/OneWay"
)
public class OneWay {
- public OneWay() {}
+ public OneWay() {}
- @WebMethod(operationName="subtract", action="urn:Subtract")
- @Oneway
- public void subtract(int i, int j) {
- System.out.println("*** Inside subtract("+i+", "+j+")");
+ @WebMethod(operationName="subtract", action="urn:Subtract")
+ @Oneway
+ public void subtract(int i, int j) {
+ System.out.println("*** Inside subtract("+i+", "+j+")");
int k = i -j ;
- if(i == 101)
- throw new RuntimeException("This is my exception in subtract ...");
- }
+ if(i == 101)
+ throw new RuntimeException("This is my exception in subtract ...");
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- @Oneway
- public void sayHi() {
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ @Oneway
+ public void sayHi() {
System.out.println("*** Hi from OneWay");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 9587376..e35e148 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
index 5350f5e..c33f165 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/OneWay"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:OneWayServiceInterface"
+ 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://example.web.service/OneWay"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:OneWayServiceInterface"
service-name="tns:OneWayService"
endpoint-name="OneWayPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
index 226f654..c08901f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the OneWay Service</description>
- <display-name>OneWayWAR</display-name>
+ <description>WebTier for the OneWay Service</description>
+ <display-name>OneWayWAR</display-name>
- <servlet>
- <description>Endpoint for OneWay Web Service</description>
- <display-name>OneWayWebService</display-name>
- <servlet-name>OneWay</servlet-name>
- <servlet-class>endpoint.OneWay</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for OneWay Web Service</description>
+ <display-name>OneWayWebService</display-name>
+ <servlet-name>OneWay</servlet-name>
+ <servlet-class>endpoint.OneWay</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>OneWay</servlet-name>
- <url-pattern>/webservice/OneWayService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>OneWay</servlet-name>
+ <url-pattern>/webservice/OneWayService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
index 1e8b6aa..1413f8e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/oneway/webclient/client/Client.java
@@ -27,40 +27,40 @@
public class Client extends HttpServlet {
@WebServiceRef(name="sun-web.serviceref/oneway") OneWayService service;
- //static OneWay port;
+ //static OneWay port;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
OneWay port = service.getOneWayPort();
- //if (port == null) port = service.getOneWayPort();
+ //if (port == null) port = service.getOneWayPort();
System.out.println("port is : " + port);
port.subtract(101, 2);
port.sayHi();
- printSuccess(out);
+ printSuccess(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- printFailure(out);
+ e.printStackTrace();
+ printFailure(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -73,7 +73,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties
index 91ad899..f18d2da 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpc-literal-bundled-wsdl-bc-consumer-se-provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
index 2e56421..d5fe041 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/build.xml
@@ -34,11 +34,11 @@
&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 dir="common:endpoint"/>
+ <delete dir="common:endpoint"/>
</target>
<target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
@@ -54,16 +54,16 @@
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- 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>
+ <!-- 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>
<target name="assemble-client" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
index f9d5e69..c5dd990 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/client/SOAPWebConsumer.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/bundled-wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/bundled-wsdl";
public static void main(String[] args) {
stat.addDescription(testId);
@@ -38,29 +38,29 @@
client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
-
+
private void addUsingSOAPConsumer() {
Calculator port= null;
try {
-
+
System.out.println(" After creating CalculatorService");
-
+
port = service.getCalculatorPort();
System.out.println(" After getting port");
-
+
// Get Stub
BindingProvider stub = (BindingProvider)port;
String endpointURI ="http://localhost:12011/calculatorendpoint";
stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
endpointURI);
System.out.println(" After setting endpoint address URI");
-
+
IncomeTaxDetails itDetails = new IncomeTaxDetails();
itDetails.setFirstName( "bhavani");
itDetails.setLastName("s");
itDetails.setAnnualIncome( 400000);
itDetails.setStatus("salaried");
-
+
long startTime = System.currentTimeMillis();
long ret = 0;
// Make 100 calls to see how much time it takes.
@@ -78,37 +78,37 @@
);
//}
long timeTaken = System.currentTimeMillis() - startTime;
-
+
//int ret = port.add(1, 2);
printSuccess("Your income tax is : Rs ", ret, timeTaken);
startTime = System.currentTimeMillis();
int k = port.add(505, 50);
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Sum of 505 and 50 is : ", k, timeTaken);
-
+
startTime = System.currentTimeMillis();
String hi = port.sayHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Output from webservice : ", hi, timeTaken);
-
- /*
+
+ /*
startTime = System.currentTimeMillis();
port.printHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi in server.log", timeTaken);
-
+
startTime = System.currentTimeMillis();
port.printHiToMe("JavaEEServiceEngine");
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi to me in server.log", timeTaken);
*/
stat.addStatus(testId, stat.PASS);
-
+
} catch(java.lang.Exception e) {
stat.addStatus(testId, stat.FAIL);
}
}
-
+
public void printFailure(String errMsg) {
System.out.println("<html>");
System.out.println("<head>");
@@ -121,17 +121,17 @@
System.out.println("</body>");
System.out.println("</html>");
}
-
+
public void printSuccess(String message, long result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
public void printSuccess(String message, String result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
index 69c9acc..55b94c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/endpoint/Calculator.java
@@ -29,12 +29,12 @@
wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
-
+
public class Calculator {
-
+
public static final String testName = "\nTest :: rpc-literal-bundled-wsdl-bc-consumer-se-provider : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -44,7 +44,7 @@
System.out.println(testName + i + "+" + j +" = " + k);
return k;
}
-
+
@WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
public long calculateIncomeTax(IncomeTaxDetails details
, IncomeTaxDetails details2
@@ -64,18 +64,18 @@
System.out.println(testName +"Tax to be paid = " + taxToBePaid);
return taxToBePaid;
}
-
+
@WebMethod(operationName="sayHi", action="urn:SayHi")
public String sayHi() {
return testName + "Hi from sayHi()";
}
-
+
@WebMethod(operationName="printHi", action="urn:PrintHi")
@Oneway
public void printHi() {
System.out.println(testName +"Hi from printHi()");
}
-
+
@WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
@Oneway
public void printHiToMe(String name) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
index 81c5309..cf35496 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/bundled-wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties
index 1060c7a..b13fb09 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpc-literal-bundled-wsdl-bc-consumer-se-provider"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
index 2d4c393..e0bba4d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/build.xml
@@ -34,11 +34,11 @@
&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 dir="common:endpoint"/>
+ <delete dir="common:endpoint"/>
</target>
<target name="setup" depends="assemble-web, deploy-app, assemble-client"/>
@@ -54,18 +54,18 @@
<param name="war.classes" value="${build.classes.dir}"/>
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
- <!-- 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"/>
- <copy file="${basedir}/wsdl/MessageTypes.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"/>
- <include name="WEB-INF/wsdl/MessageTypes.wsdl"/>
- </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"/>
+ <copy file="${basedir}/wsdl/MessageTypes.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"/>
+ <include name="WEB-INF/wsdl/MessageTypes.wsdl"/>
+ </fileset>
+ </jar>
</target>
<target name="assemble-client" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
index c54716f..dab0d2e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/client/SOAPWebConsumer.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/wsdl-import";
+ private static String testId = "jbi-serviceengine/rpc-literal/bc_consumer_sc_provider/wsdl-import";
public static void main(String[] args) {
stat.addDescription(testId);
@@ -38,29 +38,29 @@
client.addUsingSOAPConsumer();
stat.printSummary(testId);
}
-
+
private void addUsingSOAPConsumer() {
Calculator port= null;
try {
-
+
System.out.println(" After creating CalculatorService");
-
+
port = service.getCalculatorPort();
System.out.println(" After getting port");
-
+
// Get Stub
BindingProvider stub = (BindingProvider)port;
String endpointURI ="http://localhost:12011/calculatorendpoint";
stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
endpointURI);
System.out.println(" After setting endpoint address URI");
-
+
IncomeTaxDetails itDetails = new IncomeTaxDetails();
itDetails.setFirstName( "bhavani");
itDetails.setLastName("s");
itDetails.setAnnualIncome( 400000);
itDetails.setStatus("salaried");
-
+
long startTime = System.currentTimeMillis();
long ret = 0;
// Make 100 calls to see how much time it takes.
@@ -78,37 +78,37 @@
);
//}
long timeTaken = System.currentTimeMillis() - startTime;
-
+
//int ret = port.add(1, 2);
printSuccess("Your income tax is : Rs ", ret, timeTaken);
startTime = System.currentTimeMillis();
int k = port.add(505, 50);
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Sum of 505 and 50 is : ", k, timeTaken);
-
+
startTime = System.currentTimeMillis();
String hi = port.sayHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("Output from webservice : ", hi, timeTaken);
-
- /*
+
+ /*
startTime = System.currentTimeMillis();
port.printHi();
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi in server.log", timeTaken);
-
+
startTime = System.currentTimeMillis();
port.printHiToMe("JavaEEServiceEngine");
timeTaken = System.currentTimeMillis() - startTime;
printSuccess("SUCCESS : ", "Webservice has successfully printed hi to me in server.log", timeTaken);
*/
stat.addStatus(testId, stat.PASS);
-
+
} catch(java.lang.Exception e) {
stat.addStatus(testId, stat.FAIL);
}
}
-
+
public void printFailure(String errMsg) {
System.out.println("<html>");
System.out.println("<head>");
@@ -121,17 +121,17 @@
System.out.println("</body>");
System.out.println("</html>");
}
-
+
public void printSuccess(String message, long result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
public void printSuccess(String message, String result, long timeTaken) {
System.out.println("\n\n");
System.out.println(message + result);
System.out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
index 69c9acc..55b94c6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/endpoint/Calculator.java
@@ -29,12 +29,12 @@
wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
-
+
public class Calculator {
-
+
public static final String testName = "\nTest :: rpc-literal-bundled-wsdl-bc-consumer-se-provider : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -44,7 +44,7 @@
System.out.println(testName + i + "+" + j +" = " + k);
return k;
}
-
+
@WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
public long calculateIncomeTax(IncomeTaxDetails details
, IncomeTaxDetails details2
@@ -64,18 +64,18 @@
System.out.println(testName +"Tax to be paid = " + taxToBePaid);
return taxToBePaid;
}
-
+
@WebMethod(operationName="sayHi", action="urn:SayHi")
public String sayHi() {
return testName + "Hi from sayHi()";
}
-
+
@WebMethod(operationName="printHi", action="urn:PrintHi")
@Oneway
public void printHi() {
System.out.println(testName +"Hi from printHi()");
}
-
+
@WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
@Oneway
public void printHiToMe(String name) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
index 81c5309..cf35496 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/sun-http-binding/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/bc_consumer_sc_provider/wsdl-import/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
index 90d05e9..a7b7e91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/build.xml
@@ -25,7 +25,7 @@
<target name="all">
<ant dir="se_consumer_se_provider/generated_wsdl" target="all"/>
<ant dir="se_consumer_se_provider/bundled_wsdl" target="all"/>
- <ant dir="bc_consumer_sc_provider/wsdl-import" target="all"/>
- <ant dir="bc_consumer_sc_provider/bundled-wsdl" target="all"/>
+ <ant dir="bc_consumer_sc_provider/wsdl-import" target="all"/>
+ <ant dir="bc_consumer_sc_provider/bundled-wsdl" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties
index 849c555..d7953f6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpc-literal-bundled-wsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 87c424a..df83aaf 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
@@ -38,9 +38,9 @@
<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"/>
+ <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"/>
@@ -52,35 +52,35 @@
</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"/>
+ <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 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>
+ <!-- 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"/>
+ <!-- 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">
@@ -92,7 +92,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/j2ee.jar"
+ 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"/>
@@ -131,11 +131,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
index 4296a7f..628253f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/bundled_wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/bundled_wsdl";
public static void main (String[] args) {
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -58,15 +58,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
index 238dfd8..b4bc8a3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/endpoint/Calculator.java
@@ -26,15 +26,15 @@
name="Calculator",
serviceName="CalculatorService",
targetNamespace="http://example.web.service/Calculator",
- wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
+ wsdlLocation = "WEB-INF/wsdl/CalculatorService.wsdl"
)
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
public class Calculator {
- public static final String testName = "\nTest :: rpc-literal-bundled-wsdl : ";
+ public static final String testName = "\nTest :: rpc-literal-bundled-wsdl : ";
public Calculator() {}
-
+
@WebMethod(operationName="add", action="urn:Add")
public int add(
@WebParam(name = "int_1", partName = "int_1") int i,
@@ -45,38 +45,38 @@
return k;
}
- @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
- public long calculateIncomeTax(IncomeTaxDetails details
- , IncomeTaxDetails details2
- , IncomeTaxDetails details3
- , IncomeTaxDetails details4
- , IncomeTaxDetails details5
- , IncomeTaxDetails details6
- , IncomeTaxDetails details7
- , IncomeTaxDetails details8
- , IncomeTaxDetails details9
- , IncomeTaxDetails details10
- ) {
- long income = details.annualIncome;
- System.out.println(testName + "Annual income = " + income);
- long taxRate = 30; // 30%
- long taxToBePaid = income / taxRate;
- System.out.println(testName +"Tax to be paid = " + taxToBePaid);
- return taxToBePaid;
- }
+ @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
+ public long calculateIncomeTax(IncomeTaxDetails details
+ , IncomeTaxDetails details2
+ , IncomeTaxDetails details3
+ , IncomeTaxDetails details4
+ , IncomeTaxDetails details5
+ , IncomeTaxDetails details6
+ , IncomeTaxDetails details7
+ , IncomeTaxDetails details8
+ , IncomeTaxDetails details9
+ , IncomeTaxDetails details10
+ ) {
+ long income = details.annualIncome;
+ System.out.println(testName + "Annual income = " + income);
+ long taxRate = 30; // 30%
+ long taxToBePaid = income / taxRate;
+ System.out.println(testName +"Tax to be paid = " + taxToBePaid);
+ return taxToBePaid;
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- public String sayHi() {
- return testName + "Hi from sayHi()";
- }
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ public String sayHi() {
+ return testName + "Hi from sayHi()";
+ }
- @WebMethod(operationName="printHi", action="urn:PrintHi")
- public void printHi() {
- System.out.println(testName +"Hi from printHi()");
- }
+ @WebMethod(operationName="printHi", action="urn:PrintHi")
+ public void printHi() {
+ System.out.println(testName +"Hi from printHi()");
+ }
- @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
- public void printHiToMe(String name) {
- System.out.println(testName +"Hi to " + name + " from printHiToMe()");
- }
+ @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
+ public void printHiToMe(String name) {
+ System.out.println(testName +"Hi to " + name + " from printHiToMe()");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index 1c0872c..8d3678f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,16 +19,16 @@
<!-- 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"
+ 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>
<name>rpc-literal-bundled-wsdl-se-consumer-se-provider</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>rpc-literal-bundled-wsdl</name>
<description>provider service</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
index 9a201a0..9e11499 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
index 89c6f62..f935575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/bundled_wsdl/webclient/client/Client.java
@@ -30,79 +30,79 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- IncomeTaxDetails itDetails = new IncomeTaxDetails();
- itDetails.setFirstName ( "bhavani");
- itDetails.setLastName ("s");
- itDetails.setAnnualIncome ( 400000);
- itDetails.setStatus ("salaried");
+ IncomeTaxDetails itDetails = new IncomeTaxDetails();
+ itDetails.setFirstName ( "bhavani");
+ itDetails.setLastName ("s");
+ itDetails.setAnnualIncome ( 400000);
+ itDetails.setStatus ("salaried");
- long startTime = System.currentTimeMillis();
- long ret = 0;
- // Make 100 calls to see how much time it takes.
- //for(int i=0; i<1000; i++) {
- ret = port.calculateIncomeTax(itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- );
- //}
- long timeTaken = System.currentTimeMillis() - startTime;
-
+ long startTime = System.currentTimeMillis();
+ long ret = 0;
+ // Make 100 calls to see how much time it takes.
+ //for(int i=0; i<1000; i++) {
+ ret = port.calculateIncomeTax(itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ );
+ //}
+ long timeTaken = System.currentTimeMillis() - startTime;
+
//int ret = port.add(1, 2);
- printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
- startTime = System.currentTimeMillis();
- int k = port.add(505, 50);
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
+ printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
+ startTime = System.currentTimeMillis();
+ int k = port.add(505, 50);
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
- startTime = System.currentTimeMillis();
- String hi = port.sayHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Output from webservice : ", out, hi, timeTaken);
+ startTime = System.currentTimeMillis();
+ String hi = port.sayHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Output from webservice : ", out, hi, timeTaken);
- startTime = System.currentTimeMillis();
- port.printHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
- startTime = System.currentTimeMillis();
- port.printHiToMe("JavaEEServiceEngine");
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHiToMe("JavaEEServiceEngine");
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -115,14 +115,14 @@
}
public void printSuccess(String message, PrintWriter out, long result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
public void printSuccess(String message, PrintWriter out, String result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties
index 198c549..c2b65de 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpc-literal-generated-wsdl"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 0c682b8..3fa5407 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
@@ -38,9 +38,9 @@
<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"/>
+ <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"/>
@@ -52,8 +52,8 @@
</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"/>
+ <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"/>
@@ -69,7 +69,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/j2ee.jar"
+ 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"/>
@@ -125,11 +125,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
index a94c08e..b31b71e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/generated_wsdl";
+ private static String testId = "jbi-serviceengine/rpc-literal/se_consumer_se_provider/generated_wsdl";
public static void main (String[] args) {
stat.addDescription(testId);
@@ -45,8 +45,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -57,15 +57,15 @@
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
- StringBuffer buffer = new StringBuffer();
+ StringBuffer buffer = new StringBuffer();
String line = null;
- boolean found = false;
+ boolean found = false;
while ((line = input.readLine()) != null) {
- if(line.indexOf("SUCCESS") != -1) found = true;
- buffer.append(line + "\n");
+ if(line.indexOf("SUCCESS") != -1) found = true;
+ buffer.append(line + "\n");
}
log(buffer.toString());
- if(!found) return 505;
+ if(!found) return 505;
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
index 57b00e8..350b16f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/common/IncomeTaxDetails.java
@@ -17,10 +17,10 @@
package common;
public class IncomeTaxDetails {
- public String firstName;
- public String lastName;
- public String status; // salaried, self-employed, student.
- public long annualIncome;
+ public String firstName;
+ public String lastName;
+ public String status; // salaried, self-employed, student.
+ public long annualIncome;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
index 1c414ca..e0f2a44 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/endpoint/Calculator.java
@@ -31,49 +31,49 @@
@SOAPBinding(style=SOAPBinding.Style.RPC, use=SOAPBinding.Use.LITERAL)
public class Calculator {
- public static final String testName = "\nTest :: rpc-literal-generated-wsdl : ";
- public Calculator() {}
+ public static final String testName = "\nTest :: rpc-literal-generated-wsdl : ";
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(testName + i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
- @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
- public long calculateIncomeTax(IncomeTaxDetails details
- , IncomeTaxDetails details2
- , IncomeTaxDetails details3
- , IncomeTaxDetails details4
- , IncomeTaxDetails details5
- , IncomeTaxDetails details6
- , IncomeTaxDetails details7
- , IncomeTaxDetails details8
- , IncomeTaxDetails details9
- , IncomeTaxDetails details10
- ) {
- long income = details.annualIncome;
- System.out.println(testName + "Annual income = " + income);
- long taxRate = 30; // 30%
- long taxToBePaid = income / taxRate;
- System.out.println(testName +"Tax to be paid = " + taxToBePaid);
- return taxToBePaid;
- }
+ @WebMethod(operationName="calculateIncomeTax", action="urn:CalculateIncomeTax")
+ public long calculateIncomeTax(IncomeTaxDetails details
+ , IncomeTaxDetails details2
+ , IncomeTaxDetails details3
+ , IncomeTaxDetails details4
+ , IncomeTaxDetails details5
+ , IncomeTaxDetails details6
+ , IncomeTaxDetails details7
+ , IncomeTaxDetails details8
+ , IncomeTaxDetails details9
+ , IncomeTaxDetails details10
+ ) {
+ long income = details.annualIncome;
+ System.out.println(testName + "Annual income = " + income);
+ long taxRate = 30; // 30%
+ long taxToBePaid = income / taxRate;
+ System.out.println(testName +"Tax to be paid = " + taxToBePaid);
+ return taxToBePaid;
+ }
- @WebMethod(operationName="sayHi", action="urn:SayHi")
- public String sayHi() {
- return testName + "Hi from sayHi()";
- }
+ @WebMethod(operationName="sayHi", action="urn:SayHi")
+ public String sayHi() {
+ return testName + "Hi from sayHi()";
+ }
- @WebMethod(operationName="printHi", action="urn:PrintHi")
- public void printHi() {
- System.out.println(testName +"Hi from printHi()");
- }
+ @WebMethod(operationName="printHi", action="urn:PrintHi")
+ public void printHi() {
+ System.out.println(testName +"Hi from printHi()");
+ }
- @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
- public void printHiToMe(String name) {
- System.out.println(testName +"Hi to " + name + " from printHiToMe()");
- }
+ @WebMethod(operationName="printHiToMe", action="urn:PrintHiToMe")
+ public void printHiToMe(String name) {
+ System.out.println(testName +"Hi to " + name + " from printHiToMe()");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
index 89c6f62..f935575 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/rpc_literal/se_consumer_se_provider/generated_wsdl/webclient/client/Client.java
@@ -30,79 +30,79 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
- IncomeTaxDetails itDetails = new IncomeTaxDetails();
- itDetails.setFirstName ( "bhavani");
- itDetails.setLastName ("s");
- itDetails.setAnnualIncome ( 400000);
- itDetails.setStatus ("salaried");
+ IncomeTaxDetails itDetails = new IncomeTaxDetails();
+ itDetails.setFirstName ( "bhavani");
+ itDetails.setLastName ("s");
+ itDetails.setAnnualIncome ( 400000);
+ itDetails.setStatus ("salaried");
- long startTime = System.currentTimeMillis();
- long ret = 0;
- // Make 100 calls to see how much time it takes.
- //for(int i=0; i<1000; i++) {
- ret = port.calculateIncomeTax(itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- , itDetails
- );
- //}
- long timeTaken = System.currentTimeMillis() - startTime;
-
+ long startTime = System.currentTimeMillis();
+ long ret = 0;
+ // Make 100 calls to see how much time it takes.
+ //for(int i=0; i<1000; i++) {
+ ret = port.calculateIncomeTax(itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ , itDetails
+ );
+ //}
+ long timeTaken = System.currentTimeMillis() - startTime;
+
//int ret = port.add(1, 2);
- printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
- startTime = System.currentTimeMillis();
- int k = port.add(505, 50);
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
+ printSuccess("Your income tax is : Rs ", out,ret, timeTaken);
+ startTime = System.currentTimeMillis();
+ int k = port.add(505, 50);
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Sum of 505 and 50 is : ", out,k, timeTaken);
- startTime = System.currentTimeMillis();
- String hi = port.sayHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("Output from webservice : ", out, hi, timeTaken);
+ startTime = System.currentTimeMillis();
+ String hi = port.sayHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("Output from webservice : ", out, hi, timeTaken);
- startTime = System.currentTimeMillis();
- port.printHi();
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHi();
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi in server.log", timeTaken);
- startTime = System.currentTimeMillis();
- port.printHiToMe("JavaEEServiceEngine");
- timeTaken = System.currentTimeMillis() - startTime;
- printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
+ startTime = System.currentTimeMillis();
+ port.printHiToMe("JavaEEServiceEngine");
+ timeTaken = System.currentTimeMillis() - startTime;
+ printSuccess("SUCCESS : ", out, "Webservice has successfully printed hi to me in server.log", timeTaken);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -115,14 +115,14 @@
}
public void printSuccess(String message, PrintWriter out, long result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
}
public void printSuccess(String message, PrintWriter out, String result, long timeTaken) {
- if(out == null) return;
+ if(out == null) return;
out.println("\n\n");
out.println(message + result);
out.println("Time taken to invoke the endpoint operation is : " + timeTaken + " milliseconds.");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties
index 04aed80..5aed126 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="secured-ejbWS"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 31f24a7..ea9bfa2 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
@@ -50,15 +50,15 @@
<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}"/>
+ <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}"/>
+ <param name="user" value="${fileUser}"/>
</antcall>
</target>
@@ -107,10 +107,10 @@
<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"/>
+ <param name="appName" value="${appname}-ejb"/>
+ <param name="wsName" value="HelloEJB"/>
+ <param name="module" value="ejb-module"/>
+ <param name="flag" value="true"/>
</antcall>
</target>
@@ -118,7 +118,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -145,8 +145,8 @@
<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"
+ <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">
@@ -154,7 +154,7 @@
<pathelement path="${build.classes.dir}/client"/>
</classpath>
<arg value="http://${http.host}:${http.port}/wsclient/webclient/RequestProcessor"/>
- <arg value="${fileUser}:${fileUserPassword}"/>
+ <arg value="${fileUser}:${fileUserPassword}"/>
</java>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
index 6327b13..4f0f66a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-sun-web.xml
@@ -29,15 +29,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
index 1d1f3fe..8e2c646 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
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 086ff49..c1732e8 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
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url,passwd);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -57,9 +57,9 @@
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 = new sun.misc.BASE64Encoder().encode (userPassword.getBytes());
HttpURLConnection c1 = (HttpURLConnection)u.openConnection();
- c1.setRequestProperty ("Authorization", "Basic " + encoding);
+ c1.setRequestProperty ("Authorization", "Basic " + encoding);
int code = c1.getResponseCode();
InputStream is = c1.getInputStream();
BufferedReader input = new BufferedReader (new InputStreamReader(is));
@@ -67,9 +67,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[JBI-SecurityTest PrincipalSent=user PrincipalGot=user]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
index 140281c..f6f5b04 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/endpoint/ejb/HelloEJB.java
@@ -30,10 +30,10 @@
@Resource private SessionContext ctx;
public String sayHello(String who) {
- System.out.println("**** sayHello("+ who+")");
- Principal p = ctx.getCallerPrincipal();
- String principal = (p == null)? "NULL": p.toString();
- System.out.println("****EJB: principal = " + principal);
+ System.out.println("**** sayHello("+ who+")");
+ Principal p = ctx.getCallerPrincipal();
+ String principal = (p == null)? "NULL": p.toString();
+ System.out.println("****EJB: principal = " + principal);
return "JBI-SecurityTest " + who + " PrincipalGot="+principal;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
index 86fa3e4..2ac21cb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/security/jse_only/webclient/client/Client.java
@@ -38,13 +38,13 @@
throws jakarta.servlet.ServletException {
try {
Principal p = req.getUserPrincipal();
- String principal = (p==null)? "NULL": p.toString();
+ String principal = (p==null)? "NULL": p.toString();
System.out.println("****Servlet: principal = " + principal);
Hello port = service.getHelloEJBPort();
- String ret = port.sayHello("PrincipalSent="+principal);
+ String ret = port.sayHello("PrincipalSent="+principal);
System.out.println("Return value from webservice:"+ret);
-
+
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
index 475b1f4..0cb86b0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/build.xml
@@ -25,6 +25,6 @@
<target name="all">
<ant dir="web" target="all"/>
- <ant dir="ejb" target="all"/>
+ <ant dir="ejb" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
index 2e76fc1..3eaeea3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/build.xml
@@ -21,6 +21,6 @@
]>
<project name="jsr108-integration tests" default="all" basedir=".">
<target name="all">
- <ant dir="hello" target="all"/>
+ <ant dir="hello" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
index eb742fe..bc96034 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="jbi-component-su-assembly" value="ejb_noname_HiEJB_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
index 5df479e..d3c4062 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/build.xml
@@ -42,7 +42,7 @@
<target name="my-wsdl-import">
<antcall target="wsdl-import">
<param name="server" value="${server}"/>
- <param name="port" value="HiEJB"/>
+ <param name="port" value="HiEJB"/>
</antcall>
</target>
@@ -52,6 +52,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
index dbe07ce..f21e9f5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/Hi.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/jaxws")
public interface Hi {
- public String sayHi(String who);
+ public String sayHi(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
index f9801bb..03532ad 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/endpoint/jaxws/HiEJB.java
@@ -24,7 +24,7 @@
public class HiEJB implements Hi {
public String sayHi(String who) {
- System.out.println("In EJB2");
+ System.out.println("In EJB2");
return "WebSvcTest-Hi" + who;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 45ec233..399e3b7 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
index c3bc41f..9306af5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_ejb/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ 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://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
<consumes interface-name="tns:HiEJBServiceInterface"
service-name="tns:HiEJBService"
endpoint-name="HiEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties
index 69d2ca1..0740662 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="subtractorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
index 3aab8b5..0f9676e 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/build.xml
@@ -75,7 +75,7 @@
<antcall target="undeploy-war-common"/>
<antcall target="undeploy-jbi-component-su"/>
</target>
-
+
<target name="configure-webservice-management" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="configure-webservice-management"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
index afae8e7..22df5e6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
index 1b66b9d..9f9d4af 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/endpoint/Subtractor.java
@@ -25,15 +25,15 @@
targetNamespace="http://example.com/Subtractor"
)
public class Subtractor {
- static int count = 0;
- public Subtractor() {}
+ static int count = 0;
+ public Subtractor() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i -j ;
- count++;
+ count++;
System.out.println(i + "-" + j +" = " + k);
- System.out.println("Count is: "+count);
- return k;
- }
+ System.out.println("Count is: "+count);
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 1658a40..9d5fb26 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
index 6b9b035..13c33de 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.com/Subtractor"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:SubtractorService"
+ 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://example.com/Subtractor"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:SubtractorService"
link-type="standard"
service-name="tns:SubtractorService"
endpoint-name="SubtractorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
index e4c9a56..1a84ff0 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Subtractor Service</description>
- <display-name>SubtractorWAR</display-name>
+ <description>WebTier for the Subtractor Service</description>
+ <display-name>SubtractorWAR</display-name>
- <servlet>
- <description>Endpoint for Subtractor Web Service</description>
- <display-name>SubtractorWebService</display-name>
- <servlet-name>Subtractor</servlet-name>
- <servlet-class>endpoint.Subtractor</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Subtractor Web Service</description>
+ <display-name>SubtractorWebService</display-name>
+ <servlet-name>Subtractor</servlet-name>
+ <servlet-class>endpoint.Subtractor</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Subtractor</servlet-name>
- <url-pattern>/webservice/SubtractorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Subtractor</servlet-name>
+ <url-pattern>/webservice/SubtractorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
index b23c90f..3667a7d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/another_servlet/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/subtractor") SubtractorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
index 88925b3..46e1a58 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="jbi-component-su-assembly" value="ejb_noname_HelloEJB_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
index c19eac4..1d085f4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/build.xml
@@ -44,8 +44,8 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
<target name="deploy-test" depends="clean">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
index 56b3216..3ae163e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/JAXWSClient.java
@@ -27,16 +27,16 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
JAXWSClient client = new JAXWSClient();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -44,11 +44,11 @@
Hello port = service.getHelloEJBPort();
for (int i=0;i<10;i++) {
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
}
stat.addStatus(testId, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
index 7ccfee4..1890078 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumer.java
@@ -29,15 +29,15 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
SOAPEjbConsumer client = new SOAPEjbConsumer();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -51,11 +51,11 @@
endpointURI);
System.out.println(" After setting endpoint address URI");
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(testId, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
index b6f7fd1..bc96cd6 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/client/SOAPEjbConsumerNonHttpBC.java
@@ -28,16 +28,16 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello";
+ private static String testId = "jbi-serviceengine/server/ejb/hello";
@WebServiceRef
static HelloEJBService service;
public static void main(String[] args) {
- stat.addDescription(testId);
+ stat.addDescription(testId);
SOAPEjbConsumerNonHttpBC client = new SOAPEjbConsumerNonHttpBC();
client.doTest(args);
- stat.printSummary(testId);
+ stat.printSummary(testId);
}
public void doTest(String[] args) {
@@ -50,11 +50,11 @@
endpointURI);
System.out.println(" After setting endpoint address URI");
String ret = port.sayHello("Appserver Tester !");
- if(ret.indexOf("WebSvcTest-Hello") == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(ret);
stat.addStatus(testId, stat.PASS);
} catch(Exception e) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
index fd4f6f0..226bf5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/endpoint/jaxws/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/jaxws")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 8762c4e..13ae4f3 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
index 8eec636..fce247d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ 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://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
<consumes interface-name="tns:HelloEJBServiceInterface"
service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
index c95ba9a..9e71a61 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
index 1658d16..09567cc 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://endpoint/jaxws"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:HelloEJBServiceInterface"
- service-name="tns:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://endpoint/jaxws"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:HelloEJBServiceInterface"
+ service-name="tns:HelloEJBService"
endpoint-name="HelloEJBPort"/>
<artifacts xmlns="" role="consumer" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
index d2492b6..d31fcfa 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
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://endpoint/jaxws</namespace-uri>
- <local-part>HelloEJBService</local-part>
+ <namespace-uri>http://endpoint/jaxws</namespace-uri>
+ <local-part>HelloEJBService</local-part>
</service-name>
<endpoint-name>HelloEJBPort</endpoint-name>
<endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/ejb/noname/helloendpoint</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/soap/ejb/noname/helloendpoint</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>sayHello</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://endpoint/jaxws</namespace-uri>
</input>
<output>
<namespace-uri>http://endpoint/jaxws</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
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 d6e3731..f42d6d6 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
@@ -76,7 +76,7 @@
</target>
<target name="another_servlet">
- <ant inheritAll="false" dir="./another_servlet"/>
+ <ant inheritAll="false" dir="./another_servlet"/>
</target>
@@ -91,6 +91,6 @@
<target name="report-failure">
<echo message="Test failed"/>
- </target>
-
+ </target>
+
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
index 6511b48..649a29b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressClient.java
@@ -27,7 +27,7 @@
import com.example.subtractor.SubtractorService;
import com.example.subtractor.Subtractor;
-
+
import java.io.BufferedReader;
import java.io.InputStream;
import java.io.InputStreamReader;
@@ -37,42 +37,42 @@
import com.sun.ejte.ccl.reporter.SimpleReporterAdapter;
-public class StressClient extends Thread {
+public class StressClient extends Thread {
int clientId;
Hello port;
Hi port1;
Subtractor port2;
- private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
+ private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
static long startTime = 0;
static int minutesToRun = 0;
static long endTime = 0;
-
+
private SimpleReporterAdapter stat ;
-
+
HelloEJBService service;
HiEJBService service1;
SubtractorService service2;
StressClient(int i,SimpleReporterAdapter stat) {
System.out.println("Instantiating a stress client");
- //stat.addDescription("jsr108-serverside-webservices-ejb-noname-annotation");
+ //stat.addDescription("jsr108-serverside-webservices-ejb-noname-annotation");
clientId = i;
- this.stat = stat;
+ this.stat = stat;
}
void setServiceHandle( HelloEJBService ser, HiEJBService ser1, SubtractorService ser2){
service = ser;
- service1 = ser1;
- service2 = ser2;
+ service1 = ser1;
+ service2 = ser2;
}
static void setTimeToRun( int minutes ) {
minutesToRun = minutes;
- startTime = System.currentTimeMillis();
+ startTime = System.currentTimeMillis();
}
public void run() {
@@ -84,63 +84,63 @@
endpointURI);
System.out.println(clientId + ":" + " After setting endpoint address URI");
- port1 = service1.getHiEJBPort();
- BindingProvider stub1 = (BindingProvider)port1;
+ port1 = service1.getHiEJBPort();
+ BindingProvider stub1 = (BindingProvider)port1;
String endpointURI1 ="http://localhost:12017/HiEJBPort";
stub1.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI1);
+ endpointURI1);
- port2 = service2.getSubtractorPort();
- BindingProvider stub2 = (BindingProvider)port2;
+ port2 = service2.getSubtractorPort();
+ BindingProvider stub2 = (BindingProvider)port2;
String endpointURI2 ="http://localhost:12018/subtractorendpoint";
stub2.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI2);
-
+ endpointURI2);
- while((endTime - startTime) < minutesToRun*60*1000) {
+
+ while((endTime - startTime) < minutesToRun*60*1000) {
// Iterative tester for stress, per Thread
for ( int i=0 ; i < 10; i++)
- doTest("Stress Tester",i);
- endTime = System.currentTimeMillis();
- }
+ doTest("Stress Tester",i);
+ endTime = System.currentTimeMillis();
}
-
+ }
+
public void doTest(String toSend, int id) {
try {
- Integer i = (Integer)id;
+ Integer i = (Integer)id;
String ret = port.sayHello(toSend+i);
- String ret1 = port1.sayHi(toSend+i);
- int res = port2.add(5,2);
+ String ret1 = port1.sayHi(toSend+i);
+ int res = port2.add(5,2);
- if(ret.indexOf("WebSvcTest-Hello") == -1 || ret.indexOf(i.toString()) == -1) {
+ if(ret.indexOf("WebSvcTest-Hello") == -1 || ret.indexOf(i.toString()) == -1) {
System.out.println(clientId + ":" + "Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
- stat.printSummary(testId);
+ stat.printSummary(testId);
return;
- }
- //pass();
+ }
+ //pass();
System.out.println(clientId + ":" + ret);
- if(ret1.indexOf("WebSvcTest-Hi") == -1 || ret1.indexOf(i.toString()) == -1) {
- System.out.println(clientId + ":" + "Unexpected greeting " + ret1);
- stat.addStatus(testId, stat.FAIL);
- return;
- }
- //pass();
- System.out.println(clientId + ":" + ret1);
+ if(ret1.indexOf("WebSvcTest-Hi") == -1 || ret1.indexOf(i.toString()) == -1) {
+ System.out.println(clientId + ":" + "Unexpected greeting " + ret1);
+ stat.addStatus(testId, stat.FAIL);
+ return;
+ }
+ //pass();
+ System.out.println(clientId + ":" + ret1);
- if( res != 3) {
- System.out.println(clientId + ":" + "Unexpected result " + res);
- stat.addStatus(testId, stat.FAIL);
- return;
- }
+ if( res != 3) {
+ System.out.println(clientId + ":" + "Unexpected result " + res);
+ stat.addStatus(testId, stat.FAIL);
+ return;
+ }
//pass();
- System.out.println(clientId + "Result is :" + res);
+ System.out.println(clientId + "Result is :" + res);
- } catch(Exception e) {
+ } catch(Exception e) {
stat.addStatus(testId, stat.FAIL);
- stat.printSummary(testId);
+ stat.printSummary(testId);
e.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
index d0de694..defa929 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/ejb/hello/stressclient/StressSOAPEjbConsumer.java
@@ -31,12 +31,12 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
+ private static String testId = "jbi-serviceengine/server/ejb/hello/stressclient";
@WebServiceRef
static HelloEJBService service;
- @WebServiceRef
+ @WebServiceRef
static HiEJBService service1;
@WebServiceRef(wsdlLocation="http://localhost:8080/subtractorservice/webservice/SubtractorService?WSDL")
@@ -44,32 +44,32 @@
static long startTime = 0;
- static int minutesToRun = 0;
- static long endTime = 0;
+ static int minutesToRun = 0;
+ static long endTime = 0;
StressSOAPEjbConsumer() {
- //create multiple instances of iterative test clients.
+ //create multiple instances of iterative test clients.
StressClient clients[] = new StressClient[100];
for(int i = 0 ; i < 100 ; i++) {
- clients[i] = new StressClient(i,stat);
+ clients[i] = new StressClient(i,stat);
clients[i].setServiceHandle(service,service1,service2);
clients[i].start();
}
- }
+ }
public static void main(String[] args) throws Exception {
stat.addDescription(testId);
-
- if( args != null && args.length > 0 && args[0] != null)
- try {
+
+ if( args != null && args.length > 0 && args[0] != null)
+ try {
minutesToRun = Integer.parseInt(args[0]);
- } catch(NumberFormatException numEx) {
- minutesToRun = 3;
- }
- System.out.println("Time to run is: "+minutesToRun);
- Thread.currentThread().sleep(2000);
- StressClient.setTimeToRun(minutesToRun);
+ } catch(NumberFormatException numEx) {
+ minutesToRun = 3;
+ }
+ System.out.println("Time to run is: "+minutesToRun);
+ Thread.currentThread().sleep(2000);
+ StressClient.setTimeToRun(minutesToRun);
StressSOAPEjbConsumer stressClient = new StressSOAPEjbConsumer();
//stat.addStatus("jsr108-serverside-webservices-ejb-noname-annotation", stat.PASS);
- //stat.printSummary("jsr108-serverside-webservices-ejb-noname-annotation");
+ //stat.printSummary("jsr108-serverside-webservices-ejb-noname-annotation");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties
index 68987bd..7200f32 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
index 404fff8..d041889 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/build.xml
@@ -34,7 +34,7 @@
&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"/>
@@ -85,7 +85,7 @@
<echo message="Running negative test by setting jbi-enabled flag to false"/>
<antcall target="runtest-jbi-enabled-false"/>
<echo message="Running JAXWS client"/>
- <antcall target="runtest-jaxws"/>
+ <antcall target="runtest-jaxws"/>
<echo message="Running positive test by setting jbi-enabled flag to true"/>
<antcall target="runtest-jbi-enabled-true"/>
@@ -101,7 +101,7 @@
<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>
<antcall target="run-client">
<param name="client-class" value="client.SOAPWebConsumerNonHttpBC"/>
<param name="other-args" value="jbi-enabled-false"/>
@@ -112,14 +112,14 @@
<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=true"/>
- </antcall>
+ </antcall>
<antcall target="runtest-soap-binding"/>
</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>
+ </antcall>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
index 8946243..3339fd4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/JAXWSClient.java
@@ -27,18 +27,18 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
-
+ private static String testId = "jbi-serviceengine/server/web/client";
+
@WebServiceRef(wsdlLocation="http://localhost:8080/calculatorservice/webservice/CalculatorService?WSDL")
static CalculatorService service;
public static void main(String[] args) {
try {
- stat.addDescription(testId);
+ stat.addDescription(testId);
//CalculatorService service = new CalculatorService();
JAXWSClient client = new JAXWSClient();
client.doTest(args, service);
- stat.printSummary(testId);
+ stat.printSummary(testId);
} catch(Exception e) {
e.printStackTrace();
}
@@ -50,11 +50,11 @@
Calculator port = service.getCalculatorPort();
for (int i=0;i<10;i++) {
int ret = port.add(i, 10);
- if(ret != (i + 10)) {
+ if(ret != (i + 10)) {
System.out.println("Unexpected greeting " + ret);
stat.addStatus(testId, stat.FAIL);
return;
- }
+ }
System.out.println(" Adding : " + i + " + 10 = " + ret);
}
stat.addStatus(testId, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
index a9088d0..8579255 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumer.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
+ private static String testId = "jbi-serviceengine/server/web/client";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- //String endpointURI ="http://localhost:8080/soap/web/calculatorendpoint";
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ //String endpointURI ="http://localhost:8080/soap/web/calculatorendpoint";
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
index f336b8d..29d0f67 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/client/SOAPWebConsumerNonHttpBC.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/server/web/client";
+ private static String testId = "jbi-serviceengine/server/web/client";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumerNonHttpBC client = new SOAPWebConsumerNonHttpBC();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumerNonHttpBC client = new SOAPWebConsumerNonHttpBC();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
index f59f430..36a99d9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
index 8e62a0f..ed274ad 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
index 4190ac7..8516cfd 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
- xmlns:tns="http://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorServiceInterface"
- service-name="tns:CalculatorService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:tns="http://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorServiceInterface"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts role="consumer" xmlns="" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
index 4bef58a..5c84868 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/soap-binding-su/su/endpoints.xml
@@ -21,22 +21,22 @@
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://example.com/Calculator</namespace-uri>
- <local-part>CalculatorService</local-part>
+ <namespace-uri>http://example.com/Calculator</namespace-uri>
+ <local-part>CalculatorService</local-part>
</service-name>
<endpoint-name>CalculatorPort</endpoint-name>
<endpoint-role>consumer</endpoint-role>
- <address-location>http://localhost:8080/soap/web/calculatorendpoint</address-location>
- <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
+ <address-location>http://localhost:8080/soap/web/calculatorendpoint</address-location>
+ <style>http://www.w3.org/2004/08/wsdl/style/rpc</style>
<operation>
<name>add</name>
- <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
+ <mep>http://www.w3.org/2004/08/wsdl/in-out</mep>
<soapaction>""</soapaction>
<input>
<namespace-uri>http://example.com/Calculator</namespace-uri>
</input>
<output>
<namespace-uri>http://example.com/Calculator</namespace-uri>
- </output>
+ </output>
</operation>
-</endpoint>
+</endpoint>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/server/web/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties
index d70fe04..fcc0685 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 c1ab93b..18a38af 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
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <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"/>
@@ -50,23 +50,23 @@
</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"/>
+ <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"/>
+ <!-- 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">
@@ -78,7 +78,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/j2ee.jar"
+ 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"/>
@@ -117,11 +117,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
index bf2db23..e3f1114 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/add-numbers";
+ private static String testId = "jbi-serviceengine/service_unit/add-numbers";
public boolean found1 = false;
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -62,7 +62,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Result is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
index 840c6c9..f29b919 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/endpoint/AddNumber.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/AddNumber"
)
public class AddNumber {
- public AddNumber() {}
+ public AddNumber() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index aea15a6..b045160 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,16 +19,16 @@
<!-- 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"
+ 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>
<name>client_web_calculator_service_assembly</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>calc-web-client</name>
<description>provider service</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
index 2ff1f0c..eec6b06 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<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://example.web.service/AddNumber"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:AddNumberServiceInterface"
+ 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://example.web.service/AddNumber"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:AddNumberServiceInterface"
service-name="tns:AddNumberService"
endpoint-name="AddNumberPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
index 104b580..2085ed3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the AddNumber Service</description>
- <display-name>AddNumberWAR</display-name>
+ <description>WebTier for the AddNumber Service</description>
+ <display-name>AddNumberWAR</display-name>
- <servlet>
- <description>Endpoint for AddNumber Web Service</description>
- <display-name>AddNumberWebService</display-name>
- <servlet-name>AddNumber</servlet-name>
- <servlet-class>endpoint.AddNumber</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for AddNumber Web Service</description>
+ <display-name>AddNumberWebService</display-name>
+ <servlet-name>AddNumber</servlet-name>
+ <servlet-class>endpoint.AddNumber</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>AddNumber</servlet-name>
- <url-pattern>/webservice/AddNumberService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>AddNumber</servlet-name>
+ <url-pattern>/webservice/AddNumberService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
index 7de5cf6..d79eeaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/add-numbers/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") AddNumberService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
AddNumber port = service.getAddNumberPort();
int ret = port.add(1, 2);
- printSuccess(out,ret);
+ printSuccess(out,ret);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
index f70a9c0..ef14a7f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/build.xml
@@ -38,6 +38,6 @@
<ant dir="endpoint_mapping_consumer" target="clean"/>
<ant dir="add-numbers" target="clean"/>
<ant dir="enterprise_app" target="clean"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties
index e318c43..ca6a039 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 9eba418..a243147 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
@@ -76,7 +76,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -98,11 +98,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
index afd178a..b4847a7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/compApp-client";
+ private static String testId = "jbi-serviceengine/service_unit/compApp-client";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
index 1fa92bd..53f9c86 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/jbi.xml
@@ -18,14 +18,14 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <consumes interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <consumes interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
index f9171c9..4dc4f31 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/soap-binding-su/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
index ed78bcb..ee2ff26 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-client/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties
index 72c2645..d7e40ce 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
index 868d396..b0ee5a5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/build.xml
@@ -34,7 +34,7 @@
&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"/>
@@ -54,7 +54,7 @@
<param name="war.file" value="${assemble.dir}/${appname}-web.war"/>
</antcall>
<jar jarfile="${assemble.dir}/${appname}-web.war" update="true">
- <metainf file="jbi.xml"/>
+ <metainf file="jbi.xml"/>
</jar>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
index 0b73c13..b94bb13 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/client/SOAPWebConsumer.java
@@ -28,42 +28,42 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/compApp-server";
+ private static String testId = "jbi-serviceengine/service_unit/compApp-server";
public static void main (String[] args) {
stat.addDescription(testId + args[0]);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer(args);
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer(args);
stat.printSummary(testId + args[0]);
}
private void addUsingSOAPConsumer(String[] args) {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
if(args[0].equals("jbi-enabled-true"))
- stat.addStatus(testId, stat.PASS);
- else
- stat.addStatus(testId, stat.FAIL);
+ stat.addStatus(testId, stat.PASS);
+ else
+ stat.addStatus(testId, stat.FAIL);
- } catch(Exception e) {
- e.printStackTrace();
+ } catch(Exception e) {
+ e.printStackTrace();
if(args[0].equals("jbi-enabled-false"))
stat.addStatus(testId, stat.PASS);
else
- stat.addStatus(testId, stat.FAIL);
- }
+ stat.addStatus(testId, stat.FAIL);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
index f59f430..36a99d9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
index f915dc2..80539e3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorService"
- service-name="tns:CalculatorService"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorService"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
index 090b430..4434e5c 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/soap-binding-su/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/compApp-server/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties
index d70fe04..fcc0685 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 db511ea..487b99c 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
@@ -38,7 +38,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
- <delete file="${jbi-component-su-dir}/assembly/${appname}-web.war"/>
+ <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"/>
@@ -50,23 +50,23 @@
</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"/>
+ <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"/>
+ <!-- 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">
@@ -78,7 +78,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/j2ee.jar"
+ 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"/>
@@ -117,11 +117,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
index eed8e5a..7bdb43a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/endpoint-naming";
+ private static String testId = "jbi-serviceengine/service_unit/endpoint-naming";
public boolean found1 = false;
@@ -46,8 +46,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -62,7 +62,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Result is") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
index 6a8c037..7a5b2d3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/endpoint/EndpointMapping.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/EndpointMapping"
)
public class EndpointMapping {
- public EndpointMapping() {}
+ public EndpointMapping() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- //throw new java.lang.Exception("This is my exception");
- return k;
- }
+ //throw new java.lang.Exception("This is my exception");
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
index 956186b..dd2f19c 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/assembly/META-INF/jbi.xml
@@ -19,17 +19,17 @@
<!-- jbi.xml file for the SOAP binding deployments binding. -->
<jbi
- version="1.0"
- xmlns="http://java.sun.com/xml/ns/jbi"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns:ns0="http://example.web.service/EndpointMapping"
+ xmlns:ns0="http://example.web.service/EndpointMapping"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
<name>client_web_calculator_service_assembly</name>
<description>Client web calculator service assembly</description>
</identification>
- <service-unit>
+ <service-unit>
<identification>
<name>calc-web-client</name>
<description>provider service</description>
@@ -41,10 +41,10 @@
</service-unit>
<connections>
- <connection>
- <consumer endpoint-name="EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
- <provider endpoint-name="javaee_EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
- </connection>
+ <connection>
+ <consumer endpoint-name="EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
+ <provider endpoint-name="javaee_EndpointMappingPort" service-name="ns0:EndpointMappingService"/>
+ </connection>
</connections>
</service-assembly>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
index 54fe804..198633b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/javaee-se-serviceunit/su/META-INF/jbi.xml
@@ -18,13 +18,13 @@
-->
<jbi xmlns="http://java.sun.com/xml/ns/jbi" xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension" xmlns:ns0="http://example.web.service/EndpointMapping" version="1.0">
- <services binding-component="false">
- <provides endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService"/>
- <javaee_ext:ept-mappings>
- <javaee_ext:ept-mapping>
- <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
- <javaee_ext:wsdl-ept endpoint-name="EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
- </javaee_ext:ept-mapping>
- </javaee_ext:ept-mappings>
- </services>
+ <services binding-component="false">
+ <provides endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService"/>
+ <javaee_ext:ept-mappings>
+ <javaee_ext:ept-mapping>
+ <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
+ <javaee_ext:wsdl-ept endpoint-name="EndpointMappingPort" interface-name="ns0:EndpointMappingServiceInterface" service-name="ns0:EndpointMappingService" type="provider"/>
+ </javaee_ext:ept-mapping>
+ </javaee_ext:ept-mappings>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
index 358740a..f3c6d5d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the EndpointMapping Service</description>
- <display-name>EndpointMappingWAR</display-name>
+ <description>WebTier for the EndpointMapping Service</description>
+ <display-name>EndpointMappingWAR</display-name>
- <servlet>
- <description>Endpoint for EndpointMapping Web Service</description>
- <display-name>EndpointMappingWebService</display-name>
- <servlet-name>EndpointMapping</servlet-name>
- <servlet-class>endpoint.EndpointMapping</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for EndpointMapping Web Service</description>
+ <display-name>EndpointMappingWebService</display-name>
+ <servlet-name>EndpointMapping</servlet-name>
+ <servlet-class>endpoint.EndpointMapping</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>EndpointMapping</servlet-name>
- <url-pattern>/webservice/EndpointMappingService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EndpointMapping</servlet-name>
+ <url-pattern>/webservice/EndpointMappingService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
index f7bf467..f05bdc4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") EndpointMappingService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
EndpointMapping port = service.getEndpointMappingPort();
int ret = port.add(1, 2);
- printSuccess(out,ret);
+ printSuccess(out,ret);
} catch(java.lang.Exception e) {
- //e.printStackTrace();
- printFailure(out, e.getMessage());
+ //e.printStackTrace();
+ printFailure(out, e.getMessage());
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out, String errMsg) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out, int result) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties
index acc57f3..c2f7a50 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 fc8855f..6c6d910 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
@@ -76,7 +76,7 @@
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/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/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"/>
@@ -98,11 +98,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
index 6b64922..75549c2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/client/TestClient.java
@@ -29,7 +29,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/endpoint_mapping_consumer";
+ private static String testId = "jbi-serviceengine/service_unit/endpoint_mapping_consumer";
public boolean found1 = false;
public boolean found2 = false;
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EndpointMappingConsumer add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
index b8bd78b..e50ea4f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/endpoint/EndpointMappingConsumer.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/EndpointMappingConsumer"
)
public class EndpointMappingConsumer {
- public EndpointMappingConsumer() {}
+ public EndpointMappingConsumer() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
index 3e17b8c..db3551a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/jbi.xml
@@ -18,21 +18,21 @@
-->
<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:ns0="http://example.web.service/EndpointMappingConsumer"
- xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <consumes interface-name="ns0:EndpointMappingConsumerServiceInterface"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
+ xmlns:javaee_ext="http://javaee.serviceengine.sun.com/endpoint/naming/extension"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <consumes interface-name="ns0:EndpointMappingConsumerServiceInterface"
service-name="ns0:EndpointMappingConsumerService"
endpoint-name="javaee_EndpointMappingConsumerPort"/>
- <javaee_ext:ept-mappings>
- <javaee_ext:ept-mapping>
- <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
- <javaee_ext:wsdl-ept endpoint-name="EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
- </javaee_ext:ept-mapping>
- </javaee_ext:ept-mappings>
- </services>
+ <javaee_ext:ept-mappings>
+ <javaee_ext:ept-mapping>
+ <javaee_ext:java-ept endpoint-name="javaee_EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
+ <javaee_ext:wsdl-ept endpoint-name="EndpointMappingConsumerPort" interface-name="ns0:EndpointMappingConsumerServiceInterface" service-name="ns0:EndpointMappingConsumerService" type="consumer"/>
+ </javaee_ext:ept-mapping>
+ </javaee_ext:ept-mappings>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
index c322df7..1935ac5 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/assembly/META-INF/jbi.xml
@@ -19,10 +19,10 @@
<!-- 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"
- xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:ns0="http://example.web.service/EndpointMappingConsumer"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
@@ -52,10 +52,10 @@
</service-unit>
<connections>
- <connection>
- <consumer endpoint-name="javaee_EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
- <provider endpoint-name="EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
- </connection>
+ <connection>
+ <consumer endpoint-name="javaee_EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
+ <provider endpoint-name="EndpointMappingConsumerPort" service-name="ns0:EndpointMappingConsumerService"/>
+ </connection>
</connections>
</service-assembly>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
index 0f959c9..19bbafe 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/sun-http-binding/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/EndpointMappingConsumer"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:EndpointMappingConsumerServiceInterface"
+ 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://example.web.service/EndpointMappingConsumer"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:EndpointMappingConsumerServiceInterface"
service-name="tns:EndpointMappingConsumerService"
endpoint-name="EndpointMappingConsumerPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
index c3440c3..3b035ea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the EndpointMappingConsumer Service</description>
- <display-name>EndpointMappingConsumerWAR</display-name>
+ <description>WebTier for the EndpointMappingConsumer Service</description>
+ <display-name>EndpointMappingConsumerWAR</display-name>
- <servlet>
- <description>Endpoint for EndpointMappingConsumer Web Service</description>
- <display-name>EndpointMappingConsumerWebService</display-name>
- <servlet-name>EndpointMappingConsumer</servlet-name>
- <servlet-class>endpoint.EndpointMappingConsumer</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for EndpointMappingConsumer Web Service</description>
+ <display-name>EndpointMappingConsumerWebService</display-name>
+ <servlet-name>EndpointMappingConsumer</servlet-name>
+ <servlet-class>endpoint.EndpointMappingConsumer</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>EndpointMappingConsumer</servlet-name>
- <url-pattern>/webservice/EndpointMappingConsumerService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>EndpointMappingConsumer</servlet-name>
+ <url-pattern>/webservice/EndpointMappingConsumerService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
index 1778d2b..1b95b39 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/endpoint_mapping_consumer/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef EndpointMappingConsumerService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
index fe440c0..3ebe52b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/build.xml
@@ -25,23 +25,23 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
pre-compile-single: called before javac compilation of single file
post-compile-single: called after javac compilation of single file
- pre-dist: called before jar building
- post-dist: called after jar building
- post-clean: called after cleaning build products
+ pre-dist: called before jar building
+ post-dist: called after jar building
+ post-clean: called after cleaning build products
pre-run-deploy: called before deploying
post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -49,20 +49,20 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-debug: defines macro for class debugging
do-dist: jar archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -70,10 +70,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
index 62135aa..4128528 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/nbproject/build-impl.xml
@@ -36,8 +36,8 @@
<project name="EntApp-ejb-impl" default="build" basedir=".." xmlns:ejbjarproject3="http://www.netbeans.org/ns/j2ee-ejbjarproject/3" xmlns:ejbjarproject2="http://www.netbeans.org/ns/j2ee-ejbjarproject/2" xmlns:ejbjarproject1="http://www.netbeans.org/ns/j2ee-ejbjarproject/1" xmlns:jaxws="http://www.netbeans.org/ns/jax-ws/1">
<import file="ant-deploy.xml"/>
<target name="default" depends="dist,javadoc" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
+ <!--
+ INITIALIZATION SECTION
-->
<target name="-pre-init">
<!-- Empty placeholder for easier customization. -->
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
index 2788e7c..6321cdf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-ejb/src/java/entapp/ejb/HelloEJB.java
@@ -49,5 +49,5 @@
System.out.println(hello);
return hello;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
index a151ac1..027ea2b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/build.xml
@@ -25,27 +25,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before jar building
- -post-dist: called after jar building
- -post-clean: called after cleaning build products
+ -pre-dist: called before jar building
+ -post-dist: called after jar building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -53,21 +53,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: jar archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -75,10 +75,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
index 3b4a7cb..7fe97b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/nbproject/build-impl.xml
@@ -662,7 +662,7 @@
</target>
<target name="javadoc" depends="init,javadoc-build,javadoc-browse" description="Build Javadoc."/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target name="-pre-pre-compile-test" if="have.tests" depends="init,compile">
@@ -704,7 +704,7 @@
</target>
<target name="compile-test-single" depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target name="-pre-test-run" if="have.tests" depends="init">
@@ -731,7 +731,7 @@
</target>
<target name="test-single" depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test."/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target name="-debug-start-debuggee-test" if="have.tests" depends="init,compile-test">
@@ -747,7 +747,7 @@
</target>
<target name="debug-fix-test" if="netbeans.home" depends="init,-pre-debug-fix,-do-debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target name="deps-clean" depends="init" if="no.dist.ear.dir" unless="no.deps">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
index c1ea04b..1afeef3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/EntApp-war/src/java/entapp/web/HelloWeb.java
@@ -46,5 +46,5 @@
System.out.println(hello);
return hello;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
index 768e2c3..715ccfe 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/build.xml
@@ -25,21 +25,21 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- pre-init: called before initialization of project properties
- post-init: called after initialization of project properties
- pre-compile: called before javac compilation
- post-compile: called after javac compilation
- pre-dist: called before jar building
- post-dist: called after jar building
- post-clean: called after cleaning build products
+ pre-init: called before initialization of project properties
+ post-init: called after initialization of project properties
+ pre-compile: called before javac compilation
+ post-compile: called after javac compilation
+ pre-dist: called before jar building
+ post-dist: called after jar building
+ post-clean: called after cleaning build products
pre-run-deploy: called before deploying
post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="post-compile">
<obfuscate>
@@ -47,17 +47,17 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
do-dist: jar archive building
- run: execution of project
+ run: execution of project
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -65,10 +65,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
index 144d630..cb08385 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="sjsas" property="sjsas.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${sjsas.password}" file="${sjsas.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="sjsas" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${sjsas.url}${sun-web-app.context-root}"/>
</target>
@@ -49,11 +49,11 @@
<mkdir dir="${sjsas.resources.dir}/META-INF"/>
<property name="sjsas.resources.file" value="${sjsas.resources.dir}/META-INF/sun-resources.xml"/>
<property name="lefty" value="<"/>
-
+
<property name="righty" value=">"/>
<concat destfile="${sjsas.resources.file}">${lefty}?xml version="1.0" encoding="UTF-8"?${righty}
-${lefty}!DOCTYPE resources PUBLIC
- "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
+${lefty}!DOCTYPE resources PUBLIC
+ "-//Sun Microsystems Inc.//DTD Application Server 9.0 Resource Definitions //EN"
"${sjsas.root}/lib/dtds/sun-resources_1_2.dtd"${righty}
${lefty}resources${righty}
${lefty}/resources${righty}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
index cd5c7cf..6917e5b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/EntApp/nbproject/build-impl.xml
@@ -35,8 +35,8 @@
<project name="EntApp-impl" default="build" basedir=".." xmlns:ear2="http://www.netbeans.org/ns/j2ee-earproject/2">
<import file="ant-deploy.xml"/>
<target name="default" depends="dist" description="Build whole project."/>
- <!--
- INITIALIZATION SECTION
+ <!--
+ INITIALIZATION SECTION
-->
<target name="pre-init">
<!-- Empty placeholder for easier customization. -->
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 068f84e..1dfb07e 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
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
Don't rename jdk.home as java.home
jdk.home=${env.JAVA_HOME}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
index d5b0f47..8102c78 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/build.xml
@@ -19,168 +19,168 @@
<project name="Plain EJB invocation from JBI" default="all" basedir=".">
- <property environment="env"/>
+ <property environment="env"/>
<property file="build.properties"/>
-
- <target name="all" depends="clean, setup, runtest, undeploy">
- <antcall target="clean"/>
- </target>
+
+ <target name="all" depends="clean, setup, runtest, undeploy">
+ <antcall target="clean"/>
+ </target>
- <target name="setup">
- <antcall target="compile-entapp"/>
- <antcall target="wsgen-sun-http-binding"/>
- <antcall target="build-serviceassembly"/>
- <antcall target="deploy-serviceassembly"/>
- </target>
+ <target name="setup">
+ <antcall target="compile-entapp"/>
+ <antcall target="wsgen-sun-http-binding"/>
+ <antcall target="build-serviceassembly"/>
+ <antcall target="deploy-serviceassembly"/>
+ </target>
- <target name="runtest">
+ <target name="runtest">
- <!-- Build the client -->
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-d"/>
- <arg line="build"/>
- <arg line="-keep"/>
- <arg line="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl"/>
- </exec>
- <exec executable="${env.S1AS_HOME}/bin/wsimport">
- <arg line="-d"/>
- <arg line="build"/>
- <arg line="-keep"/>
- <arg line="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl"/>
- </exec>
+ <!-- Build the client -->
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-d"/>
+ <arg line="build"/>
+ <arg line="-keep"/>
+ <arg line="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl"/>
+ </exec>
+ <exec executable="${env.S1AS_HOME}/bin/wsimport">
+ <arg line="-d"/>
+ <arg line="build"/>
+ <arg line="-keep"/>
+ <arg line="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl"/>
+ </exec>
- <javac srcdir="client" includes="Client.java" destdir="build" classpath="${client.classpath}" debug="true"/>
+ <javac srcdir="client" includes="Client.java" destdir="build" classpath="${client.classpath}" debug="true"/>
- <java classname="client.Client" classpath="${client.classpath}" fork="true"/>
-
- </target>
-
- <target name="clean">
-
- <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant">
- <arg line="clean"/>
- </exec>
-
- <delete dir="build"/>
-
- <delete includeemptydirs="true" failonerror="false">
- <fileset dir="service-assembly/sun-http-binding" includes="*.wsdl, *.xsd"/>
- <fileset dir="service-assembly/sun-http-binding/entapp"/>
- </delete>
-
- </target>
-
- <target name="undeploy">
- <antcall target="undeploy-serviceassembly"/>
- </target>
-
- <target name="compile-entapp">
- <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant"/>
- <!--
- <ant dir="${ent.app}"/>
- -->
-
- <!-- Add jbi.xml file to the .ear file -->
- <jar destfile="${ent.app}/dist/EntApp.ear"
- basedir="service-assembly/sun-javaee-engine"
- includes="META-INF/jbi.xml"
- update="true"
- />
- </target>
-
- <target name="wsgen-sun-http-binding">
- <!-- generate WSDL for the EJB web service -->
- <exec executable="${env.S1AS_HOME}/bin/wsgen">
- <arg line="-cp"/>
- <arg line="${ent.app}/${ejb.module}/build/ear-module"/>
- <arg line="${ejb.webservice.class}"/>
- <arg line="-wsdl"/>
- <arg line="-d"/>
- <arg line="service-assembly/sun-http-binding"/>
- </exec>
- <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
- <replace file="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl">
- <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
- <replacevalue>http://localhost:12000/entapp/ejb/HelloEJB</replacevalue>
- </replace>
-
- <!-- generate WSDL for the Servlet web service -->
- <exec executable="${env.S1AS_HOME}/bin/wsgen">
- <arg line="-cp"/>
- <arg line="${ent.app}/${web.module}/build/ear-module/WEB-INF/classes"/>
- <arg line="${web.webservice.class}"/>
- <arg line="-wsdl"/>
- <arg line="-d"/>
- <arg line="service-assembly/sun-http-binding"/>
- </exec>
- <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
- <replace file="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl">
- <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
- <replacevalue>http://localhost:12000/entapp/web/HelloEJB</replacevalue>
- </replace>
+ <java classname="client.Client" classpath="${client.classpath}" fork="true"/>
</target>
- <target name="build-serviceassembly">
- <mkdir dir="build"/>
+ <target name="clean">
- <!-- Build the service unit & assembly jars -->
- <jar destfile="build/sun-http-binding.jar"
- basedir="service-assembly/sun-http-binding"
- includes="*.wsdl, *.xsd, META-INF/jbi.xml"
- />
- <jar destfile="build/EntApp.zip"
- basedir="build"
- includes="sun-http-binding.jar"
- />
- <jar destfile="build/EntApp.zip"
- update="true"
- basedir="${ent.app}/dist"
- includes="EntApp.ear"
- />
- <jar destfile="build/EntApp.zip"
- basedir="service-assembly"
- includes="META-INF/jbi.xml"
- update="true"
- />
- </target>
+ <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant">
+ <arg line="clean"/>
+ </exec>
- <target name="deploy-serviceassembly">
- <exec executable="${asadmin.command}">
- <arg line="deploy-jbi-service-assembly"/>
- <arg line="build/EntApp.zip"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="start-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- </target>
-
- <target name="undeploy-serviceassembly">
- <exec executable="${asadmin.command}">
- <arg line="stop-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="shut-down-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="undeploy-jbi-service-assembly"/>
- <arg line="EntApp"/>
- </exec>
- </target>
+ <delete dir="build"/>
- <target name="restart-ejbmodule">
- <exec executable="${asadmin.command}">
- <arg line="disable"/>
- <arg line="${ejb.module}"/>
- </exec>
- <exec executable="${asadmin.command}">
- <arg line="enable"/>
- <arg line="${ejb.module}"/>
- </exec>
- </target>
+ <delete includeemptydirs="true" failonerror="false">
+ <fileset dir="service-assembly/sun-http-binding" includes="*.wsdl, *.xsd"/>
+ <fileset dir="service-assembly/sun-http-binding/entapp"/>
+ </delete>
+
+ </target>
+
+ <target name="undeploy">
+ <antcall target="undeploy-serviceassembly"/>
+ </target>
+
+ <target name="compile-entapp">
+ <exec dir="${ent.app}" executable="${env.ANT_HOME}/bin/ant"/>
+ <!--
+ <ant dir="${ent.app}"/>
+ -->
+
+ <!-- Add jbi.xml file to the .ear file -->
+ <jar destfile="${ent.app}/dist/EntApp.ear"
+ basedir="service-assembly/sun-javaee-engine"
+ includes="META-INF/jbi.xml"
+ update="true"
+ />
+ </target>
+
+ <target name="wsgen-sun-http-binding">
+ <!-- generate WSDL for the EJB web service -->
+ <exec executable="${env.S1AS_HOME}/bin/wsgen">
+ <arg line="-cp"/>
+ <arg line="${ent.app}/${ejb.module}/build/ear-module"/>
+ <arg line="${ejb.webservice.class}"/>
+ <arg line="-wsdl"/>
+ <arg line="-d"/>
+ <arg line="service-assembly/sun-http-binding"/>
+ </exec>
+ <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
+ <replace file="service-assembly/sun-http-binding/${ejb.webservice.name}Service.wsdl">
+ <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
+ <replacevalue>http://localhost:12000/entapp/ejb/HelloEJB</replacevalue>
+ </replace>
+
+ <!-- generate WSDL for the Servlet web service -->
+ <exec executable="${env.S1AS_HOME}/bin/wsgen">
+ <arg line="-cp"/>
+ <arg line="${ent.app}/${web.module}/build/ear-module/WEB-INF/classes"/>
+ <arg line="${web.webservice.class}"/>
+ <arg line="-wsdl"/>
+ <arg line="-d"/>
+ <arg line="service-assembly/sun-http-binding"/>
+ </exec>
+ <!-- Replace REPLACE_WITH_ACTUAL_URL with some value -->
+ <replace file="service-assembly/sun-http-binding/${web.webservice.name}Service.wsdl">
+ <replacetoken>REPLACE_WITH_ACTUAL_URL</replacetoken>
+ <replacevalue>http://localhost:12000/entapp/web/HelloEJB</replacevalue>
+ </replace>
+
+ </target>
+
+ <target name="build-serviceassembly">
+ <mkdir dir="build"/>
+
+ <!-- Build the service unit & assembly jars -->
+ <jar destfile="build/sun-http-binding.jar"
+ basedir="service-assembly/sun-http-binding"
+ includes="*.wsdl, *.xsd, META-INF/jbi.xml"
+ />
+ <jar destfile="build/EntApp.zip"
+ basedir="build"
+ includes="sun-http-binding.jar"
+ />
+ <jar destfile="build/EntApp.zip"
+ update="true"
+ basedir="${ent.app}/dist"
+ includes="EntApp.ear"
+ />
+ <jar destfile="build/EntApp.zip"
+ basedir="service-assembly"
+ includes="META-INF/jbi.xml"
+ update="true"
+ />
+ </target>
+
+ <target name="deploy-serviceassembly">
+ <exec executable="${asadmin.command}">
+ <arg line="deploy-jbi-service-assembly"/>
+ <arg line="build/EntApp.zip"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="start-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ </target>
+
+ <target name="undeploy-serviceassembly">
+ <exec executable="${asadmin.command}">
+ <arg line="stop-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="shut-down-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="undeploy-jbi-service-assembly"/>
+ <arg line="EntApp"/>
+ </exec>
+ </target>
+
+ <target name="restart-ejbmodule">
+ <exec executable="${asadmin.command}">
+ <arg line="disable"/>
+ <arg line="${ejb.module}"/>
+ </exec>
+ <exec executable="${asadmin.command}">
+ <arg line="enable"/>
+ <arg line="${ejb.module}"/>
+ </exec>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
index 093f01e..c11f36b 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/client/Client.java
@@ -25,33 +25,33 @@
public class Client {
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/service_unit/enterprise_app";
+ private static String testId = "jbi-serviceengine/service_unit/enterprise_app";
public static void main (String[] args) {
stat.addDescription(testId);
- Client client = new Client();
- client.invoke();
+ Client client = new Client();
+ client.invoke();
stat.printSummary(testId );
}
private void invoke() {
- try {
+ try {
- HelloEJBService helloEJBService = new HelloEJBService();
- HelloEJB port = helloEJBService.getHelloEJBPort();
- String hello = port.sayHello("Bhavani");
- System.out.println("Output :: " + hello);
+ HelloEJBService helloEJBService = new HelloEJBService();
+ HelloEJB port = helloEJBService.getHelloEJBPort();
+ String hello = port.sayHello("Bhavani");
+ System.out.println("Output :: " + hello);
- HelloWebService helloWebService = new HelloWebService();
- HelloWeb webPort = helloWebService.getHelloWebPort();
- hello = webPort.sayHello("Bhavani");
- System.out.println("Output :: " + hello);
+ HelloWebService helloWebService = new HelloWebService();
+ HelloWeb webPort = helloWebService.getHelloWebPort();
+ hello = webPort.sayHello("Bhavani");
+ System.out.println("Output :: " + hello);
- stat.addStatus(testId, stat.PASS);
+ stat.addStatus(testId, stat.PASS);
- } catch(Exception ex) {
- ex.printStackTrace();
- stat.addStatus(testId, stat.FAIL);
- }
- }
+ } catch(Exception ex) {
+ ex.printStackTrace();
+ stat.addStatus(testId, stat.FAIL);
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
index 9962281..2edfeb9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/META-INF/jbi.xml
@@ -19,10 +19,10 @@
<!-- 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"
- xmlns:tns="http://glassfish.samples.sun.com/"
+ version="1.0"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns:tns="http://glassfish.samples.sun.com/"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi ./jbi.xsd">
<service-assembly>
<identification>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
index 9bd2a21..3470077 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-http-binding/META-INF/jbi.xml
@@ -18,18 +18,18 @@
-->
<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:ejb="http://ejb.entapp/"
- xmlns:web="http://web.entapp/"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="ejb:HelloEJBService"
- service-name="ejb:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ejb="http://ejb.entapp/"
+ xmlns:web="http://web.entapp/"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="ejb:HelloEJBService"
+ service-name="ejb:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <consumes interface-name="web:HelloWebService"
- service-name="web:HelloWebService"
+ <consumes interface-name="web:HelloWebService"
+ service-name="web:HelloWebService"
endpoint-name="HelloWebPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
index 53b12f0..838d380 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/service_unit/enterprise_app/service-assembly/sun-javaee-engine/META-INF/jbi.xml
@@ -18,18 +18,18 @@
-->
<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:ejb="http://ejb.entapp/"
- xmlns:web="http://web.entapp/"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="ejb:HelloEJBService"
- service-name="ejb:HelloEJBService"
+ xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ xmlns="http://java.sun.com/xml/ns/jbi"
+ xmlns:javaesb="http://java.sun.com"
+ xmlns:ejb="http://ejb.entapp/"
+ xmlns:web="http://web.entapp/"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="ejb:HelloEJBService"
+ service-name="ejb:HelloEJBService"
endpoint-name="HelloEJBPort"/>
- <provides interface-name="web:HelloWebService"
- service-name="web:HelloWebService"
+ <provides interface-name="web:HelloWebService"
+ service-name="web:HelloWebService"
endpoint-name="HelloWebPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties
index ac59642..c27c121 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="provider_su"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./endpoint/web.xml"/>
<property name="jbi-component-su-assembly" value="sample_service_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
index de94c36..9bf0bea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/build.xml
@@ -27,24 +27,24 @@
]>
<project name="warservice" default="all" basedir=".">
-
+
&commonSetup;
&commonBuild;
&testproperties;
&jaxwsTools;
&jbicommon;
&jbiproperties;
- <target name="all" depends="clean, deploy, runtest, undeploy, clean"/>
-
+ <target name="all" depends="clean, deploy, runtest, undeploy, clean"/>
+
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
<delete file="${basedir}/service_assembly/${appname}.war"/>
<delete file="${basedir}/service_assembly/${http-soap-bc-su}.jar"/>
<delete file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip"/>
</target>
-
+
<target name="assemble" depends="init-common, compile">
-
+
<!-- Step1. Build the provider service unit -->
<echo message="classes dir = ${build.classes.dir}"/>
<echo message="assemble.dir = ${assemble.dir}/${appname}.war"/>
@@ -63,7 +63,7 @@
</jar>
<!-- Copy the JavaEE app to the service assembly -->
<copy file="${assemble.dir}/${appname}.war" todir="${basedir}/service_assembly"/>
-
+
<!-- Step2. Build the consumer service unit -->
<jar jarfile="${basedir}/service_assembly/${http-soap-bc-su}.jar">
<fileset dir="${basedir}/service_assembly/service_units/soap-bc-su">
@@ -73,64 +73,64 @@
<include name="CalculatorService_schema1.xsd"/>
</fileset>
</jar>
-
+
<!-- Step2. Build the service assembly -->
<zip destfile="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" basedir="${basedir}/service_assembly">
<include name="META-INF/jbi.xml"/>
<include name="${http-soap-bc-su}.jar"/>
<include name="${javaee-se-su}.war"/>
</zip>
-
+
</target>
- <target name="install" depends="init-common">
- <copy file="${env.S1AS_HOME}/jbi/sharedlibraries/wsdl/installer/wsdlsl.jar" todir="${servicemix-autodeploy-dir}"/>
- <echo message="Installing SunWSDLSharedLibrary..."/>
- <sleep seconds="10"/>
- <copy file="${env.S1AS_HOME}/jbi/components/javaeeserviceengine/installer/appserv-jbise.jar" todir="${servicemix-autodeploy-dir}"/>
- <echo message="Installing Java EE Service Engine..."/>
- <sleep seconds="15"/>
- </target>
-
- <target name="uninstall" depends="init-common">
- <delete file="${servicemix-autodeploy-dir}/appserv-jbise.jar"/>
- <echo message="Uninstalling Java EE Service Engine..."/>
- <sleep seconds="10"/>
- <delete file="${servicemix-autodeploy-dir}/wsdlsl.jar"/>
- <echo message="Uninstalling SunWSDLSharedLibrary..."/>
- <sleep seconds="10"/>
- </target>
-
- <target name="deploy" depends="assemble">
- <copy file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" todir="${servicemix-autodeploy-dir}"/>
- <sleep seconds="15"/>
- </target>
+ <target name="install" depends="init-common">
+ <copy file="${env.S1AS_HOME}/jbi/sharedlibraries/wsdl/installer/wsdlsl.jar" todir="${servicemix-autodeploy-dir}"/>
+ <echo message="Installing SunWSDLSharedLibrary..."/>
+ <sleep seconds="10"/>
+ <copy file="${env.S1AS_HOME}/jbi/components/javaeeserviceengine/installer/appserv-jbise.jar" todir="${servicemix-autodeploy-dir}"/>
+ <echo message="Installing Java EE Service Engine..."/>
+ <sleep seconds="15"/>
+ </target>
- <target name="undeploy">
- <delete file="${servicemix-autodeploy-dir}/${jbi-component-su-assembly}.zip"/>
- <sleep seconds="15"/>
- </target>
+ <target name="uninstall" depends="init-common">
+ <delete file="${servicemix-autodeploy-dir}/appserv-jbise.jar"/>
+ <echo message="Uninstalling Java EE Service Engine..."/>
+ <sleep seconds="10"/>
+ <delete file="${servicemix-autodeploy-dir}/wsdlsl.jar"/>
+ <echo message="Uninstalling SunWSDLSharedLibrary..."/>
+ <sleep seconds="10"/>
+ </target>
+
+ <target name="deploy" depends="assemble">
+ <copy file="${basedir}/service_assembly/${jbi-component-su-assembly}.zip" todir="${servicemix-autodeploy-dir}"/>
+ <sleep seconds="15"/>
+ </target>
+
+ <target name="undeploy">
+ <delete file="${servicemix-autodeploy-dir}/${jbi-component-su-assembly}.zip"/>
+ <sleep seconds="15"/>
+ </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-client" depends="init-common">
<antcall target="compile-client">
<param name="test-wsdl-uri" value="provider/webservice/CalculatorService?WSDL"/>
<param name="client-src" value="client"/>
</antcall>
</target>
-
+
<target name="runtest" depends="assemble-client">
<echo message="Running SOAP Binding client"/>
<antcall target="run-client">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
index c2fefe8..ef93dab 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/client/SOAPWebConsumer.java
@@ -28,41 +28,41 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/sm/bc_consumer_se_provider";
+ private static String testId = "jbi-serviceengine/sm/bc_consumer_se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId );
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
- try {
+ com.example.calculator.Calculator port= null;
+ try {
- System.out.println(" After creating CalculatorService");
+ System.out.println(" After creating CalculatorService");
port = service.getCalculatorPort();
- System.out.println(" After getting port");
+ System.out.println(" After getting port");
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:8192/calculatorendpoint/";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
- System.out.println(" After setting endpoint address URI");
- System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
- stat.addStatus(testId, stat.PASS);
- //System.out.println(" No Exception thrown");
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:8192/calculatorendpoint/";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
+ System.out.println(" After setting endpoint address URI");
+ System.out.println(" Using SOAP binding's consumer to add 1 + 2 = " + port.add(1,2));
+ stat.addStatus(testId, stat.PASS);
+ //System.out.println(" No Exception thrown");
- } catch(Exception e) {
- e.printStackTrace();
- if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
- stat.addStatus(testId, stat.PASS);
- else {
- stat.addStatus(testId, stat.FAIL);
- System.out.println(" SOAPFaultException Not thrown");
- }
- }
+ } catch(Exception e) {
+ e.printStackTrace();
+ if(e instanceof jakarta.xml.ws.soap.SOAPFaultException)
+ stat.addStatus(testId, stat.PASS);
+ else {
+ stat.addStatus(testId, stat.FAIL);
+ System.out.println(" SOAPFaultException Not thrown");
+ }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
index a279a2b..f1c0f31 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/Calculator.java
@@ -25,12 +25,12 @@
targetNamespace="http://example.com/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- return k;
- }
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/endpoint/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
index 287c050..f07df33 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
index 930693b..dc26680 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/javaee-se-su/META-INF/jbi.xml
@@ -18,14 +18,14 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="false">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="false">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
index 7b48fda..e73bd32 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<jbi version="1.0"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
- xmlns="http://java.sun.com/xml/ns/jbi"
+ 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://example.com/Calculator"
xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
+ <services binding-component="true">
<consumes interface-name="tns:CalculatorService"
link-type="standard"
- service-name="tns:CalculatorService"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
</services>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
index 2f0ece3..c679213 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/sm/bc_consumer_se_provider/service_assembly/service_units/soap-bc-su/xbean.xml
@@ -26,5 +26,5 @@
locationURI="http://localhost:8192/calculatorendpoint"
defaultMep="http://www.w3.org/2004/08/wsdl/in-out"
/>
-
+
</beans>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
index a8360ec..2639278 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/build.xml
@@ -26,6 +26,6 @@
<target name="all">
<ant dir="se_consumerNprovider" target="all"/>
<ant dir="se_provider" target="all"/>
- <ant dir="se_consumer" target="all"/>
+ <ant dir="se_consumer" target="all"/>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 65d6dc5..bb98f0f 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -110,11 +110,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
index e6aafe7..2e5ce4b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_consumer";
+ private static String testId = "jbi-serviceengine/soapfault/se_consumer";
public boolean found1 = false;
@@ -47,8 +47,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -63,7 +63,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Exception thrown Successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
index dc0b90f..fc3b358 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/endpoint/Calculator.java
@@ -26,13 +26,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- throw new java.lang.Exception("This is my exception");
- //return k;
- }
+ throw new java.lang.Exception("This is my exception");
+ //return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
index e48a408..9464b01 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumer/webclient/client/Client.java
@@ -28,37 +28,37 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- printFailure(out);
+ printFailure(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- if(e instanceof service.web.example.calculator.Exception_Exception) {
- printSuccess(out);
- }
+ e.printStackTrace();
+ if(e instanceof service.web.example.calculator.Exception_Exception) {
+ printSuccess(out);
+ }
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -71,7 +71,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties
index 0300108..6003a7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calc-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 9424e88..d251b75 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -110,11 +110,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
index 61c6e43..520f2ea 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/client/TestClient.java
@@ -30,7 +30,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_consumerNprovider";
+ private static String testId = "jbi-serviceengine/soapfault/se_consumerNprovider";
public boolean found1 = false;
@@ -47,8 +47,8 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
- fail();
+ } catch (Exception e) {
+ fail();
}
}
@@ -63,7 +63,7 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("Exception thrown Successfully") != -1)
- found1 = true;
+ found1 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
index 098fa9d..49894ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/endpoint/Calculator.java
@@ -26,23 +26,23 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) throws Exception {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) throws Exception {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
- throw new java.lang.Exception("This is my exception...");
- //return k;
- }
+ throw new java.lang.Exception("This is my exception...");
+ //return k;
+ }
/*
- @WebMethod(operationName="subtract", action="urn:Subtract")
- @Oneway
- public void subtract(int i, int j) {
+ @WebMethod(operationName="subtract", action="urn:Subtract")
+ @Oneway
+ public void subtract(int i, int j) {
int k = i -j ;
System.out.println(i + "-" + j +" = " + k);
- if(i == 101)
- throw new RuntimeException("This is my exception in subtract ...");
- }
+ if(i == 101)
+ throw new RuntimeException("This is my exception in subtract ...");
+ }
*/
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index 3bc80b9..80f2e5d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 33974f9..433bd19 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,15 +18,15 @@
-->
<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://example.web.service/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <provides interface-name="tns:CalculatorServiceInterface"
+ 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://example.web.service/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <provides interface-name="tns:CalculatorServiceInterface"
service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<artifacts xmlns="" role="provider" file-name="endpoints.xml" type="xml"/>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
index d185f6f..2f7b478 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_consumerNprovider/webclient/client/Client.java
@@ -28,35 +28,35 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- PrintWriter out=null;
+ PrintWriter out=null;
try {
System.out.println(" Service is :" + service);
resp.setContentType("text/html");
- out = resp.getWriter();
+ out = resp.getWriter();
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- printFailure(out);
+ printFailure(out);
} catch(java.lang.Exception e) {
- e.printStackTrace();
- printSuccess(out);
+ e.printStackTrace();
+ printSuccess(out);
} finally {
- if(out != null) {
+ if(out != null) {
out.flush();
out.close();
- }
- }
+ }
+ }
}
public void printFailure(PrintWriter out) {
- if(out == null) return;
- out.println("<html>");
+ if(out == null) return;
+ out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
out.println("</head>");
@@ -69,7 +69,7 @@
}
public void printSuccess(PrintWriter out) {
- if(out == null) return;
+ if(out == null) return;
out.println("<html>");
out.println("<head>");
out.println("<title>TestServlet</title>");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties
index 68987bd..7200f32 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="calculatorservice"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="jbi-component-su-assembly" value="web_calculator_consumer_assembly"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
index 8fe560b..242abf3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/build.xml
@@ -34,7 +34,7 @@
&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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
index c75060d..b433e3d 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/client/SOAPWebConsumer.java
@@ -28,53 +28,53 @@
static CalculatorService service;
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
- private static String testId = "jbi-serviceengine/soapfault/se_provider";
+ private static String testId = "jbi-serviceengine/soapfault/se_provider";
public static void main (String[] args) {
stat.addDescription(testId);
- SOAPWebConsumer client = new SOAPWebConsumer();
- client.addUsingSOAPConsumer();
+ SOAPWebConsumer client = new SOAPWebConsumer();
+ client.addUsingSOAPConsumer();
stat.printSummary(testId );
}
private void addUsingSOAPConsumer() {
- com.example.calculator.Calculator port= null;
+ com.example.calculator.Calculator port= null;
port = service.getCalculatorPort();
- // Get Stub
- BindingProvider stub = (BindingProvider)port;
- String endpointURI ="http://localhost:12011/calculatorendpoint";
- stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
- endpointURI);
+ // Get Stub
+ BindingProvider stub = (BindingProvider)port;
+ String endpointURI ="http://localhost:12011/calculatorendpoint";
+ stub.getRequestContext().put(BindingProvider.ENDPOINT_ADDRESS_PROPERTY,
+ endpointURI);
- String failedMsg = null;
+ String failedMsg = null;
- try {
- System.out.println("\nInvoking throwRuntimeException");
- port.throwRuntimeException("bhavani");
- } catch(Exception ex) {
- System.out.println(ex);
- if(!(ex instanceof RuntimeException) ||
- !(ex.getMessage().equals("Calculator :: Threw Runtime Exception"))) {
- failedMsg = "port.throwRuntimeException() did not receive RuntimeException 'Calculator :: Threw Runtime Exception'";
- }
- }
+ try {
+ System.out.println("\nInvoking throwRuntimeException");
+ port.throwRuntimeException("bhavani");
+ } catch(Exception ex) {
+ System.out.println(ex);
+ if(!(ex instanceof RuntimeException) ||
+ !(ex.getMessage().equals("Calculator :: Threw Runtime Exception"))) {
+ failedMsg = "port.throwRuntimeException() did not receive RuntimeException 'Calculator :: Threw Runtime Exception'";
+ }
+ }
- try {
- System.out.println("\nInvoking throwApplicationException");
- port.throwApplicationException("bhavani");
- } catch(Exception ex) {
- System.out.println(ex);
- if(!(ex instanceof com.example.calculator.Exception_Exception)) {
- failedMsg = "port.throwApplicationException() did not throw ApplicationException";
- }
- }
+ try {
+ System.out.println("\nInvoking throwApplicationException");
+ port.throwApplicationException("bhavani");
+ } catch(Exception ex) {
+ System.out.println(ex);
+ if(!(ex instanceof com.example.calculator.Exception_Exception)) {
+ failedMsg = "port.throwApplicationException() did not throw ApplicationException";
+ }
+ }
- if(failedMsg != null) {
- stat.addStatus(testId, stat.FAIL);
- } else {
- stat.addStatus(testId, stat.PASS);
- }
+ if(failedMsg != null) {
+ stat.addStatus(testId, stat.FAIL);
+ } else {
+ stat.addStatus(testId, stat.PASS);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
index 6d87634..10190ca 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/endpoint/Calculator.java
@@ -28,7 +28,7 @@
public class Calculator {
public Calculator() {}
-
+
@WebMethod(operationName="throwRuntimeException", action="urn:ThrowRuntimeException")
public String throwRuntimeException(String name) {
String exceptionMsg = "Calculator :: Threw Runtime Exception";
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
index b4da986..43378e2 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/assembly/META-INF/jbi.xml
@@ -19,9 +19,9 @@
<!-- 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"
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
index 2d1e7e8..65ca96f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/soap-binding-su-alaska/su/META-INF/jbi.xml
@@ -18,16 +18,16 @@
-->
<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://example.com/Calculator"
- xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
- <services binding-component="true">
- <consumes interface-name="tns:CalculatorService"
- link-type="standard"
- service-name="tns:CalculatorService"
+ 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://example.com/Calculator"
+ xsi:schemaLocation="http://java.sun.com/xml/ns/jbi jbi.xsd">
+ <services binding-component="true">
+ <consumes interface-name="tns:CalculatorService"
+ link-type="standard"
+ service-name="tns:CalculatorService"
endpoint-name="CalculatorPort"/>
<javaesb:artifactstype>WSDL11</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapfault/se_provider/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties
index 6ae49c8..0c8dea5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value=".consumer//web.xml"/>
<property name="sun-web.xml" value="./consumer/sun-web.xml"/>
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 2799738..157e540 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
@@ -56,7 +56,7 @@
<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"/>
@@ -98,7 +98,7 @@
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"
+ 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"/>
@@ -176,12 +176,12 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
index 466e35c..b7662d2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
index 918a957..d635f53 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_web_calculator_consumer_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_web_calculator_consumer_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
index 5c66b9e..06f6aaa 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/jms-binding-su/su/META-INF/jbi.xml
@@ -28,5 +28,5 @@
service-name="tns:CalculatorService"
endpoint-name="Calculator"/>
<javaesb:artifactstype>WSDL20</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
index 676de20..3545ae9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>CalculatorPort</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>CalculatorPort</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>CalculatorPort</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>CalculatorPort</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
index e653d46..b38ca7a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/consumer/webclient/client/Client.java
@@ -28,8 +28,8 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
index 6951320..bed1e0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/endpoint/Calculator.java
@@ -25,13 +25,13 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
index df81455..774ac6d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/assembly/META-INF/jbi.xml
@@ -22,13 +22,13 @@
version="1.0"
xmlns="http://java.sun.com/xml/ns/jbi"
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
-
+
<service-assembly>
<identification>
<name>client_web_calculator_provider_assembly</name>
<description>This is an SA for JMS Binding</description>
</identification>
-
+
<service-unit>
<identification>
<name>client_web_calculator_provider_su</name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
index 8f38d07..7546ec9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/soapoverjms/provider/jms-binding-su/su/META-INF/jbi.xml
@@ -28,5 +28,5 @@
service-name="tns:CalculatorService"
endpoint-name="Calculator"/>
<javaesb:artifactstype>WSDL20</javaesb:artifactstype>
- </services>
+ </services>
</jbi>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties
index 3f83010..e302d5f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration-web-client"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 dba069b..fe23a88 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
@@ -64,7 +64,7 @@
value="-keep -d ${build.classes.dir}/webclient/WEB-INF/classes http://localhost:8080/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/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/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"/>
@@ -111,11 +111,11 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
index eeb730d..795b052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
index 5e865d0..c49f5b1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF Calculator add SERVICE IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[3]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
index b522b9f..232817b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/endpoint/Calculator.java
@@ -27,14 +27,14 @@
targetNamespace="http://example.web.service/Calculator"
)
public class Calculator {
- public Calculator() {}
+ public Calculator() {}
- @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
- @WebMethod(operationName="add", action="urn:Add")
- public int add(int i, int j) {
+ @TransactionAttribute(TransactionAttributeType.REQUIRES_NEW)
+ @WebMethod(operationName="add", action="urn:Add")
+ public int add(int i, int j) {
int k = i +j ;
System.out.println(i + "+" + j +" = " + k);
-
- return k;
- }
+
+ return k;
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
index ba46619..3db57bf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only/webclient/client/Client.java
@@ -30,22 +30,22 @@
@WebServiceRef(name="sun-web.serviceref/calculator") CalculatorService service;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ 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 {
- UserTransaction ut = null;
+ UserTransaction ut = null;
try {
- ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
- ut.begin();
+ ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
+ ut.begin();
System.out.println(" Service is :" + service);
Calculator port = service.getCalculatorPort();
int ret = port.add(1, 2);
- ut.commit();
+ ut.commit();
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
@@ -62,12 +62,12 @@
out.flush();
out.close();
} catch(Exception e) {
- try {
- if(ut != null)
- ut.rollback();
- } catch (Exception ex) {
- ex.printStackTrace();
- }
+ try {
+ if(ut != null)
+ ut.rollback();
+ } catch (Exception ex) {
+ ex.printStackTrace();
+ }
e.printStackTrace();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 c169d21..05ecd1e 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
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
index 93df6bf..d5a819b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
index 249df90..452c694 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/endpoint/ejb/HelloEJB.java
@@ -35,36 +35,36 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_cm";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_cm";
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, "Vikas", "vikas@sun.com");
- readData(con, tableName);
+ updateTable(con, tableName, "Vikas", "vikas@sun.com");
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
index 52a6554..15b4479 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,21 +45,21 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm. This name will be used in the EJB
- String tableName = "CUSTOMER_cm";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ String tableName = "CUSTOMER_cm";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
try {
- Connection con = ds.getConnection();
+ Connection con = ds.getConnection();
// autocommit is made true so that the table is created and dropped immediately
con.setAutoCommit(true);
- createTable(con, tableName);
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
if(ut.getStatus() != Status.STATUS_ACTIVE) {
@@ -85,15 +85,15 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
@@ -106,19 +106,19 @@
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataUpdated(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- try {
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- if(db_Name.equals(name) && db_Email.equals(email))
- return true;
- }
- } finally {
- rs.close();
- }
- return false;
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ try {
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ if(db_Name.equals(name) && db_Email.equals(email))
+ return true;
+ }
+ } finally {
+ rs.close();
+ }
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 c169d21..05ecd1e 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
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
index 89353c1..af512dc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
index b0b504e..b5e84b3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/endpoint/ejb/HelloEJB.java
@@ -35,39 +35,39 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_cm1";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_cm1";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, nameEntry, emailEntry);
- readData(con, tableName);
+ updateTable(con, tableName, nameEntry, emailEntry);
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
index 5d45796..fcf0d00 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbcommit1/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,31 +45,31 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_cm1. This name will be used in the EJB
- String tableName = "CUSTOMER_cm1";
- String[] names = {"Vikas", "VikasAwasthi"};
- String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
+ String tableName = "CUSTOMER_cm1";
+ String[] names = {"Vikas", "VikasAwasthi"};
+ String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
try {
- Connection con = ds.getConnection();
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
- updateTable(con, tableName, names[1], emails[1]);
+ updateTable(con, tableName, names[1], emails[1]);
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- if(ut.getStatus() != Status.STATUS_ACTIVE) {
+ if(ut.getStatus() != Status.STATUS_ACTIVE) {
ret += "FAILED";
- } else {
- System.out.println("**** committing transaction");
- ut.commit();
- if(!isDataUpdated(con, tableName, names, emails)) {
- ret += "FAILED";
+ } else {
+ System.out.println("**** committing transaction");
+ ut.commit();
+ if(!isDataUpdated(con, tableName, names, emails)) {
+ ret += "FAILED";
}
- }
+ }
PrintWriter out = resp.getWriter();
resp.setContentType("text/html");
out.println("<html>");
@@ -83,55 +83,55 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- // autocommit is made true so that the table is created immediately
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ // autocommit is made true so that the table is created immediately
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
private void dropTable(Connection con, String tableName) throws Exception {
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
PreparedStatement pStmt = con.prepareStatement("DROP TABLE "+tableName);
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataUpdated(Connection con, String tableName, String[] names, String[] emails) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- int allDataCount = 0;
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- for (int i=0; i < names.length; i++)
- if(db_Name.equals(names[i]) && db_Email.equals(emails[i]))
- allDataCount++;
- }
- rs.close();
- return (allDataCount == names.length);
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ int allDataCount = 0;
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ for (int i=0; i < names.length; i++)
+ if(db_Name.equals(names[i]) && db_Email.equals(emails[i]))
+ allDataCount++;
+ }
+ rs.close();
+ return (allDataCount == names.length);
}
- private void updateTable(Connection con, String tableName, String name, String email)
- throws Exception {
- PreparedStatement pStmt =
- con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
- pStmt.executeUpdate();
+ private void updateTable(Connection con, String tableName, String name, String email)
+ throws Exception {
+ PreparedStatement pStmt =
+ con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
+ pStmt.executeUpdate();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 c169d21..05ecd1e 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
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
index 1d33eab..6db83c0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/client/TestClient.java
@@ -47,7 +47,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -64,9 +64,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
index 91ea7e6..053ddbb 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/endpoint/ejb/HelloEJB.java
@@ -35,36 +35,36 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_rb";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_rb";
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, "Vikas", "vikas@sun.com");
- readData(con, tableName);
+ updateTable(con, tableName, "Vikas", "vikas@sun.com");
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
index b23f0fb..9f00acf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,26 +45,26 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb. This name will be used in the EJB
- String tableName = "CUSTOMER_rb";
+ String tableName = "CUSTOMER_rb";
try {
- Connection con = ds.getConnection();
- con.setAutoCommit(true);
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ con.setAutoCommit(true);
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- if(ut.getStatus() != Status.STATUS_MARKED_ROLLBACK) {
+ if(ut.getStatus() != Status.STATUS_MARKED_ROLLBACK) {
ret += "FAILED";
- }
- System.out.println("**** rollbacking transaction");
- ut.rollback();
- if(isDataPresent(con, tableName)) {
+ }
+ System.out.println("**** rollbacking transaction");
+ ut.rollback();
+ if(isDataPresent(con, tableName)) {
ret += "FAILED";
}
PrintWriter out = resp.getWriter();
@@ -80,15 +80,15 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
@@ -101,15 +101,15 @@
// Check whether the EJB webservice has updated the data in the table.
private boolean isDataPresent(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
- ResultSet rs = pStmt.executeQuery();
- while(rs.next()) {
- String db_Name = rs.getString(1);
- String db_Email = rs.getString(2);
- System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
- rs.close();
- return true;
- }
- return false;
+ PreparedStatement pStmt = con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
+ ResultSet rs = pStmt.executeQuery();
+ while(rs.next()) {
+ String db_Name = rs.getString(1);
+ String db_Email = rs.getString(2);
+ System.out.println("NAME="+db_Name+", EMAIL="+db_Email);
+ rs.close();
+ return true;
+ }
+ return false;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties
index 0331624..90d8451 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="jsr208-integration"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="sun-web.xml" value="./sun-web.xml"/>
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 c169d21..05ecd1e 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
@@ -105,7 +105,7 @@
<antcall target="undeploy-app"/>
<antcall target="undeploy-client"/>
</target>
-
+
<target name="undeploy-client" depends="init-common">
<echo message="Undeploying client application"/>
<exec executable="${ASADMIN}">
@@ -132,8 +132,8 @@
<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"
+ <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">
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
index d43e70f..90aeff1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-sun-web.xml
@@ -24,15 +24,15 @@
<service-ref>
<service-ref-name>sun-web.serviceref/HelloEJBService</service-ref-name>
<port-info>
- <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
- <wsdl-port>
- <namespaceURI>http://endpoint/ejb</namespaceURI>
- <localpart>HelloEJBPort</localpart>
- </wsdl-port>
- <stub-property>
- <name>jbi-enabled</name>
- <value>true</value>
- </stub-property>
+ <service-endpoint-interface>endpoint.ejb.Hello</service-endpoint-interface>
+ <wsdl-port>
+ <namespaceURI>http://endpoint/ejb</namespaceURI>
+ <localpart>HelloEJBPort</localpart>
+ </wsdl-port>
+ <stub-property>
+ <name>jbi-enabled</name>
+ <value>true</value>
+ </stub-property>
</port-info>
<wsdl-override>http://localhost:8080/HelloEJBService/HelloEJB?WSDL</wsdl-override>
</service-ref>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
index 5ac2649..cd958a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client-web.xml
@@ -20,7 +20,7 @@
<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
+ 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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
index 293b817..be9d25e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/client/TestClient.java
@@ -48,7 +48,7 @@
try {
int code = invokeServlet(url);
report(code);
- } catch (Exception e) {
+ } catch (Exception e) {
e.printStackTrace();
fail();
}
@@ -65,9 +65,9 @@
while ((line = input.readLine()) != null) {
log(line);
if(line.indexOf("So the RESULT OF EJB webservice IS") != -1)
- found1 = true;
+ found1 = true;
if(line.indexOf("[WebSvcTest-Hello Appserver Tester !]") != -1)
- found2 = true;
+ found2 = true;
}
return code;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
index 23167eb..9073933 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/Hello.java
@@ -22,5 +22,5 @@
targetNamespace="http://endpoint/ejb")
public interface Hello {
- public String sayHello(String who);
+ public String sayHello(String who);
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
index 8d2468d..494ec81 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/endpoint/ejb/HelloEJB.java
@@ -35,39 +35,39 @@
@TransactionAttribute(TransactionAttributeType.REQUIRED)
public String sayHello(String who) {
- System.out.println("**** EJB Called");
- Connection con=null;
- String tableName = "CUSTOMER_rb1";
- String nameEntry = "Vikas";
- String emailEntry= "vikas@sun.com";
+ System.out.println("**** EJB Called");
+ Connection con=null;
+ String tableName = "CUSTOMER_rb1";
+ String nameEntry = "Vikas";
+ String emailEntry= "vikas@sun.com";
- try {
- con = ds.getConnection();
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ try {
+ con = ds.getConnection();
+ System.out.println("**** auto commit = " + con.getAutoCommit());
- updateTable(con, tableName, nameEntry, emailEntry);
- readData(con, tableName);
+ updateTable(con, tableName, nameEntry, emailEntry);
+ readData(con, tableName);
} catch(Exception ex) {
throw new RuntimeException(ex);
} finally {
- try {
- if(con != null) con.close();
- } catch (SQLException se) {}
- }
- //ctx.setRollbackOnly();
+ try {
+ if(con != null) con.close();
+ } catch (SQLException se) {}
+ }
+ //ctx.setRollbackOnly();
return "WebSvcTest-Hello " + who;
}
private void updateTable(Connection con, String tableName, String name, String email) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
pStmt.executeUpdate();
}
private void readData(Connection con, String tableName) throws Exception {
- PreparedStatement pStmt =
+ PreparedStatement pStmt =
con.prepareStatement("SELECT NAME, EMAIL FROM "+tableName);
ResultSet rs = pStmt.executeQuery();
while(rs.next()){
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
index 07e1477..798c69b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/web.xml
@@ -18,30 +18,30 @@
-->
<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">
+ 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>WebTier for the Calculator Service</description>
- <display-name>CalculatorWAR</display-name>
+ <description>WebTier for the Calculator Service</description>
+ <display-name>CalculatorWAR</display-name>
- <servlet>
- <description>Endpoint for Calculator Web Service</description>
- <display-name>CalculatorWebService</display-name>
- <servlet-name>Calculator</servlet-name>
- <servlet-class>endpoint.Calculator</servlet-class>
- <load-on-startup>0</load-on-startup>
- </servlet>
+ <servlet>
+ <description>Endpoint for Calculator Web Service</description>
+ <display-name>CalculatorWebService</display-name>
+ <servlet-name>Calculator</servlet-name>
+ <servlet-class>endpoint.Calculator</servlet-class>
+ <load-on-startup>0</load-on-startup>
+ </servlet>
- <servlet-mapping>
- <servlet-name>Calculator</servlet-name>
- <url-pattern>/webservice/CalculatorService</url-pattern>
- </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Calculator</servlet-name>
+ <url-pattern>/webservice/CalculatorService</url-pattern>
+ </servlet-mapping>
- <session-config>
- <session-timeout>54</session-timeout>
- </session-config>
+ <session-config>
+ <session-timeout>54</session-timeout>
+ </session-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
index 44286cb..52c5be7 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/jbi-serviceengine/transactions/jse_only_ejbrollback1/webclient/client/Client.java
@@ -36,8 +36,8 @@
HelloEJBService service;
@Resource(mappedName="jdbc/__default") private DataSource ds;
- public void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws jakarta.servlet.ServletException {
+ public void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws jakarta.servlet.ServletException {
doPost(req, resp);
}
@@ -45,25 +45,25 @@
throws jakarta.servlet.ServletException {
UserTransaction ut = null;
// Create Table with name CUSTOMER_rb1. This name will be used in the EJB
- String tableName = "CUSTOMER_rb1";
+ String tableName = "CUSTOMER_rb1";
String[] names = {"Vikas", "VikasAwasthi"};
String[] emails= {"vikas@sun.com", "VikasA@sun.com"};
try {
- Connection con = ds.getConnection();
- createTable(con, tableName);
+ Connection con = ds.getConnection();
+ createTable(con, tableName);
ut = (UserTransaction) new InitialContext().lookup("java:comp/UserTransaction");
ut.begin();
- updateTable(con, tableName, names[1], emails[1]);
+ updateTable(con, tableName, names[1], emails[1]);
System.out.println(" Service is :" + service);
- Hello port = service.getHelloEJBPort();
-
- String ret = port.sayHello("Appserver Tester !");
+ Hello port = service.getHelloEJBPort();
+
+ String ret = port.sayHello("Appserver Tester !");
System.out.println("Return value from webservice:"+ret);
- System.out.println("**** rollbacking transaction");
- ut.rollback();
-
- if(isDataPresent(con, tableName)) {
+ System.out.println("**** rollbacking transaction");
+ ut.rollback();
+
+ if(isDataPresent(con, tableName)) {
ret += "FAILED";
}
@@ -80,30 +80,30 @@
out.println("[" + ret + "]");
out.println("</body>");
out.println("</html>");
- dropTable(con, tableName);
+ dropTable(con, tableName);
} catch(Exception e) {
e.printStackTrace();
- }
+ }
}
// use this table in the EJB webservice
private void createTable(Connection con, String tableName) throws Exception {
- // autocommit is made true so that the table is created immediately
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
- System.out.println("**** auto commit = " + con.getAutoCommit());
+ // autocommit is made true so that the table is created immediately
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
+ System.out.println("**** auto commit = " + con.getAutoCommit());
PreparedStatement pStmt =
con.prepareStatement("CREATE TABLE "+tableName+" (NAME VARCHAR(30) NOT NULL PRIMARY KEY, EMAIL VARCHAR(30))");
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
private void dropTable(Connection con, String tableName) throws Exception {
- boolean autoCommit = con.getAutoCommit();
- con.setAutoCommit(true);
+ boolean autoCommit = con.getAutoCommit();
+ con.setAutoCommit(true);
PreparedStatement pStmt = con.prepareStatement("DROP TABLE "+tableName);
pStmt.executeUpdate();
- con.setAutoCommit(autoCommit);
+ con.setAutoCommit(autoCommit);
}
// Check whether the EJB webservice has updated the data in the table.
@@ -120,12 +120,12 @@
return false;
}
- private void updateTable(Connection con, String tableName, String name, String email)
- throws Exception {
- PreparedStatement pStmt =
- con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
- pStmt.setString(1, name);
- pStmt.setString(2, email);
- pStmt.executeUpdate();
+ private void updateTable(Connection con, String tableName, String name, String email)
+ throws Exception {
+ PreparedStatement pStmt =
+ con.prepareStatement("INSERT INTO "+ tableName +" (NAME, EMAIL) VALUES(?,?)");
+ pStmt.setString(1, name);
+ pStmt.setString(2, email);
+ pStmt.executeUpdate();
}
}
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
index 7bfba78..0afe722 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.properties
@@ -15,22 +15,22 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index b58f877..d5bef0f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -53,11 +53,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/signature"
includes="SignatureTestService.class, SignatureTest.class, MyDateValueType.class, MySecondDateValueType.class"/>
</copy>
<!--
@@ -70,7 +70,7 @@
<param name="src" value="signatureejb"/>
</antcall>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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>
@@ -78,24 +78,24 @@
<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"/>
+ <copy todir="${build.classes.dir}"
+ file="SignatureMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="SignatureMapping_appclient.xml,META-INF/wsdl/**,signature/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="SignatureMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="SignatureMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="SignatureMapping_ejb.xml,META-INF/wsdl/**,signatureejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -114,19 +114,19 @@
<target name="run" depends="init-common">
<exec executable="${APPCLIENT}" failonerror="false">
- <arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
+ <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>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- </echo>
+ <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
index 80ca908..1738490 100644
--- 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
@@ -28,25 +28,25 @@
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 {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ 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);
@@ -58,13 +58,13 @@
System.out.println("MSG: " + msg);
stat.addStatus("signature SEI.sayHello(msg)", stat.PASS);
} catch (Exception e1) {
- e1.printStackTrace();
+ e1.printStackTrace();
stat.addStatus("signature SEI.sayHello(msg)", stat.FAIL);
}
/* uncomment the following when the date->calendar is done
- MySecondDateValueType d =
+ MySecondDateValueType d =
new MySecondDateValueType(new java.util.GregorianCalendar(), "Suck it up and do it!");
MyDateValueType c = new MyDateValueType();
c.setDate(new java.util.GregorianCalendar());
@@ -83,7 +83,7 @@
try {
test.setMyDateValueType(c);
MyDateValueType date2 = test.getMyDateValueType();
- System.out.println("RETURNED ANOTHER LUCKY DATE = "
+ System.out.println("RETURNED ANOTHER LUCKY DATE = "
+ date2.getDate() + "; with message = " + date2.getWhine());
stat.addStatus("signature SEI.setValueTypeWithDate", stat.PASS);
@@ -107,10 +107,10 @@
stat.addStatus("signature SEI.setValueTypeWithDates", stat.FAIL);
}
*/
- } catch (Exception ex) {
+ } 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/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/descriptor/application-client.xml
index fd3f1ab..dffacb6 100644
--- 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
@@ -27,6 +27,6 @@
<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-qname>
</service-ref>
</application-client>
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
index 64f30b4..5c864da 100644
--- 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
@@ -25,7 +25,7 @@
public MyDateValueType() {}
- public MyDateValueType(Date date, java.lang.String whine,
+ public MyDateValueType(Date date, java.lang.String whine,
MySecondDateValueType[] dates) {
this.date = date;
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
index 26fd613..d60d3fa 100644
--- 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
@@ -17,7 +17,7 @@
package signatureejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -33,55 +33,55 @@
private MyDateValueType[] myDates;
public SignatureEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SignatureEJB::ejbCreate !!");
+ System.out.println("In SignatureEJB::ejbCreate !!");
}
public void SetTestDate(java.util.Date testDate) {
- System.out.println("In SignatureEJB::setTestDate = " + testDate);
+ System.out.println("In SignatureEJB::setTestDate = " + testDate);
date = testDate;
}
public java.util.Date GetTestDate() {
- System.out.println("In SignatureEJB::getTestDate !!");
+ System.out.println("In SignatureEJB::getTestDate !!");
return date;
}
public void setMyDateValueType(MyDateValueType mytestdate) {
- System.out.println("In SignatureEJB::setMyDateValueType: date = "
+ System.out.println("In SignatureEJB::setMyDateValueType: date = "
+ mytestdate.getDate() + " ; whine = " + mytestdate.getWhine());
myDate = mytestdate;
}
public MyDateValueType getMyDateValueType() {
- System.out.println("In SignatureEJB::getMyDateValueType !!");
+ System.out.println("In SignatureEJB::getMyDateValueType !!");
return myDate;
}
public void setMyDateValueTypes(MyDateValueType[] mytestdates) {
- System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = "
+ System.out.println("In SignatureEJB::setMyDateValueTypes: dates.size = "
+ mytestdates.length);
myDates = mytestdates;
}
public MyDateValueType[] getMyDateValueTypes() {
- System.out.println("In SignatureEJB::getMyDateValueTypes !!");
+ System.out.println("In SignatureEJB::getMyDateValueTypes !!");
return myDates;
}
public String SayHello(String msg) {
- System.out.println("In SignatureEJB::SayHello !!");
+ 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/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/mapping/j2w/signature/wscompile_config_appclient.xml
index 8732c3c..cc694df 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SignatureTestService.wsdl"
packageName="signature"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml b/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
index deab13f..4afbf5e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/ns2package/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="ns2package.wsdl"
packageName="ns2package"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/report.xml b/appserver/tests/appserv-tests/devtests/webservice/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties
index 18d8f0e..b251c64 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpcencodedOneway"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
@@ -26,13 +26,13 @@
<property name="web.xml" value="descriptor/web.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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}AppClient.jar"/>
<property name="app.type" value="application"/>
<property name="mappingfile.location" value="${basedir}"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
index a5afd3f..0f314d0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <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
@@ -43,9 +43,9 @@
-->
<target name="all" depends="simple-mapping, full-mapping"/>
- <target name="simple-mapping"
+ <target name="simple-mapping"
depends="build-simple-mapping,deploy,assemble-client, run,undeploy"/>
- <target name="full-mapping"
+ <target name="full-mapping"
depends="build-full-mapping,deploy,run,undeploy"/>
<target name="compile" depends="">
@@ -77,32 +77,32 @@
<param name="hasWebclient" value="yes"/>
</antcall>
<antcall target="ear-common" />
- </target>
-
+ </target>
+
<target name="assemble-client" depends="init-common">
<antcall target="compile-common">
<param name="src" value="client"/>
- </antcall>
+ </antcall>
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="NoMetadata.SimpleTest.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="NoMetadata.SimpleTest.xml"/>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="NoMetadata.SimpleTest.xml,META-INF/wsdl/**,rpcencoded/*.class,com/**" />
- </antcall>
+ </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}//RPCEncodedOneway/Hello"/>
</antcall>
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -116,19 +116,19 @@
<delete file ="/tmp/debugModel.txt"/>
<delete file ="/tmp/debugModel.model"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="wscompile" depends="init-common">
<mkdir dir="vo_output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d vo_output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/rpcencoded">
- <fileset dir="vo_output/rpcencoded"
+ <fileset dir="vo_output/rpcencoded"
includes="Hello.class"/>
</copy>
<delete dir="vo_output"/>
@@ -139,23 +139,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:onewayModel.txt -model ${mappingfile.name} wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:onewayModel.txt -model ${mappingfile.name} wscompile_config.xml"/>
-->
<!-- use mapping -->
- <param name="wscompile.command"
- value="-import -cp . -keep -d output -Xdebugmodel:onewayModel.txt -mapping ${mappingfile.name} wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-import -cp . -keep -d output -Xdebugmodel:onewayModel.txt -mapping ${mappingfile.name} wscompile_config.xml"/>
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
index 03f2404..b3bd06f 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/rpcencoded/HelloImpl.java
@@ -27,7 +27,7 @@
public class HelloImpl implements jakarta.servlet.SingleThreadModel, ServiceLifecycle {
private boolean gotInit = false;
-
+
public void init(Object o) {
System.out.println("Got ServiceLifecycle::init call " + o);
gotInit = true;
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
index a3249e7..235fd41 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpcencoded_oneway/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="rpcencoded">
</wsdl>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties
index f52b31e..5a276db 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="rpclit"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="test.client" value="Client"/>
<property name="application.xml" value="descriptor/application.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
index 93f91a0..a2eba0a 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -52,17 +52,17 @@
<target name="assemble" depends="init-common, build, compile">
<copy todir="${build.classes.dir}/META-INF/wsdl"
file="SimpleTest.wsdl"/>
- <copy todir="${build.classes.dir}"
- file="RpcLitMapping.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="RpcLitMapping.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="RpcLitMapping.xml,META-INF/wsdl/**,rpclit/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -76,19 +76,19 @@
<target name="run" depends="init-common">
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <param name="wscompile.command"
value="-import -keep -d output -s output -classpath . wscompile_config.xml"/>
</antcall>
<copy todir="${build.classes.dir}/rpclit">
- <fileset dir="output/rpclit"
+ <fileset dir="output/rpclit"
includes="SimpleTest.class,EchoStringType.class,StringResponseNameType.class"/>
</copy>
<delete dir="output"/>
@@ -99,23 +99,23 @@
<mkdir dir="output"/>
<antcall target="run.wscompile">
<!-- use model -->
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model RpcLitMapping.xml wscompile_config.xml"/>
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -model RpcLitMapping.xml wscompile_config.xml"/>
<!-- use mapping -->
-<!--
- <param name="wscompile.command"
- value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
+<!--
+ <param name="wscompile.command"
+ value="-gen -cp . -keep -d output -Xdebugmodel:anyRpcModel.txt -mapping RpcLitMapping.xml wscompile_config.xml"/>
-->
</antcall>
<delete dir="output"/>
</target>
<target name="usage">
- <echo>
- Usage:
- ant all (Executes the WebServices test)
- ant clean
- </echo>
+ <echo>
+ Usage:
+ ant all (Executes the WebServices test)
+ ant clean
+ </echo>
</target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
index c0b592e..1e2b4f3 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/rpclit/SimpleTestImpl.java
@@ -15,7 +15,7 @@
*/
/*
- * @(#)SimpleTestImpl.java 1.3 02/04/05
+ * @(#)SimpleTestImpl.java 1.3 02/04/05
*/
package rpclit;
@@ -37,7 +37,7 @@
public SimpleTestImpl(){}
- public EchoStringType echoString(StringResponseNameType v)
+ public EchoStringType echoString(StringResponseNameType v)
throws RemoteException
{
return null; //for now
diff --git a/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml b/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
index 7df0d33..cc296d1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/rpclit/wscompile_config.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="SimpleTest.wsdl"
packageName="rpclit"/>
</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/run_test.sh b/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
index 7f1e505..34f882f 100755
--- a/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
+++ b/appserver/tests/appserv-tests/devtests/webservice/run_test.sh
@@ -45,11 +45,11 @@
}
get_test_target(){
- case ${1} in
- webservice_all )
- TARGET=all
- export TARGET;;
- esac
+ case ${1} in
+ webservice_all )
+ TARGET=all
+ export TARGET;;
+ esac
}
OPT=${1}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
index 0b38bee..ba913f0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/build.xml
@@ -28,7 +28,7 @@
&commonSetup;
&commonBuild;
&reporting;
-
+
<target name="check-nss" depends="init-common">
<!--
Determine if we need to use the certutil or the keytool command to
@@ -47,8 +47,8 @@
</and>
</condition>
</target>
-
-
+
+
<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">
@@ -77,12 +77,12 @@
<arg value="${ssl.password}"/>
<arg value="-dname"/>
<arg value="cn=Unknown Duke, ou=Prog, o=HackSoft, c=US"/>
- </exec>
+ </exec>
<antcall target="setup-pe"/>
<antcall target="setup-ee"/>
</target>
-
-
+
+
<target name="setup-pe" depends="init-common" unless="use.certutil">
<echo message="Exporting appserver public key from ${admin.domain}"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
@@ -95,20 +95,20 @@
<echo message="Extracting tester public key"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-export -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
- </exec>
+ </exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<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"/>
</target>
-
+
<target name="setup-ee" depends="init-common" if="use.certutil">
<echo message="Exporting appserver public key from ${admin.domain}"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
<env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
- <arg line="-L -n s1as -d ${env.S1AS_HOME}/domains/${admin.domain}/config -a -o appserver.cer"/>
- </exec>
+ <arg line="-L -n s1as -d ${env.S1AS_HOME}/domains/${admin.domain}/config -a -o appserver.cer"/>
+ </exec>
<echo message="Importing the Appserver certificate on the client keystore"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
@@ -117,7 +117,7 @@
<echo message="Extracting tester public key"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-export -rfc -alias s1astester -keystore keystore.jks -storepass ${ssl.password} -file client.cer"/>
- </exec>
+ </exec>
<echo message="Importing tester public key in appserver trusted certificates"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
<env key="LD_LIBRARY_PATH" path="${env.S1AS_HOME}/lib"/>
@@ -125,7 +125,7 @@
</exec>
<antcall target="restart-ee-server"/>
</target>
-
+
<target name="restart-pe-server">
<echo message="Restarting PE server..."/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -151,20 +151,20 @@
<delete file="invalid_keystore.jks"/>
<delete file="keystore.jks"/>
<delete file="appserver.cer"/>
- <delete file="client.cer"/>
+ <delete file="client.cer"/>
<antcall target="unsetup-pe"/>
<antcall target="unsetup-ee"/>
</target>
-
-
+
+
<target name="unsetup-pe" depends="init-common" unless="use.certutil">
<echo message="Removing tester public key from appserver trusted certificates"/>
<exec executable="${java.home}/bin/keytool" failonerror="true">
<arg line="-delete -alias s1astester -keystore ${env.S1AS_HOME}/domains/${admin.domain}/config/cacerts.jks -storepass ${ssl.password}"/>
- </exec>
+ </exec>
<antcall target="restart-pe-server"/>
- </target>
-
+ </target>
+
<target name="unsetup-ee" depends="init-common" if="use.certutil">
<echo message="Removing tester public key from appserver trusted certificates"/>
<exec executable ="${env.S1AS_HOME}/lib/certutil" failonerror="true">
@@ -172,28 +172,28 @@
<arg line="-D -n s1astester -d ${env.S1AS_HOME}/domains/${admin.domain}/config"/>
</exec>
<antcall target="restart-ee-server"/>
- </target>
+ </target>
<target name="all">
<antcall target="setup"/>
<ant dir="ejb_ssl_cacert" target="all"/>
- <ant dir="ejb3_ssl_cacert" target="all"/>
+ <ant dir="ejb3_ssl_cacert" target="all"/>
<antcall target="unsetup"/>
</target>
<target name="clean">
<delete>
- <fileset dir="${basedir}"
+ <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)
+ <echo>
+ Usage:
+ ant all (Executes all the webservice security tests)
- ant ejb_ssl_cacert (Executes the client certificate ejb ssl endpoint test)
- </echo>
+ 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/common.xml b/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
index 7dd6f79..6961891 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/common.xml
@@ -18,15 +18,15 @@
<!-- run appclient in AppServ -->
<target name="runclient-secure" depends="init-common">
-
+
<echo message="Executing appclient at Basedir:${basedir}" />
- <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
+ <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
/>
<echo message="Appname: ${appname}" />
<echo message="Display name for appclient: ${appname}Client" />
<echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
+ <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="-name ${appname}Client"/>
<arg line="-textauth"/>
@@ -35,19 +35,19 @@
<arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<arg line="${appclient.application.args}"/>
</exec>
- </target>
-
+ </target>
+
<!-- run appclient in AppServ -->
<target name="runclient-invalid-secure" depends="init-common">
-
+
<echo message="Executing appclient at Basedir:${basedir}" />
- <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
+ <echo message="Appclient jar: ${assemble.dir}/${appname}AppClient.jar"
/>
<echo message="Appname: ${appname}" />
<echo message="Display name for appclient: ${appname}Client" />
<echo message="appclient -client ${assemble.dir}/${appname}AppClient.jar -name ${appname}Client -textauth -user j2ee -password j2ee -xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml ${appclient.application.args}"/>
<exec executable="${APPCLIENT}" failonerror="false">
- <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../invalid_keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
+ <env key="VMARGS" value="-Djavax.net.ssl.keyStore=${basedir}/../invalid_keystore.jks -Djavax.net.ssl.keyStorePassword=changeit -Djavax.net.ssl.trustStore=${basedir}/../cacerts.jks -Djavax.net.ssl.trustStorePassword=changeit"/>
<arg line="-client ${assemble.dir}/${appname}AppClient.jar"/>
<arg line="-name ${appname}Client"/>
<arg line="-textauth"/>
@@ -56,4 +56,4 @@
<arg line="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
<arg line="${appclient.application.args}"/>
</exec>
- </target>
+ </target>
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 7c85409..1418c5c 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
@@ -26,18 +26,18 @@
<project name="EJB3_SSL_CACERT" default="core" basedir=".">
- &commonAnnotations;
+ &commonAnnotations;
&commonSetup;
&commonBuild;
&common;
<property name="src-name" value="endpoint/HelloImpl.java"/>
<property name="client-src-name" value="client/Client.java"/>
<property name="app-client-parameters" value="-xml ${env.S1AS_HOME}/domains/${admin.domain}/config/glassfish-acc.xml"/>
-
+
<target name="test-build">
<basename file="${src-name}" property="server" suffix=".java"/>
<dirname file="${src-name}" property="directory"/>
- <basename file="${directory}" property="pkg-name"/>
+ <basename file="${directory}" property="pkg-name"/>
<antcall target="test-compile"/>
<echo message="Building with package ${pkg-name}"/>
<jar destfile="${env.APS_HOME}/build/module/archive/${server}.jar"
@@ -45,28 +45,28 @@
includes="${pkg-name}/**">
<metainf dir="${pkg-name}"
includes="*.xml"/>
- </jar>
+ </jar>
</target>
-
+
<target name="test-deploy" depends="test-build">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<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>
+ </exec>
</target>
<target name="test-undeploy">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<exec executable="${env.S1AS_HOME}/bin/asadmin" failonerror="true">
<arg line="undeploy --port ${admin.port} --user ${admin.user} --passwordfile ${admin.password.file} ${server}"/>
- </exec>
- </target>
+ </exec>
+ </target>
<target name="test-prepare-client">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<antcall target="clean"/>
<mkdir dir="${env.APS_HOME}/build/module/classes"/>
<echo message="Create appclient jar file"/>
@@ -74,34 +74,34 @@
<arg line="-keep -d ${env.APS_HOME}/build/module/classes localwsdl/${server}Service.wsdl"/>
</exec>
<antcall target="compile-client"/>
- <antcall target="unjar-client-utils"/>
+ <antcall target="unjar-client-utils"/>
<jar destfile="${env.APS_HOME}/build/module/archive/HelloAppClient.jar">
<fileset dir="${env.APS_HOME}/build/module/classes"/>
<fileset dir="." includes="localwsdl/**"/>
<manifest>
- <attribute name="Main-Class" value="client.Client"/>
+ <attribute name="Main-Class" value="client.Client"/>
</manifest>
- </jar>
- </target>
+ </jar>
+ </target>
<target name="test-run">
- <basename file="${src-name}" property="server" suffix=".java"/>
- <basename file="${server}" property="port" suffix="EJB"/>
+ <basename file="${src-name}" property="server" suffix=".java"/>
+ <basename file="${server}" property="port" suffix="EJB"/>
<exec executable="${env.S1AS_HOME}/bin/appclient">
- <arg line="-client ${env.APS_HOME}/build/module/archive/HelloAppClient.jar FAILURE ejb-ssl-cacert-no-certificate-test"/>
- </exec>
+ <arg line="-client ${env.APS_HOME}/build/module/archive/HelloAppClient.jar FAILURE ejb-ssl-cacert-no-certificate-test"/>
+ </exec>
<antcall target="runclient-invalid-secure">
<param name="appname" value="Hello"/>
<param name="appclient.application.args"
value="FAILURE ejb-ssl-cacert-invalid-certificate-test"/>
- </antcall>
+ </antcall>
<antcall target="runclient-secure">
<param name="appname" value="Hello"/>
<param name="appclient.application.args"
value="SUCCESS ejb-ssl-cacert-valid-certificate-test"/>
- </antcall>
- </target>
-
+ </antcall>
+ </target>
+
<target name="all" depends="clean, test-deploy, test-prepare-client, test-run, test-undeploy">
</target>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
index 872a7bf..82b5970 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/client/Client.java
@@ -36,27 +36,27 @@
public static void main(String[] args) {
boolean successExpected=true;
String description;
- if (args.length>1) {
+ if (args.length>1) {
if (args[0].compareToIgnoreCase("Failure")==0) {
successExpected=false;
- }
+ }
description=args[1];
} else {
successExpected = false;
- description="webservices-ejb-rolesAllowed-annotation-negative";
- }
+ description="webservices-ejb-rolesAllowed-annotation-negative";
+ }
System.out.println("Starting test " + description);
- stat.addDescription(description);
+ stat.addDescription(description);
Client client = new Client();
client.doTest(description, successExpected);
- stat.printSummary(description);
+ stat.printSummary(description);
}
public void doTest(String desc, boolean successExpected) {
-
+
try {
HelloImpl port = service.getHelloImplPort();
-
+
String ret = port.sayHello("Appserver Tester !");
if(ret.indexOf("WebSvcTest-Hello") == -1) {
System.out.println("Unexpected greeting " + ret);
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
index 3ac0fb9..6198896 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/HelloImpl.java
@@ -26,5 +26,5 @@
public String sayHello(String who) {
return "WebSvcTest-Hello " + who;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
index 4a1831f..9bc93c4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/ejb3_ssl_cacert/endpoint/sun-ejb-jar.xml
@@ -23,11 +23,11 @@
<ejb>
<ejb-name>HelloImpl</ejb-name>
<webservice-endpoint>
- <port-component-name>HelloImpl</port-component-name>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
- <login-config>
- <auth-method>CLIENT-CERT</auth-method>
- </login-config>
+ <port-component-name>HelloImpl</port-component-name>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <login-config>
+ <auth-method>CLIENT-CERT</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
<webservice-description>
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
index ff68a20..8d1274f 100755
--- 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
@@ -15,22 +15,22 @@
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="appname" value="${module}-ejbtaxcal"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="com.sun.s1peqe.webservices.ejb.taxcal.client.TaxCalClient"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/client/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/client/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<property name="appclient.jar" value="${assemble.dir}/${appname}-client.jar"/>
<property name="app.type" value="application"/>
<property name="wsdl-file" value="wsdl/TaxCalEjbService.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
index 8067c24..f2f6ec5 100755
--- 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
@@ -31,14 +31,14 @@
&commonSecurity;
&testproperties;
- <target name="all"
+ <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"/>
@@ -49,18 +49,18 @@
</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>
+ <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}"/>
@@ -121,13 +121,13 @@
</target>
<target name="build" depends="init-common,compile">
- <antcall target="ws-package-ejb-jar-common">
- <param name="ejbjar.classes"
+ <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">
+ </antcall>
+ <antcall target="ws-package-appclientjar-common">
<param name="appclientjar.classes"
value="com/sun/s1peqe/webservices/ejb/taxcal/client/*.class" />
<param name="appclientjar.files"
@@ -137,20 +137,20 @@
</antcall>
<antcall target="ear-common"/>
- </target>
+ </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"
+ <property name="statetax-ejb-endpoint-url"
value="https://${http.host}:${https.port}/statetaxejb"/>
- <property name="fedtax-ejb-endpoint-url"
+ <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}"/>
@@ -161,23 +161,23 @@
<antcall target="runclient-invalid-secure">
<param name="appclient.application.args"
value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False True"/>
- </antcall>
+ </antcall>
<antcall target="runclient-common">
<param name="appclient.application.args"
value="${statetax-ejb-endpoint-url} ${fedtax-ejb-endpoint-url} False False"/>
- </antcall>
+ </antcall>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
</target>
- <!--
- =======================================================
+ <!--
+ =======================================================
User Defined specific targets
=======================================================
-->
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
index 350e156..d91762f 100755
--- 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
@@ -30,12 +30,12 @@
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");
@@ -48,47 +48,47 @@
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";
-
+ // "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");
+ 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");
@@ -102,25 +102,25 @@
}
}
}
-
+
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");
@@ -130,7 +130,7 @@
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
index 9df53d2..e55096d 100755
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 781ab1b..2afdcaa 100755
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 2583c19..3aa33b1 100755
--- 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
@@ -18,16 +18,16 @@
-->
<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>
+ 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/ejb/sun-ejb-jar.xml b/appserver/tests/appserv-tests/devtests/webservice/security/ejb_ssl_cacert/descriptor/ejb/sun-ejb-jar.xml
index fffddc9..5b7d729 100755
--- 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
@@ -28,10 +28,10 @@
<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>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <login-config>
+ <auth-method>CLIENT-CERT</auth-method>
+ </login-config>
</webservice-endpoint>
</ejb>
<ejb>
@@ -40,7 +40,7 @@
<webservice-endpoint>
<port-component-name>FedTaxIFPort</port-component-name>
<endpoint-address-uri>fedtaxejb</endpoint-address-uri>
- <transport-guarantee>CONFIDENTIAL</transport-guarantee>
+ <transport-guarantee>CONFIDENTIAL</transport-guarantee>
</webservice-endpoint>
</ejb>
</enterprise-beans>
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
index f45cb45..edcf25c 100755
--- 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
@@ -17,7 +17,7 @@
package com.sun.s1peqe.webservices.ejb.taxcal;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class FedTaxEjb implements SessionBean {
private SessionContext sc;
-
+
public FedTaxEjb(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In FedTaxEjb::ejbCreate !!");
+ System.out.println("In FedTaxEjb::ejbCreate !!");
}
public double getFedTax(double income, double deductions) {
@@ -38,13 +38,13 @@
}
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
index e4c1322..543fb54 100755
--- 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
@@ -22,6 +22,6 @@
public interface FedTaxIF extends Remote{
- public double getFedTax(double income, double deductions) throws RemoteException;
+ 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
index 78cea45..3357ecc 100755
--- 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
@@ -17,7 +17,7 @@
package com.sun.s1peqe.webservices.ejb.taxcal;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -26,11 +26,11 @@
public class StateTaxEjb implements SessionBean {
private SessionContext sc;
-
+
public StateTaxEjb(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In StateTaxEjb::ejbCreate !!");
+ System.out.println("In StateTaxEjb::ejbCreate !!");
}
public double getStateTax(double income, double deductions) {
@@ -38,13 +38,13 @@
}
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
index 3e87a23..38ad453 100755
--- 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
@@ -22,6 +22,6 @@
public interface StateTaxIF extends Remote{
- public double getStateTax(double income, double deductions) throws RemoteException;
+ public double getStateTax(double income, double deductions) throws RemoteException;
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/security/report.xml b/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
index 65a32ae..094e365 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/security/report.xml
@@ -23,7 +23,7 @@
<target name="report">
<echo message="Comparing results with expected results"/>
-
+
<xslt style="${stylesheet}"
in="${xmlfile}" out="${htmlfile}"
basedir="." destdir="." />
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
index e2ea498..d08aa1d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.properties
@@ -15,26 +15,26 @@
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="appname" value="${module}"/> \u0020
<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="ejbjar.files" value="${build.classes.dir}"/> \u0020
<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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index 4ebd0f9..46b23e4 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <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
@@ -46,53 +46,53 @@
<param name="src" value="servlet"/>
</antcall>
</target>
-
+
<target name="gen-servlet-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/WEB-INF/wsdl"/>
+ <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"/>
+ <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>
+
<target name="assemble-web" depends="init-common, compile, gen-servlet-wsdl">
<antcall target="webclient-war-common">
- <param name="hasWebclient" value="yes"/>
+ <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>
+ </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"/>
+ </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"
+ <param name="appclientjar.classes"
value="SimpleHandlerMapping_servlet.xml,META-INF/wsdl/**,simplehandler/**,servlet/SimpleServer.class,com/**" />
- </antcall>
+ </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>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-war-common">
- <param name="contextroot" value="ServletHandlerTest"/>
- </antcall>
+ <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>
@@ -100,10 +100,10 @@
<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>
-
+ </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
index 36fe9f5..86dd0ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/client/Client.java
@@ -30,28 +30,28 @@
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 {
-
+ 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) {
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
index 07e1cb0..4b08059 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SimpleHandlerServlet"
- targetNamespace="urn:HandlerTest"
- typeNamespace="urn:HandlerTest"
+ <service
+ name="SimpleHandlerServlet"
+ targetNamespace="urn:HandlerTest"
+ typeNamespace="urn:HandlerTest"
packageName="handlertest">
<interface name="servlet.SimpleServer"/>
</service>
-</configuration>
+</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
index c14bb7a..d2d8301 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<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>
+ <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>
+ <service-qname xmlns:servicens="urn:HandlerTest">servicens:SimpleHandlerServlet</service-qname>
<port-component-ref>
<service-endpoint-interface>ejb.SimpleServer</service-endpoint-interface>
- </port-component-ref>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
index 336e4f8..f9f2117 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/ServletHandlerTestImpl.java
@@ -22,23 +22,23 @@
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 !!");
+ 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() {}
+
+ 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
index 628a251..c985152 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleHandler.java
@@ -21,13 +21,13 @@
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();
@@ -37,7 +37,7 @@
}
return true;
}
-
+
public boolean handleResponse(MessageContext context) {
try {
Date startTime = (Date) context.getProperty("startTime");
@@ -49,7 +49,7 @@
}
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
index dc5cf26..0675cd2 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/servlethandler/servlet/SimpleServer.java
@@ -19,7 +19,7 @@
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/WebServiceTestImpl.java b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
index 4ac9d8f..965eeac 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/shared/war/WebServiceTestImpl.java
@@ -21,13 +21,13 @@
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");
@@ -55,13 +55,13 @@
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
index 20a3d45..21c84b0 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/shared/war/config.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="WebServiceServletTest"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
+ <service
+ name="WebServiceServletTest"
+ targetNamespace="urn:WebServiceTest"
+ typeNamespace="urn:WebServiceTest"
packageName="test.webservice">
<interface name="test.webservice.WebServiceTest"/>
</service>
-</configuration>
+</configuration>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
index 4ac3352..aa07f94 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.properties
@@ -15,26 +15,26 @@
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="appname" value="${module}"/> \u0020
<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="ejbjar.files" value="${build.classes.dir}"/> \u0020
<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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index 99f16a5..d93f199 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <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
@@ -49,45 +49,45 @@
<param name="src" value="ejb"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <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"/>
+ <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>
+
<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>
<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"
+ <param name="appclientjar.classes"
value="SoapFaultMapping_ejb.xml,META-INF/wsdl/**,soapfault/**,com/**" />
- </antcall>
+ </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>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
</target>
@@ -95,10 +95,10 @@
<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>
-
+ </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
index 94bb7c1..c147d36 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/client/Client.java
@@ -30,26 +30,26 @@
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 {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ Context ic = new InitialContext();
+
Service testService = (Service) ic.lookup("java:comp/env/service/soapfault");
- SimpleSoapFaultSEI test = (SimpleSoapFaultSEI)
+ SimpleSoapFaultSEI test = (SimpleSoapFaultSEI)
testService.getPort(new QName("urn:SoapFaultTest", "SimpleSoapFaultSEIPort"),
SimpleSoapFaultSEI.class);
-
+
((Stub)test)._setProperty(Stub.ENDPOINT_ADDRESS_PROPERTY,
targetEndpointAddress);
@@ -62,11 +62,11 @@
}
stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
+ } 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/config-interface.xml b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
index 7bbdfac..8bef265 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SoapFaultService"
- targetNamespace="urn:SoapFaultTest"
- typeNamespace="urn:SoapFaultTest"
+ <service
+ name="SoapFaultService"
+ targetNamespace="urn:SoapFaultTest"
+ typeNamespace="urn:SoapFaultTest"
packageName="soapfault">
<interface name="soapfault.ejb.SimpleSoapFaultSEI"/>
</service>
-</configuration>
+</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
index a25d0ec..87ba024 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/descriptor/application-client.xml
@@ -24,11 +24,11 @@
<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>
+ <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>
+ <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>
+ </port-component-ref>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
index b0bf170..0c58545 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapException.java
@@ -17,13 +17,13 @@
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
index 4f68723..8646555 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultImpl.java
@@ -25,38 +25,38 @@
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
+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 !!");
-}
-
+ 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
index 74df048..113d8f1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/simplefault/ejb/SimpleSoapFaultSEI.java
@@ -20,7 +20,7 @@
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
index 0ba66c2..24c9cd5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.properties
@@ -15,22 +15,22 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index d8f775c..b3b40d8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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"/>
@@ -84,24 +84,24 @@
<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"/>
+ <copy todir="${build.classes.dir}"
+ file="mapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="mapping_appclient.xml,META-INF/wsdl/**,soapfaults/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="mapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="mapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="mapping_ejb.xml,META-INF/wsdl/**,soapfaultsejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -125,21 +125,21 @@
<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>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <param name="wscompile.command"
value="-import -cp . -mapping mapping_ejb.xml -f:explicitcontext wscompile_config_ejb.xml"/>
</antcall>
</target>
@@ -148,7 +148,7 @@
<delete dir="out"/>
<mkdir dir="out"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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>
@@ -157,16 +157,16 @@
<delete dir="out"/>
<mkdir dir="out"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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>
+ <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
index 1a018ca..4e0a26d 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/client/Client.java
@@ -27,25 +27,25 @@
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 {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ 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);
@@ -72,11 +72,11 @@
}
stat.addStatus("soapfaultsclient main", stat.PASS);
- } catch (Exception ex) {
+ } 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/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
index 05d466c..9ec3319 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<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-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
index 4ec0566..263306e 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/ejb/SoapFaultsEJB.java
@@ -17,7 +17,7 @@
package soapfaultsejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,14 +28,14 @@
private SessionContext sc;
public SoapFaultsEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In SoapFaultsEJB::ejbCreate !!");
+ System.out.println("In SoapFaultsEJB::ejbCreate !!");
}
public Test1ResponseType test1(String a, String b,
Test2RequestType c)
- throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException
+ throws FaultOne, FaultThree, FaultTwo, java.rmi.RemoteException
{
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -65,16 +65,16 @@
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/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
index 38d7aaa..20a2fdf 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 6150951..bb3634b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/soapfaults/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index 46c880f..ae631e1 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.properties
@@ -15,26 +15,26 @@
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="appname" value="${module}"/> \u0020
<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="ejbjar.files" value="${build.classes.dir}"/> \u0020
<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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="sun-application.xml"\u0020
+ value="descriptor/sun-application.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index 24a165c..e86f2a9 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/build.xml
@@ -30,9 +30,9 @@
&testproperties;
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <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
@@ -49,34 +49,34 @@
<param name="src" value="stubprops"/>
</antcall>
</target>
-
+
<target name="gen-ejb-wsdl" depends="init-common">
- <mkdir dir="${build.classes.dir}/META-INF/wsdl"/>
+ <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"/>
+ <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>
+
<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"/>
+ 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>
+
+
<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="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"/>
@@ -88,61 +88,61 @@
<fileset dir="${build.classes.dir}" casesensitive="yes">
<include name="WEB-INF/wsdl/SayHelloService.wsdl"/>
<include name="SayHelloMapping_ejb.xml"/>
- </fileset>
+ </fileset>
</jar>
- <delete file="webservices.xml"/>
- </target>
-
+ <delete file="webservices.xml"/>
+ </target>
+
<target name="compile-web" depends="">
<antcall target="compile-common">
<param name="src" value="../shared/war"/>
</antcall>
- </target>
-
+ </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"/>
+ <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>
+
<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>
+ </antcall>
<unjar src="${env.APS_HOME}/lib/reporter.jar"
dest="${build.classes.dir}"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="Client.class, test/**,com/**" />
- </antcall>
+ </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>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-jar-common"/>
<antcall target="deploy-war-common">
- <param name="contextroot" value="WebServiceTestServlet"/>
+ <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>
-
+ </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
index 0429160..11a1660 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/client/Client.java
@@ -31,43 +31,43 @@
*/
public class Client {
-
+
private static SimpleReporterAdapter stat =
- new SimpleReporterAdapter("appserv-tests");
+ 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");
+ stat.printSummary("webservices-web-stubs-properties");
}
public void doTest(String[] args) {
try {
dynamic(args);
- stat.addStatus("web-stubs-properties Dynamic Proxy", stat.PASS);
+ 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);
+ 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,
+ 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"),
+ new QName("urn:WebServiceTest","WebServiceTestPort"),
WebServiceTest.class);
String[] params = new String[1];
- params[0] = " from client";
+ params[0] = " from client";
System.out.println(intf.doTest(params));
}
-
+
}
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
index 0e0b627..5c9ef91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/config-interface.xml
@@ -19,11 +19,11 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <service
- name="SayHelloService"
- targetNamespace="urn:WebServiceTest"
- typeNamespace="urn:WebServiceTest"
+ <service
+ name="SayHelloService"
+ targetNamespace="urn:WebServiceTest"
+ typeNamespace="urn:WebServiceTest"
packageName="stubprops">
<interface name="stubprops.SimpleServer"/>
</service>
-</configuration>
+</configuration>
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
index 901f2aa..932f37b 100644
--- 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
@@ -26,7 +26,7 @@
<webservice-endpoint>
<port-component-name>SimpleServerPort</port-component-name>
<endpoint-address-uri>simpleserver/SimpleServer</endpoint-address-uri>
- <debugging-enabled>true</debugging-enabled>
+ <debugging-enabled>true</debugging-enabled>
</webservice-endpoint>
</ejb>
</enterprise-beans>
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
index 12f6c59..36605da 100644
--- 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
@@ -34,7 +34,7 @@
<stub-property>
<name>javax.xml.rpc.service.endpoint.address</name>
<value>http://@webHost@:@webPort@/simpleserver/SimpleServer </value>
- </stub-property>
+ </stub-property>
</port-info>
- </service-ref>
+ </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
index 55e67ca..283ad48 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/descriptor/web.xml
@@ -41,5 +41,5 @@
<port-component-ref>
<service-endpoint-interface>stubprops.SimpleServer</service-endpoint-interface>
</port-component-ref>
- </service-ref>
+ </service-ref>
</web-app>
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
index b3c5973..8c189bc 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServer.java
@@ -22,8 +22,8 @@
package stubprops;
-import java.rmi.RemoteException;
-import java.rmi.Remote;
+import java.rmi.RemoteException;
+import java.rmi.Remote;
/**
* Simple WebServices Interface
@@ -31,6 +31,6 @@
* @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
index b71c4fe..4a88917 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/SimpleServerImpl.java
@@ -25,36 +25,36 @@
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
-import java.rmi.RemoteException;
+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 !!");
-}
-
+ 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
index 3db4899..94706ff 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/webstub_properties/stubprops/TestServlet.java
@@ -33,16 +33,16 @@
* @author dochez
*/
public class TestServlet implements WebServiceTest {
-
+
SimpleServer port;
-
+
/** Creates a new instance of TestServlet */
public TestServlet() {
- System.out.println("Test servlet instantiated");
+ System.out.println("Test servlet instantiated");
}
-
+
public String doTest(String[] parameters) throws RemoteException {
-
+
System.out.println("Test servlet invoked");
Service ref;
try {
@@ -60,7 +60,7 @@
java.util.Iterator itr = ref.getPorts();
while (itr.hasNext()) {
System.out.println(itr.next());
-
+
}
port = (SimpleServer) ref.getPort(SimpleServer.class);
@@ -73,6 +73,6 @@
System.out.println("failure : cannot get port");
return "Failed - Cannot get port";
}
- return port.sayHello(parameters[0]);
- }
+ return port.sayHello(parameters[0]);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
index 0a40a08..b3ecf0b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/build.properties
@@ -15,9 +15,9 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="service_endpoint_address"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="ejb.wsit.descriptors" value="./descriptors"/>
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 ede3a10..348af5c 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
@@ -45,7 +45,7 @@
<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"/>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
index fcd3cb7..e1e4d2c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/service_endpoint_address/client/Client.java
@@ -32,7 +32,7 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wls_dd.service_endpoint_address");
+ stat.addDescription("wls_dd.service_endpoint_address");
Client client = new Client();
client.runTest();
stat.printSummary("wls_dd.service_endpoint_address");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties
index 9a4e313..22b6611 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/build.properties
@@ -15,10 +15,10 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="wsdl_exposed_false"/>
-<property name="appname" value="${module}"/>
+<property name="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="./web.xml"/>
<property name="webservices.xml" value="./webservices.xml"/>
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 cca584e..78d64b5 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
@@ -75,8 +75,8 @@
<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"
+ <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>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
index cc331e3..8d6d615 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/client/Client.java
@@ -32,7 +32,7 @@
static AddNumbersImplService service;
public static void main(String[] args) {
- stat.addDescription("wls_dd.wsdl_exposed_false");
+ stat.addDescription("wls_dd.wsdl_exposed_false");
Client client = new Client();
client.runTest();
stat.printSummary("wls_dd.wsdl_exposed_false");
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
index 39bd1a5..06c3052 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wls_dd/wsdl_exposed_false/web.xml
@@ -18,17 +18,17 @@
-->
<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>AddNumbersImpl</servlet-name>
- <servlet-class>wls_dd.wsdl_exposed_false.endpoint.AddNumbersImpl</servlet-class>
- </servlet>
- <servlet-mapping>
- <servlet-name>AddNumbersImpl</servlet-name>
- <url-pattern>/service</url-pattern>
- </servlet-mapping>
+ 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>AddNumbersImpl</servlet-name>
+ <servlet-class>wls_dd.wsdl_exposed_false.endpoint.AddNumbersImpl</servlet-class>
+ </servlet>
+ <servlet-mapping>
+ <servlet-name>AddNumbersImpl</servlet-name>
+ <url-pattern>/service</url-pattern>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
index ea2650a..1d0f8b6 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/application.xml
@@ -18,9 +18,9 @@
-->
<application
- version="1.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>WSI Sample Application description</description>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
index 6633c3f..25d7fe5 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi-sampleapp/descriptors/web.xml
@@ -18,8 +18,8 @@
-->
<web-app version="2.4"
- xmlns="http://java.sun.com/xml/ns/j2ee"
- xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+ 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>WSI-Sample-Application</display-name>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
index 0f79eab..95bf199 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.properties
@@ -15,22 +15,22 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index 49b7904..f227f99 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/faultcode"
includes="SimpleTestService.class, SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/faultcodeejb"
includes="SimpleTestService.class, SimpleTest.class"/>
</copy>
<delete dir="output"/>
@@ -84,24 +84,24 @@
<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"/>
+ <copy todir="${build.classes.dir}"
+ file="FaultCodeMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="FaultCodeMapping_appclient.xml,META-INF/wsdl/**,faultcode/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="FaultCodeMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="FaultCodeMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="FaultCodeMapping_ejb.xml,META-INF/wsdl/**,faultcodeejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -121,29 +121,29 @@
<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>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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>
+ <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
index 0950680..75cfd91 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/client/Client.java
@@ -27,25 +27,25 @@
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 {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ 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);
@@ -65,11 +65,11 @@
System.out.println("RETURN LUCKY NUMBER = " + ret);
*/
stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } 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/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/descriptor/application-client.xml
index 25ff5b5..1ccab9c 100644
--- 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
@@ -27,6 +27,6 @@
<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-qname>
</service-ref>
</application-client>
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
index e997514..548d61c 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/ejb/FaultCodeEJB.java
@@ -17,7 +17,7 @@
package faultcodeejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,25 +28,25 @@
private SessionContext sc;
public FaultCodeEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In FaultCodeEJB::ejbCreate !!");
+ System.out.println("In FaultCodeEJB::ejbCreate !!");
}
public String echoString(String body) {
- System.out.println("In FaultCodeEJB:: echoString = " + 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/wscompile_config_appclient.xml b/appserver/tests/appserv-tests/devtests/webservice/wsi/faultcode/wscompile_config_appclient.xml
index 59bb4ea..1dde122 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index f064674..af5e53f 100644
--- 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
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index b8b6a3a..320b811 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.properties
@@ -15,22 +15,22 @@
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="appname" value="${module}"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="test.client"
- value="Client"/>
+<property name="test.client"\u0020
+ 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="application-client.xml"\u0020
+ value="descriptor/application-client.xml"/>
+<property name="sun-application-client.xml"\u0020
+ value="descriptor/sun-application-client.xml"/>
+<property name="appclientjar.files" value="${build.classes.dir}"/> \u0020
<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
index c68415a..3587f03 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/build.xml
@@ -33,9 +33,9 @@
<target name="run.wscompile">
- <exec executable="${WSCOMPILE}" failonerror="true" >
- <arg line="-source 1.1.2 ${wscompile.command}" />
- </exec>
+ <exec executable="${WSCOMPILE}" failonerror="true" >
+ <arg line="-source 1.1.2 ${wscompile.command}" />
+ </exec>
</target>
<target name="compile" depends="">
@@ -58,11 +58,11 @@
<target name="wscompile-appclient" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/xsdany"
includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
</copy>
<delete dir="output"/>
@@ -71,11 +71,11 @@
<target name="wscompile-ejb" depends="init-common">
<mkdir dir="output"/>
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <fileset dir="output/xsdanyejb"
includes="TestService.class, Test.class, SingleWildcardType.class, RepeatedWildcardType.class, Test1RequestType.class, Test1ResponseType.class"/>
</copy>
<delete dir="output"/>
@@ -84,24 +84,24 @@
<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"/>
+ <copy todir="${build.classes.dir}"
+ file="XsdAnyMapping_appclient.xml"/>
<antcall target="appclient-jar-common">
- <param name="appclientjar.classes"
+ <param name="appclientjar.classes"
value="XsdAnyMapping_appclient.xml,META-INF/wsdl/**,xsdany/*.class" />
</antcall>
- <copy todir="${build.classes.dir}"
- file="XsdAnyMapping_ejb.xml"/>
+ <copy todir="${build.classes.dir}"
+ file="XsdAnyMapping_ejb.xml"/>
<antcall target="ejb-jar-common">
- <param name="ejbjar.classes"
+ <param name="ejbjar.classes"
value="XsdAnyMapping_ejb.xml,META-INF/wsdl/**,xsdanyejb/*.class" />
</antcall>
<antcall target="ear-common" />
- </target>
+ </target>
- <target name="deploy"
+ <target name="deploy"
depends="init-common">
<antcall target="deploy-common"/>
</target>
@@ -121,29 +121,29 @@
<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>
<target name="gen-mapping-appclient" depends="init-common">
<antcall target="run.wscompile">
- <param name="wscompile.command"
+ <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"
+ <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>
+ <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
index b3fab97..eaac596 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/client/Client.java
@@ -27,25 +27,25 @@
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 {
+ try {
String targetEndpointAddress = args[0];
- Context ic = new InitialContext();
-
+ 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);
@@ -63,11 +63,11 @@
System.out.println("RETURN LUCKY NUMBER = " + ret);
stat.addStatus("xsdanyclient main", stat.PASS);
-
- } catch (Exception ex) {
+
+ } 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/descriptor/application-client.xml b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
index 5dca417..f018ec8 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/descriptor/application-client.xml
@@ -27,6 +27,6 @@
<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-qname>
</service-ref>
</application-client>
diff --git a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
index be667d5..1047c96 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/ejb/XsdAnyEJB.java
@@ -17,7 +17,7 @@
package xsdanyejb;
import java.io.Serializable;
-import java.rmi.RemoteException;
+import java.rmi.RemoteException;
import jakarta.ejb.SessionBean;
import jakarta.ejb.SessionContext;
import jakarta.ejb.EJBException;
@@ -28,15 +28,15 @@
private SessionContext sc;
public XsdAnyEJB(){}
-
+
public void ejbCreate() throws RemoteException {
- System.out.println("In XsdAnyEJB::ejbCreate !!");
+ System.out.println("In XsdAnyEJB::ejbCreate !!");
}
- public int test1(int a,
- xsdanyejb.SingleWildcardType c,
- xsdanyejb.RepeatedWildcardType d)
- throws java.rmi.RemoteException
+ public int test1(int a,
+ xsdanyejb.SingleWildcardType c,
+ xsdanyejb.RepeatedWildcardType d)
+ throws java.rmi.RemoteException
{
MessageContext msgContext = sc.getMessageContext();
System.out.println("msgContext = " + msgContext);
@@ -57,16 +57,16 @@
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
index 881891f..bcb953b 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_appclient.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <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
index bbeb29b..cc2b737 100644
--- a/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
+++ b/appserver/tests/appserv-tests/devtests/webservice/xsdany/wscompile_config_ejb.xml
@@ -19,7 +19,7 @@
<configuration
xmlns="http://java.sun.com/xml/ns/jax-rpc/ri/config">
- <wsdl
+ <wsdl
location="xsdany.wsdl"
packageName="xsdanyejb"/>
</configuration>
