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>
