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/web/responseExceptionMessageEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
index 3ba0eb0..fef5dc2 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6254469");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -55,14 +55,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/HelloJapan" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
// Decode error message using the same charset that it was encoded in
BufferedReader bis = new BufferedReader(
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties
index 255aa97..16fa887 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/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="web"/>
<property name="appname" value="${module}-response-exception-message-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -42,19 +42,19 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
</antcall>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -62,7 +62,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -74,10 +74,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
index ec0bc4c..7848e43 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseExceptionMessageEncoding/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>HelloJapan</display-name>
<servlet-name>HelloJapan</servlet-name>
<servlet-class>test.HelloJapan</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>HelloJapan</servlet-name>