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/multiServletRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
index 5ff1f27..8e7a560 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,7 +34,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Multi Servlet Requests");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "multiServletRequests", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-multiServletRequests", stat.FAIL);
- }
+ }
stat.printSummary("web/multiServletRequests---> expect " + EXPECTED_COUNT);
}
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.1\n").getBytes());
os.write(("Host: localhost\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -84,19 +84,19 @@
if (index != -1) {
index = line.indexOf("::");
String status = line.substring(index+2);
-
+
System.out.println("=== status: " + status);
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multiServletRequests: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
j++;
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
index cfa4ab2..2554d97 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.properties
@@ -15,14 +15,14 @@
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}-multiServletRequests"/>
+<property name="appname" value="${module}-multiServletRequests"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/web-multiServletRequests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml
index deec8a9..ac46190 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/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,16 +42,16 @@
</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>
- </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>
@@ -59,7 +59,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -76,10 +76,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/multiServletRequests/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
index ac3278e..7e1a009 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/descriptor/web.xml
@@ -22,23 +22,23 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest2</display-name>
<servlet-name>ServletTest2</servlet-name>
<servlet-class>test.ServletTest2</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<display-name>ServletTest3</display-name>
<servlet-name>ServletTest3</servlet-name>
<servlet-class>test.ServletTest3</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -51,7 +51,7 @@
<servlet-name>ServletTest3</servlet-name>
<url-pattern>/ServletTest3</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
index 0535fe4..be414b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream dout =
+ DataOutputStream dout =
new DataOutputStream(urlConnection.getOutputStream());
dout.writeByte(1);
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
index 68d876a..e9745e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest2.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("=========== In ServletTest2 ============");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
index a92dab0..c9e5c86 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiServletRequests/servlet/ServletTest3.java
@@ -29,14 +29,14 @@
public void init(ServletConfig config) throws ServletException {
super.init(config);
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("================ In Servlet3 ===============");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
