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/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>
