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/accessLoggingBadRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
index 61459a6..24661c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest.java
@@ -21,7 +21,7 @@
/**
* Unit test for:
*
- * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
+ * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
* ("ACCESS LOG DOES NOT RECORD REQUESTS THAT FAIL WITH AN HTTP 400 ERROR")
*/
public class WebTest {
@@ -37,14 +37,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -85,6 +85,6 @@
// ignore
}
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
index 339db3a..617aa00 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/WebTest2.java
@@ -21,7 +21,7 @@
/**
* Unit test for:
*
- * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
+ * https://bug.oraclecorp.com/pls/bug/webbug_print.show?c_rptno=12303232
* ("ACCESS LOG DOES NOT RECORD REQUESTS THAT FAIL WITH AN HTTP 400 ERROR")
*/
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 12303232");
WebTest2 webTest = new WebTest2(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties
index a9a8057..e46db67 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/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}-access-logging-bad-requests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
index fb6553b..b6d2cfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/build.xml
@@ -40,7 +40,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"/>
@@ -48,16 +48,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest*"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -77,7 +77,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}"/>
@@ -101,10 +101,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
index 5d9013b..f2ec9ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingBadRequests/servlet/CheckAccessLog.java
@@ -42,6 +42,6 @@
}
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
index 5ac1b6a..927e7ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3398");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties
index d2aa5e2..fb5e02a 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/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}-access-logging-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
index 42017c3..42c1fde 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -68,7 +68,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}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
index a859212..6442212 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingDynamicReconfig/servlet/CheckAccessLog.java
@@ -27,6 +27,6 @@
String[] files = new File(location + "/domains/domain1/logs/access").list();
if (files != null && files.length == 2) {
resp.getWriter().println("SUCCESS!");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
index 2f4d2fd..501a2f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest.java
@@ -37,14 +37,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -52,14 +52,14 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/index.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
index 5db9995..3c25546 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/WebTest2.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 13450");
WebTest2 webTest = new WebTest2(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -72,7 +72,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties
index 0426377..6d733d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/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}-access-logging-write-interval-seconds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
index c6abe6e..f3585af 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/build.xml
@@ -40,7 +40,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"/>
@@ -48,16 +48,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest*"/>
- </target>
-
+ </target>
+
<target name="enable-access-logging" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/access"/>
<antcall target="asadmin-common-ignore-fail">
@@ -77,7 +77,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}"/>
@@ -101,10 +101,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="disable-access-logging" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
index 34a00c1..f76338a 100644
--- a/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/accessLoggingWriteIntervalSeconds/servlet/CheckAccessLog.java
@@ -36,6 +36,6 @@
}
}
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
index cc564cb..d0fb4d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/build.xml
@@ -30,7 +30,7 @@
&run;
<import file="build-properties.xml"/>
-
+
<path id="class.path">
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
<pathelement location="build"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
index d5c34bb..21d67c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
+++ b/appserver/tests/appserv-tests/devtests/web/allowEncodedSlash/src/main/java/org/glassfish/devtests/web/allowencodedslash/AllowEncodedSlash.java
@@ -61,7 +61,7 @@
try {
connection = (HttpURLConnection) new URL("http://localhost:" + adminPort + "/management/domain/resources/jdbc-resource/jdbc%2F__TimerPool.xml").openConnection();
connection.setRequestProperty("X-GlassFish-3", "true");
- System.out.println("Connection response code returned "+connection.getResponseCode());
+ System.out.println("Connection response code returned "+connection.getResponseCode());
report("response-" + expectedCode + "-try-" + count, expectedCode == connection.getResponseCode());
} finally {
if(connection != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
index 35b9c76..e8a6312 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4932547");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties
index 064ba21..e075e3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/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}-anonymous-access-forbidden"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/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,17 +42,17 @@
</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">
@@ -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/anonymousAccessForbidden/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
index 5e07154..54ec581 100644
--- a/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/anonymousAccessForbidden/descriptor/web.xml
@@ -35,7 +35,7 @@
<security-role>
<description>test role</description>
<role-name>testrole</role-name>
- </security-role>
+ </security-role>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
index 814b8df..bc41adb 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Request Dispatcher in Servlet.init()");
String host = args[0];
@@ -41,16 +41,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "ApplicationDispatcher", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
}
if (count != EXPECTED_COUNT){
stat.addStatus("applicationDispatcher", stat.FAIL);
- }
+ }
stat.printSummary("web/applicationDispatcher---> expect 2 PASS");
}
@@ -65,7 +65,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -77,20 +77,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("applicationDispatcher: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties
index 588356a..ffc3b2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/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}-applicationDispatcher"/>
+<property name="appname" value="${module}-applicationDispatcher"/> \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-applicationDispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/applicationDispatcher/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
index 655c0ca..12554f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/descriptor/web.xml
@@ -28,12 +28,12 @@
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
<load-on-startup>1000</load-on-startup>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/*</url-pattern>
- </servlet-mapping>
+ </servlet-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
index 5dec147..dae8861 100644
--- a/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/applicationDispatcher/servlet/ServletTest.java
@@ -34,23 +34,23 @@
private ServletContext context;
private static String status = "ApplicationDispatcher::PASS";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
try{
- RequestDispatcher requestD =
+ RequestDispatcher requestD =
getServletContext().getRequestDispatcher("/test.jsp");
if ( requestD == null){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
System.out.println("[Servlet.RequestDispatcher: " + requestD + "]");
} catch (Throwable t){
- status = "ApplicationDispatcher::FAIL";
+ status = "ApplicationDispatcher::FAIL";
}
- System.out.println("status: " + status);
+ System.out.println("status: " + status);
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,7 +58,7 @@
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("[Servlet.doPost]");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties b/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties
index 46b120e..694cbb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/asadminDeletes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/asadminDeletes/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}-asadmin-deletes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties
index 4dbf747..1935115 100644
--- a/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/asadminDeletesTarget/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}-asadmin-deletes-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
index 44105d6..ddd1a5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String EXPECTED_RESPONSE =
+ private static final String EXPECTED_RESPONSE =
"RemoteAddress=123.456.789";
private static final String TEST_NAME =
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6347215");
WebTest test = new WebTest(args);
@@ -72,7 +72,7 @@
stat.printSummary(TEST_NAME);
}
- private void doTest() throws Exception {
+ private void doTest() throws Exception {
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/remoteAddress.jsp "
@@ -81,7 +81,7 @@
os.write(get.getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties
index ebb05a2..3c6fa44 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/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}-auth-passthrough-get-remote-address"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteAddress/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
index fe74da8..b7e63b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/WebTest.java
@@ -34,7 +34,7 @@
= new SimpleReporterAdapter("appserv-tests");
private static String EXPECTED_RESPONSE = null;
- private static final String EXPECTED_RESPONSE_LOCALHOST =
+ private static final String EXPECTED_RESPONSE_LOCALHOST =
"RemoteHost=localhost";
static{
@@ -68,7 +68,7 @@
public void doTest() {
- try {
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties
index 7cbfa5d..9be83dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/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}-auth-passthrough-get-remote-host"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
index 3d1fd8b..f8adba4 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetRemoteHost/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
index de95de9..3a9516d 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6170450");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -71,7 +71,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties
index f9fece6..3a3cabf 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/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}-auth-passthrough-get-scheme"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughGetScheme/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
index 14aeae6..b67aecc 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6397218");
WebTest test = new WebTest(args);
@@ -71,7 +71,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
@@ -80,7 +80,7 @@
os.write("Proxy-keysize: 512\n".getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties
index e5f2ba7..5496a3d 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/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}-auth-passthrough-request-is-secure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughRequestIsSecure/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
index 775b57f..5c97d3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/WebTest.java
@@ -39,7 +39,7 @@
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
- private static final String EXPECTED_LOCATION =
+ private static final String EXPECTED_LOCATION =
"https://lbhost:8888/jsp/redirect/target.jsp";
private static final String TEST_NAME =
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6269102");
WebTest webTest = new WebTest(args);
@@ -64,8 +64,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/sendRedirect.jsp "
@@ -93,7 +93,7 @@
os.write("Proxy-keysize: 512\n".getBytes());
os.write("Proxy-ip: 123.456.789\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties
index 3338931..26bd2d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/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}-auth-passthrough-send-redirect-from-jsp-with-https-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
index 2b1e2b9..18c1d9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectFromJspWithHttpsServerName/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
index b2dc3e9..524794f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6590921");
WebTest webTest = new WebTest(args);
@@ -59,8 +59,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -78,7 +78,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties
index 04b829e..32add35 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/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}-auth-passthrough-send-redirect-host-request-header-without-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectHostRequestHeaderWithoutPort/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
index 84a88ed..38dba9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6269102");
WebTest webTest = new WebTest(args);
@@ -64,8 +64,8 @@
}
public void doTest() {
-
- try {
+
+ try {
testRemoteAddress();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
}
private void testRemoteAddress() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties
index 9d03ca5..234356c 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/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}-auth-passthrough-send-redirect-with-https-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
index 2b1e2b9..18c1d9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/authPassthroughSendRedirectWithHttpsServerName/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
index 4a7483c..73fe3a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test BodyTag behavior when tag is reused");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,7 +75,7 @@
count++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
if (count == 1)
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties
index 9eaf5aa..cc3355a 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/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}-bodytag"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml b/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/bodyTag/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
index 2dce391..737a7bf 100644
--- a/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/bodyTag/servlet/mypack/MyBody.java
@@ -21,7 +21,7 @@
public class MyBody extends BodyTagSupport {
-
+
public int doEndTag() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
index 9656e4b..dd3d6aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/WebTest.java
@@ -30,8 +30,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -48,12 +48,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("broken_webapp: " + responseCode + " Expected code: 404");
+ System.out.println("broken_webapp: " + responseCode + " Expected code: 404");
if (urlConnection.getResponseCode() != 404){
stat.addStatus("Test broken_webapp", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties
index 5d83f67..64e8d4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/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}-broken_webapp"/>
+<property name="appname" value="${module}-broken_webapp"/> \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-broken_webapp"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
index 0b01046..485280f 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/build.xml
@@ -36,7 +36,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"/>
@@ -44,24 +44,24 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,10 +73,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/broken_webapp/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
index 29ac78b..c7df9d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
index 5f5f378..807480f 100644
--- a/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/broken_webapp/servlet/ServletTest.java
@@ -46,11 +46,11 @@
public class ServletTest extends HttpServlet{
private String status = "DelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,16 +58,16 @@
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("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println(status);
response.setContentType("text/html");
-
+
status = "broken_webapp::FAIL";
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/build.xml b/appserver/tests/appserv-tests/devtests/web/build.xml
index 8871a47..d391f8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/build.xml
@@ -57,7 +57,7 @@
<ant dir="jspConfigIncludeChain" target="all"/>
<ant dir="jspConfigJavacSource" target="build-publish-war"/>
<ant dir="jspConfigJspFile" target="all"/>
- <ant dir="jspConfigModificationTestInterval" target="all"/>
+ <ant dir="jspConfigModificationTestInterval" target="all"/>
<ant dir="jspConfigUndeclaredNS" target="all"/>
<ant dir="jspConfigUsePrecompiled" target="all"/>
<ant dir="jspConfigUsePrecompiled2" target="all"/>
@@ -81,15 +81,15 @@
<ant dir="jspNullFragment" target="all"/>
<ant dir="jspPoundSyntax" target="all"/>
<ant dir="jspPrecompileConsiderDomainLibJarFilesAndClasses" target="all"/>
- <ant dir="jspPrecompileDeployDashDashLibraries" target="all"/>
+ <ant dir="jspPrecompileDeployDashDashLibraries" target="all"/>
<ant dir="jspPrecompileIgnoreFragmentErrors" target="all"/>
<ant dir="jspReloadGeneratedServletIfUpdated" target="all"/>
<ant dir="jspResourceInjectionContextListener" target="all"/>
<ant dir="jspResourceInjectionSimpleTagHandler" target="all"/>
<ant dir="jspResourceInjectionTagHandler" target="all"/>
<ant dir="jspResourceInjectionTagHandlerPoolingDisabled" target="all"/>
- <ant dir="jspRuntimeCompileConsiderDomainLibJarFilesAndClasses" target="all"/>
- <ant dir="jspRuntimeDeployDashDashLibraries" target="all"/>
+ <ant dir="jspRuntimeCompileConsiderDomainLibJarFilesAndClasses" target="all"/>
+ <ant dir="jspRuntimeDeployDashDashLibraries" target="all"/>
<ant dir="jspScriptlessTagBodyJspDocument" target="all"/>
<ant dir="jspScriptletAfterScriptlessTag" target="all"/>
<ant dir="jspScriptletDeclNestedInCustomAction" target="all"/>
@@ -145,7 +145,7 @@
<ant dir="cacheFilterMappingDispatcher" target="all"/>
<ant dir="cacheHelperRef" target="all"/>
<ant dir="contentlength" target="all"/>
- <ant dir="cookiePropertiesSunWebXml" target="all"/>
+ <ant dir="cookiePropertiesSunWebXml" target="all"/>
<ant dir="defaultCharset" target="all"/>
<ant dir="dirListing" target="all"/>
<ant dir="defaultServletWithSubdirectoryMapping" target="all"/>
@@ -153,8 +153,8 @@
<ant dir="errorPageExceptionTypeWrapper" target="all"/>
<ant dir="errorPageHandlingForError" target="all"/>
<ant dir="servletInitBeforeGetServletConfig" target="all"/>
- <ant dir="listenerFilterServletInit" target="all"/>
- <ant dir="filterMultipleInit" target="all"/>
+ <ant dir="listenerFilterServletInit" target="all"/>
+ <ant dir="filterMultipleInit" target="all"/>
<ant dir="filterURIMapping" target="all"/>
<ant dir="forwardWithQueryString" target="all"/>
<ant dir="getAttributeAfterForward" target="all"/>
@@ -210,7 +210,7 @@
<ant dir="servlet-3.0/asyncTimeoutNoListener" target="all"/>
<ant dir="servlet-3.0/asyncDelayDispatchAndComplete" target="all"/>
<ant dir="servlet-3.0/dispatchForwardAsyncDispatch" target="all"/>
- <ant dir="servlet-3.0/cookieHttpOnly" target="all"/>
+ <ant dir="servlet-3.0/cookieHttpOnly" target="all"/>
<ant dir="servlet-3.0/defaultErrorPage" target="all"/>
<ant dir="servlet-3.0/javaxServletContextOrderedLibs" target="all"/>
<ant dir="servlet-3.0/multiWebFragments" target="all"/>
@@ -306,9 +306,9 @@
<ant dir="sessionSetMaxInactiveIntervalExpire" target="all"/>
<ant dir="sessionSetMaxInactiveIntervalToZeroAndInvalidate" target="all"/>
<ant dir="setMultiValuedResponseHeader" target="all"/>
- <ant dir="standalonewar" target="all"/>
- <ant dir="sessionWithoutCookie" target="all"/>
- <ant dir="createSessionInServletRequestListener" target="all"/>
+ <ant dir="standalonewar" target="all"/>
+ <ant dir="sessionWithoutCookie" target="all"/>
+ <ant dir="createSessionInServletRequestListener" target="all"/>
<ant dir="servlet-3.1/networkPathReference" target="all"/>
<ant dir="servlet-3.1/nonBlockingOutput" target="all"/>
<ant dir="servlet-3.1/nonBlockingInput" target="all"/>
@@ -355,13 +355,13 @@
<ant dir="contextPathXmlConfig" target="all"/>
<ant dir="contextRoot" target="all"/>
<ant dir="contextValveSetRequestedSessionCookiePath" target="all"/>
- <ant dir="contextXmlConfig" target="all"/>
+ <ant dir="contextXmlConfig" target="all"/>
<ant dir="contextXmlLifecycleListener" target="all"/>
<ant dir="contextXmlLifecycleListenerGlobal" target="all"/>
<ant dir="contextXmlRemoteHostValve" target="all"/>
<ant dir="cookieValueWithEquals" target="all"/>
<ant dir="cookieValueWithSpaces" target="all"/>
- <ant dir="crossContextDispatchLongestContextRootMatch" target="all"/>
+ <ant dir="crossContextDispatchLongestContextRootMatch" target="all"/>
<ant dir="delegate" target="all"/>
<ant dir="disableDefaultErrorPage" target="all"/>
<ant dir="emptyContextRoot" target="all"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
index eca641f..70888f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6175642");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -63,14 +63,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties
index 99b0be1..ee36df3 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/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}-cache-control-response-headers"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
index 431473f..af28de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheControlResponseHeaders/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -75,7 +75,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}"/>
@@ -87,10 +87,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/cacheFilterMappingDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
index aaac949..185808c 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/WebTest.java
@@ -49,9 +49,9 @@
* body.
* Counter in /dispatchTo gets incremented.
*/
- success = doTest("http://" + hostPortRoot + "/dispatchTo",
+ success = doTest("http://" + hostPortRoot + "/dispatchTo",
"RESPONSE-0");
-
+
if (success) {
/*
* Access /dispatchTo directly, expect "RESPONSE-1" in response
@@ -114,7 +114,7 @@
*/
success = doTest("http://" + hostPortRoot + "/dispatchFrom?action=include",
"RESPONSE-4");
- }
+ }
if (success) {
/*
@@ -147,7 +147,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties
index ca444c5..cb7b623 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/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}-cache-filter-mapping-dispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/cacheFilterMappingDispatcher/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
index 48bb787..76e5660 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheFilterMappingDispatcher/descriptor/sun-web.xml
@@ -27,6 +27,6 @@
<dispatcher>FORWARD</dispatcher>
<dispatcher>INCLUDE</dispatcher>
</cache-mapping>
- </cache>
+ </cache>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
index 633aa64..834da50 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 12891, 17377");
@@ -63,8 +63,8 @@
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/" + path);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties
index 34478fa..e5b8a00 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/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}-cache-hang"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
index 7e8cf85..947d5bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHang/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -72,9 +72,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
index 4710ec0..a1f2658 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/WebTest.java
@@ -37,24 +37,24 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6240539");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200, "
+ "received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties
index e17b834..75994a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/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}-cache-helper-ref"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/cacheHelperRef/servlet/helpers/MyCacheHelper.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
index 1c18db2..e57e17a 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/helpers/MyCacheHelper.java
@@ -29,21 +29,21 @@
public class MyCacheHelper implements CacheHelper {
// Values is initialized to CacheAble
- private static String cacheKey="myKey";
+ private static String cacheKey="myKey";
private static boolean isCacheAble=true;
private static boolean isRefreshNeeded=false;
private static int timeOut=20;
-
-
+
+
public void init (ServletContext context, Map props) throws Exception {
System.out.println("myCacheHelper2:init");
// Nothing to initialize
}
-
+
public void destroy() throws Exception {
System.out.println("myCacheHelper2:exit");
}
-
+
public String getCacheKey(HttpServletRequest req) {
System.out.println("myCacheHelper2:getCacheKey");
String key = req.getParameter("cacheKey");
@@ -53,7 +53,7 @@
// If user do not enter a key, the default value is "myKey"
return cacheKey;
}
-
+
public int getTimeout(HttpServletRequest req) {
String timeOutStr = null;
int time = 0;
@@ -66,7 +66,7 @@
System.out.println("Number Format Exception Occurs: "
+ nfe.getMessage());
}
- // Negative time out value treat as 0
+ // Negative time out value treat as 0
if (time > 0)
return time;
else return 0;
@@ -74,18 +74,18 @@
// if user do not enter time out, use default timeOut value
else return timeOut;
}
-
+
public boolean isCacheable(HttpServletRequest req) {
String isCacheAbleStr = null;
System.out.println("myCacheHelper2:isCacheable");
isCacheAbleStr = (String)req.getParameter("isCacheAble");
- // Check if isCacheAble null
+ // Check if isCacheAble null
if ((isCacheAbleStr != null)
&& (isCacheAbleStr.compareTo("false") != 0))
return false;
else return isCacheAble;
}
-
+
public boolean isRefreshNeeded(HttpServletRequest req) {
String isRefreshNeededStr = null;
System.out.println("myCacheHelper2:isRefreshNeeded");
@@ -94,6 +94,6 @@
&& (isRefreshNeededStr.compareTo("true") !=0))
return true;
else return isRefreshNeeded;
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
index 026f0b0..703fec1 100644
--- a/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cacheHelperRef/servlet/servlets/TestServlet.java
@@ -21,9 +21,9 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
// Do nothing
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
index 35b8b61..cc39b79 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/ServletTest.java
@@ -25,7 +25,7 @@
public class ServletTest extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -34,7 +34,7 @@
doPost(request, response);
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
index 9986a22..0c4055f 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.properties
@@ -15,11 +15,11 @@
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}-case-sensitive-host-mapping"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
index 4c4d4dc..6c9714e 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/build.xml
@@ -38,7 +38,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"/>
@@ -46,10 +46,10 @@
</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
@@ -57,14 +57,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
- <target name="build-publish-war" depends="build, publish-war-common" />
+ <target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -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/caseSensitiveHostMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
index fe24a0f..ffd668e 100644
--- a/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/caseSensitiveHostMapping/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
index 699cfaa..99096a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/WebTest.java
@@ -23,10 +23,10 @@
* Fix for CR 6947296
*/
public class WebTest {
-
+
private static final String TEST_NAME = "change-session-id-on-authentication";
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -39,7 +39,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
String result = goGet(host, port, contextRoot + "/welcome.jsp",
null, false);
@@ -47,12 +47,12 @@
if (result != null && result.length() > 0) {
result2 = goGet(host, port, contextRoot + "/secure.jsp",
result, true);
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result != null && result.length() > 0 &&
result2 != null && result2.length() > 0 &&
- !result.equals(result2)) ?
+ !result.equals(result2)) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -97,7 +97,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -118,5 +118,5 @@
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
index 51670f1..9b21976 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.properties
@@ -15,12 +15,12 @@
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}-change-session-id-on-authentication"/>
+<property name="appname" value="${module}-change-session-id-on-authentication"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<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="context.xml" value="descriptor/context.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
index 6f062b0..21d88b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/changeSessionIdOnAuthentication/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,10 +43,10 @@
</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
@@ -54,7 +54,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -65,11 +65,11 @@
<param name="groups" value="javaee"/>
</antcall>
</target>
-
+
<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}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
index f8fce13..fb92b09 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4861933");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -65,7 +65,7 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
@@ -76,7 +76,7 @@
os.write(hostHeader.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties
index 9d7c1d9..1b9e0b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/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}-chunking-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
index eb3dc68..8c82e68 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -67,7 +67,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}"/>
@@ -79,10 +79,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
index 6013b69..19910f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/chunkingDisabled/servlet/TestServlet.java
@@ -27,7 +27,7 @@
throws IOException, ServletException {
PrintWriter out = res.getWriter();
-
+
/*
* Check to see if we are in SE/EE, by trying to load a class that's
* available only in SE/EE.
@@ -40,7 +40,7 @@
"com.sun.enterprise.ee.web.authenticator.HASingleSignOn");
// EE
out.println("This is EE");
- } catch (ClassNotFoundException e) {
+ } catch (ClassNotFoundException e) {
// PE
for (int i=0; i<BUFFER_SIZE; i++) {
out.print("X");
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
index 1195887..df795f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11417 and IT 11419");
@@ -65,11 +65,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String jsp) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + jsp);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties
index 6a8c0b0..a319f9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/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}-class-path-manifest-attribute"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
index b1b55ef..baed4f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttribute/build.xml
@@ -36,7 +36,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"/>
@@ -46,23 +46,23 @@
</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="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/classPathManifestAttributePrecompile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
index 9ed954d..0784ebb 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11417 and IT 11419");
@@ -65,11 +65,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String jsp) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + jsp);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties
index f25b58a..d340b3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/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}-class-path-manifest-attribute-precompile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
index b1b55ef..baed4f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classPathManifestAttributePrecompile/build.xml
@@ -36,7 +36,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"/>
@@ -46,23 +46,23 @@
</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="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/classloaderGetResourceJarFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
index 7f81ff5..08cdda3 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6495991");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -71,6 +71,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties
index 4f236b6..1b343ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/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}-classloader-get-resource-jar-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/classloaderGetResourceJarFile/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
index b7c11b0..c784e81 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/descriptor/web.xml
@@ -18,6 +18,6 @@
-->
<web-app version="2.5" 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">
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
index bdb965d..ec1ad97 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourceJarFile/servlet/test/Dummy.java
@@ -18,7 +18,7 @@
/*
* Dummy class to make sure the war has WEB-INF/classes folder. The test.jsp
- * in this web application does getResource with a resource path that is
+ * in this web application does getResource with a resource path that is
* relative to WEB-INF/classes folder.
*/
public class Dummy {
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
index fbacc99..ddbefd9 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6568");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -72,6 +72,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties
index 710236f..c4c2169 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/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}-classloader-get-resources-delegate-false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
index 4345c0d..d843d67 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
index b1c86c3..ea69c41 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/descriptor/web.xml
@@ -28,6 +28,6 @@
<servlet-name>TestServlet</servlet-name>
<url-pattern>/test</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
index c22efda..0af35db 100644
--- a/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/classloaderGetResourcesDelegateFalse/servlet/TestServlet.java
@@ -32,7 +32,7 @@
throw new ServletException(
"Wrong number of resource URLs, expected 2");
}
- urls[i++] = e.nextElement();
+ urls[i++] = e.nextElement();
}
if (i != 2) {
@@ -51,14 +51,14 @@
/*
* Since delegate is set to false, we expect the first URL in the
* returned enum:
- *
+ *
* jar:file:/space/luehe/ws/v3/distributions/web/target/glassfish\
- * /domains/domain1/applications\
+ * /domains/domain1/applications\
* /web-classloader-get-resources-delegate-false-web/WEB-INF/lib\
* /mytest.jar!/test.txt
- *
+ *
* to be longer than the second:
- *
+ *
* jar:file:/space/luehe/ws/v3/distributions/web/target/glassfish\
* /lib/test.jar!/test.txt|#]
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
index 0d56d9c..60147cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for comet: echo");
@@ -126,7 +126,7 @@
int statusCode = urlConnection.getResponseCode();
if (HttpURLConnection.HTTP_OK != statusCode) {
throw new IllegalStateException("Incorrect return code: " + statusCode);
- }
+ }
} finally {
try {
if (os != null) {
@@ -178,7 +178,7 @@
listenMessage = br.readLine();
endSignal.countDown();
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new IllegalStateException("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties
index 4b1da17..c03a1c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/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}-comet-echo"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
index 7931a0f..4b399e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/build.xml
@@ -39,7 +39,7 @@
<fileset dir="${basedir}" includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,20 +47,20 @@
</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:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -81,7 +81,7 @@
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -96,7 +96,7 @@
<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/cometEcho/servlet/CometEchoServlet.java b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
index 9896c9d..4587948 100644
--- a/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/cometEcho/servlet/CometEchoServlet.java
@@ -83,7 +83,7 @@
res.setContentType("text/html");
res.setHeader("Cache-Control", "private");
res.setHeader("Pragma", "no-cache");
-
+
PrintWriter writer = res.getWriter();
ChatListnerHandler handler = new ChatListnerHandler();
handler.attach(writer);
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
index 8fa4ebc..4804080 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314912");
@@ -58,7 +58,7 @@
}
private void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -76,7 +76,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -94,6 +94,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties
index 682bf52..0eefab0 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/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}-commons-digester-class-not-found-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml
index abeb6fe..62109d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsDigesterClassNotFoundException/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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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/commonsLogging/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
index c007b51..115863a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6220818");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -58,7 +58,7 @@
}
private void invokeServlet() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/From");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties
index 4d00f8d..978260a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/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}-commons-logging"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml
index 3f1f8f5..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/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,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -72,10 +72,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/commonsLogging/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
index 66b9875..41767a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLogging/descriptor/web.xml
@@ -42,6 +42,6 @@
<servlet-name>To</servlet-name>
<url-pattern>/To</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
index 896c4cb..78563c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2692");
@@ -57,11 +57,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -80,7 +80,7 @@
br = new BufferedReader(new InputStreamReader(is));
String line = br.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -98,6 +98,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties
index ad325a2..a96a95a 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/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}-commons-logging-local-and-global"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
index 469ba33..7c34dc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/build.xml
@@ -36,7 +36,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"/>
@@ -46,23 +46,23 @@
</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="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="setup" depends="init-common">
<antcall target="copyResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
index 54cb2c0..1775efe 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/lib/test/MyTest.java
@@ -23,7 +23,7 @@
public String toString() {
Log log = LogFactory.getLog(MyTest.class);
- return "SUCCESS";
+ return "SUCCESS";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
index 8964c36..1e5cc21 100644
--- a/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/commonsLoggingLocalAndGlobal/servlet/TestServlet.java
@@ -26,8 +26,8 @@
try {
Object o = Class.forName("test.MyTest").newInstance();
res.getWriter().println(o.toString());
- } catch (Exception e) {
- throw new ServletException(e);
- }
+ } catch (Exception e) {
+ throw new ServletException(e);
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
index b85d2a9..6c3c869 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -35,7 +35,7 @@
try{
stat.addDescription("Standalone Servlet/Filter war test");
-
+
System.out.println("Running test");
url = new URL("http://" + host + ":" + port + contextRoot + "/ServletTest");
String originalLoc = url.toString();
@@ -46,7 +46,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
@@ -54,13 +54,13 @@
String encodedURL = urlConnection.getHeaderField ("Location");
System.out.println("responseCode: " + responseCode);
System.err.println("encodedURL : " + encodedURL);
-
+
if (urlConnection.getResponseCode() != 201){
stat.addStatus("contentLength-responseCode", stat.FAIL);
} else {
stat.addStatus("contentLength-responseCode", stat.PASS);
}
-
+
if (encodedURL != null && !encodedURL.startsWith(originalLoc)){
stat.addStatus("contentLength-header", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties b/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties
index 5706241..092362d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/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}-contentType"/>
+<property name="appname" value="${module}-contentType"/> \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-contentType"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml b/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml
index 3f1f8f5..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/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,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -72,10 +72,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/contentlength/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contentlength/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
index accc230..61c7333 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/WebTest.java
@@ -21,8 +21,8 @@
/*
* Unit test for glassfish/domains/domain1/config/web-context-path-xml-config.xml
*
- * This unit test ensures webapp context_path.xml packaged outside of the archive. Needs to be a separate test from contextXmlConfig since contextXmlConfig tests webapp/META-INF/context.xml packaged inside the WAR
- *
+ * This unit test ensures webapp context_path.xml packaged outside of the archive. Needs to be a separate test from contextXmlConfig since contextXmlConfig tests webapp/META-INF/context.xml packaged inside the WAR
+ *
*/
public class WebTest {
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context_path.xml");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties
index e405f9e..55b5100 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/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}-context-path-xml-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
index 294ad9c..630f6e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextPathXmlConfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<copy file="descriptor/web-context-path-xml-config.xml" todir="${env.S1AS_HOME}/domains/domain1/config"/>
</target>
@@ -71,7 +71,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}"/>
@@ -83,10 +83,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/contextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
index 65c2afe..95fe7f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context-root setting in "
+ "sun-web.xml");
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties
index 5c75cf3..fa2fcbc 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/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}-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
index 65404f8..6c7a286 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/contextRoot/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
index 3214c9d..c72cb16 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRoot/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>mycontextroot</context-root>
+ <context-root>mycontextroot</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
index 9d57fde..e1cd8d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/WebTest.java
@@ -19,8 +19,8 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for GLASSFISH-18861
- *
+ * Unit test for GLASSFISH-18861
+ *
* After setting context root of two wars which deployed on the server target with the same value,
* both of the two wars accessed failed.
*
@@ -42,7 +42,7 @@
contextRoot1 = args[2];
contextRoot2 = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GLASSFISH-18861");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties
index b11ac9f..f805d6b 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/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}-context-root-duplicate"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
index 567e3ed..b544c56 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextRootDuplicate/build.xml
@@ -36,7 +36,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"/>
@@ -44,17 +44,17 @@
</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="deploy" depends="init-common">
@@ -92,7 +92,7 @@
value="applications.application.contextroot2.context-root=contextroot1"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<exec executable="${ASADMIN}" failonerror="false">
<arg line="undeploy"/>
@@ -119,7 +119,7 @@
<arg line="--target ${appserver.instance.name}"/>
<arg line="${contextroot2}"/>
</exec>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
index 26cc8f8..0b7f017 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7426");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties
index 643ee31..3d0c94d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/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}-context-valve-set-requested-session-cookie-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml
index 5f36715..62db9d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextValveSetRequestedSessionCookiePath/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,22 +42,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -69,10 +69,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/contextXmlConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
index d84e828..732a29a 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/WebTest.java
@@ -23,18 +23,18 @@
* ("Add support for context.xml"):
*
* This unit test ensures the following context.xml configuration.
- *
- * 1. default virtual-server context.xml using virtual-server property
- * "contextXmlDefault"
- *
+ *
+ * 1. default virtual-server context.xml using virtual-server property
+ * "contextXmlDefault"
+ *
* 2. deployed webapps's context.xml (META-INF/context.xml)
*
* The global context.xml and virtual-server context.xml will be copied to config
* and removed after this unit test.
- *
+ *
* The "contextXml" property of the virtual-server "server" is added (before
* the webapp's deployment) and removed (after the webapp's undeployment)
- *
+ *
*/
public class WebTest {
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2439");
@@ -66,7 +66,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
@@ -93,7 +93,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties
index 9c2a154..4ff25e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/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}-context-xml-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
index 80a228c..8ef7ce1 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlConfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<copy file="descriptor/context.xml" todir="${env.S1AS_HOME}/domains/domain1/config"/>
<copy file="descriptor/context.xml.default" todir="${env.S1AS_HOME}/domains/domain1/config"/>
@@ -83,7 +83,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}"/>
@@ -95,10 +95,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/contextXmlLifecycleListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
index c2bf517..f1e8f0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for LifecycleListener in context.xml");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties
index c57793e..8c079ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/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}-context-xml-lifecycle-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
index 42d265d..b1c258d 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/contextXmlLifecycleListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
index d21827c..fded175 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListener/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -54,7 +54,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
index 469ea0b..7c03573 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/WebTest.java
@@ -20,7 +20,7 @@
/*
*
- * This unit test checkes LifecycleListener in context.xml configuration.
+ * This unit test checkes LifecycleListener in context.xml configuration.
* The global context.xml should be shared across by all webapps.
*/
public class WebTest {
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for global LifecycleListener in context.xml");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties
index 9e6b060..4a5402f 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/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}-context-xml-lifecycle-listener-global"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
index 19f8a7a..8d67178 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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"/>
@@ -59,7 +59,7 @@
<copy file="lib/test.jar" todir="${env.S1AS_HOME}/lib"
failonerror="true"/>
-->
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -86,13 +86,13 @@
</delete>
<delete file="${env.S1AS_HOME}/domains/domain1/config/context.xml"/>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -104,10 +104,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/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
index d21827c..fded175 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlLifecycleListenerGlobal/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -54,7 +54,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
index b6b8bf7..267f913 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Valve in context.xml");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties
index bb70fe2..ff378a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/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}-context-xml-remote-host-valve"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
index 4bf71cd..127eb32 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/contextXmlRemoteHostValve/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
index 57f89be..77bcf44 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,14 +44,14 @@
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("[Servlet.doPost]");
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
index 334ac3c..7bda64e 100644
--- a/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/contextXmlRemoteHostValve/servlet/TestServlet.java
@@ -33,7 +33,7 @@
!"VALUE_3".equals(req.getAttribute("ATTR_3"))) {
throw new ServletException("Missing request attributes");
*/
- if (!"VALUE_1".equals(req.getAttribute("ATTR_1"))) {
+ if (!"VALUE_1".equals(req.getAttribute("ATTR_1"))) {
throw new ServletException("Missing request attributes");
} else {
res.getWriter().print(true);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
index 951122f..1097911 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * This unit tests expects the following Set-Cookie response header, based on
+ * This unit tests expects the following Set-Cookie response header, based on
* the cookie-properties specified in sun-web.xml:
*
* Set-Cookie: JSESSIONID=[...]; Domain=.iplanet.com; Path=/
@@ -62,7 +62,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4924948");
WebTest webTest = new WebTest(args);
@@ -71,8 +71,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties
index feea854..2ee503f 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/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="web"/>
-<property name="appname" value="${module}-cookie-properties"/>
+<property name="appname" value="${module}-cookie-properties"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookiePropertiesSunWebXml/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/cookieValueWithEquals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
index 94c3015..2e53274 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeCreateCookie();
invokeGetCookie();
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties
index b6ca126..15bc3e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/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}-cookie-value-with-equals"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
index 4d845ee..392ce8b 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithEquals/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,10 +73,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/cookieValueWithSpaces/WebTest.java b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
index a9ca676..6f6a49e 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeCreateCookie();
invokeGetCookie();
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties
index 0fa3d70..61c0376 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/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}-cookie-value-with-spaces"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/cookieValueWithSpaces/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/createHttpsListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
index 321a103..3a20227 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -53,7 +53,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode != 200){
stat.addStatus("createHttpsListener", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties
index b301f46..459867e 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/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}-createHttpsListener"/>
+<property name="appname" value="${module}-createHttpsListener"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
index ca8bc81..9d55ea2 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/build.xml
@@ -50,7 +50,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"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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>
@@ -80,7 +80,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}"/>
@@ -92,10 +92,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/createHttpsListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
index 0f736a8..59dc98c 100644
--- a/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createHttpsListener/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
index 8ee79db..a1268eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for "
+ "create session in HttpRequestListener.requestInitialized");
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/checkresult";
HttpURLConnection conn = (HttpURLConnection)
@@ -94,7 +94,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -114,7 +114,7 @@
}
}
}
-
+
private String getSessionId(HttpURLConnection conn) {
String sessionId = null;
String cookieString = conn.getHeaderField("Set-Cookie");
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties
index e5c1d48..9c916a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/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}-create-session-in-servlet-request-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/createSessionInServletRequestListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
index 4b01b45..6e5f4a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app xmlns="http://java.sun.com/xml/ns/javaee" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="3.0" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd">
- <listener>
+ <listener>
<listener-class>test.MyServletRequestListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
index 36572ef..97a5090 100644
--- a/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
+++ b/appserver/tests/appserv-tests/devtests/web/createSessionInServletRequestListener/servlet/test/CheckResult.java
@@ -38,6 +38,6 @@
(currentTime - lastAccessedTime <= maxIdleTime));
}
out.println(result);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
index 19532ca..e951a23 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/WebTest.java
@@ -40,7 +40,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3284");
WebTest webTest = new WebTest(args);
@@ -57,13 +57,13 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/123/From");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties
index 1a747f2..b0f44df 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/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}-cross-context-dispatch-longest-context-root-match"/>
<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="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="from.war" value="from.war"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
index 8544f0c..1cc07fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/crossContextDispatchLongestContextRootMatch/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${from.war}"/>
@@ -48,8 +48,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -62,8 +62,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -74,7 +74,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
index a239251..024f661 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT GLASSFISH-16768");
@@ -79,7 +79,7 @@
sb.append("?").append(param);
}
URL url = new URL(sb.toString());
-
+
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties
index c5e4e76..7c6e760 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/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}-csrf-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
index 05c71d8..82ae005 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,10 +73,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/csrfFilter/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
index 1c55372..bf45148 100644
--- a/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/csrfFilter/descriptor/web.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+
<filter>
<filter-name>csrf</filter-name>
<filter-class>org.apache.catalina.filters.CsrfPreventionFilter</filter-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
index 6371494..d157037 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4921329");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary("default-charset");
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println("default-charset test failed.");
@@ -64,7 +64,7 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
System.out.println(("GET " + contextRoot + "/jsp/getRequestCharset.jsp"
@@ -72,7 +72,7 @@
os.write(("GET " + contextRoot + "/jsp/getRequestCharset.jsp"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties
index ad5a426..5bf8557 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/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="web"/>
-<property name="appname" value="${module}-default-charset"/>
+<property name="appname" value="${module}-default-charset"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml
index 525c627..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultCharset/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultCharset/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/defaultContentType/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultContentType/build.properties
index a4725f9..57d36a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultContentType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultContentType/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}-default-content-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultContentType/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties
index 1ca51a4..27077c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/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}-defaultKeepAlive"/>
+<property name="appname" value="${module}-defaultKeepAlive"/> \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-defaultKeepAlive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
index f5491b1..3105528 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultKeepAlive/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
index 3f023f5..ccf02f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("defaultResponseType");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -57,7 +57,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/test.xyz");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties
index b4a3178..d5353a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/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}-default-response-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
index 1fe7a27..bfb4357 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultResponseType/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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="setup" depends="init-common">
- <copy file="docroot/test.xyz"
+ <copy file="docroot/test.xyz"
todir="${env.S1AS_HOME}/domains/domain1/docroot"/>
<antcall target="asadmin-common-ignore-fail">
@@ -73,7 +73,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -87,10 +87,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
index 21397ea..80bc21a 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/WebTest.java
@@ -24,9 +24,9 @@
* Issue: GLASSFISH-17413
*/
public class WebTest {
-
+
private static final String TEST_NAME = "web-default-servlet-with-subdirectory-mapping";
-
+
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("DefaultServlet with sub-directory mapping.");
String host = args[0];
@@ -43,11 +43,11 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "From index.jsp", contextRoot + "/index.jsp" );
ok = ok && goGet(host, port, "From test.txt", contextRoot + "/static/test.txt");
-
+
stat.addStatus(TEST_NAME,
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -69,7 +69,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -85,11 +85,11 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return ok;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties
index cc35be5..5662291 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/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}-default-servlet-with-subdirectory-mapping"/>
+<property name="appname" value="${module}-default-servlet-with-subdirectory-mapping"/> \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-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
index a02c945..e41ba73 100644
--- a/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/defaultServletWithSubdirectoryMapping/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,20 +45,20 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -75,10 +75,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/delegate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
index 8f783ee..d3a56a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/WebTest.java
@@ -23,10 +23,10 @@
*
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
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("Classloader delegate flag");
String host = args[0];
@@ -43,16 +43,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "delegate-flag", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
System.out.println(t.getMessage());
}
if (count != EXPECTED_COUNT){
stat.addStatus("delegate", stat.FAIL);
- }
+ }
stat.printSummary("web/delegateFlag---> expect " + EXPECTED_COUNT + " PASS");
}
@@ -66,7 +66,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -78,20 +78,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(result +": " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
+ stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/build.properties b/appserver/tests/appserv-tests/devtests/web/delegate/build.properties
index 0829ddd..56bcda2 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/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}-delegate"/>
+<property name="appname" value="${module}-delegate"/> \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="glassfish-web.xml" value="descriptor/glassfish-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/build.xml b/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
index 797931b..aac0777 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/build.xml
@@ -41,9 +41,9 @@
<javac srcdir="./shared/test"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="test-sun-web-xml">
@@ -61,7 +61,7 @@
<antcall target="run"/>
<antcall target="undeploy"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -81,10 +81,10 @@
</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
@@ -94,14 +94,14 @@
<delete file="${sun-web.xml}" failonerror="false"/>
<delete file="${glassfish-web.xml}" failonerror="false"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -113,14 +113,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-appserv" depends="setup-appserv">
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
index 196a604..81e62e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
index ecea96b..0a51d3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/delegate/servlet/ServletTest.java
@@ -25,11 +25,11 @@
public class ServletTest extends HttpServlet{
private String status = "DelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,11 +37,11 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
-
+
DelegateTest delegate = null;
try{
Class clazz = Class.forName("test.DelegateTest");
@@ -54,7 +54,7 @@
if (delegate != null){
try{
- System.out.println("Delegate: " + delegate.getChildName());
+ System.out.println("Delegate: " + delegate.getChildName());
status = "DelegateTest::PASS";
} catch (Exception ex){
status = "DelegateTest::FAIL";
@@ -72,13 +72,13 @@
} else {
status = "OverridableJavax::PASS";
}
-
+
} catch (Exception ex){
status = "OverridableJavax::FAIL";
ex.printStackTrace();
}
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java b/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
index d6934c8..2631a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/WebTest.java
@@ -24,9 +24,9 @@
* Bug 6172839
*/
public class WebTest {
-
+
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("Standalone Session Invalid war test");
String host = args[0];
@@ -43,10 +43,10 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "", contextRoot + "/" );
-
+
stat.addStatus("web-directoryListing",
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -69,7 +69,7 @@
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("Authorization: Basic ajJlZTpqMmVl\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -86,11 +86,11 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return (count == EXPECTED_COUNT);
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties b/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties
index 2ebce29..8477d16 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/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}-directoryListing"/>
+<property name="appname" value="${module}-directoryListing"/> \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-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml b/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml
index dce4b75..3f28b0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/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,20 +42,20 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -72,10 +72,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/dirListing/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
index 6f43e08..93e2518 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet>
<servlet-name>default</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dirListing/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
index 7a99557..87707b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 11423");
@@ -66,7 +66,7 @@
stat.printSummary();
}
- private void doTest() throws Exception {
+ private void doTest() throws Exception {
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test" + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties
index 634e813..3fd3d83 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/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}-disable-default-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/disableDefaultErrorPage/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/distributableWebappEnforceSerializableSessionAttrs/WebTest.java b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
index b0d01e3..55bc915 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4981028");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties
index b42a005..4b47979 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/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}-distributable-webapp-enforce-serializable-session-attrs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/distributableWebappEnforceSerializableSessionAttrs/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,17 +42,17 @@
</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">
@@ -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/dosBrokenPost/build.properties b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.properties
index 3cb14b3..f36cf12 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/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}-dosBrokenPost"/>
+<property name="appname" value="${module}-dosBrokenPost"/> \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-dosBrokenPost"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml
index 66780eb..c7c5c65 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/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,13 +42,13 @@
</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">
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/dosBrokenPost/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dosBrokenPost/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
index 2b17755..7073bd4 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/WebTest.java
@@ -18,30 +18,30 @@
import java.util.concurrent.atomic.AtomicInteger;
public class WebTest extends Thread{
- private static String TEST_NAME = "dos-slow-client";
+ private static String TEST_NAME = "dos-slow-client";
- public static final AtomicInteger count = new AtomicInteger();
+ public static final AtomicInteger count = new AtomicInteger();
- static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", TEST_NAME);
+ static SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", TEST_NAME);
- public static void main(String args[]) throws InterruptedException {
+ public static void main(String args[]) throws InterruptedException {
- // The stat reporter writes out the test info and results
- // into the top-level quicklook directory during a run.
+ // The stat reporter writes out the test info and results
+ // into the top-level quicklook directory during a run.
- stat.addDescription("Slow client bytes write");
+ stat.addDescription("Slow client bytes write");
- String host = args[0];
- int port = Integer.parseInt(args[1]);
- int num = Integer.parseInt(args[2]);
+ String host = args[0];
+ int port = Integer.parseInt(args[1]);
+ int num = Integer.parseInt(args[2]);
- for (int i=0; i < num; i++) {
- new SlowClient(host, port, new WebTest());
- }
- Thread.sleep(30000);
+ for (int i=0; i < num; i++) {
+ new SlowClient(host, port, new WebTest());
+ }
+ Thread.sleep(30000);
- stat.addStatus(TEST_NAME, count.get() == num ? stat.PASS : stat.FAIL);
- stat.printSummary(TEST_NAME);
- }
+ stat.addStatus(TEST_NAME, count.get() == num ? stat.PASS : stat.FAIL);
+ stat.printSummary(TEST_NAME);
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties
index 9a93395..8ebe417 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/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}-dosSlowClient"/>
+<property name="appname" value="${module}-dosSlowClient"/> \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-dosSlowClient"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
index 9a6639a..d9f8502 100644
--- a/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/dosSlowClient/build.xml
@@ -56,7 +56,7 @@
<param name="operand.props"
value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=5"/>
</antcall>
-
+
</target>
<target name="restore" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
index b0298da..7eb4a38 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Double content-length header");
String host = args[0];
@@ -41,15 +41,15 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "EXPIRED", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
} finally{
if (count != EXPECTED_COUNT){
stat.addStatus("web-doubleContentLength", stat.FAIL);
- }
+ }
}
stat.printSummary("web/doubleContentLength---> expect 2 PASS");
@@ -73,7 +73,7 @@
} catch (Exception e) {
// Web server sometimes sends the response with 400 status
// code right after the second content-length header in which
- // case next os.write will cause an exception.
+ // case next os.write will cause an exception.
}
InputStream is = s.getInputStream();
@@ -89,11 +89,11 @@
stat.addStatus("web-doubleContentLength", stat.PASS);
count++;
break;
- }
+ }
lineNum++;
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties
index 64d741d..ac38d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/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}-doubleContentLength"/>
+<property name="appname" value="${module}-doubleContentLength"/> \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-doubleContentLength"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml
index 32d49d6..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/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,13 +42,13 @@
</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">
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/doubleContentLength/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
index 78751a7..96605cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/doubleContentLength/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
HttpSession session = request.getSession(true);
@@ -62,7 +62,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
index d72998d..9578b3f 100644
--- a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/WebTest.java
@@ -37,9 +37,9 @@
java.math.BigDecimal.class);
System.out.println("Result: " + o);
if ("1234567890123456789".equals(o.toString()))
- stat.addStatus(testName, stat.PASS);
+ stat.addStatus(testName, stat.PASS);
else
- stat.addStatus(testName, stat.FAIL);
+ stat.addStatus(testName, stat.FAIL);
stat.printSummary();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
index 807b2d2..4fcf732 100644
--- a/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elBigDecimal/build.xml
@@ -32,14 +32,14 @@
<target name="clean">
<delete file="WebTest.class" />
</target>
-
+
<target name="compile">
<javac
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar;${env.S1AS_HOME}/modules/jakarta.el.jar;${env.S1AS_HOME}/modules/jakarta.el-api.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="compile">
<java classname="WebTest">
@@ -51,7 +51,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
index 914ab7a..f5184c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 26628");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -56,14 +56,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/foo.jsp HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties
index 0b6a2f2..85ee296 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/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}-el-function-without-params"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elFunctionWithoutParams/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,17 +42,17 @@
</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">
@@ -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/elUninterpretedTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
index 50a118f..c49404c 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test EL is empty instead of null when appear in uninterpreted tag attributes");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jspx" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -76,7 +76,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties
index 05b66af..401b230 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/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}-elUninterpretedTag"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elUninterpretedTag/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,17 +42,17 @@
</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">
@@ -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/elequals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
index 565a51c..219aed2 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/WebTest.java
@@ -47,7 +47,7 @@
webTest.test("/equals.jsp");
} catch (Exception ex) {
ex.printStackTrace();
- stat.addStatus(testName, stat.FAIL);
+ stat.addStatus(testName, stat.FAIL);
}
stat.printSummary();
diff --git a/appserver/tests/appserv-tests/devtests/web/elequals/build.properties b/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
index 1fbb61b..db31616 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/build.properties
@@ -15,12 +15,12 @@
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}-elexpr-equals"/>
+<property name="appname" value="${module}-elexpr-equals"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
<property name="precompilejsp" value="false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/elequals/build.xml b/appserver/tests/appserv-tests/devtests/web/elequals/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/elequals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/elequals/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/emptyContextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
index b611b7d..8bfd97c 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/WebTest.java
@@ -26,7 +26,7 @@
* sun-web.xml, as follows:
*
* <sun-web-app>
- * <context-root>/</context-root>
+ * <context-root>/</context-root>
* </sun-web-app>
*/
public class WebTest {
@@ -45,7 +45,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context-root setting in "
+ "sun-web.xml");
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -108,6 +108,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties
index ed00c28..7958e36 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/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}-empty-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml
index 6c9683f..968deb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/emptyContextRoot/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
index 656c52c..12921d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyContextRoot/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>/</context-root>
+ <context-root>/</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
index 3787482..e8296e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28058");
WebTest webTest = new WebTest(args);
@@ -49,15 +49,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties
index f0756e7..ad3a8a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/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}-empty-servlet-path-jsp-include"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/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/emptyServletPathJspInclude/servlet/Foo.java b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
index f2c6b99..2833aec 100644
--- a/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
+++ b/appserver/tests/appserv-tests/devtests/web/emptyServletPathJspInclude/servlet/Foo.java
@@ -27,6 +27,6 @@
System.out.println("FOOFOO: " + req.getRequestURL());
RequestDispatcher rd = getServletConfig().getServletContext().getNamedDispatcher("jsp");
rd.forward(req, res);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
index f0ae591..d991e32 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/WebTest.java
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for exception-type-to-custom-error-page mapping");
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -79,7 +79,7 @@
}
private void invoke() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/sqlException.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties
index 2f86482..4bb4114 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/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}-error-page-exception-type-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeMapping/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/errorPageExceptionTypeWrapper/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
index 43633c1..af931d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 13924");
WebTest webTest = new WebTest(args);
@@ -60,15 +60,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties
index 4893ace..4cf2868 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/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}-error-page-exception-type-wrapper"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageExceptionTypeWrapper/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/errorPageHandlingForError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
index 2d2cf81..c8465cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for error-page-handling-for-error");
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("HelloServlet",
"HTTP/1.1 500 ",
"Error page for Hello Exception");
@@ -81,7 +81,7 @@
}
private void invoke(String page, String expectedStatus, String expectedResponseBody) throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/" + page + " HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties
index 92c82d0..cb1aca6 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/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}-error-page-handling-for-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/errorPageHandlingForError/servlet/test/HelloServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
index ccad9ef..f77cf60 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/HelloServlet.java
@@ -35,8 +35,8 @@
*/
@WebServlet(name="HelloServlet", urlPatterns={"/HelloServlet"})
public class HelloServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,10 +53,10 @@
// the servlet returns 200 if PrintWriter is closed
// out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -67,9 +67,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -82,7 +82,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
index 88ddcb5..944f505 100644
--- a/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/errorPageHandlingForError/servlet/test/TestServlet.java
@@ -25,6 +25,6 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- if (true) throw new NoClassDefFoundError();
+ if (true) throw new NoClassDefFoundError();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
index 78f2c87..22d04b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/WebTest.java
@@ -26,7 +26,7 @@
new SimpleReporterAdapter("appserv-tests");
public static void main(String args[]) {
-
+
stat.addDescription("IT 11802: exploded war support");
String host = args[0];
@@ -35,7 +35,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -60,7 +60,7 @@
System.out.println(getString);
os.write(getString.getBytes());
os.write("\n".getBytes());
-
+
is = s.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -90,5 +90,5 @@
}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties
index a4527a0..ca25f81 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/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="web"/>
-<property name="appname" value="${module}-exploded-war"/>
+<property name="appname" value="${module}-exploded-war"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
index 026f89a..2b11992 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,17 +60,17 @@
<copy file="${web.xml}" todir="${assemble.dir}/WEB-INF"/>
<echo message="test.ServletContainerInitializerTest"
file="${assemble.dir}/WEB-INF/lib/foo.jar/META-INF/services/jakarta.servlet.ServletContainerInitializer"/>
-
+
<javac
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-dir"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -82,10 +82,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/explodedWar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
index db8bc3a..2a5289b 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/descriptor/web.xml
@@ -21,14 +21,14 @@
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
index a71f636..bd7f577 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest.java
@@ -19,19 +19,19 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession(true).setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
index ac702d5..ca52181 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/FilterTest2.java
@@ -22,19 +22,19 @@
@WebFilter("/*")
public class FilterTest2 implements Filter{
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession(true).setAttribute("FILTER2", "PASS");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
index 40d8be4..27718ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/explodedWar/servlet/ServletTest.java
@@ -28,12 +28,12 @@
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();
out.println(request.getSession(true).getAttribute("FILTER") + " " +
request.getSession(true).getAttribute("FILTER2") + " " +
- getServletContext().getAttribute("SCInit"));
+ getServletContext().getAttribute("SCInit"));
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
index 681a193..59bafbf 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/WebTest.java
@@ -23,8 +23,8 @@
* (Add support for nested JAR files to <sun-web-app><class-loader>'s
* extra-class-path attribute and to "asadmin deploy --libraries"):
*
- * This unit adds "jar:file:/tmp/abc.jar!/" to the extra-class-path in
- * sun-web.xml, and expects the servlet to be able to instantiate the
+ * This unit adds "jar:file:/tmp/abc.jar!/" to the extra-class-path in
+ * sun-web.xml, and expects the servlet to be able to instantiate the
* aaa.bbb.ccc.Test class from this JAR file.
*
* Notice that because of 4735639 ("URLClassLoader does not work with
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 2917");
@@ -61,11 +61,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -84,10 +84,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties
index c95541b..4a78590 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/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}-extra-class-path-jar-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
index 5006e93..23f7379 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathJarUrl/build.xml
@@ -36,7 +36,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"/>
@@ -46,23 +46,23 @@
</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="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="setup" depends="init-common">
<copy file="abc.jar" todir="/tmp" failonerror="true"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
index 03472a0..5b4bca1 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 904");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties
index 28d0cc4..9b774e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/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}-extra-class-path-relative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml
index 3cebf8f..3fb5f14 100644
--- a/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/extraClassPathRelative/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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/fileDownloadTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.properties
index e0e5e6b..22b446f 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/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}-file-download-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
index 6f4c388..7934386 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/build.xml
@@ -45,31 +45,31 @@
<target name="build">
<mkdir dir="build/webapp"/>
- <copy file="${env.S1AS_HOME}/modules/webservices-osgi.jar" todir="build/webapp"/>
+ <copy file="${env.S1AS_HOME}/modules/webservices-osgi.jar" todir="build/webapp"/>
<javac srcdir="src/main/java" destdir="build" debug="true"
classpath="${test}"
includes="**/*.java"/>
- <zip file="${assemble.dir}/${appname}-web.war">
- <fileset dir="build/webapp"/>
- <fileset dir="src/main/webapp"/>
- </zip>
+ <zip file="${assemble.dir}/${appname}-web.war">
+ <fileset dir="build/webapp"/>
+ <fileset dir="src/main/webapp"/>
+ </zip>
</target>
- <target name="deploy">
- <property name="force" value="true"/>
- <antcall target="deploy-war-common"/>
- </target>
+ <target name="deploy">
+ <property name="force" value="true"/>
+ <antcall target="deploy-war-common"/>
+ </target>
- <target name="undeploy">
- <property name="force" value="true"/>
- <antcall target="undeploy-war-common"/>
- </target>
+ <target name="undeploy">
+ <property name="force" value="true"/>
+ <antcall target="undeploy-war-common"/>
+ </target>
<target name="all" depends="init-common, build, run, deploy, undeploy"/>
-
+
<target name="run" depends="init-common, build, deploy">
- <java classname="org.glassfish.devtests.web.filedownload.WebTest" classpath="${test}"/>
+ <java classname="org.glassfish.devtests.web.filedownload.WebTest" classpath="${test}"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
index a7df538..e964127 100644
--- a/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/fileDownloadTimeout/src/main/java/org/glassfish/devtests/web/filedownload/WebTest.java
@@ -30,63 +30,63 @@
* @author justin.d.lee@oracle.com
*/
public class WebTest extends BaseDevTest {
- private static final String TEST_NAME = "default-response-type";
+ private static final String TEST_NAME = "default-response-type";
- byte[] ba = new byte[1024];
+ byte[] ba = new byte[1024];
- @Override
- protected String getTestDescription() {
- return "file download time out test";
- }
+ @Override
+ protected String getTestDescription() {
+ return "file download time out test";
+ }
- @Override
- protected String getTestName() {
- return TEST_NAME;
- }
+ @Override
+ protected String getTestName() {
+ return TEST_NAME;
+ }
- /**
- * @param args the command line arguments
- */
- public void run() throws Exception {
- asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=300");
- // TODO code application logic here
- URL u = new URL("http://localhost:" + antProp("http.port") + "/web-file-download-timeout/webservices-osgi.jar");
- HttpURLConnection huc = (HttpURLConnection) u.openConnection();
- huc.setRequestMethod("GET");
- huc.setReadTimeout(0);
+ /**
+ * @param args the command line arguments
+ */
+ public void run() throws Exception {
+ asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=300");
+ // TODO code application logic here
+ URL u = new URL("http://localhost:" + antProp("http.port") + "/web-file-download-timeout/webservices-osgi.jar");
+ HttpURLConnection huc = (HttpURLConnection) u.openConnection();
+ huc.setRequestMethod("GET");
+ huc.setReadTimeout(0);
- InputStream is = huc.getInputStream();
+ InputStream is = huc.getInputStream();
- File base = new File("src/main/webapp/webservices-osgi.jar");
- File tmp = new File("/tmp");
- if(!tmp.exists()) {
- tmp = new File(System.getProperty("java.io.tmpdir"));
- }
- File file = File.createTempFile("webservices-osgi", ".jar", tmp);
- file.deleteOnExit();
- FileOutputStream fos = new FileOutputStream(file);
+ File base = new File("src/main/webapp/webservices-osgi.jar");
+ File tmp = new File("/tmp");
+ if(!tmp.exists()) {
+ tmp = new File(System.getProperty("java.io.tmpdir"));
+ }
+ File file = File.createTempFile("webservices-osgi", ".jar", tmp);
+ file.deleteOnExit();
+ FileOutputStream fos = new FileOutputStream(file);
- int c;
- Long start = System.currentTimeMillis();
- try {
- while ((c = is.read(ba)) != -1) {
- fos.write(ba, 0, c);
- Thread.sleep(10);
- }
- } catch (Exception e) {
- e.printStackTrace();
- } finally {
- is.close();
- fos.close();
- asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=");
- }
- Long end = System.currentTimeMillis();
+ int c;
+ Long start = System.currentTimeMillis();
+ try {
+ while ((c = is.read(ba)) != -1) {
+ fos.write(ba, 0, c);
+ Thread.sleep(10);
+ }
+ } catch (Exception e) {
+ e.printStackTrace();
+ } finally {
+ is.close();
+ fos.close();
+ asadmin("set", "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=");
+ }
+ Long end = System.currentTimeMillis();
- report(TEST_NAME, 30 <= (end - start)/1000);
- boolean same = base.length() == file.length();
- report(TEST_NAME, same);
- }
+ report(TEST_NAME, 30 <= (end - start)/1000);
+ boolean same = base.length() == file.length();
+ report(TEST_NAME, same);
+ }
public static void main(String[] args) throws Exception {
new WebTest().run();
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
index 387b887..288a8d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11979");
@@ -78,7 +78,7 @@
public boolean doTest(String page) throws Exception {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/" + page);
-
+
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties
index 65750ba..b806f32 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/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}-filter-multiple-init"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
index bc87390..5e70419 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterMultipleInit/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,10 +73,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/filterURIMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
index 69ae624..3ce20ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -43,16 +43,16 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for 4903209");
WebTest webTest = new WebTest(args);
int port = new Integer(webTest.portS).intValue();
String name;
-
+
try {
- // Check if it strips out uri parameters (";.*")
+ // Check if it strips out uri parameters (";.*")
// before mapping to webapps
webTest.goGet(webTest.host, port,
webTest.contextRoot + "/ServletTest;test=aaa" );
@@ -82,7 +82,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -123,5 +123,5 @@
stat.addStatus(TEST_NAME + " FAILED", stat.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties
index 41b37e8..405e0cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/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}-filterURIMapping"/>
+<property name="appname" value="${module}-filterURIMapping"/> \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-filterURIMapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/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,17 +42,17 @@
</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">
@@ -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/filterURIMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
index c9b81fe..1d702b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/descriptor/web.xml
@@ -26,23 +26,23 @@
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/ServletTest</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
index a76f882..f1f627c 100644
--- a/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/filterURIMapping/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,18 +39,18 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
Object obj = request.getSession().getAttribute("FILTER");
System.out.println(obj);
if ((obj != null) && (obj.equals("PASS"))) {
out.println("Filter invoked");
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
index 7b6af66..7af4608 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
private static final String TEST_NAME = "form-based";
private static final String JSESSIONID = "JSESSIONID";
private static final String FILTER_REQUEST = "FILTER-REQUEST:";
@@ -52,7 +52,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone jsr115 war test");
WebTest webTest = new WebTest(args);
@@ -92,7 +92,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -111,7 +111,7 @@
close(is);
close(br);
}
-
+
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
}
@@ -141,7 +141,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -188,7 +188,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/build.properties b/appserver/tests/appserv-tests/devtests/web/form-based/build.properties
index 3f42c58..695fc81 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/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}-form-based"/>
+<property name="appname" value="${module}-form-based"/> \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-form-based"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/build.xml b/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
index 4767586..dc3984d 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/build.xml
@@ -36,7 +36,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"/>
@@ -52,11 +52,11 @@
</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="**/*.jsp"/>
+ <param name="webclient.war.classes" value="**/*.class"/>
+ <param name="webclient.war.classes" value="**/*.jsp"/>
</antcall>
<javac
@@ -64,8 +64,8 @@
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">
@@ -75,7 +75,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}"/>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
index f15f4c3..7391d79 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/form-based/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/form-based/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
index 0925729..643fbf5 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/WebTest.java
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4925406");
WebTest webTest = new WebTest(args);
@@ -59,8 +59,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties
index c8aab4a..27011f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/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="web"/>
-<property name="appname" value="${module}-form-hint-field"/>
+<property name="appname" value="${module}-form-hint-field"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintField/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,17 +42,17 @@
</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">
@@ -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/formHintFieldPostWithQueryParam/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
index 36d9319..a62d710 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/WebTest.java
@@ -25,7 +25,7 @@
* form-hint-field if form action contains query parameters.
*/
public class WebTest {
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -66,10 +66,10 @@
// Construct body
String body = URLEncoder.encode("j_encoding", "UTF-8")
+ "=" + URLEncoder.encode("Shift_JIS", "UTF-8");
-
+
// Create a socket to the host
Socket socket = new Socket(host, new Integer(port).intValue());
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream(), "UTF8"));
@@ -78,7 +78,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
@@ -101,5 +101,5 @@
stat.addStatus(TEST_NAME, stat.PASS);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties
index 9590c7f..fcb95cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/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}-form-hint-field-post-with-query-param"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParam/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,17 +42,17 @@
</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">
@@ -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/formHintFieldPostWithQueryParamPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
index 78bfe93..6b1b7fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6346738");
WebTest test = new WebTest(args);
@@ -67,7 +67,7 @@
}
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -76,7 +76,7 @@
// Create a socket to the host
socket = new Socket(host, new Integer(port).intValue());
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
socket.getOutputStream()));
@@ -85,7 +85,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties
index f00095b..5df65c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/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}-form-hint-field-post-with-query-param-precedence"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPostWithQueryParamPrecedence/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/formHintFieldPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
index 0252223..6195e78 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/WebTest.java
@@ -24,8 +24,8 @@
* <locale-charset-info>, which has been deprecated.
*
* In its sun-web.xml, this web module specifies two parameter-encoding
- * elements, each with a form-hint-field attribute: the value of the
- * form-hint-field attribute of the <parameter-encoding> subelement of
+ * elements, each with a form-hint-field attribute: the value of the
+ * form-hint-field attribute of the <parameter-encoding> subelement of
* <sun-web-app> is 'sunWebAppFromHintField', whereas the value of the
* form-hint-field attribute of the <parameter-encoding> subelement of
* <locale-charset-info> is 'localeCharsetInfoFormHintField'.
@@ -69,7 +69,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -77,8 +77,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties
index 43a141f..1a895c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/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="web"/>
-<property name="appname" value="${module}-form-hint-field-precedence"/>
+<property name="appname" value="${module}-form-hint-field-precedence"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formHintFieldPrecedence/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,17 +42,17 @@
</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">
@@ -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/formLoginAccessSessionOnResumedRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
index ccc19eb..9781d97 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for http://forums.java.net/jive/thread.jspa?messageID=299899
- *
+ *
* Make sure that session established by FormAuthenticator may be accessed
* (resumed) by protected resource (in this case, AccessSession servlet) even
* if the original request that caused a (re)login contains a cookie with an
@@ -56,7 +56,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test that accesses session established by " +
@@ -71,7 +71,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -102,7 +102,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -121,7 +121,7 @@
close(is);
close(br);
}
-
+
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
}
@@ -151,7 +151,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -198,7 +198,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties
index f12a19a..aa2214b 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/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}-form-login-access-session-on-resumed-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml
index 417f845..53bdbf2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/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"/>
@@ -50,10 +50,10 @@
</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
@@ -61,14 +61,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
index 99fd1d7..5d8b991 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/descriptor/web.xml
@@ -35,12 +35,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
index e871aa1..5401657 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginAccessSessionOnResumedRequest/servlet/AccessSession.java
@@ -32,7 +32,7 @@
}
HttpSession session = req.getSession(false);
- if (session == null) {
+ if (session == null) {
throw new ServletException("Unable to access login session");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
index 80db35b..868e7bf 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/WebTest.java
@@ -48,7 +48,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -122,7 +122,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties
index d673a47..1a6562d 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/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}-form-login-jsecurity-check-direct-access"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml
index 417f845..53bdbf2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/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"/>
@@ -50,10 +50,10 @@
</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
@@ -61,14 +61,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -85,7 +85,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginJSecurityCheckDirectAccess/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
index 4b1fd13..a4560f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/WebTest.java
@@ -25,7 +25,7 @@
*
* This unit test has been reworked in light of the fix for CR 6633257:
* Rather than issuing a redirect over https to the login.jsp login page
- * (which is protected by a transport-guarantee of CONFIDENTIAL), the
+ * (which is protected by a transport-guarantee of CONFIDENTIAL), the
* redirect over https will be applied to the original request (that is,
* to protected.jsp), followed by a FORWARD dispatch to login.jsp.
*
@@ -51,7 +51,7 @@
httpsPort = args[2];
contextRoot = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3374");
@@ -80,11 +80,11 @@
}
String redirectLocation = conn.getHeaderField("Location");
System.out.println("Location: " + redirectLocation);
-
+
String expectedRedirectLocation = "https://" + host + ":" + httpsPort
+ contextRoot + "/protected.jsp";
if (!expectedRedirectLocation.equals(redirectLocation)) {
throw new Exception("Unexpected redirect location");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties
index d197535..b3149b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/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}-form-login-transport-guarantee-confidential"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
index 75d78ff..da38959 100644
--- a/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/formLoginTransportGuaranteeConfidential/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -76,7 +76,7 @@
<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/forwardWithQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
index a0be862..738eb48 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Forward With Query String");
String host = args[0];
@@ -41,7 +41,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest?queryString=test" );
} catch (Throwable t) {
@@ -50,7 +50,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("forwardWithQueryString", stat.FAIL);
- }
+ }
stat.printSummary("web/forwardWithQueryString---> expect " + EXPECTED_COUNT);
}
@@ -65,7 +65,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -80,18 +80,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-forwardWithQueryString: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties
index b470ee5..9bafb17 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/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}-forwardWithQueryString"/>
+<property name="appname" value="${module}-forwardWithQueryString"/> \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-forwardWithQueryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml
index 743470d..a937d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/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,15 +42,15 @@
</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">
@@ -60,7 +60,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/forwardWithQueryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/forwardWithQueryString/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
index d4371f6..147e8ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/FilterTest.java
@@ -19,18 +19,18 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
filterChain.doFilter(request, response);
- }
-
-
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
index 4cd933e..995671d 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest.java
@@ -28,7 +28,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -38,12 +38,12 @@
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();
-
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
index 0a51ae2..d330493 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest2.java
@@ -25,7 +25,7 @@
public class ServletTest2 extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -35,13 +35,13 @@
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();
-
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
index 26d5ca5..508d67a 100644
--- a/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/forwardWithQueryString/servlet/ServletTest3.java
@@ -25,20 +25,20 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- context = config.getServletContext();
+ context = config.getServletContext();
}
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();
-
+
System.out.println("queryString: " + request.getQueryString());
out.println("FILTER-QUERYSTRING:" +
(request.getQueryString() != null ? "PASS" : "FAIL"));
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
index 2d046aa..726a0fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/WebTest.java
@@ -21,7 +21,7 @@
public class WebTest {
private static final String TEST_NAME = "get-attribute-after-forward";
-
+
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,7 +40,7 @@
stat.addDescription("Get attribute after forward");
WebTest webTest = new WebTest(args);
-
+
try {
webTest.doTest(
"/forward.jsp?forward=include.jsp&include=process.jsp" );
@@ -63,5 +63,5 @@
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
index 7fdc9f9..13baeab 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.properties
@@ -15,11 +15,11 @@
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}-get-attribute-after-forward"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml
index 1a0fc3e..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterForward/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/getAttributeAfterInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
index bcf10b7..47acdef 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final String TEST_NAME = "get-attribute-after-include";
private static final SimpleReporterAdapter stat =
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
index 86eba21..c20560c 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.properties
@@ -15,11 +15,11 @@
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}-get-attribute-after-include"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml
index 1a0fc3e..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getAttributeAfterInclude/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/getLocalPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getLocalPort/WebTest.java
index 6253733..dbe5e86 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/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("Test for getLocalName() getLocalPort Servlet 2.4 new Features");
@@ -44,13 +44,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "getLocalPort", contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("localPort getLocalPort UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("localPort getLocalPort UNPREDICTED-FAILURE", stat.FAIL);
@@ -72,7 +72,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));
@@ -87,19 +87,19 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase(String.valueOf(port))){
stat.addStatus("web-localPort: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-localPort: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-localPort: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("localPort getLocalPort UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties
index 6ccadaf..acc8934 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/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}-localName"/>
+<property name="appname" value="${module}-localName"/> \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-localName"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml b/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml
index eec3bec..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/getLocalPort/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
index 68296c9..7e52e63 100644
--- a/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getLocalPort/servlet/ServletTest.java
@@ -23,13 +23,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("getLocalPort:" + request.getLocalPort());
out.flush();
out.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
index da1e18c..b74e2b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4894654");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJSP();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,14 +65,14 @@
}
private void invokeJSP() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/main.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -93,7 +93,7 @@
int i = line.indexOf("/jsp/first.jsp");
line = line.substring(i);
System.out.println(line);
-
+
Socket sock2 = new Socket(host, new Integer(port).intValue());
os = sock2.getOutputStream();
get = "GET "+ contextRoot + line + " HTTP/1.0\n";
@@ -105,7 +105,7 @@
while ((line = bis.readLine()) != null) {
i = line.indexOf("iPlanetDirectoryPro=");
- if (i > 0) {
+ if (i > 0) {
param1 = line.substring(i);
System.out.println("First param is " + param1);
if ((line = bis.readLine()) != null) {
@@ -113,7 +113,7 @@
if (i > 0) {
param2 = line.substring(i);
System.out.println("Second param is " + param2);
- }
+ }
}
}
}
@@ -128,7 +128,7 @@
fail = false;
} else {
stat.addStatus("Parameters encoding/decoding is not consistent",
- stat.FAIL);
+ stat.FAIL);
fail = true;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties
index 10eecca..9bc420e 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/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}-getRequestURI"/>
+<property name="appname" value="${module}-getRequestURI"/> \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-getRequestURI"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml b/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/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/getRequestURI/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getRequestURI/descriptor/web.xml
@@ -22,13 +22,13 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
index f2292b8..7415e9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6021119");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -78,7 +78,7 @@
os.write(("GET " + contextRoot + "/TestServlet HTTP/1.1\n").getBytes());
os.write(("Host: " + SERVER_NAME + ":" + SERVER_PORT + "\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties
index b4829c1..90517c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/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}-get-server-name-and-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/getServerNameAndPort/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/ha/cluster-tests/ha-web/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
index f579559..77d690c 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
index f7b5512..0d4bfa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
index 13b1803..39049ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index 03aeb46..92d0f2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -32,8 +32,8 @@
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -47,7 +47,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -63,13 +63,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -80,9 +80,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -95,7 +95,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
index 7a8f104..3271c26 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.properties
@@ -15,7 +15,7 @@
SPDX-License-Identifier: EPL-2.0 OR GPL-2.0 WITH Classpath-exception-2.0
-->
-
+
<property name="module" value="web"/>
<property name="appname" value="${module}-ha-web"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml
index 53c7612..38a57c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
index 8b15f37..a6e1a75 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/main/java/com/acme/HttpClient.java
@@ -116,7 +116,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -134,7 +134,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -169,7 +169,7 @@
result = result && prev.getJsessionCookie().equals(current.getJsessionCookie());
result = result && prev.getHttpCounter() < current.getHttpCounter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
index c4b608b..0cf7255 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/ha-web/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
index c51a2b9..9a89c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
index 001b1dd..4c682f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index ed64b72..0f12964 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/SFSBModifiedAttribute/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,7 +75,7 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
@@ -84,7 +84,7 @@
session.setAttribute(KEY_1, sfsb1);
session.setAttribute(KEY_2, sfsb2);
-
+
out.println("<h3>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h3>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -113,13 +113,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -130,9 +130,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -145,7 +145,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
index 9be04e4..51b10c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-attribute/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
index 3dafe05..a0687e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
index 3d93e10..c37d861 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
index 54dee0e..a203249 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index a0b649a..b036a28 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/SFSBModifiedSession/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
index b676835..feed93f 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
index 50a1183..a8afc66 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover-modified-session/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
index f579559..77d690c 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/build.xml
@@ -30,27 +30,27 @@
<import file="nbproject/build-impl.xml"/>
<!--
- There exist several targets which are by default empty and which can be
- used for execution of your tasks. These targets are usually executed
- before and after some main targets. They are:
+ There exist several targets which are by default empty and which can be
+ used for execution of your tasks. These targets are usually executed
+ before and after some main targets. They are:
- -pre-init: called before initialization of project properties
- -post-init: called after initialization of project properties
- -pre-compile: called before javac compilation
- -post-compile: called after javac compilation
+ -pre-init: called before initialization of project properties
+ -post-init: called after initialization of project properties
+ -pre-compile: called before javac compilation
+ -post-compile: called after javac compilation
-pre-compile-single: called before javac compilation of single file
-post-compile-single: called after javac compilation of single file
-pre-compile-test: called before javac compilation of JUnit tests
-post-compile-test: called after javac compilation of JUnit tests
-pre-compile-test-single: called before javac compilation of single JUnit test
-post-compile-test-single: called after javac compilation of single JUunit test
- -pre-dist: called before archive building
- -post-dist: called after archive building
- -post-clean: called after cleaning build products
+ -pre-dist: called before archive building
+ -post-dist: called after archive building
+ -post-clean: called after cleaning build products
-pre-run-deploy: called before deploying
-post-run-deploy: called after deploying
- Example of pluging an obfuscator after the compilation could look like
+ Example of pluging an obfuscator after the compilation could look like
<target name="-post-compile">
<obfuscate>
@@ -58,21 +58,21 @@
</obfuscate>
</target>
- For list of available properties check the imported
- nbproject/build-impl.xml file.
+ For list of available properties check the imported
+ nbproject/build-impl.xml file.
Other way how to customize the build is by overriding existing main targets.
- The target of interest are:
+ The target of interest are:
init-macrodef-javac: defines macro for javac compilation
init-macrodef-junit: defines macro for junit execution
init-macrodef-debug: defines macro for class debugging
do-dist: archive building
- run: execution of project
- javadoc-build: javadoc generation
+ run: execution of project
+ javadoc-build: javadoc generation
- Example of overriding the target for project execution could look like
+ Example of overriding the target for project execution could look like
<target name="run" depends="<PROJNAME>-impl.jar">
<exec dir="bin" executable="launcher.exe">
@@ -80,10 +80,10 @@
</exec>
</target>
- Notice that overridden target depends on jar target and not only on
- compile target as regular run target does. Again, for list of available
- properties which you can use check the target you are overriding in
- nbproject/build-impl.xml file.
+ Notice that overridden target depends on jar target and not only on
+ compile target as regular run target does. Again, for list of available
+ properties which you can use check the target you are overriding in
+ nbproject/build-impl.xml file.
-->
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
index f7b5512..0d4bfa1 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/ant-deploy.xml
@@ -25,7 +25,7 @@
<tempfile prefix="gfv3" property="gfv3.password.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<echo message="AS_ADMIN_PASSWORD=${gfv3.password}" file="${gfv3.password.file}"/>
</target>
-
+
<target name="-parse-sun-web" depends="-init-cl-deployment-env" if="sun.web.present">
<tempfile prefix="gfv3" property="temp.sun.web" destdir="${java.io.tmpdir}"/>
<copy file="${deploy.ant.docbase.dir}/WEB-INF/sun-web.xml" tofile="${temp.sun.web}"/>
@@ -39,7 +39,7 @@
<replacevalue><![CDATA[--> <sun-web-app]]></replacevalue>
</replace>
<xmlproperty file="${temp.sun.web}" validate="false">
- </xmlproperty>
+ </xmlproperty>
<delete file="${temp.sun.web}"/>
<property name="deploy.ant.client.url" value="${gfv3.url}${sun-web-app.context-root}"/>
<property name="deploy.context.root.argument" value="&contextroot=${sun-web-app.context-root}"/>
@@ -71,7 +71,7 @@
<property name="full.deploy.ant.archive" location="${deploy.ant.archive}"/>
<get src="${gfv3.admin.url}/__asadmin/deploy?path=${full.deploy.ant.archive}${deploy.context.root.argument}&force=true&name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-deploy-with-pw" if="gfv3.password">
<echo message="Deploying ${deploy.ant.archive}"/>
@@ -91,7 +91,7 @@
<tempfile prefix="gfv3" property="gfv3.results.file" destdir="${java.io.tmpdir}"/> <!-- do not forget to delete this! -->
<get src="${gfv3.admin.url}/__asadmin/undeploy?name=${ant.project.name}"
dest="${gfv3.results.file}"/>
- <delete file="${gfv3.results.file}"/>
+ <delete file="${gfv3.results.file}"/>
</target>
<target name="-undeploy-with-pw" if="gfv3.password">
<echo message="Undeploying ${deploy.ant.archive}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
index 13b1803..39049ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/nbproject/build-impl.xml
@@ -477,9 +477,9 @@
<target name="-init-taskdefs">
<fail unless="libs.CopyLibs.classpath">
The libs.CopyLibs.classpath property is not set up.
-This property must point to
+This property must point to
org-netbeans-modules-java-j2seproject-copylibstask.jar file which is part
-of NetBeans IDE installation and is usually located at
+of NetBeans IDE installation and is usually located at
<netbeans_installation>/java<version>/ant/extra folder.
Either open the project in the IDE and make sure CopyLibs library
exists or setup the property manually. For example like this:
@@ -855,7 +855,7 @@
</target>
<target depends="init,javadoc-build,javadoc-browse" description="Build Javadoc." name="javadoc"/>
<!--
-
+
JUNIT COMPILATION SECTION
-->
<target depends="init,compile" if="have.tests" name="-pre-pre-compile-test">
@@ -894,7 +894,7 @@
</target>
<target depends="init,compile,-pre-pre-compile-test,-pre-compile-test-single,-do-compile-test-single,-post-compile-test-single" name="compile-test-single"/>
<!--
-
+
JUNIT EXECUTION SECTION
-->
<target depends="init" if="have.tests" name="-pre-test-run">
@@ -921,7 +921,7 @@
</target>
<target depends="init,compile-test-single,-pre-test-run-single,-do-test-run-single,-post-test-run-single" description="Run single unit test." name="test-single"/>
<!--
-
+
JUNIT DEBUGGING SECTION
-->
<target depends="init,compile-test" if="have.tests" name="-debug-start-debuggee-test">
@@ -947,7 +947,7 @@
</target>
<target depends="init,-pre-debug-fix,-do-debug-fix-test" if="netbeans.home" name="debug-fix-test"/>
<!--
-
+
CLEANUP SECTION
-->
<target depends="init" if="no.dist.ear.dir" name="deps-clean" unless="no.deps"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
index f81f933..31be01b 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/SFSBDriver/src/java/net/max/ee/sfsb/SFSBDriverServlet.java
@@ -38,8 +38,8 @@
*/
public class SFSBDriverServlet extends HttpServlet {
-
- /**
+
+ /**
* Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
@@ -53,7 +53,7 @@
try {
out.println("<html>");
out.println("<head>");
- out.println("<title>Servlet SFSBDriverServlet</title>");
+ out.println("<title>Servlet SFSBDriverServlet</title>");
out.println("</head>");
out.println("<body>");
out.println("<h1>Servlet SFSBDriverServlet at " + request.getContextPath () + "</h1>");
@@ -75,13 +75,13 @@
out.println("<h1>From session SFSB[1] NOT NULL ?: " + ("" + (sfsb1 != null)) + " </h1>");
out.println("<h1>From session SFSB[2] NOT NULL? : " + ("" + (sfsb2 != null)) + " </h1>");
-
+
if (sfsb1 == null) {
InitialContext ctx = new InitialContext();
sfsb1 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
sfsb2 = (SimpleSessionBean) ctx.lookup("java:global/SFSBDriver/SimpleSessionBean");
-
+
out.println("<h1>Created SFSB[1]: " + sfsb1.asString() + " </h1>");
out.println("<h1>Created SFSB[2]: " + sfsb2.asString() + " </h1>");
@@ -109,13 +109,13 @@
out.println("</html>");
} catch (Exception nmEx) {
nmEx.printStackTrace(out);
- } finally {
+ } finally {
out.close();
}
- }
+ }
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
- /**
+ /**
* Handles the HTTP <code>GET</code> method.
* @param request servlet request
* @param response servlet response
@@ -126,9 +126,9 @@
protected void doGet(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
processRequest(request, response);
- }
+ }
- /**
+ /**
* Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -141,7 +141,7 @@
processRequest(request, response);
}
- /**
+ /**
* Returns a short description of the servlet.
* @return a String containing servlet description
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
index 62f4dfd..6040133 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/main/java/com/acme/HttpClient.java
@@ -113,7 +113,7 @@
System.out.println("Failed " + info);
}
}
-
+
} catch (Exception e) {
e.printStackTrace();
}
@@ -131,7 +131,7 @@
}
if (tmpSessState.getJsessionCookie() == null) {
- tmpSessState.setJsessionCookie(cookie);
+ tmpSessState.setJsessionCookie(cookie);
}
int code = ((HttpURLConnection) uc).getResponseCode();
InputStream is = uc.getInputStream();
@@ -198,7 +198,7 @@
result = result && prev.getHttpCounter() < current.getHttpCounter();
result = result && prev.getEjb1Counter() < current.getEjb1Counter();
result = result && prev.getEjb2Counter() < current.getEjb2Counter();
-
+
}
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
index c4b608b..0cf7255 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/cluster-tests/simple-failover/src/test/java/com/acme/AppTest.java
@@ -23,7 +23,7 @@
/**
* Unit test for simple App.
*/
-public class AppTest
+public class AppTest
extends TestCase
{
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
index b13617d..da15b11 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/WebTest.java
@@ -64,7 +64,7 @@
user = args[5];
password = args[6];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -152,7 +152,7 @@
// follow the redirect
int cA1 = go(port1, new URL(redirect).getPath(), "A");
int cB1 = go(port1, contextRootPrefix + "-b/index.jsp", "B");
-
+
// stop inst1
asadmin("stop-local-instance", instancename1);
@@ -208,7 +208,7 @@
System.out.println(sb);
os.write("\n\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -231,7 +231,7 @@
close(os);
close(br);
close(is);
- }
+ }
if (count == -1) {
throw new Exception("Failed to access index.jsp");
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties
index eb8451b..46679a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/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}-ha-sso-failover"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml
index 3f43fe5..769c967 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,7 +47,7 @@
</target>
<target name="build" depends="compile">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<delete file="${basedir}/docroot/index.jsp"/>
<copy file="${basedir}/docroot/index.jsp.a" tofile="${basedir}/docroot/index.jsp"/>
@@ -68,7 +68,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -118,7 +118,7 @@
<param name="operand.props" value="--cluster ${cluster.name} --systemproperties HTTP_LISTENER_PORT=${instance.http.port} ${instance.name}"/>
</antcall>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common">
<param name="appname" value="${appname}-a"/>
@@ -157,7 +157,7 @@
</antcall>
<antcall target="run"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common">
<param name="appname" value="${appname}-a"/>
@@ -167,7 +167,7 @@
<param name="appname" value="${appname}-b"/>
<param name="appserver.instance.name" value="${cluster.name}"/>
</antcall>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
index bb5d516..4851c74 100644
--- a/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ha/ssoFailover/descriptor/web.xml
@@ -26,12 +26,12 @@
<distributable/>
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
index 9ca539f..2133138 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("headerBufferSize");
@@ -62,7 +62,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -86,6 +86,6 @@
} else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties
index 30780f5..c56577e 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/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}-headerBufferFull"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml
index 5b43fb0..d3abc12 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferFull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferFull/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,15 +42,15 @@
</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>
@@ -74,7 +74,7 @@
value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.max-response-headers=100"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -90,10 +90,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/headerBufferSize/WebTest.java b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
index ed9c518..eea996a 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/WebTest.java
@@ -36,7 +36,7 @@
= new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "headerBufferSize";
- // Request keys
+ // Request keys
/** Hashtable key for headers property (type of corresponding value = Hashtable). */
public static final String HEADERS = "headers";
@@ -46,7 +46,7 @@
/** Hashtable key for request parameters property (type of corresponding value = Hashtable). */
public static final String REQUEST_PARAMS = "request_params";
- // Response keys
+ // Response keys
/** Hashtable key for response code property (type of corresponding value = Integer). */
public static final String RESPONSE_CODE = "response_code";
@@ -56,18 +56,18 @@
/** Hashtable key for response content property (type of corresponding value = String). */
public static final String RESPONSE_CONTENT = "response_content";
- // Request and response keys
+ // Request and response keys
/** Hashtable key for cookies property (type of corresponding value = String[]). */
public static final String COOKIES = "cookies";
- // Values
+ // Values
/** GET value for property method. */
public static final String GET_METHOD = "GET";
/** POST value for property method. */
public static final String POST_METHOD = "POST";
- // Default values
+ // Default values
/** Default value for property method. */
private static final String DEFAULT_METHOD = GET_METHOD;
@@ -77,7 +77,7 @@
/** Default value for user-agent header. */
private static final String DEFAULT_CONNECTION_HEADER = "close";
- // Static methods
+ // Static methods
/**
** Main method for testing purposes.
@@ -89,62 +89,62 @@
String host = args[0];
String port = args[1];
String contextRoot = args[2];
-
- try {
- String[] testUrls = new String[1];
- testUrls[0] = "http://" + host + ":" + port + contextRoot
+
+ try {
+ String[] testUrls = new String[1];
+ testUrls[0] = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
- String[] methods = new String[2];
- methods[0] = "GET";
- methods[1] = "GET";
- Hashtable[] paramsTables = new Hashtable[4];
- Hashtable params1 = new Hashtable();
- params1.put("test", "on");
- params1.put("num_tel", "065216464");
- Hashtable params2 = new Hashtable();
- params2.put("test", "on");
- params2.put("num_tel", "0577749059");
- Hashtable params3 = new Hashtable();
- params3.put("num_tel", "0652361456");
- Hashtable params4 = new Hashtable();
- String[] multipleParam = new String[3];
- multipleParam[0] = "1";
- multipleParam[1] = "2";
- multipleParam[2] = "3";
- params4.put("a", multipleParam);
- params4.put("b", "2");
- params4.put("c", "3");
- paramsTables[0] = params1;
- paramsTables[1] = params2;
- paramsTables[2] = params3;
- paramsTables[3] = params4;
- for(int i = 0; i < 1; i++) {
- Hashtable reqProperties = new Hashtable();
- reqProperties.put(METHOD, methods[i]);
- reqProperties.put(REQUEST_PARAMS, paramsTables[i]);
- System.out.println("TEST " + (i + 1) + ": " + testUrls[i] + " (" + methods[i] + ")");
- System.out.println("Parameters:");
- for(Enumeration keys = (paramsTables[i]).keys(); keys.hasMoreElements(); ) {
- String paramName = (String) keys.nextElement();
- Object paramValues = (paramsTables[i]).get(paramName);
- if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int j = 0; j < paramValueList.length; j++) {
- String paramValue = paramValueList[j];
- if(j == 0)
- System.out.print(paramName + " = " + paramValue);
- else
- System.out.print(", " + paramValue);
- }
- System.out.println();
- }
- else {
- // Single parameter value
- String paramValue = (String) paramValues;
- System.out.println(paramName + " = " + paramValue);
- }
- }
+ String[] methods = new String[2];
+ methods[0] = "GET";
+ methods[1] = "GET";
+ Hashtable[] paramsTables = new Hashtable[4];
+ Hashtable params1 = new Hashtable();
+ params1.put("test", "on");
+ params1.put("num_tel", "065216464");
+ Hashtable params2 = new Hashtable();
+ params2.put("test", "on");
+ params2.put("num_tel", "0577749059");
+ Hashtable params3 = new Hashtable();
+ params3.put("num_tel", "0652361456");
+ Hashtable params4 = new Hashtable();
+ String[] multipleParam = new String[3];
+ multipleParam[0] = "1";
+ multipleParam[1] = "2";
+ multipleParam[2] = "3";
+ params4.put("a", multipleParam);
+ params4.put("b", "2");
+ params4.put("c", "3");
+ paramsTables[0] = params1;
+ paramsTables[1] = params2;
+ paramsTables[2] = params3;
+ paramsTables[3] = params4;
+ for(int i = 0; i < 1; i++) {
+ Hashtable reqProperties = new Hashtable();
+ reqProperties.put(METHOD, methods[i]);
+ reqProperties.put(REQUEST_PARAMS, paramsTables[i]);
+ System.out.println("TEST " + (i + 1) + ": " + testUrls[i] + " (" + methods[i] + ")");
+ System.out.println("Parameters:");
+ for(Enumeration keys = (paramsTables[i]).keys(); keys.hasMoreElements(); ) {
+ String paramName = (String) keys.nextElement();
+ Object paramValues = (paramsTables[i]).get(paramName);
+ if(paramValues instanceof String[]) {
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int j = 0; j < paramValueList.length; j++) {
+ String paramValue = paramValueList[j];
+ if(j == 0)
+ System.out.print(paramName + " = " + paramValue);
+ else
+ System.out.print(", " + paramValue);
+ }
+ System.out.println();
+ }
+ else {
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ System.out.println(paramName + " = " + paramValue);
+ }
+ }
String[] cookieList = new String[9];
@@ -180,35 +180,35 @@
reqProperties.put(COOKIES, cookieList);
- Hashtable result = call(testUrls[i], reqProperties);
- System.out.println("Result:");
- System.out.println( "Response Code = " + ( (Integer) result.get(RESPONSE_CODE) ).toString() );
- System.out.println( "Response Message = " + (String) result.get(RESPONSE_MESSAGE) );
- System.out.println("Response Content:");
- System.out.println( (String) result.get(RESPONSE_CONTENT) );
- String[] setCookies = (String[]) result.get(COOKIES);
- if( (setCookies != null) && (setCookies.length > 0) ) {
- System.out.println("Cookies set by Server:");
- for(int j = 0; j < setCookies.length; j++) {
- System.out.println("Cookie " + (j + 1) + " = " + setCookies[j]);
- }
- }
- System.out.println();
- System.out.println("-------------------------------------------");
- System.out.println();
- System.out.println();
+ Hashtable result = call(testUrls[i], reqProperties);
+ System.out.println("Result:");
+ System.out.println( "Response Code = " + ( (Integer) result.get(RESPONSE_CODE) ).toString() );
+ System.out.println( "Response Message = " + (String) result.get(RESPONSE_MESSAGE) );
+ System.out.println("Response Content:");
+ System.out.println( (String) result.get(RESPONSE_CONTENT) );
+ String[] setCookies = (String[]) result.get(COOKIES);
+ if( (setCookies != null) && (setCookies.length > 0) ) {
+ System.out.println("Cookies set by Server:");
+ for(int j = 0; j < setCookies.length; j++) {
+ System.out.println("Cookie " + (j + 1) + " = " + setCookies[j]);
+ }
+ }
+ System.out.println();
+ System.out.println("-------------------------------------------");
+ System.out.println();
+ System.out.println();
if ( ((Integer)result.get(RESPONSE_CODE)) == 200){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
- } catch(Exception exc) {
- System.err.println( "Exception occurred: " + exc.getMessage() );
- exc.printStackTrace(System.err);
+ }
+ } catch(Exception exc) {
+ System.err.println( "Exception occurred: " + exc.getMessage() );
+ exc.printStackTrace(System.err);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
stat.printSummary(TEST_NAME);
}
@@ -252,33 +252,33 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
public static Hashtable call(String url, Hashtable requestProperties)
- throws MalformedURLException, IOException {
- if(url == null)
- throw new MalformedURLException("URL address cannot be null!");
- if(requestProperties == null)
- throw new MalformedURLException("URL request properties cannot be null!");
- // else
- Hashtable headers = (Hashtable) requestProperties.get(HEADERS);
- if(headers == null)
- headers = new Hashtable();
- if( ( ( (String) headers.get("User-Agent") ) == null ) || ( ( (String) headers.get("User-Agent") ).equals("") ) )
- headers.put("User-Agent", DEFAULT_USER_AGENT_HEADER);
- if( ( ( (String) headers.get("Connection") ) == null ) || ( ( (String) headers.get("Connection") ).equals("") ) )
- headers.put("Connection", DEFAULT_CONNECTION_HEADER);
- String method = (String) requestProperties.get(METHOD);
- if( (method == null) || !( method.equalsIgnoreCase(GET_METHOD) || method.equalsIgnoreCase(POST_METHOD) ) )
- method = DEFAULT_METHOD;
- Hashtable requestParams = (Hashtable) requestProperties.get(REQUEST_PARAMS);
- if(requestParams == null)
- requestParams = new Hashtable();
- String[] cookies = (String[]) requestProperties.get(COOKIES);
- if(cookies == null)
- cookies = new String[0];
- if( method.equalsIgnoreCase(GET_METHOD) )
- return( doGetCall(url, headers, cookies, requestParams) );
- else
- return( doPostCall(url, headers, cookies, requestParams) );
- }
+ throws MalformedURLException, IOException {
+ if(url == null)
+ throw new MalformedURLException("URL address cannot be null!");
+ if(requestProperties == null)
+ throw new MalformedURLException("URL request properties cannot be null!");
+ // else
+ Hashtable headers = (Hashtable) requestProperties.get(HEADERS);
+ if(headers == null)
+ headers = new Hashtable();
+ if( ( ( (String) headers.get("User-Agent") ) == null ) || ( ( (String) headers.get("User-Agent") ).equals("") ) )
+ headers.put("User-Agent", DEFAULT_USER_AGENT_HEADER);
+ if( ( ( (String) headers.get("Connection") ) == null ) || ( ( (String) headers.get("Connection") ).equals("") ) )
+ headers.put("Connection", DEFAULT_CONNECTION_HEADER);
+ String method = (String) requestProperties.get(METHOD);
+ if( (method == null) || !( method.equalsIgnoreCase(GET_METHOD) || method.equalsIgnoreCase(POST_METHOD) ) )
+ method = DEFAULT_METHOD;
+ Hashtable requestParams = (Hashtable) requestProperties.get(REQUEST_PARAMS);
+ if(requestParams == null)
+ requestParams = new Hashtable();
+ String[] cookies = (String[]) requestProperties.get(COOKIES);
+ if(cookies == null)
+ cookies = new String[0];
+ if( method.equalsIgnoreCase(GET_METHOD) )
+ return( doGetCall(url, headers, cookies, requestParams) );
+ else
+ return( doPostCall(url, headers, cookies, requestParams) );
+ }
/**
** Static protected method for performing GET HTTP request to the specified URL.<br>
@@ -293,7 +293,7 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
protected static Hashtable doGetCall(String url, Hashtable headers, String[] cookies, Hashtable requestParams)
- throws MalformedURLException, IOException {
+ throws MalformedURLException, IOException {
// Set parameters
StringBuffer queryString = new StringBuffer();
@@ -301,25 +301,25 @@
String paramName = (String) keys.nextElement();
Object paramValues = requestParams.get(paramName);
if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int i = 0; i < paramValueList.length; i++) {
- String paramValue = paramValueList[i];
- if(queryString.length() == 0)
- queryString.append("?");
- else
- queryString.append("&");
- queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int i = 0; i < paramValueList.length; i++) {
+ String paramValue = paramValueList[i];
+ if(queryString.length() == 0)
+ queryString.append("?");
+ else
+ queryString.append("&");
+ queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
}
else {
- // Single parameter value
- String paramValue = (String) paramValues;
- if(queryString.length() == 0)
- queryString.append("?");
- else
- queryString.append("&");
- queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ if(queryString.length() == 0)
+ queryString.append("?");
+ else
+ queryString.append("&");
+ queryString.append( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
}
}
URL urlToCall = new URL( url + queryString.toString() );
@@ -332,16 +332,16 @@
String headerName = (String) keys.nextElement();
String headerValue = (String) headers.get(headerName);
if( headerName.equalsIgnoreCase("Cookie") )
- cookiesList.append(headerValue);
+ cookiesList.append(headerValue);
else
- urlConnection.setRequestProperty(headerName, headerValue);
+ urlConnection.setRequestProperty(headerName, headerValue);
}
// Set cookies
for(int i = 0; i < cookies.length; i++) {
- if(cookiesList.length() > 0)
- cookiesList.append("," + cookies[i]);
- else
- cookiesList.append(cookies[i]);
+ if(cookiesList.length() > 0)
+ cookiesList.append("," + cookies[i]);
+ else
+ cookiesList.append(cookies[i]);
}
urlConnection.setRequestProperty( "Cookie", cookiesList.toString() );
// Setting GET method
@@ -365,21 +365,21 @@
// Get response message
String responseMessage = urlConnection.getResponseMessage();
if(responseMessage != null)
- result.put(RESPONSE_MESSAGE, responseMessage);
+ result.put(RESPONSE_MESSAGE, responseMessage);
// Receive cookies
String returnedCookiesStr = urlConnection.getHeaderField("Set-Cookie");
if(returnedCookiesStr != null) {
- StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
- int tokens = commaTokenizer.countTokens();
- if(tokens > 0) {
- String[] returnedCookies = new String[tokens];
- int z = 0;
- while( commaTokenizer.hasMoreTokens() ) {
- returnedCookies[z] = commaTokenizer.nextToken();
- z++;
- }
- result.put(COOKIES, returnedCookies);
- }
+ StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
+ int tokens = commaTokenizer.countTokens();
+ if(tokens > 0) {
+ String[] returnedCookies = new String[tokens];
+ int z = 0;
+ while( commaTokenizer.hasMoreTokens() ) {
+ returnedCookies[z] = commaTokenizer.nextToken();
+ z++;
+ }
+ result.put(COOKIES, returnedCookies);
+ }
}
responseReader.close();
return(result);
@@ -398,7 +398,7 @@
** @throws IOException if an I/O exception occurs during the HTTP request
**/
protected static Hashtable doPostCall(String url, Hashtable headers, String[] cookies, Hashtable requestParams)
- throws MalformedURLException, IOException {
+ throws MalformedURLException, IOException {
URL urlToCall = new URL(url);
HttpURLConnection urlConnection = (HttpURLConnection) urlToCall.openConnection();
urlConnection.setInstanceFollowRedirects(true);
@@ -409,16 +409,16 @@
String headerName = (String) keys.nextElement();
String headerValue = (String) headers.get(headerName);
if( headerName.equalsIgnoreCase("Cookie") )
- cookiesList.append(headerValue);
+ cookiesList.append(headerValue);
else
- urlConnection.setRequestProperty(headerName, headerValue);
+ urlConnection.setRequestProperty(headerName, headerValue);
}
// Set cookies
for(int i = 0; i < cookies.length; i++) {
- if(cookiesList.length() > 0)
- cookiesList.append("," + cookies[i]);
- else
- cookiesList.append(cookies[i]);
+ if(cookiesList.length() > 0)
+ cookiesList.append("," + cookies[i]);
+ else
+ cookiesList.append(cookies[i]);
}
urlConnection.setRequestProperty( "Cookie", cookiesList.toString() );
// Setting POST method
@@ -433,29 +433,29 @@
String paramName = (String) keys.nextElement();
Object paramValues = requestParams.get(paramName);
if(paramValues instanceof String[]) {
- // Multiple parameter values
- String[] paramValueList = (String[]) paramValues;
- for(int i = 0; i < paramValueList.length; i++) {
- String paramValue = paramValueList[i];
- if(writtenParams > 0) {
- out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- else {
- out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- writtenParams++;
- }
+ // Multiple parameter values
+ String[] paramValueList = (String[]) paramValues;
+ for(int i = 0; i < paramValueList.length; i++) {
+ String paramValue = paramValueList[i];
+ if(writtenParams > 0) {
+ out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ else {
+ out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ writtenParams++;
+ }
}
else {
- // Single parameter value
- String paramValue = (String) paramValues;
- if(writtenParams > 0) {
- out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- else {
- out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
- }
- writtenParams++;
+ // Single parameter value
+ String paramValue = (String) paramValues;
+ if(writtenParams > 0) {
+ out.print( "&" + URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ else {
+ out.print( URLEncoder.encode(paramName,"ISO8859-1") + "=" + URLEncoder.encode(paramValue,"ISO8859-1") );
+ }
+ writtenParams++;
}
}
out.close();
@@ -475,21 +475,21 @@
// Get response message
String responseMessage = urlConnection.getResponseMessage();
if(responseMessage != null)
- result.put(RESPONSE_MESSAGE, responseMessage);
+ result.put(RESPONSE_MESSAGE, responseMessage);
// Receive cookies
String returnedCookiesStr = urlConnection.getHeaderField("Set-Cookie");
if(returnedCookiesStr != null) {
- StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
- int tokens = commaTokenizer.countTokens();
- if(tokens > 0) {
- String[] returnedCookies = new String[tokens];
- int z = 0;
- while( commaTokenizer.hasMoreTokens() ) {
- returnedCookies[z] = commaTokenizer.nextToken();
- z++;
- }
- result.put(COOKIES, returnedCookies);
- }
+ StringTokenizer commaTokenizer = new StringTokenizer(returnedCookiesStr, ",", false);
+ int tokens = commaTokenizer.countTokens();
+ if(tokens > 0) {
+ String[] returnedCookies = new String[tokens];
+ int z = 0;
+ while( commaTokenizer.hasMoreTokens() ) {
+ returnedCookies[z] = commaTokenizer.nextToken();
+ z++;
+ }
+ result.put(COOKIES, returnedCookies);
+ }
}
responseReader.close();
return(result);
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties
index be1385b..d787639 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/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="web"/>
-<property name="appname" value="${module}-headerBufferSize"/>
+<property name="appname" value="${module}-headerBufferSize"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
index 9976ae9..859fdad 100644
--- a/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/headerBufferSize/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -73,7 +73,7 @@
value="configs.config.server-config.network-config.transports.transport.tcp.buffer-size-bytes="/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -88,10 +88,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/httpCompression/build.properties b/appserver/tests/appserv-tests/devtests/web/httpCompression/build.properties
index 46b120e..694cbb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpCompression/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpCompression/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}-asadmin-deletes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java b/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
index 6a06cff..32c722d 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpCompression/src/main/java/org/glassfish/devtests/web/httpcompression/HttpCompressionTest.java
@@ -43,7 +43,7 @@
public void run() {
try {
final int port = Integer.valueOf(antProp("http.port"));
- final String path = "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.compression=";
+ final String path = "configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.compression=";
final String[] schemes = {"gzip", "lzma"};
for (String scheme : schemes) {
String header = scheme + "-";
@@ -66,7 +66,7 @@
get("localhost", port, false, "compressed-output-off-2", scheme);
}
} catch (Exception e) {
- report(e.getMessage(), false);
+ report(e.getMessage(), false);
throw new RuntimeException(e.getMessage(), e);
} finally {
stat.printSummary();
@@ -94,8 +94,8 @@
found |= line.toLowerCase().contains("content-encoding: " + compScheme);
if (zipped) {
chunked |= line.toLowerCase().contains("transfer-encoding: chunked");
- contentLength |= !line.toLowerCase().contains("content-length");
- }
+ contentLength |= !line.toLowerCase().contains("content-length");
+ }
}
} finally {
s.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties
index a52c5a4..c84471a 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/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}-httpConnectorKeepAlive"/>
+<property name="appname" value="${module}-httpConnectorKeepAlive"/> \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-httpConnectorKeepAlive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
index f636658..1269933 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpConnectorKeepAlive/build.xml
@@ -36,13 +36,13 @@
<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"/>
</antcall>
</target>
-
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -60,16 +60,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>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -94,10 +94,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/httpListenerAdminReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
index 520ca56..7b8e7f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("adminReconfig");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -55,7 +55,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
sock.setSoTimeout(5000);
OutputStream os = sock.getOutputStream();
@@ -64,7 +64,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties
index 176fc68..ab51658 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/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}-adminReconfig"/>
+<property name="appname" value="${module}-adminReconfig"/> \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-adminReconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
index c1d9868..25b3505 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerAdminReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -63,7 +63,7 @@
value="configs.config.server-config.network-config.protocols.protocol.admin-listener.security-enabled=false"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -77,7 +77,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
index 38597da..2f11380 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("httpListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
index b17a957..18743c5 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("httpListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties
index ad39ac2..399b7f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/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}-httpListenerDynamicConfig"/>
+<property name="appname" value="${module}-httpListenerDynamicConfig"/> \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-httpListenerDynamicConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
index bdf6df8..ec4194f 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/build.xml
@@ -50,7 +50,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"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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>
@@ -80,7 +80,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}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<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/httpListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
index 4e13ba7..82c14da 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1703");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -62,19 +62,19 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/TestServlet" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("Accept-Language: de\n".getBytes());
- // Send Accept-Language header with invalid locale code. Make sure
- // this locale is getting ignored
+ // Send Accept-Language header with invalid locale code. Make sure
+ // this locale is getting ignored
os.write("Accept-Language: 12\n".getBytes());
os.write("Accept-Language: FR\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties
index c788360..13c8811 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/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}-http-request-ignore-invalid-accept-language-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
index 4103311..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
index 0f21f56..7cbd4e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestIgnoreInvalidAcceptLanguageHeader/servlet/test/TestServlet.java
@@ -43,7 +43,7 @@
boolean passed = false;
if (num == 2 && deLocaleSeen && frLocaleSeen) {
passed = true;
- }
+ }
res.getWriter().print(passed);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
index e5ebb40..6e9aa89 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Http Request whitespace tolerance");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -63,7 +63,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties
index 135d57f..ee9c434 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/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}-http-request-whitespace-tolerance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpRequestWhitespaceTolerance/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/httpResponseErrorMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
index 7dfea7c..a143d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for XSS HttpServletResponse.sendError");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -73,7 +73,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties
index 80e7c9c..31f3513 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/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}-http-response-error-message"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseErrorMessage/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/httpResponseServerHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
index 2d4bdf4..57b4331 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6320750");
@@ -49,12 +49,12 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
private void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/" + "test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -62,12 +62,12 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
return;
- }
+ }
InputStream is = conn.getInputStream();
String serverHeader = conn.getHeaderField("Server");
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties
index cffa23c..685d688 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/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}-http-response-server-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpResponseServerHeader/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/httpServletDoPost/build.properties b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.properties
index a6adb7a..546668b 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/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}-httpServletDoPost"/>
+<property name="appname" value="${module}-httpServletDoPost"/> \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-httpServletDoPost"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml
index 8eed661..c7a084f 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/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="."
@@ -77,10 +77,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/httpServletDoPost/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
index 36e5965..c8e1c8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/descriptor/web.xml
@@ -22,12 +22,12 @@
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>servlet.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
index f31f884..b715ff1 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletDoPost/servlet/ServletTest.java
@@ -28,7 +28,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -36,7 +36,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
index 7a67065..98ee9f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4968841");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -58,7 +58,7 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
System.out.println(("OPTIONS " + contextRoot + "/TestServlet"
@@ -66,7 +66,7 @@
os.write(("OPTIONS " + contextRoot + "/TestServlet"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties
index 235a0c8..d836344 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/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}-http-servlet-get-all-declared-methods"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml
index 38d5f1e..3aa3b52 100644
--- a/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/httpServletGetAllDeclaredMethods/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,17 +42,17 @@
</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="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/includeErrorPageAfterResponseCommit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
index 3828aac..958bfca 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/WebTest.java
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for " + TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -56,8 +56,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -75,7 +75,7 @@
}
private void invoke() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/sqlException.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties
index 843e072..0013f1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/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}-error-page-after-response-commit"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
index 00ae711..fd4ffdf 100644
--- a/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/includeErrorPageAfterResponseCommit/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/index/WebTest.java b/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
index b7be3f6..bb6eb08 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/index/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -44,12 +44,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("index", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/index/build.properties b/appserver/tests/appserv-tests/devtests/web/index/build.properties
index 9b56204..0bd835a 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/index/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}-index"/>
+<property name="appname" value="${module}-index"/> \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-index"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/index/build.xml b/appserver/tests/appserv-tests/devtests/web/index/build.xml
index d9e0234..fdaf8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/index/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/index/build.xml
@@ -33,7 +33,7 @@
<target name="clean" depends="init-common">
</target>
-
+
<target name="compile" depends="clean">
</target>
@@ -42,11 +42,11 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -58,9 +58,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
index 9eaab13..003eeae 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/WebTest.java
@@ -27,7 +27,7 @@
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
-
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -47,7 +47,7 @@
writeOneByte(urlConnection);
int responseCode= urlConnection.getResponseCode();
- System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
+ System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
if (urlConnection.getResponseCode() >= 400 && urlConnection.getResponseCode() < 500){
stat.addStatus("Test installationPathDisclosure", stat.PASS);
} else {
@@ -65,7 +65,7 @@
writeOneByte(urlConnection);
int responseCode= urlConnection.getResponseCode();
- System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
+ System.out.println("installationPathDisclosure: " + responseCode + " Expected code: 40X");
if (urlConnection.getResponseCode() >= 400 && urlConnection.getResponseCode() < 500){
stat.addStatus("Test installationPathDisclosure-wrongUrl", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties
index f0db845..1e804bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/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}-installationPathDisclosure"/>
+<property name="appname" value="${module}-installationPathDisclosure"/> \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-installationPathDisclosure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
index d9e0234..fdaf8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/installationPathDisclosure/build.xml
@@ -33,7 +33,7 @@
<target name="clean" depends="init-common">
</target>
-
+
<target name="compile" depends="clean">
</target>
@@ -42,11 +42,11 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -58,9 +58,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
index 0cb8ba2..0e4cef0 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for:
*
* http://java.net/jira/browse/GLASSFISH-16013
- * ("RestartRequired: changing http port does not trigger restart required message
+ * ("RestartRequired: changing http port does not trigger restart required message
* for a standalone instance")
*/
public class WebTest {
@@ -47,7 +47,7 @@
location = args[3];
contextRoot = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 16013");
WebTest webTest = new WebTest(args);
@@ -55,8 +55,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -66,13 +66,13 @@
}
private void invoke() throws Exception {
-
- URL url = new URL("http://" + host + ":" + newPort + contextRoot);
+
+ URL url = new URL("http://" + host + ":" + newPort + contextRoot);
System.out.println("Connecting ... "+url);
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties
index cb1bcfd..70a0e50 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/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}-instance-http-port-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
index 82568f5..dedd64e 100644
--- a/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/instanceHttpPortDynamicReconfig/build.xml
@@ -38,7 +38,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"/>
@@ -46,15 +46,15 @@
</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="create-instance" depends="init-common">
<antcall target="create-instance-common"/>
@@ -79,13 +79,13 @@
value="--target ${instance.name} HTTP_LISTENER_PORT=${instance.http.port.2}"/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-instance"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -99,10 +99,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-instance"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
index ee42b93..68fb006 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/WebTest.java
@@ -25,10 +25,10 @@
* disabled.
*
* This client attempts to connect to this URL:
- *
+ *
* http://<host>:<port>/web-invoker-servlet-disabled/servlet/TestServlet
*
- * which must result in a 404, because the test servlet is mapped to this
+ * which must result in a 404, because the test servlet is mapped to this
* url-pattern in web.xml: /TestServlet, instead of /servlet/TestServlet.
*
* The client will be able to connect successfully to the above URL only if the
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4944160");
WebTest webTest = new WebTest(args);
@@ -58,20 +58,20 @@
}
public void doTest() {
-
+
URL url = null;
HttpURLConnection conn = null;
int responseCode;
boolean fail = false;
- try {
+ try {
/*
* Connect to the wrong mapping.
*
* This will work only if the InvokerServlet in default-web.xml
* has been enabled, and therefore must fail (with a 404 response
* code) since the InvokerServlet should not have been enabled.
- */
+ */
url = new URL("http://" + host + ":" + port + contextRoot
+ "/servlet/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties
index b9dd83b..f5b21b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/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="web"/>
-<property name="appname" value="${module}-invoker-servlet-disabled"/>
+<property name="appname" value="${module}-invoker-servlet-disabled"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/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/invokerServletDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
index 28af79d..c9a0508 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
index 65ccb10..c534281 100644
--- a/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/invokerServletDisabled/servlet/test/TestServlet.java
@@ -25,6 +25,6 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- getServletContext().log("This servlet should not have been invoked");
+ getServletContext().log("This servlet should not have been invoked");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
index 51f2b18..1ae659f 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4882996");
WebTest webTest = new WebTest(args);
@@ -61,14 +61,14 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/junk.jsp HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties
index b7c1311..9330fbc 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/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}-javax-servlet-error-request-uri-dynamic-resource"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriDynamicResource/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,17 +42,17 @@
</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">
@@ -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/javaxServletErrorRequestUriStaticResource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
index 93a7384..c32e6f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4882996");
WebTest webTest = new WebTest(args);
@@ -68,7 +68,7 @@
}
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -111,8 +111,8 @@
if (line == null ||
(!line.equals("http://" + host + ":" + port +
contextRoot + "/404handler.jsp") &&
- !line.equals("http://" +
- InetAddress.getLocalHost().getHostName() +
+ !line.equals("http://" +
+ InetAddress.getLocalHost().getHostName() +
":" + port + contextRoot +
"/404handler.jsp"))) {
throw new Exception("Unexpected response");
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties
index 72340bc..ac08b9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/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}-javax-servlet-error-request-uri-static-resource"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/javaxServletErrorRequestUriStaticResource/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,17 +42,17 @@
</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">
@@ -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/jmxUndeployEvent/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
index 46b5a35..775e353d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/WebTest.java
@@ -26,8 +26,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -35,7 +35,7 @@
try{
stat.addDescription("JMX undeployment event test.");
-
+
url = new URL("http://" + host + ":" + port + contextRoot + "/ServletTest");
System.out.println("\n Invoking url: " + url.toString());
conn = url.openConnection();
@@ -43,13 +43,13 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
System.out.println("responseCode: " + responseCode);
-
+
if (urlConnection.getResponseCode() != 404){
stat.addStatus("jmxUndeployEvent", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties
index b79a75d..0fc6d9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/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}-jmxUndeployEvent"/>
+<property name="appname" value="${module}-jmxUndeployEvent"/> \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-jmxUndeployEvent"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml
index 95c6bef..75d01aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/jmxUndeployEvent/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
index 750862b..43bc911 100644
--- a/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jmxUndeployEvent/servlet/ServletTest.java
@@ -31,7 +31,7 @@
import java.sql.*;
public class ServletTest extends HttpServlet{
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -42,9 +42,9 @@
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("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println("jmxUndeployEvent::FAIL");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties
index a136d01..1273c86 100644
--- a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/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}-jroute-id-in-cookie-or-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
index 121358a..4b0660c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jrouteIdInCookieOrURL/build.xml
@@ -36,7 +36,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"/>
@@ -44,26 +44,26 @@
</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="setup-policy" depends="init-common">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"/>
- <copy file="server.policy"
+ <copy file="server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,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}"/>
@@ -83,13 +83,13 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-policy" depends="setup-policy">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
index 8a5a692..cbae49e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 13129");
WebTest webTest = new WebTest(args);
@@ -64,7 +64,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
@@ -85,7 +85,7 @@
System.out.println("session id = " + id);
return id;
- } finally {
+ } finally {
if (bis != null) {
try {
bis.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties
index e2d15d5..0ae3241 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/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="web"/>
-<property name="appname" value="${module}-jsessionId-parameter"/>
+<property name="appname" value="${module}-jsessionId-parameter"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
index f8053cd..b39d17c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsessionIdParameter/build.xml
@@ -36,9 +36,9 @@
<delete file="WebTest.class"/>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="build" depends="init-common">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -46,14 +46,14 @@
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -65,10 +65,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/jsfWithBundledOneDotOneJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
index 0a8e125..ab04d45 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 651");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -82,10 +82,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties
index e4b3e1e..e71997b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/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}-jsf-with-bundled-one-dot-one-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsfWithBundledOneDotOneJarFiles/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,17 +42,17 @@
</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">
@@ -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/jsp-security/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
index abdd620..493eb94 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/WebTest.java
@@ -24,12 +24,12 @@
* is not defined in web.xml
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
private static final String TEST_NAME = "web-jsp-security";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -43,13 +43,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -84,18 +84,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -112,5 +112,5 @@
} catch (IOException ex) {}
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties
index 5796737..aecfe60 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/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}-jsp-security"/>
+<property name="appname" value="${module}-jsp-security"/> \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-jsp-security"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml b/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml
index 3a6c74f..f561c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/jsp-security/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jsp-security/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,10 +42,10 @@
</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
@@ -53,7 +53,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -64,11 +64,11 @@
<param name="groups" value="Admin"/>
</antcall>
</target>
-
+
<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}"/>
@@ -80,10 +80,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
index f26a537..b912ca8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/WebTest.java
@@ -29,7 +29,7 @@
* Test accesses 403.jsp, which sets the response code to 403 and therefore
* causes a forward to the error403.jsp error page, which sets the response
* content type to text/xml;charset=Shift_JIS.
- *
+ *
* Test then accesses throwable.jsp, which throws a Throwable and therefore
* causes a forward to the errorThrowable.jsp error page, which sets the
* response content type to text/xml;charset=Shift_JIS.
@@ -57,7 +57,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 815");
WebTest webTest = new WebTest(args);
@@ -65,8 +65,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/403.jsp", "HTTP/1.1 403");
invoke("/throwable.jsp", "HTTP/1.1 500");
stat.addStatus(TEST_NAME, stat.PASS);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties
index 1aa452e..7001b0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/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}-jsp-allow-error-page-to-set-response-charset-if-no-output-written"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAllowErrorPageToSetResponseCharsetIfNoOutputWritten/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/jspAnonymousClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
index 72a4ba7..eeafb99 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6202290");
@@ -51,11 +51,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties
index 1fa0c2a..1f36e32 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/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}-jsp-anonymous-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAnonymousClass/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/jspAttributeNameWithColonOrDot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
index 74c5d73..5328aa7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/WebTest.java
@@ -41,25 +41,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28380");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp//test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -72,7 +72,7 @@
while ((line = bis.readLine()) != null) {
lastLine = line;
}
-
+
if (EXPECTED.equals(lastLine)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties
index a9f52f9..f22cce3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.properties
@@ -15,13 +15,13 @@
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}-jsp-attribute-name-with-colon-or-dot"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspAttributeNameWithColonOrDot/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
index 17b952d..d4cbe81 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/descriptor/web.xml
@@ -24,9 +24,9 @@
<jsp-config>
<taglib>
- <taglib-uri>http://s1as/mytaglib</taglib-uri>
- <taglib-location>/WEB-INF/tlds/my-taglib.tld</taglib-location>
- </taglib>
+ <taglib-uri>http://s1as/mytaglib</taglib-uri>
+ <taglib-location>/WEB-INF/tlds/my-taglib.tld</taglib-location>
+ </taglib>
</jsp-config>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
index 82bc3e6..556f826 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspAttributeNameWithColonOrDot/servlet/taglib/EchoAttributesTag.java
@@ -25,9 +25,9 @@
import jakarta.servlet.jsp.tagext.DynamicAttributes;
/**
- * SimpleTag handler that echoes all its attributes
+ * SimpleTag handler that echoes all its attributes
*/
-public class EchoAttributesTag
+public class EchoAttributesTag
extends TagSupport
implements DynamicAttributes
{
@@ -50,16 +50,16 @@
out.print(",");
}
}
- } catch (IOException ioe) {
- throw new JspException(ioe.toString(), ioe);
- }
-
+ } catch (IOException ioe) {
+ throw new JspException(ioe.toString(), ioe);
+ }
+
return EVAL_PAGE;
}
public void setDynamicAttribute(String uri, String localName,
- Object value)
+ Object value)
throws JspException
{
keys.add(localName);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
index c5b74ce..ec224cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/WebTest.java
@@ -24,8 +24,8 @@
* Each of the JSP pages accessed by this test is preceded by a BOM from
* which the JSP container derives the page encoding:
*
- * Page Page Encoding Bytes
- * UTF-16BE.jsp UTF-16, big-endian FE FF
+ * Page Page Encoding Bytes
+ * UTF-16BE.jsp UTF-16, big-endian FE FF
* UTF-16LE.jsp UTF-16, little-endian FF FE
* UTF-8.jsp UTF-8 EF BB BF
*
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM in JSP classic syntax");
@@ -86,14 +86,14 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
/*
* @return true if passed, false if failed
*/
public boolean doTest(String jspPage) throws Exception {
-
+
InputStream is = null;
BufferedReader input = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntax/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/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
index 03c4d10..c31bef8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/WebTest.java
@@ -23,7 +23,7 @@
*
* This test enforces that a translation error be reported if the page
* encoding identified by a BOM (in this case: UTF-16BE) does not match the
- * page encoding derived from jsp configuration element page-encoding
+ * page encoding derived from jsp configuration element page-encoding
* (in this case: UTF-8).
*/
public class WebTest {
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/UTF-16BE.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties
index 19717b0..b1a888e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/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}-jsp-bom-in-classic-syntax-encoding-mismatch-jspconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchJspConfig/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/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
index 94daea7..b0a5a0a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/encodingMismatch.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties
index 250b71c..d1deaae 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/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}-jsp-bom-in-classic-syntax-encoding-mismatch-pagedir"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspBomInClassicSyntaxEncodingMismatchPageDir/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/jspCacheTaglibPrecompile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
index 9516d35..b70f402 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/WebTest.java
@@ -25,7 +25,7 @@
* (SQE cache tests failed /w PWC6117: File "/jsp/caching/Sun ONE
* Application Server Tags" not found)
*
- * Make sure that during precompilation, the JSP compiler will not
+ * Make sure that during precompilation, the JSP compiler will not
* (erroneously) ignore any locally bundled appserv-tags.jar (and cause
* precompilation and therefore deployment to fail), even though this JAR
* file is not listed amongst the JAR files known to contain TLD resources
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1668");
WebTest webTest = new WebTest(args);
@@ -56,8 +56,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -67,7 +67,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/caching/basicCache.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties
index bbf9bfe..f8779fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/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}-jsp-cache-taglib-precompile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCacheTaglibPrecompile/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/jspCachingInstanceLevel/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
index aca8632..200662c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 8397");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,7 +63,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/jsp/caching/basicCache.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties
index 823f04d..e45485c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/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}-jsp-caching-instance-level"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
index ed0bc55..4a988a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCachingInstanceLevel/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
index f7f5849..eddbfe0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
@@ -59,14 +59,14 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
index 35594cd..abbd728 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.properties
@@ -15,12 +15,12 @@
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}-jsp-calling-el-fuction-from-tagfile-within-same-taglib-infinite-recursion"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCallingELFuctionFromTagfileWithinSameTaglibInfiniteRecursion/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/jspCommentedOutPageDirective/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
index 112d673..a98b977 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 29971");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -56,7 +56,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + "/" + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -73,6 +73,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties
index ec5b524..0a888f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/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="web"/>
-<property name="appname" value="${module}-jsp-commented-out-page-directive"/>
+<property name="appname" value="${module}-jsp-commented-out-page-directive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective/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/jspCommentedOutPageDirective1/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
index 771242b..b9cb011 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 29971");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -57,7 +57,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -74,6 +74,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties
index ec5b524..0a888f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/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="web"/>
-<property name="appname" value="${module}-jsp-commented-out-page-directive"/>
+<property name="appname" value="${module}-jsp-commented-out-page-directive"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCommentedOutPageDirective1/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/jspConfigBuffer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
index 94cc534..1e6f833 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties
index 6332441..b6badf8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.properties
@@ -15,13 +15,13 @@
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}-jsp-config-buffer"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigBuffer/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspConfigDefaultContentType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
index dd001bb..09bf97e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties
index 8e5c7df..cec1b76 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.properties
@@ -15,13 +15,13 @@
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}-jsp-config-default-content-type"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigDefaultContentType/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspConfigGetServletPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
index 96ed2c0..eab72e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27704");
WebTest webTest = new WebTest(args);
@@ -53,14 +53,14 @@
public void doTest() {
InputStream is = null;
BufferedReader input = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ SERVLET_PATH);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties
index ad578b0..6b6e1b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/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}-jsp-config-get-servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigGetServletPath/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/jspConfigIncludeChain/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
index 99d816d..620b583 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27704");
WebTest webTest = new WebTest(args);
@@ -52,14 +52,14 @@
public void doTest() {
InputStream is = null;
BufferedReader input = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/subdir/including.txt");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties
index f28d8c1..c5dc1a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/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}-jsp-config-include-chain"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigIncludeChain/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/jspConfigJavacSource/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
index f7f5076..d303312 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/WebTest.java
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -64,7 +64,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties
index 8039f3a..bb57b40 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/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}-jsp-config-javac-source"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/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/jspConfigJavacSource/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
index 94a3f8d..4df6cf7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJavacSource/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="compilerSourceVM" value="1.4" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
index e6280e7..43d97d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/WebTest.java
@@ -52,7 +52,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties
index 89aed08..1b4ea81 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/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}-jsp-config-jsp-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/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/jspConfigJspFile/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
index a1f9bff..696b58e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigJspFile/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="myParam" value="myValue" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
index a9db115..08512cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/WebTest.java
@@ -23,7 +23,7 @@
* ignored").
*
* This test:
- *
+ *
* - accesses a JSP,
*
* - updates the JSP (through a servlet),
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for modificationTestInterval "
+ "jsp-config property");
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -86,10 +86,10 @@
System.out.println("Updating JSP ...");
bodyLine = getBodyLine("UpdateJsp");
System.out.println(bodyLine);
-
+
/*
- * Access JSP. Must get original contents, because the
- * modificationTestInterval specified in sun-web.xml has not yet
+ * Access JSP. Must get original contents, because the
+ * modificationTestInterval specified in sun-web.xml has not yet
* expired, which means that we must not (yet) check for any
* modifications of the JSP
*/
@@ -154,5 +154,5 @@
if (bis != null) bis.close();
} catch (IOException ex) {}
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties
index 605dc87..490d4b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/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}-jsp-config-modification-test-interval"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/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/jspConfigModificationTestInterval/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
index 4c97974..273044f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="modificationTestInterval" value="60" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
index 6211b59..e16e6b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>UpdateJsp</display-name>
<servlet-name>UpdateJsp</servlet-name>
<servlet-class>UpdateJsp</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>UpdateJsp</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
index ce4a5b0..51aa407 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigModificationTestInterval/servlet/UpdateJsp.java
@@ -32,7 +32,7 @@
/*
* Manually update timestamp on JSP file to a value far into the
- * future, so that the corresponding servlet class file will be
+ * future, so that the corresponding servlet class file will be
* guaranteed to be out-of-date
*/
f.setLastModified(System.currentTimeMillis() + 9000000000L);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
index 0983025..11adbea 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/WebTest.java
@@ -42,27 +42,27 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp:attribute with omit");
WebTest webTest = new WebTest(args);
webTest.doTest();
webTest.doTest2();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
// An error should be raised with undeclared tag
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties
index ba3f595..2f07966 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.properties
@@ -15,13 +15,13 @@
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}-jsp-config-undeclared-ns"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUndeclaredNS/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspConfigUsePrecompiled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
index cfaf4cb..7de4317 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6181923");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -117,5 +117,5 @@
if (bis != null) bis.close();
} catch (IOException ex) {}
}
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties
index ae36243..1cb6891 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/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}-jsp-config-use-precompiled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/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/jspConfigUsePrecompiled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
index e91b9d2..3c0b165 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="use-precompiled" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
index 6d94850..6fd29c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled/servlet/org/apache/jsp/jsp/test_jsp.java
@@ -47,7 +47,7 @@
_jspxFactory = JspFactory.getDefaultFactory();
response.setContentType("text/html");
pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
+ null, true, 8192, true);
_jspx_page_context = pageContext;
application = pageContext.getServletContext();
config = pageContext.getServletConfig();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
index 39c5628..2791426 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/WebTest.java
@@ -69,7 +69,7 @@
System.err.println("Unexpected return code: " + code);
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
- try (InputStream is = conn.getInputStream(); BufferedReader input = new BufferedReader(new InputStreamReader(is))) {
+ try (InputStream is = conn.getInputStream(); BufferedReader input = new BufferedReader(new InputStreamReader(is))) {
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
System.err.println("Wrong response. " + "Expected: " + EXPECTED_RESPONSE + ", received: " + line);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties
index 224b0ae..83e8075 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/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}-jsp-config-use-precompiled2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigUsePrecompiled2/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,17 +42,17 @@
</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">
@@ -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/jspConfigWelcomeFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
index 70cf4c9..0af233e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27664");
WebTest webTest = new WebTest(args);
@@ -48,7 +48,7 @@
ok = ok && webTest.doTest("http://" + webTest.host + ":" + webTest.port
+ webTest.contextRoot + "/TestServlet");
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
- stat.printSummary();
+ stat.printSummary();
}
public boolean doTest(String urlString) {
@@ -56,13 +56,13 @@
InputStream is = null;
BufferedReader input = null;
boolean status = false;
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
status = false;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties
index c071dc8..da802cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/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="web"/>
-<property name="appname" value="${module}-jsp-config-welcome-files"/>
+<property name="appname" value="${module}-jsp-config-welcome-files"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${module}-jsp-config-welcome-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspConfigWelcomeFiles/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/jspCustomTagAttributeOfArrayType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
index be24e06..b3591e5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
@@ -59,7 +59,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -74,7 +74,7 @@
}
if (!EXPECTED.equals(lastLine)) {
- System.err.println("Wrong response body. Expected: "
+ System.err.println("Wrong response body. Expected: "
+ EXPECTED + ", received: " + lastLine);
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties
index c9af765..816f232 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/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}-jsp-custom-tag-attribute-of-array-type"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
index ae209ba..239d2a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTagAttributeOfArrayType/servlet/taglib/MyTag.java
@@ -38,7 +38,7 @@
throw new JspException(ioe.toString(), ioe);
}
- return EVAL_PAGE;
+ return EVAL_PAGE;
}
public void setArray(String[] args) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
index c8fc588..45db300 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/WebTest.java
@@ -59,7 +59,7 @@
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
-
+
int responseCode = conn.getResponseCode();
if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200" + ", received: " + responseCode);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties
index b49d48e..d333977 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/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}-jsp-custom-taglib-bundled-as-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibBundledAsJar/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/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
index e430c4a..c529d30 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/WebTest.java
@@ -20,7 +20,7 @@
/*
* Unit test for
- *
+ *
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=590
* ("TLDs in EAR-bundled JARs not found")
*
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 590");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties
index ea5f300..5176338 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/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}-jsp-customi-taglib-jar-inside-ear-with-manifest-classpath"/>
+<property name="appname" value="${module}-jsp-customi-taglib-jar-inside-ear-with-manifest-classpath"/> \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="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
index 2e04658..cca122f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithManifestClassPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${mytaglib.jar}"/>
@@ -56,8 +56,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.jar, *.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -70,8 +70,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -83,7 +83,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
index 19d508f..9405c9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 590");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties
index 8175c16..926ab5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/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}-jsp-custom-taglib-jar-inside-ear-without-manifest-classpath"/>
<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="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
index effbf79..0270cb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspCustomTaglibJarInsideEarWithoutManifestClassPath/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}/lib"/>
<delete file="${assemble.dir}/lib/${mytaglib.jar}"/>
@@ -56,8 +56,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="lib/*.jar,*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -70,8 +70,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -83,7 +83,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
index c61b93d..7d7f9c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/WebTest.java
@@ -39,16 +39,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for enum support in EL");
WebTest webTest = new WebTest(args);
webTest.doTest("/enum.jsp", "jsp-el-enum-test");
- stat.printSummary();
+ stat.printSummary();
}
private boolean checkValue(BufferedReader input,
- String expectedValue)
+ String expectedValue)
throws Exception {
String line = input.readLine();
if (line == null)
@@ -64,7 +64,7 @@
+ expectedValue + ", received: " + line);
return true;
}
- return false;
+ return false;
}
public void doTest(String path, String testName) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
index 571cd1b..84a9932 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.properties
@@ -15,12 +15,12 @@
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}-el-enum"/>
+<property name="appname" value="${module}-el-enum"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml b/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspELEnum/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspELEnum/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspErrorPageClassCastException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
index 813439f..d958d6d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/WebTest.java
@@ -44,12 +44,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 31171");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -64,7 +64,7 @@
System.out.println("GET " + requestUri + " HTTP/1.0");
os.write(("GET " + requestUri + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
is = s.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -74,7 +74,7 @@
break;
}
}
-
+
if (line != null) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties
index 6433011..7da363b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/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}-jsp-error-page-class-cast-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageClassCastException/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/jspErrorPageServletErrorException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
index 2e41717..0da24ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/WebTest.java
@@ -56,7 +56,7 @@
os.write("\n".getBytes());
try (InputStream is = s.getInputStream(); BufferedReader bis = new BufferedReader(new InputStreamReader(is))) {
-
+
String line = null;
int count = 0;
while ((line = bis.readLine()) != null) {
@@ -65,7 +65,7 @@
count++;
}
}
-
+
if (count == 2) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties
index b75ea5e..0201011 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/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}-jsp-error-page-servlet-error-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageServletErrorException/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/jspErrorPageStatusCode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
index b021007..1fe90d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5018291");
try {
@@ -52,21 +52,21 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/foo.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
throw new Exception("Wrong response code. Expected: 500" +
", received: " + responseCode);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties
index bcd89fd..84b28cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/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}-jsp-error-page-status-code"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspErrorPageStatusCode/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/jspExceptionInTagBodyRestoreJspWriter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
index 6bc5159..7f29ae9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 16181");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties
index 9b16620..87ff62d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/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="web"/>
-<property name="appname" value="${module}-jsp-exception-in-tag-body-restore-jsp-writer"/>
+<property name="appname" value="${module}-jsp-exception-in-tag-body-restore-jsp-writer"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspExceptionInTagBodyRestoreJspWriter/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/jspForwardNormalizePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
index ad3a144..b6db534 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat forward and getRequestDispatcher security issue");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties
index de3df14..0ee3276 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/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}-jsp-forward-normalize-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardNormalizePath/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/jspForwardPreserveApplicationResponseWrapper/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
index 6e7cac2..b0df59c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4875808");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties
index 96d2120..06024d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/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}-jsp-forward-preserve-application-response-wrapper"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardPreserveApplicationResponseWrapper/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/jspForwardUnbuffered/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
index 9f3e27f..099dfd7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 13499");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest1() throws Exception {
@@ -65,10 +65,10 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
- }
+ }
}
/*
@@ -83,7 +83,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
throw new Exception("Wrong response code. Expected: 500" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties
index 6d4fa46..418a874 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/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}-jsp-forward-unbuffered"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspForwardUnbuffered/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/jspGetTagLibraryInfos/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
index 19c9693..3229c62 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for TagLibraryInfo.getTagLibraryInfos()");
@@ -50,11 +50,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties
index 74cb308..28ce113 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/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}-jsp-get-tag-library-infos"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/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/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
index e80bda2..97d2ffb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspGetTagLibraryInfos/servlet/taglib/MyTagExtraInfo.java
@@ -31,7 +31,7 @@
vms[0] = new ValidationMessage(null, "Wrong number of tsglibs");
}
- return vms;
+ return vms;
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties
index ee53f25..323236c 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/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}-jsp-in-webapp-with-bundled-xercesImpl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspInWebappWithBundledXercesImpl/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,17 +42,17 @@
</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">
@@ -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/jspIncludeResourceNameWithPlusChar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
index c512b67..ffc9bfd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4897017, 4789272");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties
index 59efc07..2691aca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/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}-jsp-include-resource-name-with-plus-char"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludeResourceNameWithPlusChar/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/jspIncludedWelcomePage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
index 4982bfd..a3a8e7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/WebTest.java
@@ -24,7 +24,7 @@
* see http://issues.apache.org/bugzilla/show_bug.cgi?id=33223.
*
* This test case used to throw a java.lang.StringIndexOutOfBoundsException
- * when reconstructing the URI of a JSP that is the target of a
+ * when reconstructing the URI of a JSP that is the target of a
* RequestDispatcher.include() from the jakarta.servlet.include.XXX
* request attributes.
*/
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 33223");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties
index a3c3da1..c91287d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/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="web"/>
-<property name="appname" value="${module}-jsp-included-welcome-page"/>
+<property name="appname" value="${module}-jsp-included-welcome-page"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspIncludedWelcomePage/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/jspNestedScriptingTagExtraInfo/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
index cba9597..badb89a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/WebTest.java
@@ -38,25 +38,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27665");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp//test.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties
index 4bc277d..4738c46 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/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}-jsp-nested-scripting-tag-extra-info"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
index ca1d351..394a9ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNestedScriptingTagExtraInfo/servlet/taglib/MyTag.java
@@ -21,7 +21,7 @@
public class MyTag extends TagSupport {
- private static int counter = 1;
+ private static int counter = 1;
private String name;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
index 024a107..2453edb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/WebTest.java
@@ -37,18 +37,18 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 27948");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties
index c75beda..67953cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/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}-jsp-null-fragment"/>
+<property name="appname" value="${module}-jsp-null-fragment"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspNullFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspNullFragment/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspPoundSyntax/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
index b040428..05cfabf 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit tests for pound syntax as literal");
WebTest webTest = new WebTest(args);
@@ -54,11 +54,11 @@
webTest.doTest4("/testjsp21z.jsp",
"pound-syntax-allowed-as-literal-true-test");
- stat.printSummary();
+ stat.printSummary();
}
private boolean checkValue(BufferedReader input,
- String key, String expectedValue)
+ String key, String expectedValue)
throws Exception {
String line = input.readLine();
while (line.equals(""))
@@ -75,7 +75,7 @@
+ key + ": " + expectedValue + ", received: " + line);
return true;
}
- return false;
+ return false;
}
public void doTest1(String path, String testName) {
@@ -130,14 +130,14 @@
public void doTest2(String path, String testName) {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ':' + port + '/' + contextRoot + path);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode == 200) {
+ if (responseCode == 200) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(testName, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
index c9445c7..2882094 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.properties
@@ -15,12 +15,12 @@
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}-pound-literal"/>
+<property name="appname" value="${module}-pound-literal"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
<property name="tlds" value="descriptor/tlds"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPoundSyntax/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
index c3610cd..3c2526f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6251872");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties
index 3f3dff0..4953d7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/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}-jsp-precompile-consider-domain-lib-jarfiles-and-classes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
index e77aef4..3070ed3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileConsiderDomainLibJarFilesAndClasses/build.xml
@@ -36,7 +36,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="myclasses"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -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/jspPrecompileDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
index d5667da..058b296 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4883");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties
index 62e6201..5ec38bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/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}-jsp-precompile-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
index 7e8c024..3c26aa2 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileDeployDashDashLibraries/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-libraries"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/jspPrecompileIgnoreFragmentErrors/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
index 03be013..1e69ade 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/WebTest.java
@@ -25,7 +25,7 @@
* precompilation (during deployment) as long as jsp-config property
* 'ignoreJspFragmentErrors' has been set to TRUE in sun-web.xml.
*
- * Otherwise, precompilation of this webapp's JSPs would have failed,
+ * Otherwise, precompilation of this webapp's JSPs would have failed,
* since the 'counter' variable is not declared in any of the included
* JSP segments.
*/
@@ -48,7 +48,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6393940");
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties
index b92c489..7971645 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/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}-jsp-precompile-ignore-fragment-errors"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/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/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
index 88fbebf..69eabb3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspPrecompileIgnoreFragmentErrors/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="ignoreJspFragmentErrors" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
index d3e9ea7..954a3fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/WebTest.java
@@ -54,7 +54,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test to ensure that servlet that "
@@ -75,7 +75,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties
index 266558d..899ca69 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/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}-jsp-reload-generated-servlet-if-updated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
index 6ceef6a..774e319 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -90,10 +90,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/jspReloadGeneratedServletIfUpdated/test_jsp.java b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
index 4cce1aa..e22bdd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspReloadGeneratedServletIfUpdated/test_jsp.java
@@ -49,7 +49,7 @@
response.setContentType("text/html");
response.setHeader("X-Powered-By", "JSP/2.3");
pageContext = _jspxFactory.getPageContext(this, request, response,
- null, true, 8192, true);
+ null, true, 8192, true);
_jspx_page_context = pageContext;
application = pageContext.getServletContext();
config = pageContext.getServletConfig();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
index ba586fa..e715bb0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP "
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties
index 70fd52d..d140b95 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/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}-jsp-resource-injection-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/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/jspResourceInjectionContextListener/servlet/taglib/MyListener.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
index ee5b0f7..dfab8a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionContextListener/servlet/taglib/MyListener.java
@@ -49,7 +49,7 @@
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
index 1a13c3d..b096bfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties
index f8fdb95..ca89588 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/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}-jsp-resource-injection-simple-tag-handler"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/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/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
index 8fc6444..2f8de7d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionSimpleTagHandler/servlet/taglib/MySimpleTag.java
@@ -75,6 +75,6 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
index 30b224b..34fcb29 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
index 635d89c..f603321 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build-ng.xml
@@ -57,9 +57,9 @@
<target name="build" depends="compile">
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -91,7 +91,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties
index eee488b..12d669a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/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}-jsp-resource-injection-tag-handler"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/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/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
index ce5a64b..98b2a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/servlet/taglib/MyTag.java
@@ -76,7 +76,7 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
return SKIP_BODY;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
index 54ec0cb..e0be9aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/WebTestNG.java
@@ -57,7 +57,7 @@
while ((line = input.readLine()) != null) {
lastLine = line;
}
-
+
Assert.assertEquals(lastLine, EXPECTED_RESPONSE);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
index ca0a20b..4374ba9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandler/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
index 81a2e6b..46befc5 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -57,7 +57,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties
index 7ea9a10..c35f027 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/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}-jsp-resource-injection-tag-handler-pooling-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/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/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
index ce5a64b..98b2a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspResourceInjectionTagHandlerPoolingDisabled/servlet/taglib/MyTag.java
@@ -76,7 +76,7 @@
} catch (Exception ex) {
ex.printStackTrace();
throw new JspException(ex);
- }
+ }
return SKIP_BODY;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
index f0fddb3..5950ba9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6251872");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties
index b0b1777..0e05f64 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/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}-jsp-runtime-compile-consider-domain-lib-jarfiles-and-classes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
index 1aab6d2..c832488 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeCompileConsiderDomainLibJarFilesAndClasses/build.xml
@@ -36,7 +36,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="myclasses"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -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/jspRuntimeDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
index e06054c..db90cca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4883");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties
index adc7f16..3463342 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/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}-jsp-runtime-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
index 113bbe1..c001f02 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspRuntimeDeployDashDashLibraries/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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="deploy" depends="init-common">
<antcall target="deploy-war-libraries"/>
</target>
@@ -72,10 +72,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/jspScriptlessTagBodyJspDocument/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
index 728360f..2697dac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
@@ -51,7 +51,7 @@
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties
index 9663d7e..5617c40 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/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}-jsp-scriptless-tag-body-jsp-document"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptlessTagBodyJspDocument/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspScriptletAfterScriptlessTag/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
index 681cd1c..61e7a5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/WebTest.java
@@ -40,25 +40,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 30067");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties
index a3f3ab1..d8795c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/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}-jsp-scriptlet-after-scriptless-tag"/>
+<property name="appname" value="${module}-jsp-scriptlet-after-scriptless-tag"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletAfterScriptlessTag/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspScriptletDeclNestedInCustomAction/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
index 1c8bd8c..01b441e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4869146");
WebTest webTest = new WebTest(args);
@@ -61,7 +61,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
@@ -76,7 +76,7 @@
}
if (!EXPECTED.equals(lastLine)) {
- stat.addStatus("Wrong response body. Expected: "
+ stat.addStatus("Wrong response body. Expected: "
+ EXPECTED + ", received: " + lastLine,
stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties
index e249dab..b76898d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/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}-jsp-scriptlet-decl-nested-in-custom-action"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletDeclNestedInCustomAction/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
index 66f212c..2add95d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5052205");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties
index 1fd9ca2..d0f9c4b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/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="web"/>
-<property name="appname" value="${module}-jsp-scriptlet-syntax-error-correct-error-message"/>
+<property name="appname" value="${module}-jsp-scriptlet-syntax-error-correct-error-message"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspScriptletSyntaxErrorCorrectErrorMessage/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/jspSelfReferencingErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
index 25516d2..1a6fd09 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for detecting self-referencing error page");
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -57,7 +57,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -69,6 +69,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties
index c2cf851..a2330e7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/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}-jsp-self-referencing-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPage/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/jspSelfReferencingErrorPageWithRelativePath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
index 242f1a8..3f1378d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for detecting self-referencing error page");
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -58,7 +58,7 @@
}
public void invokeJsp() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/jsp/test.jsp";
HttpURLConnection conn = (HttpURLConnection)
@@ -70,6 +70,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties
index b262fe8..5866f8e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/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}-jsp-self-referencing-error-page-with-relative-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSelfReferencingErrorPageWithRelativePath/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/jspServletOverride/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
index ac2bd6e..bfee083 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/WebTest.java
@@ -69,13 +69,13 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
-
+
BufferedReader br = null;
- try {
+ try {
br = new BufferedReader(new InputStreamReader(
conn.getInputStream()));
String line = null;
@@ -84,7 +84,7 @@
break;
}
}
-
+
if (line != null) {
// Check <OBJECT> classid comment
System.out.println(line);
@@ -115,7 +115,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties
index 305ac06..f63dd04 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.properties
@@ -15,13 +15,13 @@
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}-jsp-servlet-override"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="application.xml" value="descriptor/application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="precompilejsp" value="false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspServletOverride/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspServletOverride/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspSessionInvalidated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
index 403d5af..43be877 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/WebTest.java
@@ -23,23 +23,23 @@
* "Cannot find attribute when session invalidated"
*/
public class WebTest {
-
+
private static final String TEST_NAME = "jsp-session-invalidated";
private static final String EXPECTED_RESPONSE = "SUCCESS";
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
-
+
public WebTest(String[] args) {
host = args[0];
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6362293");
WebTest webTest = new WebTest(args);
@@ -51,7 +51,7 @@
}
stat.printSummary();
}
-
+
/*
public void doTest() {
try {
@@ -60,7 +60,7 @@
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
-
+
int responseCode = conn.getResponseCode();
if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
@@ -85,7 +85,7 @@
}
}
*/
-
+
public void doTest() throws Exception {
BufferedReader input = null;
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties
index 3232b40..0b5cfaa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/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}-jsp-session-invalidated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSessionInvalidated/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/jspSimpleTagAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
index fd1ea48..e653ff9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test BodyTag behavior when tag is reused");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("BodyTag test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -87,7 +87,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
if (count == 6)
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties
index 217e2c8..58b8bad 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/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}-jsp-simpletag-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
index 9e14b69..6d05eba 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspSimpleTagAnnotation/servlet/mypack/MySimpleTag.java
@@ -28,7 +28,7 @@
public class MySimpleTag extends SimpleTagSupport {
-
+
private boolean pConstructed = false;
private PageContext pageContext;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
index 72ff365..2d646ed 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("jspStaticFileEncoding");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties
index 397a02b..1785fdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/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}-staticFileEncoding"/>
+<property name="appname" value="${module}-staticFileEncoding"/> \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-staticFileEncoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
index bec8c2a..f6eca0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspStaticFileEncoding/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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>
@@ -60,7 +60,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/jspTagFileBomEncodingMismatchTagDir/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
index 7424cba..5c48cdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for BOM encoding mismatch");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -68,7 +68,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 500) {
+ if (responseCode != 500) {
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties
index 480b85a..239c562 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/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}-jsp-tagfile-bom-encoding-mismatch-tagdir"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagFileBomEncodingMismatchTagDir/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspTagHandlerPostConstructAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
index ff0e426..06fa267 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into JSP tag handler");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties
index 0b99099..4b20acd 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/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}-jsp-resource-injection-tag-handler-post-construct"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/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/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
index 1f53065..c42d21e 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructAnnotation/servlet/taglib/MyTag.java
@@ -50,7 +50,7 @@
sb.append(",ds3-login-timeout=" + loginTimeout);
} catch (Exception ex) {
throw new RuntimeException(ex);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
index 34dddd0..669f654 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for specifying post-construction requirements of a JSP tag
* handler using the <post-construct> deployment descriptor element.
*
- * This unit test is equivalent in functionality to the
+ * This unit test is equivalent in functionality to the
* jspResourceInjectionTagHandlerPostConstruct unit test, where the
* post-construction requirements are declared using the @PostConstruct
* annotation.
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for post-construct element on "
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties
index efa98e7..0b20b43 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/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}-jsp-tag-handler-post-construct-element"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/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/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
index 440be8d..2d36a60 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPostConstructElement/servlet/taglib/MyTag.java
@@ -49,7 +49,7 @@
sb.append(",ds3-login-timeout=" + loginTimeout);
} catch (Exception ex) {
throw new RuntimeException(ex);
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
index 1239047..9017eab 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
numRun = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @PreDestroy on JSP tag handler");
@@ -60,10 +60,10 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
- public void runFirst() throws Exception {
+ public void runFirst() throws Exception {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties
index 93bd54c..5d1e2f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/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}-jsp-tag-handler-pre-destroy-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
index 7e83f72..d129333 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagHandlerPreDestroyAnnotation/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-first" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
index 44bb15e..39bce7a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 659");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties
index 02950f3..297dab7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/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}-jsp-tag-library-validator-xml-view-static-include"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/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/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
index 2168757..444f6c3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagLibraryValidatorXMLViewStaticInclude/servlet/taglib/MyValidator.java
@@ -36,7 +36,7 @@
public ValidationMessage[] validate(String prefix, String uri,
PageData page) {
- /*
+ /*
StringBuffer sb = new StringBuffer();
sb.append("---------- Prefix=" + prefix + " URI=" + uri +
@@ -56,34 +56,34 @@
}
sb.append("-----------------------------------------------");
System.out.println(sb.toString());
- */
+ */
try {
- DefaultHandler h = new DefaultHandler();
+ DefaultHandler h = new DefaultHandler();
- // parse the page
- SAXParserFactory f = SAXParserFactory.newInstance();
- f.setValidating(false);
- f.setNamespaceAware(true);
- SAXParser p = f.newSAXParser();
- p.parse(page.getInputStream(), h);
+ // parse the page
+ SAXParserFactory f = SAXParserFactory.newInstance();
+ f.setValidating(false);
+ f.setNamespaceAware(true);
+ SAXParser p = f.newSAXParser();
+ p.parse(page.getInputStream(), h);
- } catch (SAXException ex) {
- return vmFromString(ex.toString());
- } catch (ParserConfigurationException ex) {
- return vmFromString(ex.toString());
- } catch (IOException ex) {
- return vmFromString(ex.toString());
- }
+ } catch (SAXException ex) {
+ return vmFromString(ex.toString());
+ } catch (ParserConfigurationException ex) {
+ return vmFromString(ex.toString());
+ } catch (IOException ex) {
+ return vmFromString(ex.toString());
+ }
return null;
}
// constructs a ValidationMessage[] from a single String and no ID
private static ValidationMessage[] vmFromString(String message) {
- return new ValidationMessage[] {
- new ValidationMessage(null, message)
- };
+ return new ValidationMessage[] {
+ new ValidationMessage(null, message)
+ };
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
index db774e5..4de7d6f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
index c8b15fa..6da9ec9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.properties
@@ -15,12 +15,12 @@
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}-jsp-tag-release-called-when-pooling-disabled"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
index 75f0403..f86354a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingDisabled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="enablePooling" value="false" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
index 84a3fad..93d63d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
index 019dae0..591c80a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.properties
@@ -15,12 +15,12 @@
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}-jsp-tag-release-called-when-pooling-enabled"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml
index 097431c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/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,10 +42,10 @@
</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
@@ -53,8 +53,8 @@
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">
@@ -64,7 +64,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}"/>
@@ -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/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
index d0df8c6..1d7e33b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagReleaseCalledWhenPoolingEnabled/descriptor/sun-web.xml
@@ -22,5 +22,5 @@
<sun-web-app>
<jsp-config>
<property name="enablePooling" value="true" />
- </jsp-config>
+ </jsp-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
index 39d7e7b..3434421 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/WebTest.java
@@ -22,14 +22,14 @@
public class WebTest
{
-
+
private static boolean pass = false;
private static int bTag = 0;
private static int useBean = 0;
private static int scriptlet = 0;
private static int ELvalue1 = 0;
private static int ELvalue2 = 0;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -38,14 +38,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test tagdependent bodies are handled correctly in XML syntax");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jspx" );
if (bTag == 6 && useBean == 1 && scriptlet == 1 &&
@@ -109,7 +109,7 @@
}
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties
index a940410..fe3a162 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/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}-jspTagdependentXml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/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/jspTagdependentXml/servlet/mypack/MyBody.java b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
index fb686e6..042e528 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTagdependentXml/servlet/mypack/MyBody.java
@@ -21,7 +21,7 @@
public class MyBody extends BodyTagSupport {
-
+
String echoStr;
String staticStr;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
index 8d6fa76..10fb3ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for escaping EL expressions in template text");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties
index 09019fb..2f54209 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/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="web"/>
-<property name="appname" value="${module}-jsp-template-text-escaped-el"/>
+<property name="appname" value="${module}-jsp-template-text-escaped-el"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTemplateTextEscapedEL/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/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
index f43c474..2443446 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/WebTest.java
@@ -53,18 +53,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/notfound.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode == 500) {
+ if (responseCode == 500) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
System.err.println("Wrong response code. Expected: 500"
diff --git a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties
index 4f629be..a8a7fe3 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/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}-jsp-throws-file-not-found-expect-500-response-code"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspThrowsFileNotFoundExpect500ResponseCode/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/jspTrimDirectiveWhitespaces/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
index f6833fe..8c5195f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/WebTest.java
@@ -35,12 +35,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for enum support in EL");
WebTest webTest = new WebTest(args);
webTest.doTest("/trim.jsp", "jsp-trimDirectiveWhitespaces");
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String testName) {
@@ -69,7 +69,7 @@
// System.out.println("line3:" + line3);
String line4 = input.readLine();
// System.out.println("line4:" + line4);
-
+
if ("".equals(line1) &&
"xyz".equals(line2) &&
"".equals(line3) &&
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
index 6bf5f74..5cdd52b 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.properties
@@ -15,12 +15,12 @@
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}-trimDirectiveWhitespaces"/>
+<property name="appname" value="${module}-trimDirectiveWhitespaces"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspTrimDirectiveWhitespaces/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspUrnJspTldWithoutUri/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
index 2fee798..e26a109 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/WebTest.java
@@ -42,25 +42,25 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for urn:jsptld:<path>");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
BufferedReader bis = null;
- try {
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jspx");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
stat.addStatus("Wrong response code. Expected: 200"
+ ", received: " + responseCode, stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties
index 2631fa3..e7e7fd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/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}-jsp-urn-jsp-tld-without-uri"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspUrnJspTldWithoutUri/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspUseBean/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
index fa45ef6..6977cac 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/WebTest.java
@@ -21,11 +21,11 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final String TEST_NAME = "jsp-use-bean";
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -34,14 +34,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Test useBean optimization behavior");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus(TEST_NAME, pass? stat.PASS: stat.FAIL);
@@ -78,10 +78,10 @@
int index = line.indexOf("PASS");
if (index >= 0) {
pass = true;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties b/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties
index ad6dc76..429689a 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/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="web"/>
-<property name="appname" value="${module}-jsp-use-bean"/>
+<property name="appname" value="${module}-jsp-use-bean"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml b/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspUseBean/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspUseBean/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jspWelcomePageWithoutAnyServletMappings/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
index 51ffa0d..751b217 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6372570");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties
index 9dccba8..15a3351 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/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}-jsp-welcome-page-without-any-servlet-mappings"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspWelcomePageWithoutAnyServletMappings/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/jspXpoweredByDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
index f2fb4eb..269d1fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for disabling 'X-Powered-By: JSP/2.0' response header");
WebTest webTest = new WebTest(args);
@@ -46,8 +46,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties
index 8ef9bec..8a1b52f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/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="web"/>
-<property name="appname" value="${module}-jsp-xpowered-by-disabled"/>
+<property name="appname" value="${module}-jsp-xpowered-by-disabled"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredByDisabled/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/jspXpoweredBySingleResponseHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
index d4f464e..4da5968 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for https://glassfish.dev.java.net/issues/show_bug.cgi?id=1093
* ("x-powered-by header has redundant information"):
*
- * Make sure that if one JSP forwards to another, the response does not
+ * Make sure that if one JSP forwards to another, the response does not
* contain any duplicate 'X-Powered-By: JSP' header.
*/
public class WebTest {
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish issue 1093");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties
index b995abc..00a19fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/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}-jsp-xpowered-by-single-response-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspXpoweredBySingleResponseHeader/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/jspcConfigure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
index b01c9b1..6a771eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4994790");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties
index bcfabc8..220eb92 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/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="web"/>
-<property name="appname" value="${module}-jspc-configure"/>
+<property name="appname" value="${module}-jspc-configure"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspcConfigure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspcConfigure/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/jspconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
index c9f444f..1317f4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -35,7 +35,7 @@
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, "JSP-CONFIG", contextRoot + "/test.jsp" );
goGet2(host, port, "ELIgnored", contextRoot + "/foo/test.jsp" );
@@ -81,7 +81,7 @@
if (!status.equalsIgnoreCase("PASS")){
throw new Exception("Wrong response");
}
- }
+ }
}
} finally {
try {
@@ -98,7 +98,7 @@
} catch (IOException ex) {}
}
}
-
+
private static void goGet2(String host, int port,
String result, String contextPath)
throws Exception
@@ -109,7 +109,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
index 41d02c5..c4fd2a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.properties
@@ -15,11 +15,11 @@
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}-jsp-config"/>
+<property name="appname" value="${module}-jsp-config"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/jspconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jspconfig/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/jstlHtmlParamOutsideFmtMessage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
index 945419e..faa07f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6361668");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/test.jspx");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties
index cabffb9..562ad69 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/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}-jstl-html-param-outside-fmt-message"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jstlHtmlParamOutsideFmtMessage/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/jstlLocaleSupportAPI/WebTest.java b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
index f5e0202..1a923e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 871");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
// Access test1.jsp
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
@@ -65,7 +65,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -90,7 +90,7 @@
String acceptLanguage = "Accept-Language: de\n";
os.write(acceptLanguage.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties
index a1800c5..6432da4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/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}-jstl-locale-support-api"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/jstlLocaleSupportAPI/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/keepAlive/build.properties b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.properties
index 9d9190a..790c28c 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/keepAlive/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}-keepalive"/>
+<property name="appname" value="${module}-keepalive"/> \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-keepalive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAlive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAlive/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/keepAliveTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
index 53d6ede..fdb6d6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeout/build.xml
@@ -36,7 +36,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=10"/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds=10"/>
</antcall>
</target>
@@ -44,7 +44,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds="/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-1.http.timeout-seconds="/>
</antcall>
</target>
@@ -61,7 +61,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties
index 5b01a71..6c4141b 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/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}-keepAliveTimeoutInSecondsZeroSSL"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
index 4e15c50..771ff0e 100644
--- a/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/keepAliveTimeoutSSL/build.xml
@@ -37,7 +37,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds=10"/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds=10"/>
</antcall>
<sleep seconds="10"/>
</target>
@@ -46,7 +46,7 @@
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
- value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds="/>
+ value="configs.config.server-config.network-config.protocols.protocol.http-listener-2.http.timeout-seconds="/>
</antcall>
</target>
@@ -64,7 +64,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
index a2e8e56..a32de4e 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6456553");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeWithLargeCookie();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties
index 7ac6001..6ee6aa5 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/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}-large-cookie-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
index 24d5370..ab6cf07 100644
--- a/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/largeCookieError/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/listenerDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
index 2a6c82d..4a730e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/WebTest.java
@@ -33,7 +33,7 @@
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
public static void main(String args[]) throws Exception {
String host = args[0];
@@ -41,12 +41,12 @@
String contextRoot = args[2];
stat.addDescription("Ensure disabled HTTP listener gives ConnectException");
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/ServletTest");
System.out.println("Invoking url: " + url.toString());
- try {
+ try {
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.getResponseCode();
System.err.println("Expected java.net.ConnectException: "
@@ -56,6 +56,6 @@
stat.addStatus(TEST_NAME, stat.PASS);
}
- stat.printSummary();
+ stat.printSummary();
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties
index 87de9f4..80d0d1d 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/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}-listenerDisabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
index e486e4d..fd44b68 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-http-listener" />
@@ -79,7 +79,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}"/>
@@ -91,10 +91,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/listenerDisabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerDisabled/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
index 03c9b03..7075c6d 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -44,14 +44,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for IT 13555");
WebTest webTest = new WebTest(args);
int port = new Integer(webTest.portS).intValue();
String name;
-
+
try {
webTest.goGet(webTest.host, port,
webTest.contextRoot + "/test" );
@@ -81,7 +81,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -122,5 +122,5 @@
stat.addStatus(TEST_NAME + " FAILED", stat.FAIL);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties
index 0c3493c..b8957ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/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="web"/>
-<property name="appname" value="${module}-listenerFilterServletInit"/>
+<property name="appname" value="${module}-listenerFilterServletInit"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
index 10c667d..ab6cf07 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/listenerFilterServletInit/servlet/test/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
index c004162..14210c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/FilterTest.java
@@ -30,14 +30,14 @@
System.out.println("[Filter.init]");
Record.addData("Fi");
}
-
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws IOException, ServletException {
System.out.println("[Filter.doFilter]");
filterChain.doFilter(request, response);
-
- }
-
+
+ }
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
index 81b588c..0515a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ListenerTest.java
@@ -26,7 +26,7 @@
}
public void contextInitialized(ServletContextEvent sce) {
- System.out.println("[Listener.contextInitialized]");
+ System.out.println("[Listener.contextInitialized]");
Record.addData("Li");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
index 9b92a1c..b48875c 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/Record.java
@@ -19,7 +19,7 @@
class Record {
private static String data = "";
-
+
static void addData(String a) {
data += a;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
index 91ba6bc..014808c 100644
--- a/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/listenerFilterServletInit/servlet/test/ServletTest.java
@@ -26,10 +26,10 @@
public ServletTest() {
Record.addData("S");
}
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
Record.addData("Si");
}
@@ -38,9 +38,9 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println(Record.getData());
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
index fa9783d..5661ef4 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest.java
@@ -21,13 +21,13 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
private static String host;
private static String contextRoot;
private static String port;
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("load-balancer-mod-jk", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
index eadc686..ee548b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/WebTest2.java
@@ -21,13 +21,13 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
private static String host;
private static String contextRoot;
private static String port;
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("load-balancer-mod-jk", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties
index 8ffab01..a34481a 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/loadBalanceModJK/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}-load-balance-mod-jk"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
index f2f2e41..4c936e1 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4657979");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -58,7 +58,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -76,7 +76,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
index 3f0d02f..b0ee2ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/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}-load-classes-from-zip-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/loadClassesFromZipFile/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/localeEncodingMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.properties
index 937503a..e823abc 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/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="web"/>
-<property name="appname" value="${module}-locale-encoding-mapping"/>
+<property name="appname" value="${module}-locale-encoding-mapping"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml
index 8eed661..c7a084f 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/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="."
@@ -77,10 +77,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/localeEncodingMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
index 6f63673..0c66da9 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/descriptor/web.xml
@@ -22,12 +22,12 @@
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>servlet.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
index a39b525..57d879b 100644
--- a/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/localeEncodingMapping/servlet/ServletTest.java
@@ -27,7 +27,7 @@
public class ServletTest extends HttpServlet {
protected void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-
+
response.setContentType("text/html");
response.setLocale(Locale.JAPAN);
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
index 135a9c3..f68c313 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for locally bundled log4j");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties
index a57e022..c06ce4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/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}-log4j-locally-bundled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml
index 554c651..46ecddb 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/log4jLocallyBundled/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"/>
@@ -44,17 +44,17 @@
</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">
@@ -64,7 +64,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}"/>
@@ -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/log4jXmlInEarFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
index 00fb911..dd91455 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/WebTest.java
@@ -40,7 +40,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for log4j packaged in EAR file");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/mywar/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -75,10 +75,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties
index 860692a..b46d6d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/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}-log4j-xml-in-ear-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
index 817c17b..107bf5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/log4jXmlInEarFile/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${mywar.war}"/>
@@ -47,7 +47,7 @@
<fileset dir="${assemble.dir}" includes="*.war"/>
<fileset dir="." includes="lib/*.jar, lib/*.xml"/>
</ear>
- </target>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -61,8 +61,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,7 +73,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
index 5698ba9..66af131 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,13 +40,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("malformedQueryString", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("malformedQueryString", stat.FAIL);
@@ -55,7 +55,7 @@
stat.printSummary("web/malformedQueryString---> expect 1 PASS");
}
- private static void goGet(String host,
+ private static void goGet(String host,
int port, String contextPath) throws Exception {
Socket s = new Socket(host, port);
OutputStream os = s.getOutputStream();
@@ -63,7 +63,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,19 +75,19 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-malformedQueryString", stat.PASS);
} else {
stat.addStatus("web-malformedQueryString", stat.FAIL); }
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties
index 99c2f7f..93a3e36 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/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}-malformedQueryString"/>
+<property name="appname" value="${module}-malformedQueryString"/> \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-malformedQueryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/malformedQueryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
index c790284..88c6c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/descriptor/web.xml
@@ -22,18 +22,18 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
@@ -42,7 +42,7 @@
<servlet-name>ServletTest2</servlet-name>
<url-pattern>/ServletTest2</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
index ad99f3c..131c2df 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,18 +34,18 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2?Quebec;libre");
if ( rd == null ){
out.println("TEST::FAIL");
out.flush();
- } else {
- rd.forward(request, response);
+ } else {
+ rd.forward(request, response);
}
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
index 83fdbef..223e19d 100644
--- a/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/malformedQueryString/servlet/ServletTest2.java
@@ -24,10 +24,10 @@
public class ServletTest2 extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -36,12 +36,12 @@
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("[Servlet2.doPost]");
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
index f6cf763..0d69cb8 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(TEST_NAME);
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
@@ -55,7 +55,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
sock.setSoTimeout(5000);
OutputStream os = sock.getOutputStream();
@@ -64,8 +64,8 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
- os.flush();
-
+ os.flush();
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,7 +83,7 @@
os.write(get.getBytes());
os.write("Host: localhost\n".getBytes());
os.write("\n".getBytes());
- os.flush();
+ os.flush();
try{
while ((line = bis.readLine()) != null) {
}
@@ -102,7 +102,7 @@
try{
while ((line = bis.readLine()) != null) {
- found = false;
+ found = false;
System.out.println("line: " + line);
}
}catch (SocketTimeoutException t){
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties
index e681c92..90ba0c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/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}-maxKeepAliveRequests"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
index 9a08738..2cdc86d 100644
--- a/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/maxKeepAliveRequests/build.xml
@@ -62,7 +62,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
index 1ff39d6..af683e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/WebTest.java
@@ -40,24 +40,24 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1607");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/foo.HTML");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -70,7 +70,7 @@
+ EXPECTED_CONTENT_TYPE
+ ", received: " + contentType);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
}
} catch (Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties
index 8253d0c..c2a22e8 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/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}-mime-mapping-case-insensitive-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingCaseInsensitiveMatch/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/mimeMappingInheritedFromDefaultWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
index fe803b0..8157ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Inherit MIME mapping from default-web.xml");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed.");
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties
index c60a51d..dfacbdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/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="web"/>
-<property name="appname" value="${module}-mime-mapping-inherited-from-default-web-xml"/>
+<property name="appname" value="${module}-mime-mapping-inherited-from-default-web-xml"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/mimeMappingInheritedFromDefaultWebXml/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/monitorHttpService/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
index 695c006..da73746 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/WebTest.java
@@ -63,12 +63,12 @@
port = args[6];
contextRoot = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9549");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -81,7 +81,7 @@
System.out.println("errorcount = " + errorcount);
invokeURL("http://" + host + ":" + port + contextRoot + "/statuscode?code=503");
-
+
int count503_2 = getCount("count503");
System.out.println("count503_2 = " + count503_2);
int count5xx_2 = getCount("count5xx");
@@ -101,7 +101,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
@@ -154,7 +154,7 @@
System.out.println("getCount: "+resultStr);
RestResponse response = RestUtil.get(url);
Map<String, Object> map = response.getResponse();
-
+
return ((Long)((Map)((Map)((Map)((Map)map.get("data")).get("extraProperties")).get(
"entity")).get(monitorPath)).get("count")).intValue();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties
index 1ba0e8d..a02c139 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/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}-monitor-http-service"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
index 59ef1ae..081b958 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorHttpService/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,7 +63,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -84,7 +84,7 @@
<arg value="${contextroot}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -95,7 +95,7 @@
<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/monitorServletInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
index 85911a0..c9a8da0 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/WebTest.java
@@ -63,12 +63,12 @@
contextRoot = args[6];
appName = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9481");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -80,7 +80,7 @@
String testResult = invokeURL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println(testResult);
-
+
long appReqCount2 = getValue("test/requestcount", "requestcount", "count");
System.out.println("app request count: " + appReqCount2);
long processTime2 = getValue("test/processingtime", "processingtime", "lastsampletime");
@@ -94,7 +94,7 @@
System.out.println("app error count: " + appErrorCount1);
invokeURL("http://" + host + ":" + port + contextRoot + "/badrequest");
-
+
long appErrorCount2 = getValue("badrequest/errorcount", "errorcount", "count");
System.out.println("app error count: " + appErrorCount2);
@@ -109,7 +109,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties
index 06a3517..bcaaf49 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/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="aname" value="${module}-monitor-servlet-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
index 73a2cc8..bf6696b 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorServletInstance/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,13 +63,13 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common">
<param name="as.props" value="${as.props} --name ${appname}-web"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -82,7 +82,7 @@
<arg value="${appname}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -93,7 +93,7 @@
<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/monitorWebRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
index 28fcc2b..b4bf9b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/WebTest.java
@@ -64,12 +64,12 @@
port = args[6];
contextRoot = args[7];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 9309");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
@@ -81,7 +81,7 @@
String testResult = invokeURL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println(testResult);
-
+
int webReqCount2 = getCount("web/request/requestcount", "requestcount");
System.out.println("web request count: " + webReqCount2);
int appReqCount2 = getCount("applications" + contextRoot + "-web/" + instanceName + "/requestcount", "requestcount");
@@ -98,7 +98,7 @@
System.out.println("app error count: " + appErrorCount1);
invokeURL("http://" + host + ":" + port + contextRoot + "/badrequest");
-
+
int webErrorCount2 = getCount("web/request/errorcount", "errorcount");
System.out.println("web error count: " + webErrorCount2);
int appErrorCount2 = getCount("applications" + contextRoot + "-web/" + instanceName + "/errorcount", "errorcount");
@@ -116,7 +116,7 @@
}
private String invokeURL(String urlString) throws Exception {
-
+
StringBuilder sb = new StringBuilder();
URL url = new URL(urlString);
@@ -172,5 +172,5 @@
return ((Long)((Map)((Map)((Map)((Map)map.get("data")).get("extraProperties")).get(
"entity")).get(countName)).get("count")).intValue();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties
index 66b8461..b155cc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/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}-monitor-web-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
index 7c9741b..df76d57 100644
--- a/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/monitorWebRequest/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,16 +43,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -63,7 +63,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -71,7 +71,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" classpath="${env.APS_HOME}/lib/reportbuilder.jar:${s1as.classpath}:." fork="true">
<arg value="${admin.host}"/>
@@ -84,7 +84,7 @@
<arg value="${contextroot}"/>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -95,7 +95,7 @@
<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/multiByteContextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
index 434d669..eded2d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/WebTest.java
@@ -18,7 +18,7 @@
import java.net.*;
import com.sun.ejte.ccl.reporter.*;
-/**
+/**
* Unit test for:
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=2339
@@ -42,7 +42,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2339");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/"
+ "%E3%81%A8%E7%B2%AEJot%E7%B2%AEEnterpriseApplication2%E7%B2%A4%E3%82%8D-war/test.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -79,10 +79,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties
index e7f1326..8e38c61 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/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}-multi-byte-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml
index 23f2ac6..19da3de 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/multiByteContextRoot/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
index f6443cd..452644b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRoot/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app 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"
- version="2.5">
+ 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"
+ version="2.5">
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
index 8b3c37d..9bd0a33 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/WebTest.java
@@ -20,7 +20,7 @@
import java.util.Map;
import com.sun.ejte.ccl.reporter.*;
-/**
+/**
* Unit test for:
*
* Multi-byte context root with session cookie
@@ -44,7 +44,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Multi-Byte Context Root with Session Cookie");
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String doSetJsp() throws Exception {
-
+
String sessionId = null;
URL url = new URL("http://" + host + ":" + port + "/"
@@ -92,7 +92,7 @@
sessionId = getCookieField(cookies, JSESSIONID);
System.out.println("sessionId = " + sessionId);
- } else {
+ } else {
System.err.println("Unexpected return code: " + responseCode);
}
@@ -109,7 +109,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
//String cookie = sessionId + "; myid=123@456";
String cookie = "$Version=1; " + sessionId + "; myid=\"123@456\"";
- conn.setRequestProperty("Cookie", cookie);
+ conn.setRequestProperty("Cookie", cookie);
conn.connect();
int responseCode = conn.getResponseCode();
@@ -121,10 +121,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
expected = true;
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
- } else {
+ } else {
System.err.println("Unexpected return code: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties
index 3533b38..226951d 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/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}-multi-byte-context-root-with-cookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml
index 23f2ac6..19da3de 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/multiByteContextRootWithCookie/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
index f6443cd..452644b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteContextRootWithCookie/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app 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"
- version="2.5">
+ 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"
+ version="2.5">
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
index 332bcc5..2b74efa 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -60,9 +60,9 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties
index a2880f1..f81fc98 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-default-charset"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-default-charset"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multiByteGETQueryParamDefaultCharset/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamDefaultCharset/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
index 74d2e69..4bc871b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -70,9 +70,9 @@
}
public void doTest() throws Exception {
-
+
sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties
index cb2edd0..2fdc990 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-form-hint-field"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-form-hint-field"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multiByteGETQueryParamFormHintField/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamFormHintField/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
index 65fbf07..bacff80 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -60,9 +60,9 @@
}
public void doTest() throws Exception {
-
+
Socket sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties
index 2228b0f..2626ea8 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-locale-charset-map"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-locale-charset-map"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
index 3e53dcf..17482d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamLocaleCharsetMap/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
index b20549c..897c5ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6339608");
WebTest webTest = new WebTest(args);
@@ -69,9 +69,9 @@
}
public void doTest() throws Exception {
-
+
sock = new Socket(host, Integer.parseInt(port));
-
+
BufferedWriter bw = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream(), "Shift_JIS"));
bw.write("GET " + contextRoot
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties
index fb3d119..3aed262 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/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="web"/>
-<property name="appname" value="${module}-multi-byte-get-query-param-set-char-encoding"/>
+<property name="appname" value="${module}-multi-byte-get-query-param-set-char-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
index 07daebc..91dc358 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteGETQueryParamSetCharEncoding/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
index bb2539f..86cf389 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/WebTest.java
@@ -57,7 +57,7 @@
size = Integer.parseInt(args[3]);
isAscii = Boolean.valueOf(args[4]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Multi-byte Http request buffer");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties
index e715079..cd4233a 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/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}-multi-byte-http-request-buffer"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
index d89725b..eb029df 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiByteHttpRequestBuffer/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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" encoding="UTF-8"/>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<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}"/>
@@ -73,10 +73,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/multiBytePOSTFormHintField/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
index b4d9a30..48a8d7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for POST form data with form-hint-field");
WebTest webTest = new WebTest(args);
@@ -58,7 +58,7 @@
}
public void doTest() throws Exception {
-
+
// POST body
String body = "japaneseName="
+ URLEncoder.encode("\u3068\u4eba\u6587", "Shift_JIS")
@@ -67,7 +67,7 @@
// Create a socket to the host
Socket sock = new Socket(host, Integer.parseInt(port));
OutputStream os = sock.getOutputStream();
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
sock.getOutputStream()));
@@ -75,7 +75,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties
index 17c06ee..1113358 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/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="web"/>
-<property name="appname" value="${module}-multi-byte-post-form-hint-field"/>
+<property name="appname" value="${module}-multi-byte-post-form-hint-field"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multiBytePOSTFormHintField/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
index 194af75..a7424f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiBytePOSTFormHintField/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doPost (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
index 892027e..a21448a 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/WebTest.java
@@ -24,10 +24,10 @@
* Issue Issue 464: Multi-Processor configuration aren't applied
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -36,7 +36,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("multiProcessorConfig");
String host = args[0];
@@ -45,17 +45,17 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
System.out.println(t.getMessage());
- stat.addStatus("multiProcessorConfig", stat.PASS);
+ stat.addStatus("multiProcessorConfig", stat.PASS);
}
if (count != EXPECTED_COUNT){
stat.addStatus("multiProcessorConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -71,7 +71,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));
@@ -83,16 +83,16 @@
index = line.indexOf(result);
System.out.println(line);
if (index != -1) {
- stat.addStatus("multiProcessorConfig", stat.FAIL);
+ stat.addStatus("multiProcessorConfig", stat.FAIL);
break;
- }
+ }
}
if ( index == -1 ){
- stat.addStatus("multiProcessorConfig", stat.PASS);
+ stat.addStatus("multiProcessorConfig", stat.PASS);
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties
index 6e47818..072545b 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/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}-multiProcessorConfig"/>
+<property name="appname" value="${module}-multiProcessorConfig"/> \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-multiProcessorConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
index a42cefb..d3102af 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/build.xml
@@ -36,7 +36,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"/>
@@ -70,15 +70,15 @@
</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>
@@ -86,7 +86,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -103,10 +103,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/multiProcessorConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/multiProcessorConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/multiProcessorConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
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();
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
index 5441cda..a459f60 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/WebTest.java
@@ -25,10 +25,10 @@
* forwarded to another servlet
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,13 +41,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
run(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("multiByteValue POST", stat.FAIL);
- }
+ }
} catch (Throwable t) {
stat.addStatus("multiByteValue", stat.FAIL);
}
@@ -63,12 +63,12 @@
*/
Socket s = new Socket(host, port);
OutputStream os = s.getOutputStream();
- System.out.println(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ System.out.println(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ " HTTP/1.0\n"));
- os.write(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ os.write(("GET " + contextPath + "?j_encoding=Shift_JIS"
+ " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -79,16 +79,16 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
- stat.addStatus("web-multibyteValue GET: "
+ stat.addStatus("web-multibyteValue GET: "
+ line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multibyteValue GET: "
- + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multibyteValue GET: "
+ + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
@@ -98,11 +98,11 @@
// Construct body
String body = URLEncoder.encode("j_encoding", "UTF-8")
+ "=" + URLEncoder.encode("Shift_JIS", "UTF-8");
-
+
// Create a socket to the host
s = new Socket(host, port);
os = s.getOutputStream();
-
+
// Send header
BufferedWriter wr = new BufferedWriter(new OutputStreamWriter(
s.getOutputStream(), "UTF8"));
@@ -110,7 +110,7 @@
wr.write("Content-Length: " + body.length() + "\r\n");
wr.write("Content-Type: application/x-www-form-urlencoded\r\n");
wr.write("\r\n");
-
+
// Send body
wr.write(body);
wr.flush();
@@ -126,18 +126,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
- stat.addStatus("web-multibyteValue POST: "
+ stat.addStatus("web-multibyteValue POST: "
+ line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-multibyteValue POST: "
- + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-multibyteValue POST: "
+ + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties
index 7417df8..6472a85 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/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}-multibyteValue"/>
+<property name="appname" value="${module}-multibyteValue"/> \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-multibyteValue"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml b/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/multibyteValue/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
index 9d4499f..0c17423 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/descriptor/web.xml
@@ -22,18 +22,18 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
index 8edb3c2..901727f 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest.java
@@ -41,7 +41,7 @@
}
public void doGet (HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
doPost (req,res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
index ae65275..14e1cef 100644
--- a/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/multibyteValue/servlet/ServletTest2.java
@@ -30,9 +30,9 @@
import jakarta.servlet.http.HttpServletResponse;
public class ServletTest2 extends HttpServlet {
-
+
Collator japCollator = Collator.getInstance(Locale.JAPANESE);
-
+
public void doPost (HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
@@ -51,7 +51,7 @@
}
public void doGet (HttpServletRequest req, HttpServletResponse res)
- throws ServletException, IOException {
+ throws ServletException, IOException {
doPost (req,res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
index 0fad42c..00b6254 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("networkListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
index 31ddd3d..29e708d 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("networkListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties
index a96df55..1fe2a53 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/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}-networkListenerDynamicConfig"/>
+<property name="appname" value="${module}-networkListenerDynamicConfig"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
index 0d22acd..c2a78e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/build.xml
@@ -50,7 +50,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"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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>
@@ -80,7 +80,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<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/networkListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
index 2d1ab03..d270865 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 404");
+ System.out.println("Response code: " + responseCode + " Expected code: 404");
if (responseCode == 200){
stat.addStatus("networkListenerDynamicConfigEnabled", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
index b76f5b5..9505ce1 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("networkListenerDynamicConfigEnabled-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties
index ef29bf7..89112d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/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}-networkListenerDynamicConfigEnabled"/>
+<property name="appname" value="${module}-networkListenerDynamicConfigEnabled"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
index 41f2b87..2b78f1f 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/build.xml
@@ -58,7 +58,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"/>
@@ -66,10 +66,10 @@
</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
@@ -77,10 +77,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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>
@@ -88,7 +88,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}"/>
@@ -100,7 +100,7 @@
</classpath>
</java>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -115,7 +115,7 @@
<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/networkListenerDynamicConfigEnabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerDynamicConfigEnabled/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
index d019dc0..3cfc4b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("networkListenerTarget", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties
index 1348c83..1136010 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/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}-networkListenerTarget"/>
+<property name="appname" value="${module}-networkListenerTarget"/> \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-networkListenerTarget"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
index 5292206..ee35723 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/build.xml
@@ -20,7 +20,7 @@
<!DOCTYPE project [
<!ENTITY commonSetup SYSTEM "./../../../config/properties.xml">
<!ENTITY commonBuild SYSTEM "./../../../config/common.xml">
-<!ENTITY eeCommonBuild SYSTEM "./../../../config/ee-common.xml">
+<!ENTITY eeCommonBuild SYSTEM "./../../../config/ee-common.xml">
<!ENTITY run SYSTEM "./../../../config/run.xml">
<!ENTITY testproperties SYSTEM "./build.properties">
]>
@@ -124,7 +124,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"/>
@@ -132,19 +132,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="deploy" depends="init-common">
<echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -172,7 +172,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<echo message="Undeploying warfile ${appname}-web from
${assemble.dir}/${appname}-web.war from ${basedir}." level="verbose"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/networkListenerTarget/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
index e9b1021..b743d59 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for one session cookie header");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties
index 253c394..eed74dc 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/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}-one-session-cookie-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
index 3e53d7e..9083d5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/oneSessionCookieHeader/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete file="RepRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,23 +46,23 @@
</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="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/osgiServlet/WebTest.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
index cd98b1c..b2d7ce0 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/WebTest.java
@@ -29,7 +29,7 @@
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties
index e8cbd21..a12364c 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/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}-osgi-servlet"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
index 34f31f3..7eeacf1 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/build.xml
@@ -38,7 +38,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"/>
@@ -46,14 +46,14 @@
</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="deploy" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -70,7 +70,7 @@
value="osgi-servlet"/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="run" depends="init-common">
@@ -84,7 +84,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
index 890612a..782c3cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/Activator.java
@@ -30,43 +30,43 @@
public class Activator implements BundleActivator {
- private ServiceTracker httpServiceTracker;
-
- public void start(BundleContext context) throws Exception {
- httpServiceTracker = new HttpServiceTracker(context);
- httpServiceTracker.open();
- }
+ private ServiceTracker httpServiceTracker;
- public void stop(BundleContext context) throws Exception {
- httpServiceTracker.close();
- httpServiceTracker = null;
- }
+ public void start(BundleContext context) throws Exception {
+ httpServiceTracker = new HttpServiceTracker(context);
+ httpServiceTracker.open();
+ }
- private class HttpServiceTracker extends ServiceTracker {
+ public void stop(BundleContext context) throws Exception {
+ httpServiceTracker.close();
+ httpServiceTracker = null;
+ }
- public HttpServiceTracker(BundleContext context) throws Exception {
- super(context, context.createFilter("(&(objectClass=" +
- org.osgi.service.http.HttpService.class.getName() +
+ private class HttpServiceTracker extends ServiceTracker {
+
+ public HttpServiceTracker(BundleContext context) throws Exception {
+ super(context, context.createFilter("(&(objectClass=" +
+ org.osgi.service.http.HttpService.class.getName() +
")(VirtualServer=server))"), null);
- }
+ }
- public Object addingService(ServiceReference reference) {
- HttpService httpService = (HttpService) context.getService(reference);
- try {
- httpService.registerServlet("/aa/bb", new HelloWorldServlet1(), null, null);
- httpService.registerServlet("/aa", new HelloWorldServlet2(), null, null);
+ public Object addingService(ServiceReference reference) {
+ HttpService httpService = (HttpService) context.getService(reference);
+ try {
+ httpService.registerServlet("/aa/bb", new HelloWorldServlet1(), null, null);
+ httpService.registerServlet("/aa", new HelloWorldServlet2(), null, null);
System.out.println("Registered servlet1 with mapping /aa/bb and servlet2 with mapping /aa");
test();
httpService.unregister("/aa/bb");
System.out.println("Unregistered servlet1");
test();
-
- } catch (Exception e) {
- e.printStackTrace();
- }
- return httpService;
- }
- }
+
+ } catch (Exception e) {
+ e.printStackTrace();
+ }
+ return httpService;
+ }
+ }
void test() {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
index f6535e7..57cf4fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet1.java
@@ -26,10 +26,10 @@
import jakarta.servlet.http.HttpServletResponse;
public class HelloWorldServlet1 extends HttpServlet {
-
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
- resp.setContentType("text/html");
- resp.getWriter().write("<html><body>Servlet 1 </body></html>");
- }
+
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ resp.setContentType("text/html");
+ resp.getWriter().write("<html><body>Servlet 1 </body></html>");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
index 55499f9..a8a61ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/osgiServlet/osgi-servlet/src/main/java/sahoo/osgihttp/test1/HelloWorldServlet2.java
@@ -27,9 +27,9 @@
public class HelloWorldServlet2 extends HttpServlet {
- protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp) throws ServletException, IOException {
resp.setContentType("text/html");
resp.getWriter().write("<html><body>Servlet 2 </body></html>");
- }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
index 20e6887..d19107d 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/WebTest.java
@@ -40,16 +40,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 8648");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties
index 29117d1..398440f 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/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}-override-implicit-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/overrideImplicitMapping/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/pipelineQueueFull/WebTest.java b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
index 29391aa..cc5f5d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/WebTest.java
@@ -25,16 +25,16 @@
* ("NPE When stressing GlassFish and the Pipeline Queue is full")
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -55,7 +55,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 503");
+ System.out.println("Response code: " + responseCode + " Expected code: 503");
if (responseCode != 503){
stat.addStatus("pipelineQueueFull", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties
index df19e4e..db12469 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/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}-pipelineQueueFull"/>
+<property name="appname" value="${module}-pipelineQueueFull"/> \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-pipelineQueueFull"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
index fb627be..1accc7f 100644
--- a/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/pipelineQueueFull/build.xml
@@ -62,7 +62,7 @@
</classpath>
</java>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties b/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties
index ce040a9..45a519e 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnification/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/portUnification/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}-portunif"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml b/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
index e79c2e1..00cd2bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/portUnification/build.xml
@@ -30,7 +30,7 @@
&commonBuild;
&testproperties;
&run;
-
+
<import file="../reportbuilder.xml"/>
<target name="jar" depends="build">
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties
index bb1832a..1dd62fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/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}-portunif-target"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
index 3aa17be..3bcd052 100644
--- a/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/portUnificationTarget/build.xml
@@ -32,7 +32,7 @@
&eeCommonBuild;
&testproperties;
&run;
-
+
<import file="../reportbuilder.xml"/>
<target name="jar" depends="build">
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
index 531e8e2..f82d2a2 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/WebTest.java
@@ -24,7 +24,7 @@
* regression on AS8")
*/
public class WebTest {
-
+
private static final String TEST_NAME = "programmatic-login";
private static final SimpleReporterAdapter stat =
@@ -47,11 +47,11 @@
public static void main(String[] args) {
stat.addDescription("Unit test for 4862098");
-
+
WebTest webTest = new WebTest(args);
-
+
try {
- webTest.invoke();
+ webTest.invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -77,5 +77,5 @@
", received: " + responseCode);
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
index a02fca8..6080739 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.properties
@@ -15,11 +15,11 @@
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}-programmatic-login"/>
+<property name="appname" value="${module}-programmatic-login"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/web-programmatic-login"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
index 1ddb940..d31912c 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -66,11 +66,11 @@
<param name="groups" value="testgroup1"/>
</antcall>
</target>
-
+
<target name="setup-policy" depends="init-common">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"/>
- <copy file="server.policy"
+ <copy file="server.policy"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
@@ -82,7 +82,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}"/>
@@ -96,19 +96,19 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="remove-user" depends="init-common">
<antcall target="delete-user-common">
<param name="user" value="testuser3"/>
</antcall>
- </target>
+ </target>
<target name="restore-policy" depends="setup-policy">
- <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
+ <move file="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy.SAVE"
tofile="${env.S1AS_HOME}/domains/${admin.domain}/config/server.policy"/>
<antcall target="restart-server-instance-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
index d5f8b5e..2b01cad 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
index 8bb7b98..4359984 100644
--- a/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/programmaticLogin/servlet/ServletTest.java
@@ -29,7 +29,7 @@
HttpServletResponse response)
throws ServletException, IOException {
String user = request.getParameter("user");
- String password = request.getParameter("password");
+ String password = request.getParameter("password");
System.out.println("[user] " + user + " [password] " + password);
ProgrammaticLogin login = new ProgrammaticLogin();
if (!login.login(user, password, request, response).booleanValue()) {
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
index 02e86db..45f5a71 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/WebTest.java
@@ -66,7 +66,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6188932");
WebTest webTest = new WebTest(args);
@@ -75,8 +75,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties
index 4e0a803..ba9ac4e 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/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}-proxy-auth-cert"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/proxyAuthCert/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
index 0ad211e..0d97020 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6170450");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -60,7 +60,7 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
@@ -74,7 +74,7 @@
os.write(get.getBytes());
os.write("Proxy-keysize: 512\n".getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
index bc42e12..c39efd0 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/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}-proxy-keysize"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
index ffb6657..df2f88a 100644
--- a/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/proxyKeysize/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
index 95c18ec..37c88f8 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/WebTest.java
@@ -35,12 +35,12 @@
int port = new Integer(portS).intValue();
String name;
-
+
goGet(host, port, "TEST", contextRoot + "/ServletTest" );
stat.printSummary(TEST_NAME);
}
- private static void goGet(String host, int port,
+ private static void goGet(String host, int port,
String result, String contextPath) {
try{
@@ -48,13 +48,13 @@
Socket s = new Socket(host, port);
s.setSoTimeout(5000);
OutputStream os = s.getOutputStream();
-
+
contextPath += "?url=" + contextPath;
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
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));
@@ -64,16 +64,16 @@
while ((line = bis.readLine()) != null) {
index = line.indexOf(result);
System.out.println("[Server response]" + line);
-
+
int pos = line.indexOf("Location");
if (pos != -1){
contextPath = line.substring(pos + "Location:".length()).trim();
bis.close();
is.close();
- break;
+ break;
}
}
-
+
s = new Socket(host, port);
os = s.getOutputStream();
System.out.println(("GET " + contextPath + " HTTP/1.1\n"));
@@ -85,21 +85,21 @@
while ((line = bis.readLine()) != null) {
index = line.indexOf(result);
System.out.println("[Redirect response]" + line);
-
+
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
stat.addStatus("TEST_NAME", stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/build.properties b/appserver/tests/appserv-tests/devtests/web/queryString/build.properties
index 7d2b4ff..17af4d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/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}-queryString"/>
+<property name="appname" value="${module}-queryString"/> \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-queryString"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/build.xml b/appserver/tests/appserv-tests/devtests/web/queryString/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/queryString/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
index 3dff9cb..4ec62fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/descriptor/web.xml
@@ -22,18 +22,18 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
index e49289f..074cd5e 100644
--- a/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/queryString/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private static boolean isRedirected = false;
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,14 +39,14 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
System.out.println("requestUri: " + request.getRequestURI());
-
+
if (!isRedirected){
String url = request.getParameter("url") + "?TEST=PASS";
System.out.println("[URL] " + url);
@@ -56,7 +56,7 @@
out.flush();
return;
}
-
+
out.println("TEST:" + request.getParameter("TEST"));
out.flush();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
index eaae206..81b275e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/WebTest.java
@@ -21,22 +21,22 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
/**
- * Fix for Bugzilla Bug 28959 IOException using CoyoteReader.readLine()
+ * Fix for Bugzilla Bug 28959 IOException using CoyoteReader.readLine()
* but not using .read()
*/
public static void main(String args[]) {
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Standalone test for Bugzilla 28959");
String host = args[0];
@@ -45,13 +45,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "readline", contextRoot + "/ServletTest2" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("readLineIOException UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("readLineIOException UNPREDICTED-FAILURE", stat.FAIL);
@@ -70,7 +70,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -82,24 +82,24 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASSED")){
count++;
- }
- }
+ }
+ }
lineNum++;
}
if (count == 10){
- stat.addStatus("web-readLineIOException: readLine"
+ stat.addStatus("web-readLineIOException: readLine"
, stat.PASS);
} else {
- stat.addStatus("web-readLineIOException: readLine "
- , stat.FAIL);
+ stat.addStatus("web-readLineIOException: readLine "
+ , stat.FAIL);
}
count = 1;
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties
index 7a3f33c..89cadd4 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/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}-readLineIOException"/>
+<property name="appname" value="${module}-readLineIOException"/> \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-readLineIOException"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml b/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineIOException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readLineIOException/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/readLineWithMaxLength/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
index bd99d90..56707fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/WebTest.java
@@ -43,7 +43,7 @@
contextRoot = args[2];
length = Integer.parseInt(args[3]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for readLine with max length");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties
index 00b1b89..641fc2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/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}-readLine-with-max-length"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
index 8babcba..dd42097 100644
--- a/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readLineWithMaxLength/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/readerSelectorsConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
index 3f0bfb1..7cc5775 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
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("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerSelectorsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> 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));
@@ -83,17 +83,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerSelectorsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties
index 11051cb..2eba8c1 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/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}-readerSelectorsConfig"/>
+<property name="appname" value="${module}-readerSelectorsConfig"/> \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-readerSelectorsConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
index 0a99726..3bdc712 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/build.xml
@@ -36,7 +36,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"/>
@@ -60,10 +60,10 @@
</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
@@ -71,10 +71,10 @@
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>
@@ -82,7 +82,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}"/>
@@ -94,10 +94,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/readerSelectorsConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/readerSelectorsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
index 835d56e..e3c7c7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerSelectorsConfig/servlet/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
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("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerThreadsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> expect " + EXPECTED_COUNT);
}
@@ -68,7 +68,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));
@@ -82,17 +82,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
index a904d00..770a52e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
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("http-listener reader-threads unit tests.");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-readerThreadsConfig", stat.FAIL);
- }
+ }
stat.printSummary("web/standalonewar---> 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));
@@ -83,17 +83,17 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-readerThreadsConfig: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties
index 3f8b786..9fc1e99 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/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}-readerThreadsConfig"/>
+<property name="appname" value="${module}-readerThreadsConfig"/> \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-readerThreadsConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
index 0a99726..3bdc712 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/build.xml
@@ -36,7 +36,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"/>
@@ -60,10 +60,10 @@
</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
@@ -71,10 +71,10 @@
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>
@@ -82,7 +82,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}"/>
@@ -94,10 +94,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/readerThreadsConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/readerThreadsConfig/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/readerThreadsConfig/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
index 7b8559c..d79adc1 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties
index 42ad4dc..8b5fa2b 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/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}-reconfigDefaultWebModule"/>
+<property name="appname" value="${module}-reconfigDefaultWebModule"/> \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-reconfigDefaultWebModule"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
index 0cc4b4e..7ea4493 100644
--- a/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reconfigDefaultWebModule/build.xml
@@ -38,7 +38,7 @@
value="--listeneraddress ${http.address} --listenerport ${http.alternate.port} --defaultvs server3 http-listener-server"/>
</antcall>
</target>
-
+
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
index 0f63b31..03abd8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
trustStorePath = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4946739");
WebTest webTest = new WebTest(args);
@@ -69,7 +69,7 @@
} else {
url = new URL(conn.getHeaderField("Location"));
System.out.println("Redirected to: " + url.toString());
- SSLContext ctx = SSLContext.getInstance("TLS");
+ SSLContext ctx = SSLContext.getInstance("TLS");
ctx.init(null, getTrustManagers(trustStorePath), null);
HttpsURLConnection httpsConn = (HttpsURLConnection) url.openConnection();
httpsConn.setSSLSocketFactory(ctx.getSocketFactory());
@@ -128,6 +128,6 @@
public boolean verify(String hostname, SSLSession session) {
return true;
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties
index 2e1fbd0..2539a59 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/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="web"/>
-<property name="appname" value="${module}-redirect-port"/>
+<property name="appname" value="${module}-redirect-port"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
index 8acc507..e0f541d 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPort/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -72,10 +72,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/redirectPortDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.properties
index 2c081c0..c1b9d6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/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="web"/>
-<property name="appname" value="${module}-redirect-port-dynamic-reconfig"/>
+<property name="appname" value="${module}-redirect-port-dynamic-reconfig"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
index 60cd71a..4e1f409 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortDynamicConfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="setup" depends="init-common">
<antcall target="delete-network-listener-1" />
<antcall target="create-network-listener-1" />
@@ -93,7 +93,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -109,10 +109,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-network-listener-2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
index 62535b6..0083a50 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6419659");
WebTest webTest = new WebTest(args);
@@ -69,7 +69,7 @@
os.write(get.getBytes());
os.write("Host: loadbalancer:9999\n".getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties
index f69ad2d..166ea6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/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}-redirect-port-loadbalancer"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
index 89fcd8e..60cdb8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectPortLoadBalancer/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
index f824744..4000ac7 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/WebTest.java
@@ -41,7 +41,7 @@
contextRoot = args[2];
expected = "uri = " + contextRoot + "/, pathInfo = /";
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 5141");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties
index d88e26b..6d174dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/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="web"/>
-<property name="appname" value="${module}-redirect-with-root-wild-card-url-pattern"/>
+<property name="appname" value="${module}-redirect-with-root-wild-card-url-pattern"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml
index 854bf6f..bde979b 100644
--- a/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/redirectWithRootWildCardUrlPattern/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,18 +42,18 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
@@ -68,10 +68,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/relativeRedirectAllowed/WebTest.java b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
index 2740115..b4ccc5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/WebTest.java
@@ -20,9 +20,9 @@
/*
* This unit test expects only the relative path when redirect
- * as the following is specified in sun-web.xml.
+ * as the following is specified in sun-web.xml.
*
- * <property name="relativeRedirectAllowed" value="true"/>
+ * <property name="relativeRedirectAllowed" value="true"/>
*
*/
public class WebTest {
@@ -32,7 +32,7 @@
private static final String TEST_NAME = "web-relativeRedirectAllowed";
/*
- * The relative path that is expected.
+ * The relative path that is expected.
*/
private static final String PATH = "/web-relativeRedirectAllowed/jsp/test2.jsp";
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4642650");
WebTest webTest = new WebTest(args);
@@ -55,8 +55,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJsp();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -71,14 +71,14 @@
}
private void invokeJsp() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/test1.jsp" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -97,7 +97,7 @@
fail = false;
} else {
System.err.println("Wrong path: " + line
- + ", expected: " + PATH);
+ + ", expected: " + PATH);
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties
index 3961528..8e2f708 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/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}-relativeRedirectAllowed"/>
+<property name="appname" value="${module}-relativeRedirectAllowed"/> \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-relativeRedirectAllowed"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/relativeRedirectAllowed/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/replaceRootContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
index 5d19516..d73f4e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 5056726");
WebTest webTest = new WebTest(args);
@@ -46,15 +46,15 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "test.txt");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties
index e5d45e1..1282694 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/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}-replace-root-context"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
index 4edc9cc..4ab7865 100644
--- a/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/replaceRootContext/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -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/requestDispatcherDirectoryTraversal/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
index 0501fde..b8c31fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/WebTest.java
@@ -49,7 +49,7 @@
appserverTestPath = args[3];
adminPort = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Security Vulnerability test for RequestDispatcher directory traversal");
WebTest webTest = new WebTest(args);
@@ -57,8 +57,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -109,7 +109,7 @@
} else {
System.err.println("Missing expected response: " + EXPECTED);
}
-
+
} finally {
try {
if (os != null) os.close();
@@ -125,9 +125,9 @@
} catch (IOException ex) {}
}
}
-
+
private void invokeValidationTestForDoubleDot() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
@@ -170,9 +170,9 @@
} catch (IOException ex) {}
}
}
-
+
private void invokeValidationTestForColon() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties
index dd28057..922a782 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/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}-request-dispatcher-directory-traversal"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
index 553d95e..1c7054b 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherDirectoryTraversal/build.xml
@@ -36,7 +36,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"/>
@@ -44,39 +44,39 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
<arg value="${http.port}"/>
<arg value="${contextroot}"/>
- <arg value="${env.S1AS_HOME}"/>
- <arg value="${admin.port}"/>
+ <arg value="${env.S1AS_HOME}"/>
+ <arg value="${admin.port}"/>
<classpath>
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
<pathelement location="."/>
</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/requestDispatcherForwardCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
index 4992493..1b01b5e 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
@@ -114,6 +114,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties
index 8a3bff9..7f68aa4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/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/requestDispatcherForwardCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
index fc0b994..4826851 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2210");
WebTest webTest = new WebTest(args);
@@ -116,6 +116,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties
index 6d954b2..c40c97a 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/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}-request-dispatcher-forward-head-request"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/requestDispatcherForwardHEADRequest/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
index a73b2c0..7377608 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardHEADRequest/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
index 523525d..cae739c 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 10641");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties
index e9ad6f5..e1806e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/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}-request-dispatcher-forward-non-http"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardNonHttp/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/requestDispatcherForwardSendErrorCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
index 83dcb35..a18224d 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties
index 610ebe7..a7bf9f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-send-error-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-send-error-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/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/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSendErrorCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
index 0615416..0734a82 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/WebTest.java
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6374990");
WebTest webTest = new WebTest(args);
@@ -134,7 +134,7 @@
throw new Exception("Response was delayed by 10 seconds " +
"or more, which is how long the " +
"origin servlet of the RD.forward() " +
- "has been sleeping for. " +
+ "has been sleeping for. " +
"The response should have been " +
"committed immediately.");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties
index 26e7313..5951e9f 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-forward-set-status-commit-response"/>
+<property name="appname" value="${module}-request-dispatcher-forward-set-status-commit-response"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/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/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
index effdd97..427e461 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherForwardSetStatusCommitResponse/servlet/From.java
@@ -21,8 +21,8 @@
public class From extends HttpServlet {
public void service(HttpServletRequest req, HttpServletResponse res)
- throws IOException, ServletException {
-
+ throws IOException, ServletException {
+
getServletContext().getRequestDispatcher("/To").forward(req, res);
try {
Thread.currentThread().sleep(10 * 1000);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
index c7cbc56..b9fd2bd 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 10641");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties
index 5628cf6..b754235 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/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}-request-dispatcher-include-non-http"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeNonHttp/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/requestDispatcherIncludeTargetNotFound/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
index 8fa911c..5c0089b 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6182984");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/jsp/include.jsp");
System.out.println("Connecting to: " + url.toString());
@@ -67,6 +67,6 @@
System.err.println("Wrong response code. Expected: 500"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties
index 5b6dff6..6a92d62 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-include-target-not-found"/>
+<property name="appname" value="${module}-request-dispatcher-include-target-not-found"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherIncludeTargetNotFound/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/requestDispatcherMaxDepth/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
index 4074323..56af958 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/WebTest.java
@@ -24,7 +24,7 @@
* exception in server.log file").
*
* This test's build.xml configures <web-container> property named
- * dispatcher-max-depth in domain.xml and sets its value to 5 before
+ * dispatcher-max-depth in domain.xml and sets its value to 5 before
* restarting the server.
*/
public class WebTest {
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4703023");
@@ -57,18 +57,18 @@
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/foo.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties
index 37cea8e..56efda6 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/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}-request-dispatcher-max-depth"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
index 4b41d88..8e665a0 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMaxDepth/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -72,7 +72,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}"/>
@@ -84,10 +84,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
index 54e556b..57d9113 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7034");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties
index d7ae3b3..b229454 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/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}-request-dispatcher-multiple-forward"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherMultipleForward/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/requestDispatcherPathWithParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
index b6c68e4..6cf16b7 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4873423");
WebTest webTest = new WebTest(args);
@@ -47,8 +47,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -67,7 +67,7 @@
}
private void invokeJsp() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/jsp/forwardFrom.jsp HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties
index bc76cf2..5d525ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/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="web"/>
-<property name="appname" value="${module}-request-dispatcher-path-with-params"/>
+<property name="appname" value="${module}-request-dispatcher-path-with-params"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/requestDispatcherPathWithParams/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/responseErrorMessageEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
index 5569963..684ce95 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4655010");
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/responseErrorMessageEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties
index d753f45..685e095 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/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-error-message-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/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/responseErrorMessageEncoding/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/descriptor/web.xml
index ec0bc4c..7848e43 100644
--- a/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/responseErrorMessageEncoding/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>
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>
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
index 08d0121..e42ee54 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4817642,4876454");
WebTest webTest = new WebTest(args);
@@ -62,7 +62,7 @@
os.write(get.getBytes());
os.write(("Cookie: JSESSIONID=" + JSESSION_ID + "\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,11 +87,11 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- } else {
+ } else {
System.err.println("Missing JSESSIONID");
stat.addStatus(TEST_NAME, stat.FAIL);
}
- } else {
+ } else {
System.err.println("Missing Set-Cookie response header");
stat.addStatus(TEST_NAME, stat.FAIL);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties
index 7447069..f90e0bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/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="web"/>
-<property name="appname" value="${module}-reuse-sessionid"/>
+<property name="appname" value="${module}-reuse-sessionid"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/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/reuseSessionId/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
index 28af79d..c9a0508 100644
--- a/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/reuseSessionId/descriptor/web.xml
@@ -26,7 +26,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
index 35723e8..629d39a 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/WebTest.java
@@ -22,7 +22,7 @@
public class WebTest
{
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "Security Constraint Mapping test";
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Unit test for 4903209");
String host = args[0];
@@ -41,7 +41,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
//Check if it strips out uri parameters (";.*") before mapping to webapps
goGet(host, port, contextRoot + "/ServletTest;test=aaa" );
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties
index 32ef054..b0d7a5d 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/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}-securityConstraintMapping"/>
+<property name="appname" value="${module}-securityConstraintMapping"/> \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-securityConstraintMapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/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/securityConstraintMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
index 22adcb4..ef83928 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/descriptor/web.xml
@@ -22,18 +22,18 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>10</session-timeout>
</session-config>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
index 52c3a37..d11c986 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintMapping/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,9 +39,9 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
out.println("This is Servlet Test");
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
index fe166b6..a02273c 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/WebTest.java
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for security constraints mapping");
WebTest webTest = new WebTest(args);
@@ -63,11 +63,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/application/redirect/xxx");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties
index d192e86..c582bec 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/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}-security-constraint-wildcard-mapping"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/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/securityConstraintWildcardMapping/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
index 4412abc..cb88ef6 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/descriptor/web.xml
@@ -28,7 +28,7 @@
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/application/*</url-pattern>
</servlet-mapping>
-
+
<servlet-mapping>
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/login</url-pattern>
@@ -38,18 +38,18 @@
<servlet-name>MyProtectedServlet</servlet-name>
<url-pattern>/redirect</url-pattern>
</servlet-mapping>
-
+
<session-config>
<session-timeout>
30
</session-timeout>
</session-config>
-
+
<security-constraint>
<web-resource-collection>
<web-resource-name>Protected Area</web-resource-name>
<url-pattern>/application/redirect/*</url-pattern>
- <url-pattern>/redirect</url-pattern>
+ <url-pattern>/redirect</url-pattern>
<url-pattern>/content.jsp</url-pattern>
<http-method>GET</http-method>
<http-method>POST</http-method>
@@ -58,12 +58,12 @@
<role-name>user</role-name>
</auth-constraint>
</security-constraint>
-
+
<login-config>
<auth-method>BASIC</auth-method>
<realm-name>file</realm-name>
</login-config>
-
+
<security-role>
<role-name>user</role-name>
</security-role>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
index 2c332c3..1649de9 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWildcardMapping/servlet/MyProtectedServlet.java
@@ -32,16 +32,16 @@
* @version
*/
public class MyProtectedServlet extends HttpServlet {
-
+
/** Processes requests for both HTTP <code>GET</code> and <code>POST</code> methods.
* @param request servlet request
* @param response servlet response
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
-
+
System.out.println("MyProtectedServlet.processRequest " + request.getRequestURI() + " " + request.getQueryString());
-
+
String myUrl = request.getRequestURI();
if(myUrl.indexOf("login") >= 0) {
login(request, response);
@@ -50,7 +50,7 @@
redirect(request, response);
return;
}
-
+
if(request.getRemoteUser() == null) {
String callUrl = request.getRequestURI();
String query = request.getQueryString();
@@ -63,7 +63,7 @@
} else {
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("<html>");
out.println("<head>");
out.println("<title>Servlet MyProtectedServlet</title>");
@@ -72,23 +72,23 @@
out.println("<h1>Servlet MyProtectedServlet at " + request.getContextPath() + "</h1>");
out.println("</body>");
out.println("</html>");
-
+
out.close();
}
}
-
+
private void redirect(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
-
+
response.sendRedirect(request.getParameter("nextencurl"));
}
-
+
protected void login(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
request.getRequestDispatcher("/login.jsp").forward(request, response);
- }
-
+ }
+
// <editor-fold defaultstate="collapsed" desc="HttpServlet methods. Click on the + sign on the left to edit the code.">
/** Handles the HTTP <code>GET</code> method.
* @param request servlet request
@@ -98,7 +98,7 @@
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Handles the HTTP <code>POST</code> method.
* @param request servlet request
* @param response servlet response
@@ -107,7 +107,7 @@
throws ServletException, IOException {
processRequest(request, response);
}
-
+
/** Returns a short description of the servlet.
*/
public String getServletInfo() {
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
index afa7ef0..7d7b071 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6264656");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties
index a559b43..baa9586 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/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}-security-constraint-without-any-auth-constraint"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/securityConstraintWithoutAnyAuthConstraint/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/serverRedirectWithQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
index df10b1c..72c1c95 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3085");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invokeServlet() throws Exception {
-
+
String expectedRedirectLocation = "Location: http://" + host + ":"
+ port + contextRoot + "/?" + QUERY_STRING;
@@ -78,7 +78,7 @@
InputStream is = null;
BufferedReader bis = null;
String line = null;
- try {
+ try {
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
while ((line = bis.readLine()) != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties
index 3924736..24ebcec 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/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}-server-redirect-with-query-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/serverRedirectWithQueryString/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/servlet-3.0/absoluteOrderingWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
index d25179e..de6c8bc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for absolute-ordering-web-fragments");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties
index 898af91..28c96ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/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}-servlet-3.0-absolute-ordering-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
index 668c779..8ff7bf9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -71,23 +71,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -99,10 +99,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/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
index dee048c..7147286 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/descriptor/web-fragment3.xml
@@ -20,6 +20,6 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>B</name>
</web-fragment>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
index 1e4daee..27b57ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter.java
@@ -41,7 +41,7 @@
} catch(SQLException ex) {
throw new ServletException(ex);
}
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
index d79b440..d3ed37b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
index 4f9f684..3cf6099 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter2B.java
@@ -31,7 +31,7 @@
public class WFTestFilter2B implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2B.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
index 1972806..cf882a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/absoluteOrderingWebFragments/servlet/WFTestFilter3.java
@@ -40,7 +40,7 @@
} catch(SQLException ex) {
throw new ServletException(ex);
}
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
index a472719..4d0784a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncContext#complete");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties
index 82bb7c9..2dfd3a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/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}-servlet-3.0-async-context-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
index 6be4342..26f0523 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextComplete/servlet/test/TestServlet.java
@@ -45,6 +45,6 @@
}
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties
index 6a4e934..9c47160 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/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}-servlet-3.0-async-context-create-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
index 48e0a0a..e9b7607 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/asyncContextCreateListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextCreateListener/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
index a551ae1..db0a524 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/WebTest.java
@@ -22,7 +22,7 @@
* Unit test for cross-context ASYNC dispatch.
*
* This unit test accesses servlet "dispatchFrom" in context "fromContext",
- * which initiates an ASYNC dispatch to servlet "dispatchTo" in context
+ * which initiates an ASYNC dispatch to servlet "dispatchTo" in context
* "toContext".
*/
public class WebTest {
@@ -41,7 +41,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for cross-context async dispatch");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
"/fromContext/dispatchFrom?myname=myvalue");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties
index bac0057..080983b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/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}-servlet-3.0-async-context-dispatch-cross-context"/>
+<property name="appname" value="${module}-servlet-3.0-async-context-dispatch-cross-context"/> \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="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="fromContext.war" value="fromContext.war"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
index ccddcb4..b325544 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/build.xml
@@ -34,7 +34,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="compile">
<mkdir dir="${assemble.dir}"/>
<delete file="${assemble.dir}/${fromContext.war}"/>
@@ -50,8 +50,8 @@
<delete file="${assemble.dir}/${appname}App.ear"/>
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.war"/>
- </ear>
- </target>
+ </ear>
+ </target>
<target name="compile" depends="clean">
<antcall target="compile-common">
@@ -64,8 +64,8 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
-
+ </target>
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -76,7 +76,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
index dddaff5..63f6a82 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/from_web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>DispatchFrom</servlet-name>
<servlet-class>test.DispatchFrom</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>DispatchFrom</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
index 95d0c38..b7dabfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/descriptor/to_web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>DispatchTo</servlet-name>
<servlet-class>test.DispatchTo</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>DispatchTo</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
index 54f4eb0..cb78ba6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchCrossContext/servlet/test/DispatchFrom.java
@@ -44,6 +44,6 @@
ac.dispatch(toContext, "/dispatchTo");
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
index 7bbe19c..a715e48 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet?target=DispatchTargetWithPath");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties
index 26292bc..4318543 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/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}-servlet-3.0-async-context-dispatch-to-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
index ce8cc1f..9edba11 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/descriptor/web.xml
@@ -18,18 +18,18 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet>
<servlet-name>DispatchTarget</servlet-name>
<servlet-class>test.DispatchTarget</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
index e44ddca..469a42e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchToPath/servlet/test/TestServlet.java
@@ -43,6 +43,6 @@
ac.dispatch(target);
}
},
- 5000);
+ 5000);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
index 6563cf4..8b0f8dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GLASSFISH-19364");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
if (EXPECTED_RESPONSE.equals(lastLine)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + lastLine);
stat.addStatus(TEST_NAME, stat.FAIL);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties
index dcb0d66..f4e4f68 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/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}-servlet-3.0-async-context-dispatch-with-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml
index 9afb853..0f7afb8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchWithException/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
index 99de2d5..2451246 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String target) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + target);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties
index b682b3c..191a636 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/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}-servlet-3.0-async-context-zero-arg-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml
index bed60a1..cf5af96 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextDispatchZeroArg/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
index ef45e7c..94cc0b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncContext#hasOriginalRequestAndResponse");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties
index 7fd6f0d..f0fcfac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/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}-servlet-3.0-async-context-has-original-request-and-response"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextHasOriginalRequestAndResponse/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/asyncContextMultipleDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
index 677e0a0..59409ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for repeated calls to AsyncContext#dispatch with one
+ * Unit test for repeated calls to AsyncContext#dispatch with one
* intervening ServletRequest#startAsync. This unit test also checks
* to make sure that the intervening ServletRequest#startAsync notifies
* the registered AsyncListener at its onStartAsync method, and provides
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for AsyncContext#dispatch");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
HttpURLConnection conn = getHttpURLConnection("/TestServlet");
conn.disconnect();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties
index adb53b2..a943482 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/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}-servlet-3.0-async-context-multiple-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
index b952906..39c839d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextMultipleDispatch/servlet/test/TestServlet.java
@@ -36,7 +36,7 @@
if (!req.isAsyncSupported()) {
throw new ServletException("Async not supported when it should");
}
-
+
if (req.getDispatcherType() == DispatcherType.REQUEST) {
// Container-initiated dispatch
req.setAttribute("ABC", "DEF");
@@ -80,7 +80,7 @@
/*
* ServletRequest#startAsync clears the list of AsyncListener
* instances registered with the AsyncContext - after calling
- * each AsyncListener at its onStartAsync method, which is the
+ * each AsyncListener at its onStartAsync method, which is the
* method we're in.
* Register ourselves again, so we continue to get notified
*/
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
index 98904e0..3632d7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onTimeout");
@@ -53,15 +53,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties
index ec2accc..576aeca 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/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}-servlet-3.0-async-context-set-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncContextSetTimeout/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
index 5e6a7f7..aa033de 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for delay in async dispatch and complete");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties
index 1fa196f..a4ab021 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/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}-servlet-3.0-async-delay-dispatch-and-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
index b39a30e..9196029 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncDelayDispatchAndComplete/servlet/test/TestFilter.java
@@ -31,7 +31,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
index c902ad3..ad64dfd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onComplete");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode) throws Exception {
@@ -84,7 +84,7 @@
if (input != null) input.close();
} catch (IOException ex) {}
if (conn != null) conn.disconnect();
- }
+ }
}
private HttpURLConnection getHttpURLConnection(String path) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties
index 32e0cd2..be3a9af 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/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}-servlet-3.0-async-listener-on-complete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnComplete/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
index e44f818..dc1f438 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onError");
@@ -54,15 +54,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties
index c650f41..a0678af 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/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}-servlet-3.0-async-listener-on-error"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
index 7977658..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
index 04e4995..8b8fe12 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnError/servlet/test/TestServlet.java
@@ -29,7 +29,7 @@
if (!req.isAsyncSupported()) {
throw new ServletException("Async not supported when it should");
}
-
+
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
// Container-initiated dispatch
final AsyncContext ac = req.startAsync();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
index b6f0d8e..184218e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for AsyncListener#onTimeout");
@@ -58,15 +58,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String mode, String expectedResponse) throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/AsyncListenerTimeoutServlet?" + mode);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties
index e2e9b5a..2ecd279 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/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}-servlet-3.0-async-listener-on-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml
index aca85d6..2aabd64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" debug="true"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
index 2067e22..d80bd85 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeout/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>AsyncListenerTimeoutServlet</servlet-name>
<servlet-class>test.AsyncListenerTimeoutServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>AsyncListenerTimeoutServlet</servlet-name>
<url-pattern>/AsyncListenerTimeoutServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
index 440466a..1f503bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11739");
@@ -57,15 +57,15 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String mode, String expectedResponse) throws Exception {
InputStream is = null;
BufferedReader input = null;
-
- try {
+
+ try {
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/" + path + "?" + mode);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties
index 5a1a2e4..35d182b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/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}-servlet-3.0-async-listener-on-timeout-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
index 7a220db..fa4e308 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class"/>
<delete file="ReRunConf.txt"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,19 +44,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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" debug="true"
@@ -72,9 +72,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
index e42ebc4..c25aea5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncListenerOnTimeoutDispatch/servlet/test/TestServlet.java
@@ -45,7 +45,7 @@
sb.append(", ");
sb.append(attrB);
}
- String output = sb.toString();
+ String output = sb.toString();
writer.write(output);
System.out.println(output);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
index 91d8bb2..17f7d88 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for CR 6895187");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -98,7 +98,7 @@
if (!EXPECTED_RESPONSE.equals(line)) {
throw new Exception("Missing or unexpected response body, " +
- "expected: " + EXPECTED_RESPONSE +
+ "expected: " + EXPECTED_RESPONSE +
", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties
index f90c0f8..c867f95 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/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}-servlet-3.0-async-start-outside-async-dispatch-scope"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
index b00b3d7..7403593 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/descriptor/web.xml
@@ -18,12 +18,12 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
index 8eec401..74cb7d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncStartOutsideAsyncDispatchScope/servlet/test/TestServlet.java
@@ -56,7 +56,7 @@
}
}
},
- 5000);
+ 5000);
} else if (req.getDispatcherType() == DispatcherType.ASYNC) {
/*
* Sleep during the ASYNC dispatch, which is executed on a
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
index 6d76fa7..fc79750 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties
index 61f2d73..1b9d824 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/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}-servlet-3.0-async-supported-false"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
index ff1b4cf..5c1a74a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedFalse/descriptor/web.xml
@@ -18,23 +18,23 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
- </filter>
+ </filter>
<filter-mapping>
<filter-name>TestFilter</filter-name>
<servlet-name>TestServlet</servlet-name>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
index b07121a..d53b9d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties
index 89d167b..aa2d324 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/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}-servlet-3.0-async-supported-true-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
index a155e3e..b92835c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueDeclarative/descriptor/web.xml
@@ -18,24 +18,24 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
<async-supported>true</async-supported>
- </filter>
+ </filter>
<filter-mapping>
<filter-name>TestFilter</filter-name>
<servlet-name>TestServlet</servlet-name>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
index 6fe37ff..33f09d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async-supported");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/newServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties
index 17a69c0..03cb860 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/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}-servlet-3.0-async-supported-true-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml
index db2ca34..5fe3ec5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
index 30027ff..f1fe51e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/descriptor/web.xml
@@ -18,7 +18,7 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<listener>
<listener-class>test.MyListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
index fb8aeb5..c773ca1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncSupportedTrueProgrammatic/servlet/test/MyListener.java
@@ -65,7 +65,7 @@
FilterRegistration.Dynamic fr = sc.addFilter(
"NewFilter", "test.NewFilter");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
fr.setAsyncSupported(true);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
index 798c6ef..2cfe741 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/WebTest.java
@@ -21,7 +21,7 @@
/*
* Unit test for the spec requirement that if an async timeout occurs, and
* there are no AsyncListeners registered, the container MUST do an ERROR
- * dispatch with a status code equal to 500, which in this test case is
+ * dispatch with a status code equal to 500, which in this test case is
* mapped to error.jsp, which resets the status code to 200 and outputs
* the string "SUCCESS" to the response.
*/
@@ -34,7 +34,7 @@
private static final int EXPECTED_RESPONSE_CODE = 200;
private static final String EXPECTED_RESPONSE = "SUCCESS";
-
+
private String host;
private String port;
private String contextRoot;
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for async timeout without " +
@@ -58,11 +58,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
InputStream is = null;
BufferedReader input = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties
index f52ff70..2f6911d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/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}-servlet-3.0-async-timeout-no-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml
index 550e169..7541f72 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/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>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -70,9 +70,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
index 4ca5c0b..2803400 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/asyncTimeoutNoListener/descriptor/web.xml
@@ -18,13 +18,13 @@
-->
<web-app version="3.0" 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_3_0.xsd">
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
<async-supported>true</async-supported>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
index 46de2cf..66eacd0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @ServletSecurity Inheritance");
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -106,7 +106,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties
index 727e31a..eb53382 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/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}-servlet-3.0-auth-annotation-inheritance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
index 9f2d798..13d431d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotationInheritance/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
index c813a93..349bd48 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @ServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -72,7 +72,7 @@
}
private boolean doWebMethod(String webMethod, String host, int port,
- String contextPath, boolean requireAuthenticate,
+ String contextPath, boolean requireAuthenticate,
int responseCode, String expected) throws Exception {
String urlStr = "http://" + host + ":" + port + contextPath;
@@ -102,7 +102,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties
index f7b0a8f..5e0311a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/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}-servlet-3.0-auth-annotations"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
index 75bd5b6..cf54f09 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
index 7e03bc6..5cdb5e6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/authAnnotations/servlet/TestServlet2.java
@@ -47,14 +47,14 @@
writer.write("p:Hello, " + req.getRemoteUser() + "\n");
}
- public void doOptions(HttpServletRequest req, HttpServletResponse res)
+ public void doOptions(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
writer.write("o:Hello");
}
- protected void doPut(HttpServletRequest req, HttpServletResponse res)
+ protected void doPut(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
PrintWriter writer = res.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
index ffa8d16..0fba687 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/WebTest.java
@@ -36,7 +36,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for HttpOnly cookies");
WebTest webTest = new WebTest(args);
@@ -45,7 +45,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties
index f27b1ab..68ade99 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/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}-servlet-3.0-cookie-http-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/cookieHttpOnly/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/servlet-3.0/defaultErrorPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
index a393e4e..14bae69 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default error page");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties
index d79b82a..8b18cf8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/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}-servlet-3.0-default-error-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/servlet-3.0/defaultErrorPage/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
index 4c12533..4a31812 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/defaultErrorPage/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
res.sendError(404);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
index 4ddb6a1..8c9964e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot =args[2];
}
-
+
public static void main(String[] args) throws Exception {
stat.addDescription("Unit test for dispatch forward async dispatch");
@@ -59,11 +59,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String expectedResponse) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + path);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties
index 727edac..f84c457 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/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}-servlet-3.0-dispatch-forward-async-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
index 4594a4f..f6cf71c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -43,23 +43,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,9 +71,9 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
index 7772f1e..d1a45f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward.java
@@ -18,19 +18,19 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/dispatchforward"}, asyncSupported=true)
public class DispatchForward extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String forwardUrl = "/asyncdispatch";
String withargs = req.getParameter("withargs");
if (withargs != null) {
@@ -40,10 +40,10 @@
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF: forwarding " + forwardUrl);
req.getRequestDispatcher(forwardUrl).forward(req, res);
- } else {
+ } else {
System.out.println("DF: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
index 4daa3bb..f626feb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/DispatchForward0.java
@@ -18,28 +18,28 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/dispatchforward0"}, asyncSupported=true)
public class DispatchForward0 extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String forwardUrl = "/dispatchforward";
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF0: forwarding " + forwardUrl);
req.getRequestDispatcher(forwardUrl).forward(req, res);
- } else {
+ } else {
System.out.println("DF0: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward0\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
index f7eead7..6dac6ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/dispatchForwardAsyncDispatch/servlet/test/NamedDispatchForward0.java
@@ -18,27 +18,27 @@
import java.io.IOException;
import java.io.PrintWriter;
-
+
import jakarta.servlet.DispatcherType;
import jakarta.servlet.ServletException;
import jakarta.servlet.annotation.WebServlet;
import jakarta.servlet.http.HttpServlet;
import jakarta.servlet.http.HttpServletRequest;
import jakarta.servlet.http.HttpServletResponse;
-
+
@WebServlet(urlPatterns={"/nameddispatchforward0"}, asyncSupported=true)
public class NamedDispatchForward0 extends HttpServlet {
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
-
+
String servletName = "test.DispatchForward";
if (!req.getDispatcherType().equals(DispatcherType.ASYNC)) {
System.out.println("DF0: named forwarding " + servletName);
getServletContext().getNamedDispatcher(servletName).forward(req, res);
- } else {
+ } else {
System.out.println("DF0: async dispatch type ...");
PrintWriter writer = res.getWriter();
writer.write("Hello from DispatchForward0\n");
- }
- }
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
index 5b16dad..b76cf23 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Test for filter with empty url");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties
index 038748e..e83bc9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/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}-servlet-3.0-filter-with-empty-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
index 863e187..c614495 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/filterWithEmptyUrl/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
index 347c16f..ffe115a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/WebTest.java
@@ -29,7 +29,7 @@
*
* The main web.xml declares an absolute ordering of the two web fragments,
* with webFragment2 listed first, followed by webFragment1.
- *
+ *
* Either ServletContextListener checks for the presence and contents of the
* jakarta.servlet.context.orderedLibs ServletContext attribute and, if
* satisfied, registers a Servlet.
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for " +
"jakarta.servlet.context.orderedLibs ServletContext attribute");
@@ -71,7 +71,7 @@
}
private void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot +
"/webFragment1Servlet";
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties
index 22395a7..2ce772f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/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}-servlet-3.0-javax-servlet-context-orderedLibs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
index 5af256e..145109b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -68,23 +68,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -96,10 +96,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/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
index 1680e0d..36350cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>webFragment1</name>
<listener>
<listener-class>webFragment1.WebFragmentServletContextListener</listener-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
index a1458ab..8406907 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/javaxServletContextOrderedLibs/descriptor/web-fragment2.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>webFragment2</name>
<listener>
<listener-class>webFragment2.WebFragmentServletContextListener</listener-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
index 784450e..ad71b51 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/WebTest.java
@@ -24,11 +24,11 @@
* Test login change session id in Servlet 3.0
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.0-login-change-session-id";
private static final String JSESSIONID = "JSESSIONID";
private static final String EXPECTED_RESPONSE = "one";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
List<String> result = goGet(host, port, contextRoot + "/test?run=first",
null);
@@ -49,12 +49,12 @@
if (result.size() > 0) {
result2 = goGet(host, port, contextRoot + "/test?run=second",
result.get(0));
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result.size() > 1 && result2.size() > 1
&& !result.get(0).equals(result2.get(0))
- && EXPECTED_RESPONSE.equals(result2.get(1))) ?
+ && EXPECTED_RESPONSE.equals(result2.get(1))) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -99,7 +99,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -138,5 +138,5 @@
return ret;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties
index 1580618..e6fea36 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/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}-servlet-3.0-login-change-session-id"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
index 9b455a0..f1086a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginChangeSessionId/build.xml
@@ -62,7 +62,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -83,7 +83,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
index 7596395..91e7afb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for login and logout");
@@ -50,7 +50,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -102,7 +102,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties
index abf1279..95b80c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/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}-servlet-3.0-login-logout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
index 8441852..e0362a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -84,7 +84,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
index b231671..c169619 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/descriptor/web.xml
@@ -19,7 +19,7 @@
<web-app version="3.0" 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_3_0.xsd">
<security-role>
- <role-name>javaee</role-name>
+ <role-name>javaee</role-name>
</security-role>
<login-config>
<auth-method>BASIC</auth-method>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
index a4a0923..0daf0cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/loginLogout/servlet/TestServlet2.java
@@ -42,6 +42,6 @@
b.append(req.isUserInRole("javaee") + "\n");
PrintWriter writer = res.getWriter();
writer.write(b.toString());
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
index 4e55fad..276d968 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for multi web fragments");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot;
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties
index 4907e63..99e1f99 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/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}-servlet-3.0-multi-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
index 7067a15..57d3cb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -63,23 +63,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest2"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -91,10 +91,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/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
index d02ebdd..19d1787 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
index 2dbb989..ac9aee8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
index 5da6cf9..6d765ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragments/servlet/WFTestFilter3.java
@@ -31,7 +31,7 @@
public class WFTestFilter3 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter3.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
index 836efa5..380bf5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for multi web fragments resources");
WebTest webTest = new WebTest(args);
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/index.jsp";
System.out.println(url);
HttpURLConnection conn = (HttpURLConnection)
@@ -120,7 +120,7 @@
stat.addStatus(TEST_NAME,
((status1 && status2 && status3) ? stat.PASS : stat.FAIL));
- }
+ }
}
private Set<String> parseResult(String line, String prefix) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties
index b7d4f0d..ba5d605 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/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}-servlet-3.0-multi-web-fragments-resources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
index de83360..114850f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multiWebFragmentsResources/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -62,7 +62,7 @@
includes="**/*.html"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -70,14 +70,14 @@
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -89,10 +89,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/servlet-3.0/multipart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
index b4dab55..9ee363d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -143,28 +143,28 @@
} finally {
try {
if (bis != null) {
- bis.close();
+ bis.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (is != null) {
- is.close();
+ is.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (os != null) {
- os.close();
+ os.close();
}
} catch(IOException ex) {
// ignore
}
try {
if (sock != null) {
- sock.close();
+ sock.close();
}
} catch(IOException ex) {
// ignore
@@ -175,7 +175,7 @@
static String[][] expected = {
{"1234567abcdefg"},
{"myFile", "36", "text/plain", "content-disposition content-type" },
- {"myFile2", "13812", "application/x-java-archive",
+ {"myFile2", "13812", "application/x-java-archive",
"content-disposition content-type" },
{"xyz", "14", "text/plain", "content-disposition content-type"}
};
@@ -185,5 +185,5 @@
return 0;
return 1;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
index 12ff3c0..10e9d18 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.properties
@@ -15,11 +15,11 @@
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}-servlet-3.0-multipart"/>
+<property name="appname" value="${module}-servlet-3.0-multipart"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml
index fcd7781..a44c918 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/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
debug="true"
@@ -77,10 +77,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/servlet-3.0/multipart/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
index 0a3a39f..a3c578b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/descriptor/web.xml
@@ -28,7 +28,7 @@
<max-file-size>20000</max-file-size>
</multipart-config>
-->
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
index 4562bb7..a4c8b5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/multipart/servlet/ServletTest.java
@@ -27,7 +27,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
}
@@ -35,7 +35,7 @@
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
index b61fc04..b599b32 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR: 7014654: Possible Duplicate session cookie when the session cookie name is configured.");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties
index 4fbf8d6..1eb93cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/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}-servlet-3.0-non-duplicate-session-cookie-with-custom-cookie-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/nonDuplicateSessionCookieWithCustomCookieName/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/relativeOrderingWebFragments/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
index 74ed5b4..d29f16c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for relative-ordering-web-fragments");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties
index 34104c5..6d147ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/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}-servlet-3.0-relative-ordering-web-fragments"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
index aebe021..3a2d5c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -85,23 +85,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -113,10 +113,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/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
index f6d35e0..e972f16 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>A</name>
<ordering>
<before><name>NoSuchName</name><others/></before>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
index abb30dd..4fda1fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment2.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>B</name>
<ordering>
<after><others/></after>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
index 2158ed0..e0d2cf7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment3.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>C</name>
<ordering>
<before><name>A</name><name>B</name></before>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
index b50a0d6..e95a940 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/descriptor/web-fragment4.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<name>D</name>
<ordering>
<after><name>C</name></after>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
index 3ab24b9..a5a1e90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
index 771d8d1..376a2d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter2.java
@@ -31,7 +31,7 @@
public class WFTestFilter2 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter2.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
index e2ee839..e065a23 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter3.java
@@ -31,7 +31,7 @@
public class WFTestFilter3 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter3.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
index 4ae2928..4cc6bfb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter4.java
@@ -31,7 +31,7 @@
public class WFTestFilter4 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter4.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
index 4535829..3d3020c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/relativeOrderingWebFragments/servlet/WFTestFilter5.java
@@ -31,7 +31,7 @@
public class WFTestFilter5 implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> WFTestFilter5.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
index 328f355..8a2522c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource URL from JAR inside WEB-INF/lib");
new WebTest(args).doTest();
@@ -60,7 +60,7 @@
}
public void doTest() {
- try {
+ try {
invokeTestServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties
index e6607db..8e1a922 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/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}-servlet-3.0-resource-url-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
index 411df8c..d8b6995 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/resourceURLFromLocalJar/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -54,21 +54,21 @@
includes="META-INF/**"/>
<delete dir="${build.classes.dir}/META-INF/resources"/>
- <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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -80,10 +80,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/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
index 98b33ca..aaf2c4b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for serving JSP and static " +
"resources from JAR inside WEB-INF/lib");
@@ -62,7 +62,7 @@
}
public void doTest() {
- try {
+ try {
invokeJspServlet();
invokeDefaultServlet("/abc.txt", 200, EXPECTED_RESPONSE);
invokeDefaultServlet("/folder", new int[] { 301, 302 }, contextRoot + "/folder/");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties
index c6c7e51..cd754a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/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}-servlet-3.0-serve-jsp-and-static-resource-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
index 2ad5749..41feb52 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/serveJspAndStaticResourceFromLocalJar/build.xml
@@ -38,7 +38,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,21 +56,21 @@
includes="META-INF/**"/>
<delete dir="${build.classes.dir}/META-INF/resources"/>
- <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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -82,10 +82,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/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
index 9292bc4..4017195 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=10992
* ("Unable to deploy JSF2 backing bean B 72, works in B71")
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 10992");
@@ -54,10 +54,10 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
- public void doTest() throws Exception {
+ public void doTest() throws Exception {
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/index.jsp");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties
index 054f9a5..48c9fb7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/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}-servlet-3.0-jsf-managed-bean-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
index 34b4cb3..b6e16a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/jsfManagedBeanAnnotation/build.xml
@@ -36,7 +36,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"/>
@@ -56,14 +56,14 @@
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
index d970d4d..ed4d6d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/WebTest.java
@@ -39,18 +39,18 @@
contextRoot = args[2];
testNumber = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggability of sharedlib in EAR");
WebTest webTest = new WebTest(args);
- if("1".equals(args[3])) {
+ if("1".equals(args[3])) {
webTest.doTest("/mytest1");
stat.printSummary(TEST_NAME);
- }
+ }
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -60,7 +60,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
System.out.println("Invoking " + url);
@@ -99,10 +99,10 @@
System.out.println("RESPONSE : " + line);
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE[(new Integer(testNumber)).intValue()] + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
index 5165f41..359a803 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -23,10 +23,10 @@
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
public ServContInit() {
- System.out.println("TEST APP LIB CONST");
+ System.out.println("TEST APP LIB CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- System.out.println("TEST APP LIB onStartup");
- ctx.setAttribute("APPLIB-1", "CALLED EARAPPLIB-1");
+ System.out.println("TEST APP LIB onStartup");
+ ctx.setAttribute("APPLIB-1", "CALLED EARAPPLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties
index d21bf44..ed649b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/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}-servlet-3.0-pluggability-sharedlib-ear"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
index 0421ec2..60251fa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/build.xml
@@ -38,40 +38,40 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- </jar>
- <javac srcdir="./sharedlib2"
- destdir="./sharedlib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
- <fileset dir="./sharedlib2"/>
- </jar>
- <javac srcdir="./sharedlib3"
- destdir="./sharedlib3"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
- <fileset dir="./sharedlib3"/>
- </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ </jar>
+ <javac srcdir="./sharedlib2"
+ destdir="./sharedlib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
+ <fileset dir="./sharedlib2"/>
+ </jar>
+ <javac srcdir="./sharedlib3"
+ destdir="./sharedlib3"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
+ <fileset dir="./sharedlib3"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
@@ -83,27 +83,27 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib1"
- destdir="./applib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib1"
+ destdir="./applib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib1.jar">
- <fileset dir="./applib1"/>
- </jar>
+ <jar destfile="lib/AppSharedLib1.jar">
+ <fileset dir="./applib1"/>
+ </jar>
<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>
- <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${env.APS_HOME}/build/module/archive"/>
- </jar>
+ <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <jar destfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${env.APS_HOME}/build/module/archive"/>
+ </jar>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -117,12 +117,12 @@
</classpath>
</java>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
index 86a4250..c664bcc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index a39597d..c51cfe1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", "CALLED EARSHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", "CALLED EARSHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index 275c90a..63d2833 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -22,9 +22,9 @@
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
- System.out.println("SHARED LIB 2 CONST");
+ System.out.println("SHARED LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-2", "CALLED EARSHAREDLIB-2");
+ ctx.setAttribute("SHAREDLIB-2", "CALLED EARSHAREDLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index 1d863d1..414a62b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithEAR/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
public SharedLib3ServContInit() {
- System.out.println("SHARED LIB 3 CONST");
+ System.out.println("SHARED LIB 3 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-3", "CALLED EARSHAREDLIB-3");
+ ctx.setAttribute("SHAREDLIB-3", "CALLED EARSHAREDLIB-3");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
index c4b9a4e..ad0c05d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggability of sharedlib with interrace implementation and extensions");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -57,7 +57,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
HttpURLConnection conn = (HttpURLConnection)
@@ -93,7 +93,7 @@
}
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties
index cc0b470..1cb9eda 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/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}-servlet-3.0-pluggability-sharedlib-interfaceimpl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
index 8b90c7a..43acd46 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/build.xml
@@ -36,33 +36,33 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete dir="./lib"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete dir="./lib"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
<mkdir dir="lib"/>
- <javac srcdir="./interface"
- destdir="./interface"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="lib/CommonInterface.jar">
- <fileset dir="./interface"/>
- </jar>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath};./interface"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- <fileset dir="./interface"/>
- </jar>
+ <javac srcdir="./interface"
+ destdir="./interface"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="lib/CommonInterface.jar">
+ <fileset dir="./interface"/>
+ </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath};./interface"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ <fileset dir="./interface"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
@@ -79,16 +79,16 @@
<target name="build" depends="compile">
<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>
- <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
- <jar destfile="${assemble.dir}/${appname}App.ear">
- <fileset dir="${env.APS_HOME}/build/module/archive"/>
- </jar>
+ <mkdir dir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <copy file="./application.xml" todir="${env.APS_HOME}/build/module/archive/META-INF"/>
+ <jar destfile="${assemble.dir}/${appname}App.ear">
+ <fileset dir="${env.APS_HOME}/build/module/archive"/>
+ </jar>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -101,12 +101,12 @@
</classpath>
</java>
</target>
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
index 3f25247..a8a9639 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterface.java
@@ -17,5 +17,5 @@
package com.sun.devtests.web.common;
public interface CommonInterface {
- public String sayDummyIntfHello();
+ public String sayDummyIntfHello();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
index cee2a68..27da794 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/interface/com/sun/devtests/web/common/CommonInterfaceImpl.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterface;
public class CommonInterfaceImpl implements CommonInterface {
- public String sayDummyIntfHello() {
+ public String sayDummyIntfHello() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
index b591cc6..cfdbb1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/AnotherCommonInterfaceImpl.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterface;
public class AnotherCommonInterfaceImpl implements CommonInterface {
- public String sayDummyIntfHello() {
+ public String sayDummyIntfHello() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
index 8e305f8..8c1666d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/CommonInterfaceImplExtn.java
@@ -19,7 +19,7 @@
import com.sun.devtests.web.common.CommonInterfaceImpl;
public class CommonInterfaceImplExtn extends CommonInterfaceImpl {
- public String myOwnMethod() {
+ public String myOwnMethod() {
return "HEELLLLOOOO";
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
index 74eea7d..b5f32f5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr +";");
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index 30d4787..d7b19da 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithInterfaceImplementation/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -24,9 +24,9 @@
@HandlesTypes(CommonInterface.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", c.size()+"CALLED INTFIMPL-SHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", c.size()+"CALLED INTFIMPL-SHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
index 040737e..61bce39 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/WebTest.java
@@ -39,22 +39,22 @@
contextRoot = args[2];
testNumber = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for pluggable shared libraries in WAR");
WebTest webTest = new WebTest(args);
- if("1".equals(args[3])) {
+ if("1".equals(args[3])) {
webTest.doTest("/mytest1");
stat.printSummary(TEST_NAME);
- }
- if("2".equals(args[3])) {
+ }
+ if("2".equals(args[3])) {
webTest.doTest("/mytest2");
stat.printSummary(TEST_NAME);
- }
+ }
}
public void doTest(String root) {
- try {
+ try {
invoke(root);
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -64,7 +64,7 @@
}
private void invoke(String root) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ root;
System.out.println("Invoking " + url);
@@ -103,10 +103,10 @@
System.out.println("RESPONSE : " + line);
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE[(new Integer(testNumber)).intValue()] + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
index 03dae39..75e4c01 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/build.xml
@@ -32,66 +32,66 @@
<target name="all" depends="init-sharedlib,build,run,undeploy,stopDomain,clean-lib"/>
<target name="clean" depends="init-common">
- <ant dir="webapp1" target="clean"/>
- <ant dir="webapp2" target="clean"/>
+ <ant dir="webapp1" target="clean"/>
+ <ant dir="webapp2" target="clean"/>
<antcall target="clean-common"/>
<delete>
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="clean-lib" depends="init-common">
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
- <delete file="${env.S1AS_HOME}/lib/TestSharedLib4.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib1.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib2.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib3.jar"/>
+ <delete file="${env.S1AS_HOME}/lib/TestSharedLib4.jar"/>
<antcall target="startDomain"/>
</target>
<target name="init-sharedlib" depends="init-common">
<antcall target="stopDomain"/>
- <javac srcdir="./sharedlib1"
- destdir="./sharedlib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
- <fileset dir="./sharedlib1"/>
- </jar>
- <javac srcdir="./sharedlib2"
- destdir="./sharedlib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
- <fileset dir="./sharedlib2"/>
- </jar>
- <javac srcdir="./sharedlib3"
- destdir="./sharedlib3"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
- <fileset dir="./sharedlib3"/>
- </jar>
- <javac srcdir="./sharedlib4"
- destdir="./sharedlib4"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
- <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib4.jar">
- <fileset dir="./sharedlib4"/>
- </jar>
+ <javac srcdir="./sharedlib1"
+ destdir="./sharedlib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib1.jar">
+ <fileset dir="./sharedlib1"/>
+ </jar>
+ <javac srcdir="./sharedlib2"
+ destdir="./sharedlib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib2.jar">
+ <fileset dir="./sharedlib2"/>
+ </jar>
+ <javac srcdir="./sharedlib3"
+ destdir="./sharedlib3"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib3.jar">
+ <fileset dir="./sharedlib3"/>
+ </jar>
+ <javac srcdir="./sharedlib4"
+ destdir="./sharedlib4"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
+ <jar destfile="${env.S1AS_HOME}/lib/TestSharedLib4.jar">
+ <fileset dir="./sharedlib4"/>
+ </jar>
<sleep seconds="15" />
<antcall target="startDomain"/>
</target>
<target name="build">
- <ant dir="webapp1" target="deploy"/>
- <ant dir="webapp2" target="deploy"/>
+ <ant dir="webapp1" target="deploy"/>
+ <ant dir="webapp2" target="deploy"/>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="run" depends="init-common">
<java classname="WebTest">
@@ -115,10 +115,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
- <ant dir="webapp1" target="undeploy"/>
- <ant dir="webapp2" target="undeploy"/>
- </target>
+ <ant dir="webapp1" target="undeploy"/>
+ <ant dir="webapp2" target="undeploy"/>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
index 0fc60c9..55181d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib1/com/sun/devtests/web/SharedLib1ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebServlet.class)
public class SharedLib1ServContInit implements ServletContainerInitializer {
public SharedLib1ServContInit() {
- System.out.println("SHARED LIB 1 CONST");
+ System.out.println("SHARED LIB 1 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-1", "CALLED SHAREDLIB-1");
+ ctx.setAttribute("SHAREDLIB-1", "CALLED SHAREDLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
index 9157c83..db2b894 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib2/com/sun/devtests/web/SharedLib2ServContInit.java
@@ -22,9 +22,9 @@
public class SharedLib2ServContInit implements ServletContainerInitializer {
public SharedLib2ServContInit() {
- System.out.println("SHARED LIB 2 CONST");
+ System.out.println("SHARED LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-2", "CALLED SHAREDLIB-2");
+ ctx.setAttribute("SHAREDLIB-2", "CALLED SHAREDLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
index e3a4541..c52e3ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib3/com/sun/devtests/web/SharedLib3ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class SharedLib3ServContInit implements ServletContainerInitializer {
public SharedLib3ServContInit() {
- System.out.println("SHARED LIB 3 CONST");
+ System.out.println("SHARED LIB 3 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-3", "CALLED SHAREDLIB-3");
+ ctx.setAttribute("SHAREDLIB-3", "CALLED SHAREDLIB-3");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
index a3523f5..f1f3322 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/sharedlib4/com/sun/devtests/web/SharedLib4ServContInit.java
@@ -23,9 +23,9 @@
@HandlesTypes(jakarta.jws.WebService.class)
public class SharedLib4ServContInit implements ServletContainerInitializer {
public SharedLib4ServContInit() {
- System.out.println("SHARED LIB 4 CONST");
+ System.out.println("SHARED LIB 4 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("SHAREDLIB-4", "CALLED SHAREDLIB-4");
+ ctx.setAttribute("SHAREDLIB-4", "CALLED SHAREDLIB-4");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
index 783e1a1..0c4335e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/applib1/com/sun/devtests/web/applib/ServContInit.java
@@ -23,10 +23,10 @@
@HandlesTypes(WebServlet.class)
public class ServContInit implements ServletContainerInitializer {
public ServContInit() {
- System.out.println("TEST APP LIB CONST");
+ System.out.println("TEST APP LIB CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- System.out.println("TEST APP LIB onStartup");
- ctx.setAttribute("APPLIB-1", "CALLED APPLIB-1");
+ System.out.println("TEST APP LIB onStartup");
+ ctx.setAttribute("APPLIB-1", "CALLED APPLIB-1");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties
index 24f30ee..d0e5ac2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/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}-servlet-pluggability-1"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
index d5a4a37..0672167 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,30 +45,30 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib1"
- destdir="./applib1"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib1"
+ destdir="./applib1"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib1.jar">
- <fileset dir="./applib1"/>
- </jar>
- <property name="hasWebclient" value="yes"/>
+ <jar destfile="lib/AppSharedLib1.jar">
+ <fileset dir="./applib1"/>
+ </jar>
+ <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="deploy" depends="build">
<antcall target="deploy-war-common"/>
<antcall target="clean"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
index 591a548..0429b3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp1/servlet/Test1Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
index 4beae3e..0d90ca6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/applib2/com/sun/devtests/web/applib/ServCont2Init.java
@@ -23,9 +23,9 @@
@HandlesTypes(WebFilter.class)
public class ServCont2Init implements ServletContainerInitializer {
public ServCont2Init() {
- System.out.println("APP LIB 2 CONST");
+ System.out.println("APP LIB 2 CONST");
}
public void onStartup(Set<Class<?>> c, ServletContext ctx) {
- ctx.setAttribute("APPLIB-2", "CALLED APPLIB-2");
+ ctx.setAttribute("APPLIB-2", "CALLED APPLIB-2");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties
index 719f4c9..8e68af3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/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}-servlet-pluggability-2"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
index 20102b4..911a109 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,30 +45,30 @@
</target>
<target name="build" depends="compile">
- <javac srcdir="./applib2"
- destdir="./applib2"
- classpath="${s1astest.classpath}"
- debug="on"
- failonerror="true"/>
+ <javac srcdir="./applib2"
+ destdir="./applib2"
+ classpath="${s1astest.classpath}"
+ debug="on"
+ failonerror="true"/>
<mkdir dir="lib"/>
- <jar destfile="lib/AppSharedLib2.jar">
- <fileset dir="./applib2"/>
- </jar>
- <property name="hasWebclient" value="yes"/>
+ <jar destfile="lib/AppSharedLib2.jar">
+ <fileset dir="./applib2"/>
+ </jar>
+ <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="deploy" depends="build">
<antcall target="deploy-war-common"/>
<antcall target="clean"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
index fbd7903..93f2d52 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/Test2Servlet.java
@@ -35,19 +35,19 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
- StringBuffer ret = new StringBuffer();
+ StringBuffer ret = new StringBuffer();
String attr = (String) context.getAttribute("SHAREDLIB-1");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-2");
- ret.append(attr +";");
- attr = (String) context.getAttribute("SHAREDLIB-3");
- ret.append(attr +";");
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("SHAREDLIB-3");
+ ret.append(attr +";");
attr = (String) context.getAttribute("SHAREDLIB-4");
- ret.append(attr +";");
+ ret.append(attr +";");
attr = (String) context.getAttribute("APPLIB-1");
- ret.append(attr +";");
- attr = (String) context.getAttribute("APPLIB-2");
- ret.append(attr);
+ ret.append(attr +";");
+ attr = (String) context.getAttribute("APPLIB-2");
+ ret.append(attr);
res.getWriter().write(ret.toString());
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
index b4e473f..513ef03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializer/sharedLibWithWars/webapp2/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
index 60a2294..19dd8fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 8565");
@@ -71,7 +71,7 @@
}
private void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot + "/test";
HttpURLConnection conn = (HttpURLConnection)
(new URL(url)).openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties
index 7545b68..119147f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/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}-servlet-3.0-servlet-container-initializer-add-restricted-servlet-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
index abf4a58..8c6a037 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContainerInitializerAddRestrictedServletContextListener/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -66,19 +66,19 @@
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
- <param name="webclient.war.classes" value="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -90,10 +90,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/servlet-3.0/servletContextAddListenerByClassName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
index 9f2174b..36da2d6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addListener");
@@ -55,7 +55,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties
index bb0b5c9..642b3f9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/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}-servlet-3.0-servlet-context-add-listener-by-class-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
index 48e0a0a..e9b7607 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddListenerByClassName/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
index 68ab862..ed9a6f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties
index bd52fdf..d839433 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/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}-servlet-3.0-servlet-context-add-servlet-and-filter-by-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
index cf19216..445f56f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClass/servlet/test/MyListener.java
@@ -67,6 +67,6 @@
"test.NewFilter"));
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
index 4c527c1..dfadeba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties
index 0722d33..827c94f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/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}-servlet-3.0-servlet-context-add-servlet-and-filter-by-class-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
index fe890bd..6396185 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByClassName/servlet/test/MyListener.java
@@ -44,7 +44,7 @@
FilterRegistration fr = sc.addFilter("NewFilter", "test.NewFilter");
fr.setInitParameter("filterInitName", "filterInitValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
index 909f76d..bd12d90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#addServlet and " +
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties
index fe2f4fe..46dd8ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/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}-servlet-3.0-servlet-context-add-servlet-and-filter-by-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
index daed16f..d0e7bd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletAndFilterByInstance/servlet/test/MyListener.java
@@ -87,7 +87,7 @@
FilterRegistration fr = sc.addFilter("NewFilter", filter);
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
/*
* Make sure that if we register a different filter instance
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
index 432aea0..b122b5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9181");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties
index 9e80779..b66bb64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/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}-servlet-3.0-servlet-context-add-servlet-override-default-and-jsp-servlet-mappings"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextAddServletOverrideDefaultAndJspServletMappings/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
index dbab589..832a650 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9199");
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties
index 82f0bdb..54c714f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/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}-servlet-3.0-servlet-context-complete-preliminary-filter-registration"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
index c79c625..75a21fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryFilterRegistration/servlet/test/MyListener.java
@@ -34,7 +34,7 @@
ServletContext sc = sce.getServletContext();
FilterRegistration frPrelim = sc.getFilterRegistration("MyFilter");
if (frPrelim == null) {
- throw new RuntimeException("Missing FilterRegistration for " +
+ throw new RuntimeException("Missing FilterRegistration for " +
"MyFilter");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
index 1a2b71f..6c5fd42 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 9199");
@@ -56,7 +56,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties
index f1429b2..fdb7f1a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/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}-servlet-3.0-servlet-context-complete-preliminary-servlet-registration"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
index 9dcb272..70ec642 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCompletePreliminaryServletRegistration/servlet/test/MyListener.java
@@ -34,7 +34,7 @@
ServletContext sc = sce.getServletContext();
ServletRegistration srPrelim = sc.getServletRegistration("MyServlet");
if (srPrelim == null) {
- throw new RuntimeException("Missing ServletRegistration for " +
+ throw new RuntimeException("Missing ServletRegistration for " +
"MyServlet");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
index 4799283..500a9eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription(
"Unit test for ServletContext#create[Servlet|Filter]");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties
index 424e977..5ad6fd1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/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}-servlet-3.0-servlet-context-create-servlet-and-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
index 04999ca..c1b962d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
index c885d23..1f7ed6b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/MyListener.java
@@ -72,6 +72,6 @@
FilterRegistration fr = sc.addFilter("NewFilter", filter);
fr.setInitParameter("filterInitParamName", "filterInitParamValue");
fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST),
- true, "NewServlet");
+ true, "NewServlet");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
index 6aa405f..8d4607e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletAndFilter/servlet/test/NewFilter.java
@@ -51,7 +51,7 @@
initParamValue = config.getInitParameter("filterInitParamName");
ServletContext sc = config.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
sc.log("ds1-login-timeout=" + loginTimeout);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
index 51fa794..efa01f3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for setServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -74,7 +74,7 @@
}
private boolean doWebMethod(String webMethod, String host, int port,
- String contextPath, boolean requireAuthenticate,
+ String contextPath, boolean requireAuthenticate,
int responseCode, String expected) throws Exception {
String urlStr = "http://" + host + ":" + port + contextPath;
@@ -104,7 +104,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties
index e2aaa4e..6c794e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/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}-servlet-3.0-servlet-context-create-servlet-with-servlet-security"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
index 486d888..0b75244 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextCreateServletWithServletSecurity/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
index 979a5be..ad78203 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for ServletContext#getRealPath, where the requested
+ * Unit test for ServletContext#getRealPath, where the requested
* resource is stored in the META-INF/resources directory of the
* application's bundled WEB-INF/lib/nested.jar.
*/
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getRealPath");
new WebTest(args).doTest();
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties
index 7d7bc18..4e3c58f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/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}-servlet-3.0-servlet-context-get-real-path-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
index 3ae8453..e9e7a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetRealPathFromLocalJar/servlet/TestServlet.java
@@ -23,7 +23,7 @@
public void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
String path = getServletContext().getRealPath("/abc.txt");
- if (path == null ||
+ if (path == null ||
path.indexOf("/META-INF/resources") == -1) {
throw new ServletException("Wrong resource path");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
index ec7f2b4..0838fcc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getResource");
new WebTest(args).doTest();
@@ -53,7 +53,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties
index 229c25d..031f7cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/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}-servlet-3.0-servlet-context-get-resource-in-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourceInLocalJar/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
index 0f9260e..1ef6a76 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#getResourcePaths");
new WebTest(args).doTest();
@@ -48,7 +48,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties
index a391e86..b6e13bb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/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}-servlet-3.0-servlet-context-get-resource-paths-from-local-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml
index e8a067d..ae89073 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
index 9af101b..41eb108 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextGetResourcePathsFromLocalJar/servlet/TestServlet.java
@@ -31,7 +31,7 @@
if (resPaths == null) {
throw new ServletException("No resource paths");
}
-
+
if (!resPaths.contains(CATALOG_OFFERS)) {
throw new ServletException(CATALOG_OFFERS +
" missing from resource paths");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
index 25206c7..df76792 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#setInitParameter");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties
index 76235d4..ba08630 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/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}-servlet-3.0-servlet-context-set-init-parameter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
index dc11f03..bc516b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletContextSetInitParameter/servlet/MyListener.java
@@ -27,7 +27,7 @@
* @param sce The servlet context event
*/
public void contextInitialized(ServletContextEvent sce) {
- sce.getServletContext().setInitParameter("aaa", "bbb");
+ sce.getServletContext().setInitParameter("aaa", "bbb");
}
/**
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
index ea51b73..1f113e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for empty string URL pattern");
@@ -61,7 +61,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path, String expectedResponse) throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties
index 4302d1d..63c45be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/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}-servlet-3.0-servlet-mapping-empty-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
index f1c22aa..eed1dcf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletMappingEmptyString/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servlet-3.0/servletRequestDispatcherType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
index ca96068..57b60f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletRequest#getDispatcherType");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties
index 747ed18..fdb9c4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/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}-servlet-3.0-servlet-request-dispatcher-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestDispatcherType/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
index aeea105..04be264 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6057385");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties
index d40e5cf..7a8afdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/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}-servlet-3.0-servlet-request-listener-invocation-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml
index dbf8002..f1a6574 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/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,17 +42,17 @@
</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">
@@ -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/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
index f763631..7e8ff18 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestListenerInvocationOrder/descriptor/web.xml
@@ -34,7 +34,7 @@
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
index 52f12ca..37f24aa 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Servlet[Request|Response]Wrapper#isWrapperFor");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties
index c544522..431066c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/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}-servlet-3.0-servlet-request-response-wrapper-is-wrapper-for"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
index 6b8edf4..8b10268 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/servletRequestResponseWrapperIsWrapperFor/servlet/test/TestServlet.java
@@ -28,7 +28,7 @@
ServletRequestWrapper reqWrapper1 = new SubFirstLevelRequestWrapper(req);
ServletRequestWrapper reqWrapper2 = new SecondLevelRequestWrapper(reqWrapper1);
ServletRequestWrapper reqWrapper3 = new ThirdLevelRequestWrapper(reqWrapper2);
-
+
if (!reqWrapper3.isWrapperFor(reqWrapper1) ||
!reqWrapper3.isWrapperFor(FirstLevelRequestWrapper.class)) {
throw new ServletException("Unexpected result");
@@ -44,7 +44,7 @@
ServletResponseWrapper resWrapper1 = new SubFirstLevelResponseWrapper(res);
ServletResponseWrapper resWrapper2 = new SecondLevelResponseWrapper(resWrapper1);
ServletResponseWrapper resWrapper3 = new ThirdLevelResponseWrapper(resWrapper2);
-
+
if (!resWrapper3.isWrapperFor(resWrapper1) ||
!resWrapper3.isWrapperFor(FirstLevelResponseWrapper.class)) {
throw new ServletException("Unexpected result");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
index aac7052..b04d372 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * This unit test expects the following Set-Cookie response header, based on
+ * This unit test expects the following Set-Cookie response header, based on
* the cookie-properties specified using ServletContext.setSessionCookieConfig
*
* Set-Cookie: JSESSIONID=[...]; Domain=.iplanet.com; Path=/
@@ -64,7 +64,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext SessionCookieConfig");
WebTest webTest = new WebTest(args);
@@ -100,7 +100,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie domain");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -115,7 +115,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie path");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -130,7 +130,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
}
- } else {
+ } else {
System.err.println("Missing cookie comment");
stat.addStatus(TEST_NAME, stat.FAIL);
fail = true;
@@ -157,7 +157,7 @@
}
return;
-
+
}
private String getCookieField(String cookie, String field) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties
index a73f932..e8b7154 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/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="web"/>
-<property name="appname" value="${module}-servlet-3.0-session-cookie-config"/>
+<property name="appname" value="${module}-servlet-3.0-session-cookie-config"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
index d868fa1..ea0de12 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfig/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest request, HttpServletResponse response)
throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
index 58d118d..1548ebc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties
index 956dec3..5f58100 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/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}-servlet-3.0-session-cookie-config-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index 67b4f0c..a0fe69c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -40,32 +40,32 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
index c70ce2d..77c8ed2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties
index fd7c4b1..ddbe012 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/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}-servlet-3.0-session-cookie-config-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
index de51e35..81d5d65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieConfigProgrammatic/servlet/test/CreateSession.java
@@ -40,31 +40,31 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
index 947897e..115adda 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -76,7 +76,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -145,7 +145,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties
index b7dd641..370c533 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/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}-servlet-3.0-session-cookie-custom-name-programmatic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
index 73af7f8..9fa6aae 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/descriptor/web.xml
@@ -46,5 +46,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameProgrammatic/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
index 2463901..b4cf2f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/WebTest.java
@@ -47,7 +47,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -80,7 +80,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -149,7 +149,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties
index 93b2375..56fc865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/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}-servlet-3.0-session-cookie-custom-name-sun-web-xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
index 6f11a4a..89e7a5b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/descriptor/web.xml
@@ -42,5 +42,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameSunWebXml/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
index 12d17da..c918263 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing name of session " +
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public String firstRun() throws Exception {
@@ -76,7 +76,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
// Get the MYJSESSIONID from the response
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -121,7 +121,7 @@
if (line == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (!line.contains("HttpOnly")) {
throw new Exception("Missing HttpOnly in cookie header");
}
@@ -149,7 +149,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties
index 93b2375..56fc865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/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}-servlet-3.0-session-cookie-custom-name-sun-web-xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
index dbc585d..74d4b14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/build.xml
@@ -36,7 +36,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"/>
@@ -44,15 +44,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -72,7 +72,7 @@
<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/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
index e4885d9..16dd90a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/descriptor/web.xml
@@ -38,7 +38,7 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
<session-config>
<cookie-config>
<name>ABC</name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionCookieCustomNameWebXmlSunWebXmlPrecedence/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
index 3196c54..d9cac2f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -104,7 +104,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties
index 3ec0ff5..ea4bf15 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/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}-servlet-3.0-session-id-url-rewrite-session-tracking-mode"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingMode/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
index c8553a5..7d08e14 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with custom cookie name");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -108,7 +108,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties
index 29b5486..1867928 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/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}-servlet-3.0-session-id-url-rewrite-session-tracking-mode-custom-cookie-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml
index f54871d..10a088e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeCustomCookieName/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
index 7fa0d6c..e2d6819 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for URL session tracking mode configured via web.xml");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -104,7 +104,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
index e37ce8f..64c343f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/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}-servlet-3.0-session-id-url-rewrite-session-tracking-mode-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
index f826b5e..2067d88 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/sessionIdUrlRewriteSessionTrackingModeDeclarative/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,22 +42,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -69,10 +69,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/servlet-3.0/transportProtectedAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
index 3c0afb1..599fad5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "servlet-3.0-transportProtectedAnnotation";
-
+
public static void main(String args[]) throws Exception{
String host = args[0];
String httpPort = args[1];
@@ -48,7 +48,7 @@
null, true, "mfr:Hello:javaee:false");
ok = ok && testURL("GET", "https://" + host + ":" + httpsPort + "/" + contextRoot + "/myurl3",
ssf, true, "g:Hello:javaee:true");
-
+
ok = ok && testURL("TRACE", "http://" + host + ":" + httpPort + "/" + contextRoot + "/myurl3",
null, true, "t:Hello:javaee:false");
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
@@ -96,7 +96,7 @@
return true;
}
});
-
+
connection = conn;
} else {
connection = (HttpURLConnection) url.openConnection();
@@ -113,7 +113,7 @@
throws Exception{
int responseCode = connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
return (connection.getResponseCode() == 200);
}
@@ -125,7 +125,7 @@
try {
in = new BufferedReader(
new InputStreamReader(connection.getInputStream()));
-
+
String line = "";
while ((line = in.readLine()) != null) {
System.out.println(line);
@@ -138,7 +138,7 @@
try {
if (in != null) {
in.close();
- }
+ }
} catch(IOException ioe) {
// ignore
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
index ff1a9fe..34869b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.properties
@@ -15,12 +15,12 @@
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}-servlet-3.0-transport-protected-annotation"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<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="/transport-protected-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
index 86cafd4..c165c74 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/transportProtectedAnnotation/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -71,13 +71,13 @@
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -91,10 +91,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
index b088170..d2e0821 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebFilter");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/mytest";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties
index d07c887..2634033 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/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}-servlet-3.0-web-filter-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
index 642c75d..045f131 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
index 45dc3c2..2042594 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFilterAnnotation/servlet/TestFilter2.java
@@ -34,7 +34,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter2.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
index 3374e41..467f813 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web fragment");
WebTest webTest = new WebTest(args);
@@ -110,7 +110,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties
index 99c3c59..2876c2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/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}-servlet-3.0-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/servlet-3.0/webFragment/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
index 1eba1c7..742ebdd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/descriptor/web-fragment.xml
@@ -20,7 +20,7 @@
<web-fragment 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-fragment_3_0.xsd"
- version="3.0">
+ version="3.0">
<display-name>wftest</display-name>
<distributable></distributable>
<servlet>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
index 9bd6c72..b8aa488 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
index f5f97a9..3ef36b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web fragment with ejb lite");
WebTest webTest = new WebTest(args);
@@ -98,7 +98,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties
index 723859a..02537cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/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}-servlet-3.0-web-fragment-with-ejb-lite"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithEjbLite/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/servlet-3.0/webFragmentWithFileUpload/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
index ffd0eb1..8666974 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/WebTest.java
@@ -20,7 +20,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -57,23 +57,23 @@
OutputStream os = null;
InputStream is = null;
BufferedReader br = null;
-
+
String get = "GET " + contextRoot + urlPattern + " HTTP/1.0\r\n" + "Connection: keep-alive\r\n";
System.out.println(get);
-
+
try {
sock = new Socket(host, port);
os = sock.getOutputStream();
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
int i = 0;
String line = null;
String viewId = null;
String sessionId = null;
-
+
//get session id and JSF view id
while ((line = br.readLine()) != null) {
if(line.startsWith("Set-Cookie")) {
@@ -86,7 +86,7 @@
break;
}
}
-
+
// Write header for the uploaded text file
ByteArrayOutputStream ba = new ByteArrayOutputStream();
ba.write("--AaB03x\r\n".getBytes());
@@ -95,14 +95,14 @@
ba.write("--AaB03x\r\n".getBytes());
ba.write("Content-Disposition: form-data; name=\"form:file\"; filename=\"test.txt\"\r\n".getBytes());
ba.write("Content-Type: application/octet-stream\r\n\r\n".getBytes());
-
+
// Write content of the uploaded text file
is = new FileInputStream (dir + "test.txt");
int c;
while ((c = is.read()) != -1) {
ba.write(c);
}
-
+
ba.write("\r\n--AaB03x\r\n".getBytes());
ba.write("Content-Disposition: form-data; name=\"form:j_idt4\"\r\n\r\n".getBytes());
ba.write("upload\r\n".getBytes());
@@ -115,7 +115,7 @@
ba.write("--AaB03x--\r\n".getBytes());
byte[] data = ba.toByteArray();
System.out.println(ba.toString());
-
+
// Compose the post request header
StringBuilder postHeader = new StringBuilder();
postHeader.append("POST " + contextRoot + urlPattern + " HTTP/1.1\r\n");
@@ -125,17 +125,17 @@
postHeader.append("Content-Length: " + data.length + "\r\n");
postHeader.append("Cookie: JSESSIONID=" + sessionId + "\r\n\r\n");
System.out.println(postHeader);
-
+
os.write(postHeader.toString().getBytes());
os.write(data);
-
+
while ((line = br.readLine()) != null) {
if (line.contains(EXPECTED_RESPONSE)) {
stat.addStatus(TEST_NAME, stat.PASS);
return;
}
}
-
+
System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -163,12 +163,12 @@
}
try {
if (sock != null) {
- sock.close();
+ sock.close();
}
} catch(IOException ex) {
// ignore
}
}
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties
index d6c1c41..55be470 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/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}-servlet-3.0-web-fragment-with-file-upload"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
index 7df036f..cf2abec 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -59,23 +59,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/fileupload"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -87,10 +87,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/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
index 7d8733d..5c65310 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web-fragment.xml
@@ -19,19 +19,19 @@
<web-fragment version="3.0" 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_3_0.xsd">
<display-name>File upload test</display-name>
- <servlet>
- <servlet-name>Faces Servlet</servlet-name>
- <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
- <load-on-startup>1</load-on-startup>
- </servlet>
- <!-- Map these files with JSF -->
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>/faces/*</url-pattern>
- </servlet-mapping>
- <servlet-mapping>
- <servlet-name>Faces Servlet</servlet-name>
- <url-pattern>*.xhtml</url-pattern>
- </servlet-mapping>
-
+ <servlet>
+ <servlet-name>Faces Servlet</servlet-name>
+ <servlet-class>jakarta.faces.webapp.FacesServlet</servlet-class>
+ <load-on-startup>1</load-on-startup>
+ </servlet>
+ <!-- Map these files with JSF -->
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>/faces/*</url-pattern>
+ </servlet-mapping>
+ <servlet-mapping>
+ <servlet-name>Faces Servlet</servlet-name>
+ <url-pattern>*.xhtml</url-pattern>
+ </servlet-mapping>
+
</web-fragment>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
index c4e2cf3..f117477 100755
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithFileUpload/descriptor/web.xml
@@ -21,11 +21,11 @@
xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/javaee http://xmlns.jcp.org/xml/ns/javaee/web-app_3_1.xsd"
version="3.1">
-
+
<welcome-file-list>
<welcome-file>
single.xhtml
</welcome-file>
-
+
</welcome-file-list>
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
index c8bd368..5b48bc6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/WebTest.java
@@ -50,7 +50,7 @@
expected = "success with " + adminUser;
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web-fragment with login-config");
@@ -64,7 +64,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -91,7 +91,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -139,7 +139,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -185,7 +185,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties
index 9dd0ebd..f8fbdfc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/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}-servlet-3.0-web-fragment-with-login-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
index 3374112..5d6dfdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -73,23 +73,23 @@
excludes="**/*.jsp"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -103,10 +103,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
index 43343a1..a4cb520 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfig/descriptor/web.xml
@@ -23,12 +23,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
index 2d28d79..7e7d676 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/WebTest.java
@@ -50,7 +50,7 @@
expected = "success with " + adminUser;
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for web-fragment with login-config overrided by web.xml");
@@ -64,7 +64,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -91,7 +91,7 @@
System.out.print(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -138,7 +138,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -184,7 +184,7 @@
System.out.println(sendCookie);
os.write(sendCookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties
index da250ac..5f066d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/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}-servlet-3.0-web-fragment-with-login-config-overrided"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
index 3374112..5d6dfdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -73,23 +73,23 @@
excludes="**/*.jsp"/>
<delete dir="${build.classes.dir}/META-INF"/>
- <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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -103,10 +103,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
index fe75cb6..52cceb0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webFragmentWithLoginConfigOverrided/descriptor/web.xml
@@ -23,12 +23,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
index fc4d3df..4a57a35 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebContextListener");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/mytest";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties
index a29c5cb..f611da2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/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}-servlet-3.0-web-listener-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
index 78205ce..be9d0dd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webListenerAnnotation/servlet/TestServletContextListener.java
@@ -24,7 +24,7 @@
System.out.println(">>> contextInitialized");
ServletContext context = sce.getServletContext();
context.setAttribute("myattr", "myservletcontextlistener");
- }
+ }
public void contextDestroyed(ServletContextEvent sce) {
System.out.println(">>> contextDestroyed");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java
index e6d55b4..7cc5971 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @WebServlet");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties
index 3daeeb5..1e70c35 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/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}-servlet-3.0-servlet-3.0-web-servlet-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/webServletAnnotation/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/xmlOverrideAnnotation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
index ea592fc..81958a4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for xml override annotation");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest2", 200, EXPECTED_RESPONSE);
ok = ok && invoke("/mytest", 404, null);
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
@@ -59,7 +59,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -102,10 +102,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties
index b8684ba..9f0a54d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/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}-xml-override-annotation"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml
index 32d36af..55a2a1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,23 +47,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
index ccb5be0..fa94d5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestFilter.java
@@ -32,7 +32,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotation/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
index 69ea5fd..d4b4590 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 9816");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest2", 200, EXPECTED_RESPONSE);
stat.addStatus(TEST_NAME, ((ok)? stat.PASS : stat.FAIL));
} catch (Exception ex) {
@@ -58,7 +58,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -101,10 +101,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties
index 3271d25..8c5580d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/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}-servlet-3.0-xml-override-annotation-with-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
index 9299fa7..78674dc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestFilter.java
@@ -32,7 +32,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
mesg = filterConfig.getInitParameter("mesg");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
index a5d6833..c022269 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAnnotationWithWebFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
index 54ed114..db4ec2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/WebTest.java
@@ -37,7 +37,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test that web.xml overrides @ServletSecurity");
@@ -51,7 +51,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public boolean run() throws Exception {
@@ -101,7 +101,7 @@
ok = ok && expected.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties
index 3ed79d4..d5374d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/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}-servlet-3.0-xml-override-auth-annotations"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
index 31afbda..b77a3cf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,10 +57,10 @@
</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
@@ -68,14 +68,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -90,7 +90,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
index 423016a..4e72178 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideAuthAnnotations/descriptor/web.xml
@@ -44,7 +44,7 @@
<auth-constraint/>
</security-constraint>
<security-role>
- <role-name>javaee</role-name>
+ <role-name>javaee</role-name>
</security-role>
<login-config>
<auth-method>BASIC</auth-method>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
index 8471cff..9af222b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 11750");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
boolean ok = invoke("/mytest", 404, null);
ok = invoke("/mytest2", 200, EXPECTED_RESPONSE) && ok;
ok = invoke("/mytest3", 200, EXPECTED_RESPONSE_2) && ok;
@@ -61,7 +61,7 @@
private boolean invoke(String urlPattern,
int expectedCode, String expectedResponse) throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ urlPattern;
System.out.println("Accessing " + url);
@@ -104,10 +104,10 @@
if (expectedResponse.equals(line)) {
return true;
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
return false;
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties
index 344ebf0..f31819f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/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}-servlet-3.0-xml-override-url-pattern-with-web-fragment"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
index 593eade..b3d5b44 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/build.xml
@@ -40,7 +40,7 @@
</delete>
<delete dir="lib"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -58,23 +58,23 @@
<delete dir="${build.classes.dir}/META-INF"/>
<delete dir="${build.classes.dir}/wftest"/>
- <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="**/TestServlet.class"/>
+ <param name="webclient.war.classes" value="**/TestServlet.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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -86,10 +86,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/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
index da86db7..4ec660c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestFilter.java
@@ -30,7 +30,7 @@
public class TestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> filter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
index 46b0a28..33b6ae4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
index e40cb0a..f40c3c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/TestServlet2.java
@@ -40,7 +40,7 @@
String name = (String)en.nextElement();
String value = getInitParameter(name);
msg += name + "=" + value + ", ";
- }
+ }
writer.write(", initParams: " + msg + "\n");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
index b5fc608..f61415d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.0/xmlOverrideUrlPatternWithWebFragment/servlet/WFTestFilter.java
@@ -31,7 +31,7 @@
public class WFTestFilter implements Filter {
public void init(FilterConfig filterConfig) throws ServletException {
System.out.println(">>> wfFilter.init");
- }
+ }
public void doFilter(ServletRequest req, ServletResponse res,
FilterChain chain) throws IOException, ServletException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
index 4821939..cd37e85 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for deny-uncovered-http-methods");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(boolean auth,
@@ -89,7 +89,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties
index 967d677..a7e5404 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/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}-servlet-3.1-any-authenticated-user"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
index f9b3b45..1d81b1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/anyAuthenticatedUser/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
index 879f9a7..41aa573 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/WebTest.java
@@ -24,11 +24,11 @@
* Test change session id in Servlet 3.1
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-change-session-id";
private static final String JSESSIONID = "JSESSIONID";
private static final String EXPECTED_RESPONSE = "two";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
List<String> result = goGet(host, port, contextRoot + "/test?run=first",
null);
@@ -49,12 +49,12 @@
if (result.size() > 0) {
result2 = goGet(host, port, contextRoot + "/test?run=second",
result.get(0));
- }
-
+ }
+
stat.addStatus(TEST_NAME,
(result.size() > 1 && result2.size() > 1
&& !result.get(0).equals(result2.get(0))
- && EXPECTED_RESPONSE.equals(result2.get(1))) ?
+ && EXPECTED_RESPONSE.equals(result2.get(1))) ?
stat.PASS : stat.FAIL);
} catch (Throwable t) {
System.out.println(t.getMessage());
@@ -99,7 +99,7 @@
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -138,5 +138,5 @@
return ret;
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties
index 5e7e360..a919236 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/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}-servlet-3.1-change-session-id"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
index b253495..6e91146 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/changeSessionId/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -75,7 +75,7 @@
<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/servlet-3.1/denyUncoveredHttpMethods/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
index 5dc49a5..1be8e5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for deny-uncovered-http-methods");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(String method, boolean auth,
@@ -88,7 +88,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties
index b115b3b..1c716f1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/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}-servlet-3.1-deny-uncovered-http-methods"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
index f9b3b45..1d81b1e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/denyUncoveredHttpMethods/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,10 +51,10 @@
</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
@@ -62,14 +62,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties
index 4e5d40b..a2a79fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/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}-servlet-3.1-network-path-reference"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
index 5316e6d..e93d0d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/networkPathReference/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
@@ -52,7 +52,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -74,7 +74,7 @@
<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/servlet-3.1/nonBlockingInput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
index 653d5d8..2091164 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/WebTest.java
@@ -93,7 +93,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties
index 1a41e29..417a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/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}-servlet-3.1-non-blocking-input"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<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/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
index e368d0f..3bc2098 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInput/servlet/test/TestServlet.java
@@ -77,7 +77,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
index f36a7ba..91d6f8e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/WebTest.java
@@ -90,7 +90,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties
index 1a41e29..417a5ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/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}-servlet-3.1-non-blocking-input"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<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/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
index b90ba03..b74708c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputOutput/servlet/test/TestServlet.java
@@ -83,7 +83,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
index 42d2521..e522953 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/WebTest.java
@@ -91,7 +91,7 @@
} catch(Exception ex) {
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties
index 8b41314..1ddd482 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/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}-servlet-3.1-non-blocking-input-with-async-dispatch"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<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/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
index 495366e..a7d7029 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingInputWithAsyncDispatch/servlet/test/TestServlet.java
@@ -57,7 +57,7 @@
System.out.println("--> onDataAvailable");
int len = -1;
byte b[] = new byte[1024];
- while (input.isReady()
+ while (input.isReady()
&& (len = input.read(b)) != -1) {
String data = new String(b, 0, len);
System.out.println("--> " + data);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
index 9691d5a..6a4cec4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/WebTest.java
@@ -72,7 +72,7 @@
System.out.println();
}
}
-
+
stat.addStatus(TEST_NAME, ((expected) ? stat.PASS : stat.FAIL));
} catch(Exception ex) {
ex.printStackTrace();
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties
index ee15197..7dd15a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/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}-servlet-3.1-non-blocking-output"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml
index 72a7394..2546573 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -73,7 +73,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -94,7 +94,7 @@
<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/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
index 918b5b4..f642f00 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/nonBlockingOutput/servlet/test/TestServlet.java
@@ -58,7 +58,7 @@
long startTime = System.currentTimeMillis();
while (output.isReady()) {
writeData(output);
- count++;
+ count++;
if (System.currentTimeMillis() - startTime > MAX_TIME_MILLIS
|| count > 10) {
throw new IOException("Cannot fill the write buffer");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
index 35ea1d9..1065198 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/WebTest.java
@@ -23,7 +23,7 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -141,7 +141,7 @@
static String[][] expected = {
{"1234567abcdefg"},
{"myFile", "test.txt", "36", "text/plain", "content-disposition content-type" },
- {"myFile2", "test2.txt", "37", "text/plain",
+ {"myFile2", "test2.txt", "37", "text/plain",
"content-disposition content-type" },
{"xyz", "null", "14", "text/plain", "content-disposition content-type"}
};
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties
index 30e00f4..8d20ce0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/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="web"/>
-<property name="appname" value="${module}-servlet-3.1-part-submitted-file-name"/>
+<property name="appname" value="${module}-servlet-3.1-part-submitted-file-name"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml
index 3cf9a71..68cd907 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/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
debug="true"
@@ -78,10 +78,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/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
index 667f510..2f99404 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/partSubmittedFileName/servlet/ServletTest.java
@@ -28,7 +28,7 @@
@MultipartConfig(maxFileSize=200)
public class ServletTest extends HttpServlet {
- protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ protected void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
PrintWriter out = response.getWriter();
response.setContentType("text/html");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
index 87b85d1..6a13d19 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/WebTest.java
@@ -24,11 +24,11 @@
* Test HttpServletResponse#reset and #setCharacterEncoding.
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-reset-character-encoding";
private static final String EXPECTED_CONTENT_TYPE = "Content-Type: text/plain;charset=Big5";
private static final String EXPECTED_RESPONSE="Done";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -55,7 +55,7 @@
private static boolean goGet(String host, int port, String contextPath,
String expectedContentType) throws Exception {
-
+
boolean result = false;
boolean hasExpectedContentType = (expectedContentType == null);
boolean hasDone = false;
@@ -88,7 +88,7 @@
}
lineNum++;
}
-
+
result = hasExpectedContentType && hasDone;
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties
index 04c843f..033dc04 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/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}-servlet-3.1-reset-character-encoding"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
index b253495..6e91146 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/resetCharacterEncoding/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -75,7 +75,7 @@
<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/servlet-3.1/runAsInitDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
index 4581e9b..4f3cb78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/WebTest.java
@@ -50,7 +50,7 @@
serverLog = args[4];
appName = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for @RunAs with init and destroy");
@@ -65,7 +65,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
@Override
@@ -103,7 +103,7 @@
ok = ok && EXPECTED_RESPONSE.equals(line);
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties
index d8dbcc3..c23b285 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/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}-servlet-3.1-run-as-init-destroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
index 36ea839..9653714 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/runAsInitDestroy/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -61,10 +61,10 @@
</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
@@ -72,14 +72,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runAndUndeploy" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
index 77fd9f4..d99ba9b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/WebTest.java
@@ -24,9 +24,9 @@
* Test HttpServletResponse#reset and #setCharacterEncoding.
*/
public class WebTest {
-
+
private static final String TEST_NAME = "servlet-3.1-servlet-context-get-virtual-server-name";
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -53,7 +53,7 @@
private static boolean goGet(String host, int port, String contextPath,
String expectedResult) throws Exception {
-
+
boolean result = false;
try (Socket sock = new Socket(host, port);
@@ -76,8 +76,8 @@
break;
}
}
-
- }
+
+ }
return result;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties
index a6fd392..86b9309 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/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}-servlet-3.1-servlet-context-get-virtual-server-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
index a512f8a..6c28c05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/servletContextGetVirtualServerName/build.xml
@@ -54,7 +54,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -76,7 +76,7 @@
<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/servlet-3.1/upgradeEcho/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
index 4981885..b45507c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/WebTest.java
@@ -22,7 +22,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for upgrade echo
+ * Unit test for upgrade echo
*/
public class WebTest {
@@ -84,7 +84,7 @@
System.out.format("Sleeping %d sec\n", sleepInSeconds);
Thread.sleep(sleepInSeconds * 1000);
writeChunk(output, "World");
-
+
// read data without using readLine
long startTime = System.currentTimeMillis();
System.out.println("Consuming results");
@@ -95,7 +95,7 @@
boolean hasError = sb.toString().contains("WrongClassLoader");
if (hasInfo || hasError || System.currentTimeMillis() - startTime > 20 * 1000) {
break;
- }
+ }
}
System.out.println(sb.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties
index ca97a80..5bc3722 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/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}-servlet-3.1-upgrade-simple"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<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/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
index 00ca28e..54fbc1d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeEcho/servlet/test/EchoHttpUpgradeHandler.java
@@ -78,7 +78,7 @@
System.out.println("Correct ClassLoader");
} else {
System.out.println("ERROR Wrong ClassLoader!!!");
- sb.append("WrongClassLoader");
+ sb.append("WrongClassLoader");
}
int len = -1;
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties
index 4869b81..5c8ed84 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/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}-servlet-3.1-upgrade-with-cdi"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml
index 997beda..0c064c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/reportbuilder.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -78,7 +78,7 @@
<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/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
index dd876e9..95926be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ISBNValidator.java
@@ -73,7 +73,7 @@
int sum = 0;
for (int i = 0; i < 10; i++) {
sum += (10 - i) * is[i];
- }
+ }
return (sum % 11 == 0);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
index b9fade1..2fac21a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-3.1/upgradeWithCDI/servlet/test/ReadListenerImpl.java
@@ -101,7 +101,7 @@
public void onError(final Throwable t) {
System.out.println("--> onError: " + t);
t.printStackTrace();
-
+
try {
wc.close();
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
index f4f0ad8..614781f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.addJspFile");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties
index f924757..2084051 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-add-jsp-file"/>
+<property name="appname" value="${module}-servlet-4.0-add-jsp-file"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml
index 84b8d6d..9b7fbd9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/addJspFile/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,10 +47,10 @@
</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="." includes="WebTest.java">
@@ -59,10 +59,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -70,7 +70,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -86,10 +86,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/servlet-4.0/compositeTrailerSupplier/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
index bc5078a..eddbd15 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/WebTest.java
@@ -42,7 +42,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for composite trailer supplier");
WebTest webTest = new WebTest(args);
@@ -85,7 +85,7 @@
}
String contentType = httpResponse.getHeader("Content-Type");
System.out.println("--> headers = " + httpResponse.getHeaders());
-
+
String result = new StringBuilder(httpResponse.getBody().trim())
.append('|')
.append(httpResponse.getTrailerFields().get("bar1")) // trailer field
@@ -96,7 +96,7 @@
System.out.println("--> result = " + result);
if (!EXPECTED_RESPONSE.equals(result)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + result);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties
index 8753341..6e21a0f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-composite-trailer-supplier"/>
+<property name="appname" value="${module}-servlet-4.0-composite-trailer-supplier"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/compositeTrailerSupplier/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/servlet-4.0/contextCharEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
index 36728f0..957390c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/WebTest.java
@@ -44,7 +44,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext#setRequest/ResponseCharacterEncoding");
WebTest webTest = new WebTest(args);
@@ -90,7 +90,7 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties
index c4a4215..cb6e37d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-context-char-encoding"/>
+<property name="appname" value="${module}-servlet-4.0-context-char-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/contextCharEncoding/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/servlet-4.0/defaultContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
index 3a6fc72..6ba7e4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/WebTest.java
@@ -36,7 +36,7 @@
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default-context-path setting in web.xml");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties
index 629caf9..b9404b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/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}-servlet-4.0-default-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml
index ca48582..fc5ba8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPath/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,10 +47,10 @@
</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="." includes="WebTest.java">
@@ -59,14 +59,14 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -81,10 +81,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/servlet-4.0/defaultContextPathEar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
index 3ac3190..95bd169 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/WebTest.java
@@ -36,7 +36,7 @@
host = args[0];
port = Integer.parseInt(args[1]);
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for default-context-path setting in web.xml in an ear file");
WebTest webTest = new WebTest(args);
@@ -44,8 +44,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeJsp();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties
index dbbe7d4..b1eb3c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/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}-servlet-4.0-default-context-path-ear"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml
index 17a54c6..24180b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/defaultContextPathEar/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -65,12 +65,12 @@
<jar destfile="${assemble.dir}/${appname}App.ear">
<fileset dir="${assemble.dir}" includes="*.war"/>
</jar>
- </target>
-
+ </target>
+
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -85,10 +85,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
index 54cf040..0d27c90 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/WebTest.java
@@ -42,9 +42,9 @@
contextRoot = args[2];
appName = args[3];
serverLog = args[4];
-
+
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for mapping discovery");
@@ -57,12 +57,12 @@
boolean extensionMatch = webTest.run("GET", 200, false, "/foo.Issue73", ".*ServletC.MappingImpl\\{matchValue=foo.*pattern=\\*\\.Issue73.*servletName=ServletC.*mappingMatch=EXTENSION\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING: null.*");
boolean pathMatch = webTest.run("GET", 200, false, "/path/foo", ".*ServletC.MappingImpl\\{matchValue=foo.*pattern=/path/\\*.*servletName=ServletC.*mappingMatch=PATH\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING: null.*");
- stat.addStatus(TEST_NAME + "-simple", ((contextRootMatch &&
+ stat.addStatus(TEST_NAME + "-simple", ((contextRootMatch &&
defaultMatch &&
- exactMatch &&
+ exactMatch &&
extensionMatch &&
pathMatch)? stat.PASS : stat.FAIL));
-
+
boolean asyncMatch1 = webTest.run("GET", 200, false, "/AAsyncDispatchToC", ".*ServletC.MappingImpl\\{matchValue=AAsyncDispatchToC.*pattern=/AAsyncDispatchToC.*servletName=AAsyncDispatchToC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING: null.*INCLUDE_MAPPING: null.*ASYNC_MAPPING:.*MappingImpl\\{matchValue=AAsyncDispatchToC.*pattern=/AAsyncDispatchToC.*servletName=AAsyncDispatchToC.*mappingMatch=EXACT}.*");
boolean asyncMatch2 = webTest.run("GET", 200, false, "/BIncludeDispatchServletNamedDispatcher", ".*In.ServletC.MappingImpl\\{matchValue=BIncludeDispatchServletNamedDispatcher,.pattern=/BIncludeDispatchServletNamedDispatcher,.servletName=BIncludeDispatchServletNamedDispatcher,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.MappingImpl\\{matchValue=BIncludeDispatchServletNamedDispatcher,.pattern=/BIncludeDispatchServletNamedDispatcher,.servletName=BIncludeDispatchServletNamedDispatcher,.mappingMatch=EXACT\\}.*");
@@ -70,18 +70,18 @@
stat.addStatus(TEST_NAME + "-async",
asyncMatch1 &&
asyncMatch2 ? stat.PASS : stat.FAIL);
-
+
boolean forwardMatch1 = webTest.run("GET", 200, false, "/AForwardToB", ".*ServletC.MappingImpl\\{matchValue=ServletC,.*pattern=/ServletC,.*servletName=ServletC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING:.MappingImpl\\{matchValue=AForwardToB,.pattern=/AForwardToB,.servletName=AForwardToB,.mappingMatch=EXACT\\}.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.null.*");
boolean forwardMatch2 = webTest.run("GET", 200, false, "/BForwardToC", ".*ServletC.MappingImpl\\{matchValue=ServletC,.*pattern=/ServletC,.*servletName=ServletC,.*mappingMatch=EXACT\\}.*FORWARD_MAPPING:.MappingImpl\\{matchValue=BForwardToC,.pattern=/BForwardToC,.servletName=BForwardToC,.mappingMatch=EXACT\\}.*INCLUDE_MAPPING:.null.*ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-forward", ((forwardMatch1 &&
forwardMatch2)? stat.PASS : stat.FAIL));
-
+
boolean includeMatch1 = webTest.run("GET", 200, false, "/AIncludesB", ".*AIncludesB.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.null.*In.BIncludesC.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*In.ServletC.MappingImpl\\{matchValue=AIncludesB,.pattern=/AIncludesB,.servletName=AIncludesB,.mappingMatch=EXACT\\}.*FORWARD_MAPPING:.null.*INCLUDE_MAPPING:.MappingImpl\\{matchValue=ServletC,.pattern=/ServletC,.servletName=ServletC,.mappingMatch=EXACT\\}.*ASYNC_MAPPING:.null.*");
boolean includeMatch2 = webTest.run("GET", 200, false, "/BIncludesC", ".*In.BIncludesC.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*.FORWARD_MAPPING:.null.*.INCLUDE_MAPPING:.null.*In.ServletC.MappingImpl\\{matchValue=BIncludesC,.pattern=/BIncludesC,.servletName=BIncludesC,.mappingMatch=EXACT\\}.*.FORWARD_MAPPING:.null.*.INCLUDE_MAPPING:.MappingImpl\\{matchValue=ServletC,.pattern=/ServletC,.servletName=ServletC,.mappingMatch=EXACT\\}.*.ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-include", ((includeMatch1 &&
includeMatch2)? stat.PASS : stat.FAIL));
-
+
boolean boundsMatch1 = webTest.run("GET", 200, false, "/a/foo", ".*");
boolean boundsMatch2 = webTest.run("GET", 200, false, "/f", ".*");
stat.addStatus(TEST_NAME + "-bounds", ((boundsMatch1 && boundsMatch2)? stat.PASS : stat.FAIL));
@@ -91,14 +91,14 @@
boolean namedDispatchMatch2 = webTest.run("GET", 200, false, "/BIncludeCNamedDispatcher", ".*In.ServletC.MappingImpl\\{matchValue=BIncludeCNamedDispatcher,.pattern=/BIncludeCNamedDispatcher,.servletName=BIncludeCNamedDispatcher,.mappingMatch=EXACT\\}</p><p>.FORWARD_MAPPING:.null</p><p>.INCLUDE_MAPPING:.null</p><p>.ASYNC_MAPPING:.null.*");
stat.addStatus(TEST_NAME + "-namedDispatch", ((namedDispatchMatch1 && namedDispatchMatch2)? stat.PASS : stat.FAIL));
-
-
+
+
} catch( Exception ex) {
ex.printStackTrace();
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
private boolean run(String method,
@@ -108,7 +108,7 @@
host(host).port(port).build()) {
httpClient.request().path(path).method(method).build().send();
HttpResponse httpResponse = httpClient.getHttpResponse();
-
+
int code = httpResponse.getStatus();
boolean ok = (code == status);
if (checkOKStatusOnly) {
@@ -116,7 +116,7 @@
}
BufferedReader bis = null;
String line = null;
-
+
try {
bis = new BufferedReader(new StringReader(httpResponse.getBody()));
line = bis.readLine();
@@ -124,7 +124,7 @@
ok = line.matches(matchRegex);
System.out.println("matches: " + ok);
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
} finally {
try {
@@ -135,9 +135,9 @@
// ignore
}
}
-
+
return ok;
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties
index aaaa42f..0d13d07 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/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}-servlet-4.0-mapping-discovery"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
index fef7251..04f26a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/build.xml
@@ -35,7 +35,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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="." includes="WebTest.java">
@@ -59,14 +59,14 @@
</classpath>
</javac>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
index 4e33b33..50c693a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/descriptor/web.xml
@@ -56,7 +56,7 @@
<servlet-name>BIncludesC</servlet-name>
<url-pattern>/BIncludesC</url-pattern>
</servlet-mapping>
-
+
<!-- async cases -->
<servlet>
<servlet-name>AAsyncDispatchToC</servlet-name>
@@ -112,5 +112,5 @@
<url-pattern>/a/*</url-pattern>
<url-pattern>//*</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
index 9770aa2..03ea566 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AAsyncDispatchToC.java
@@ -37,17 +37,17 @@
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
AsyncContext asyncContext = request.startAsync();
-
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
asyncContext.dispatch("/ServletC");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
index f87be65..90ae2c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AForwardToB.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getRequestDispatcher("/BForwardToC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
index 13d4a9f..c3219ad 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/AIncludesB.java
@@ -44,17 +44,17 @@
out.print("<!DOCTYPE html>");
out.print("<html>");
out.print("<head>");
- out.print("<title>Servlet AIncludesB</title>");
+ out.print("<title>Servlet AIncludesB</title>");
out.print("</head>");
out.print("<body>");
out.print("<h1>Servlet AIncludesB at " + request.getContextPath() + "</h1>");
- request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " getHttpServletMapping: "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
index c934db6..2adf4ee 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToC.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getRequestDispatcher("/ServletC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
index 7371975..71a5b4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BForwardToCNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("ServletC");
rd.forward(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
index 4579c0d..c65712f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeCNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("ServletC");
rd.include(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
index 0ff75b5..787f75d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludeDispatchServletNamedDispatcher.java
@@ -37,16 +37,16 @@
*/
protected void processRequest(HttpServletRequest request, HttpServletResponse response)
throws ServletException, IOException {
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
RequestDispatcher rd = request.getServletContext().getNamedDispatcher("fa5raP");
rd.include(request, response);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
index 9abc7ca..2075eab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/BIncludesC.java
@@ -41,13 +41,13 @@
PrintWriter out = response.getWriter();
try {
/* TODO output your page here. You may use following sample code. */
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
index be850ad..43ec1a1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/DispatchServlet.java
@@ -27,18 +27,18 @@
public class DispatchServlet extends HttpServlet {
public void doGet(HttpServletRequest request, HttpServletResponse response) throws IOException{
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
-
+
AsyncContext asyncContext = request.startAsync();
asyncContext.setTimeout(0);
asyncContext.dispatch("/ServletC");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
index 23aad83..b1ab795 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/mappingDiscovery/servlet/ServletC.java
@@ -41,16 +41,16 @@
PrintWriter out = response.getWriter();
try {
/* TODO output your page here. You may use following sample code. */
- request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getServletContext().log(this.getClass().getSimpleName() + " "
+ request.getHttpServletMapping());
HttpServletMapping forwardMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.FORWARD_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " FORWARD_MAPPING attribute: "
+ forwardMapping);
HttpServletMapping includeMapping = (HttpServletMapping) request.getAttribute(RequestDispatcher.INCLUDE_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " INCLUDE_MAPPING attribute: "
+ includeMapping);
HttpServletMapping asyncMapping = (HttpServletMapping) request.getAttribute(AsyncContext.ASYNC_MAPPING);
- request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ request.getServletContext().log(this.getClass().getSimpleName() + " ASYNC_MAPPING attribute: "
+ asyncMapping);
out.print("<p> In " + this.getClass().getSimpleName() + " " + request.getHttpServletMapping() + "</p>");
out.print("<p> FORWARD_MAPPING: " + forwardMapping + "</p>");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
index 87f7f21..332f601 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push arbitrary method");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties
index 9445c10..10f358d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/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}-servlet-4.0-push-arbitrary-method"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml
index 6d8561d..ea74b2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<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/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
index cd1a6c8..67da9f0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/FooMethodServlet.java
@@ -32,7 +32,7 @@
@WebServlet(urlPatterns="/foo/*")
public class FooMethodServlet extends HttpServlet {
-
+
@Override
protected void service(HttpServletRequest req, HttpServletResponse res)
throws IOException, ServletException {
@@ -53,6 +53,6 @@
}
res.setStatus(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
index 35a38e4..ff7473c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushArbitraryMethod/servlet/test/TestServlet.java
@@ -58,7 +58,7 @@
* cookie: [375 bytes were stripped]
* referer: https://localhost:8181/web-servlet-4.0-push-arbitrary-method/test
*/
-
+
PushBuilder pushBuilder = req.newPushBuilder().
method("FOO").
path("foo/my.css");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
index e00c99e..c461755 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/WebTest.java
@@ -45,7 +45,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push static file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties
index 140b97a..6085e62 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/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}-servlet-4.0-push-authorization"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
index e2cdfc0..972c0d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushAuthorization/build.xml
@@ -53,7 +53,7 @@
<param name="user" value="${testuser}"/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -71,7 +71,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -96,7 +96,7 @@
<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/servlet-4.0/pushCacheable/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
index 17b7354..4aa3c9e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push cacheable");
WebTest webTest = new WebTest(args);
@@ -52,7 +52,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties
index d113ace..8e728b8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/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}-servlet-4.0-push-cacheable"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushCacheable/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<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/servlet-4.0/pushDynamic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
index 49c0c22..919edc3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push dynamic file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties
index d3bdba9..9c285ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/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}-servlet-4.0-push-dynamic"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml
index 6d8561d..ea74b2c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<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/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
index f069065..c8e4c64 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/NOTfacesServlet.java
@@ -56,7 +56,7 @@
req.getServletContext().log("Should have ln parameter. Does not.");
res.sendError(HttpServletResponse.SC_INTERNAL_SERVER_ERROR);
return;
-
+
}
}
res.getWriter().println("foo: bar");
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
index 26dfd7b..7305f62 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushDynamic/servlet/test/TestServlet.java
@@ -46,7 +46,7 @@
pushBuilder = req.newPushBuilder().
path("/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/parameterMapFailure.js?ln=resources");
pushBuilder.push();
-
+
res.getWriter().println("<html><head><title>HTTP2 Test</title><link rel=\"stylesheet\" href=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/style.css\"><script type=\"text/javascript\" src=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/jsf.js?ln=javax.faces\"></script><script type=\"text/javascript\" src=\"/web-servlet-4.0-push-dynamic/NOTfaces/javax.faces.resource/parameterMapFailure.js?ln=resources\"></script></head><body>Hello</body></html>");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
index 839f97d..66224e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push query string");
WebTest webTest = new WebTest(args);
@@ -52,7 +52,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties
index 8a90eaf..22143d6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/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}-servlet-4.0-push-query-string"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushQueryString/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<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/servlet-4.0/pushStatic/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
index 213690d..6d44f31 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/WebTest.java
@@ -43,7 +43,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for http2 push static file");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties
index 7c1192b..f19ec38 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/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}-servlet-4.0-push-static"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml
index 831745f..7f4fa1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/pushStatic/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -57,7 +57,7 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -82,7 +82,7 @@
<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/servlet-4.0/reqResEncoding/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
index 869ac98..8fccc06 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/WebTest.java
@@ -44,7 +44,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for request-character-encoding, response-character-encoding in web.xml");
WebTest webTest = new WebTest(args);
@@ -90,7 +90,7 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties
index 2aea8fd..dc8f68f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-req-res-encoding"/>
+<property name="appname" value="${module}-servlet-4.0-req-res-encoding"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncoding/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/servlet-4.0/reqResEncodingGFWebxml/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
index b2decec..5bb8ef5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/WebTest.java
@@ -46,7 +46,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for request-character-encoding, response-character-encoding in web.xml and parameter-encoding in glassfish-web.xml");
WebTest webTest = new WebTest(args);
@@ -91,12 +91,12 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!JCHARSET_RESPONSE.equals(charset)) {
- throw new Exception("Wrong Content-Type charset. Expected: " +
+ throw new Exception("Wrong Content-Type charset. Expected: " +
JCHARSET_RESPONSE + ", received: " + charset);
}
-
+
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
@@ -124,12 +124,12 @@
String line = httpResponse.getBody(charset).trim();
System.out.println("--> line = " + line);
if (!JCHARSET_RESPONSE.equals(charset)) {
- throw new Exception("Wrong Content-Type charset. Expected: " +
+ throw new Exception("Wrong Content-Type charset. Expected: " +
JCHARSET_RESPONSE + ", received: " + charset);
}
-
+
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
index 312914c..5009847 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.properties
@@ -16,10 +16,10 @@
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}-servlet-4.0-req-res-encoding-gfwebxml"/>
+<property name="appname" value="${module}-servlet-4.0-req-res-encoding-gfwebxml"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
<property name="web.xml" value="descriptor/web.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
index d8fffcf..39bb534 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/reqResEncodingGFWebxml/build.xml
@@ -38,7 +38,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,10 +46,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -57,10 +57,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -68,7 +68,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<jvmarg value="-Djava.endorsed.dirs=${env.S1AS_HOME}/modules/endorsed"/>
@@ -85,10 +85,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/servlet-4.0/setSessionTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
index a29bcaf..77798be 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/WebTest.java
@@ -38,7 +38,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.setSessionTimeout()");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -83,7 +83,7 @@
String line = httpResponse.getBody().trim();
System.out.println("--> line = " + line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties
index d9669ce..c8dcbd6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/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}-servlet-4.0-set-session-timeout"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
index 229d336..75668c2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/build.xml
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
@@ -58,10 +58,10 @@
</classpath>
</javac>
- </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>
@@ -69,7 +69,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -85,10 +85,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/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
index b7eaf9a..99cb835 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/setSessionTimeout/servlet/test/MyObject.java
@@ -26,18 +26,18 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
@Override
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
@Override
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
index 0c78f9b..503b16e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/WebTest.java
@@ -42,7 +42,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for trailer");
WebTest webTest = new WebTest(args);
@@ -85,7 +85,7 @@
}
String contentType = httpResponse.getHeader("Content-Type");
System.out.println("--> headers = " + httpResponse.getHeaders());
-
+
String result = new StringBuilder(httpResponse.getBody().trim())
.append('|')
.append(httpResponse.getTrailerFields().get("bar1")) // trailer field
@@ -96,7 +96,7 @@
System.out.println("--> result = " + result);
if (!EXPECTED_RESPONSE.equals(result)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + result);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties
index 67e297d..c98b183 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/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="web"/>
-<property name="appname" value="${module}-servlet-4.0-trailer"/>
+<property name="appname" value="${module}-servlet-4.0-trailer"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
index 78d7c39..3aedb9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servlet-4.0/trailer/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,10 +45,10 @@
</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="." includes="WebTest.java">
<classpath>
@@ -56,10 +56,10 @@
<pathelement location="${env.APS_HOME}/lib/webtest.jar"/>
</classpath>
</javac>
- </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>
@@ -67,7 +67,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest" fork="true">
<sysproperty key="S1AS_HOME" value="${env.S1AS_HOME}"/>
@@ -83,10 +83,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/servletAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
index d3a0c8d..1aadac0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6535898");
@@ -62,7 +62,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -75,7 +75,7 @@
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties
index 052e444..9666302 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/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}-servlet-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
index 6a81528..63b5d4d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletAnnotationPreDestroy/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -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/servletChainedException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
index a34c114..5b7e1b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for servlet chained exception");
@@ -53,18 +53,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties
index 0867c51..5c6ae54 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/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}-servlet-chained-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml b/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/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/servletChainedException/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
index 6025751..1c17007 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletChainedException/servlet/test/TestServlet.java
@@ -37,7 +37,7 @@
Throwable t = new Throwable("test");
ServletException se1 = new ServletException("test", t);
- ServletException se2 = new ServletException(t);
+ ServletException se2 = new ServletException(t);
if (se1.getCause() == t && se2.getCause() == t) {
passed = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
index 04f620a..03bdfd7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/WebTest.java
@@ -20,13 +20,13 @@
import com.sun.ejte.ccl.reporter.*;
/**
- * Bugzilla 33463
+ * Bugzilla 33463
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -35,7 +35,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Remove Attribute on destroy");
String host = args[0];
@@ -44,7 +44,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "DESTROY", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -53,7 +53,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("attributeListenerClear", stat.FAIL);
- }
+ }
stat.printSummary("web/attributeListenerClear---> expect " + EXPECTED_COUNT);
}
@@ -68,7 +68,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
System.out.println("Time: " + (System.currentTimeMillis() - time));
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -83,18 +83,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-attributeListenerClear: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties
index 1ca409c..9177253 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/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}-servletContextAttributeEventAttributeRemoved"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
index 2717575..65e952f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/build.xml
@@ -36,7 +36,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"/>
@@ -48,16 +48,16 @@
classpath="${s1as.classpath}"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
<antcall target="restart-server-instance-common"/>
</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
@@ -65,14 +65,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -82,7 +82,7 @@
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
<antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -94,10 +94,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/servletContextAttributeEventAttributeRemoved/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
index 1a8960e..ac2559b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/descriptor/web.xml
@@ -27,14 +27,14 @@
test.StaticListener
</listener-class>
</listener>
-
+
<servlet>
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
<load-on-startup>0</load-on-startup>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
index fc1266e..c4e1136 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- ServletContext ctx = config.getServletContext();
- ctx.setAttribute("Attribut", "une valeur");
+ ServletContext ctx = config.getServletContext();
+ ctx.setAttribute("Attribut", "une valeur");
}
-
+
public void destroy(){
System.out.println("########### destroy #############");
}
@@ -41,14 +41,14 @@
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
- System.out.println("########## StaticListener.removeAttribute: " +
+
+ System.out.println("########## StaticListener.removeAttribute: " +
StaticListener.removeAttribute);
- out.println("DESTROY:"
+ out.println("DESTROY:"
+ (StaticListener.removeAttribute == true ? "PASS" : "FAIL"));
}
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
index c5c44be..f3e7de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/servlet/StaticListener.java
@@ -23,21 +23,21 @@
public static boolean removeAttribute = false;
- public void attributeAdded(ServletContextAttributeEvent evt) {
- System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeAdded(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
- public void attributeRemoved(ServletContextAttributeEvent evt) {
- System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ public void attributeRemoved(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
System.out.println("removeAttribute: " + removeAttribute);
removeAttribute = true;
- }
+ }
- public void attributeReplaced(ServletContextAttributeEvent evt) {
- System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeReplaced(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
index c5c44be..f3e7de4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeEventAttributeRemoved/shared/test/StaticListener.java
@@ -23,21 +23,21 @@
public static boolean removeAttribute = false;
- public void attributeAdded(ServletContextAttributeEvent evt) {
- System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeAdded(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nAdded a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
- public void attributeRemoved(ServletContextAttributeEvent evt) {
- System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ public void attributeRemoved(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nRemoved a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
System.out.println("removeAttribute: " + removeAttribute);
removeAttribute = true;
- }
+ }
- public void attributeReplaced(ServletContextAttributeEvent evt) {
- System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
- }
+ public void attributeReplaced(ServletContextAttributeEvent evt) {
+ System.out.println("\n\nReplaced a servlet context attribute: " + evt.getName() + " ("+ evt.getValue() +")");
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
index 3c39247..4e9ffed 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6391");
@@ -53,7 +53,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -66,7 +66,7 @@
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties
index d66bf68..f35e56a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/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}-servlet-context-attribute-listener-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
index 90abef1..7240790 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextAttributeListenerAnnotationPreDestroy/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/servletContextDestroyedEventAttributesAvailable/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
index 0772a31..e3ca54b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 6442");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
/**
@@ -72,7 +72,7 @@
* at its contextDestroyed() method and will attempt to access the
* ServletContext attribute that was added by the servlet.
* If the attribute is present, the ServletContextListener will write
- * the word "SUCCESS" to /tmp/mytest. Otherwise, it will write FAIL to
+ * the word "SUCCESS" to /tmp/mytest. Otherwise, it will write FAIL to
* that file.
*/
public void firstRun() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties
index 97ece0e..ed9af78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/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}-servlet-context-destroyed-event-attributes-available"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
index ee65da6..0a7d198 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextDestroyedEventAttributesAvailable/build.xml
@@ -36,7 +36,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"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="firstRun" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/servletContextGetContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
index f7d86d8..438bc13 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.getContextPath()");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -71,8 +71,8 @@
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!contextRoot.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
contextRoot + ", received: " + line);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties
index 49c3e21..44868ba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/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}-servlet-context-get-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetContextPath/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/servletContextGetEmptyContextPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
index b0cabe5..e85ae37 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/WebTest.java
@@ -25,7 +25,7 @@
* The empty context path is specified in the sun-web.xml, as follows:
*
* <sun-web-app>
- * <context-root></context-root>
+ * <context-root></context-root>
* </sun-web-app>
*
* and there is no contextroot specified in build.properties.
@@ -47,7 +47,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ServletContext.getContextPath()");
@@ -60,11 +60,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
@@ -80,10 +80,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties
index 1c4f0ec..6233c03 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/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}-servlet-context-get-empty-context-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml
index 6c9683f..968deb9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servletContextGetEmptyContextPath/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
index 656c52c..12921d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextGetEmptyContextPath/descriptor/sun-web.xml
@@ -20,5 +20,5 @@
<!DOCTYPE sun-web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Application Server 8.1 Servlet 2.4//EN" "http://www.sun.com/software/sunone/appserver/dtds/sun-web-app_2_4-1.dtd">
<sun-web-app>
- <context-root>/</context-root>
+ <context-root>/</context-root>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
index c210868..7fdc495 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 6391");
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
@@ -85,10 +85,10 @@
// ignore
}
}
-
+
if ("SUCCESS".equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
- } else {
+ } else {
stat.addStatus(TEST_NAME, stat.FAIL);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties
index 3bdaccd..37d8690 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/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}-servlet-context-listener-annotation-predestroy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
index e55219d..5bf4b36 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextListenerAnnotationPreDestroy/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/servletContextNullPathArgument/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
index e1f521a..021cf73 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6265066");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties
index aef39d2..abb6a05 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/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}-servlet-context-null-path-argument"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletContextNullPathArgument/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/servletEmptyLoadOnStartup/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
index bffbecd..b8d8139 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6172006");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
run();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -62,7 +62,7 @@
}
public void run() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -84,6 +84,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties
index c8353b0..48d6f0d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/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}-servlet-empty-load-on-startup"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/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,17 +42,17 @@
</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">
@@ -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/servletEmptyLoadOnStartup/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
index f5c4d3b..ae5b958 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletEmptyLoadOnStartup/descriptor/web.xml
@@ -24,7 +24,7 @@
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
<load-on-startup/>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
index 67ae488..6ddaa51 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=6943
* ("Grails sample app failed with Servlet gsp NPE")
@@ -29,7 +29,7 @@
private static final String TEST_NAME = "servlet-filter-default-invocation-order";
private static final String EXPECTED_RESPONSE = "true";
-
+
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 6943");
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -76,9 +76,9 @@
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties
index f8628f1..ddbf2a3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/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}-servlet-filter-default-invocation-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servletFilterDefaultInvocationOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
index bec2390..be5c1e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterDefaultInvocationOrder/descriptor/web.xml
@@ -18,17 +18,17 @@
-->
<web-app version="2.5" 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">
-
+
<filter>
<filter-name>Filter_A</filter-name>
<filter-class>Filter_A</filter-class>
- </filter>
+ </filter>
<filter>
<filter-name>Filter_B</filter-name>
<filter-class>Filter_B</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>Filter_A</filter-name>
<url-pattern>/*</url-pattern>
@@ -38,12 +38,12 @@
<filter-name>Filter_B</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
index b3384f2..3a699c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/WebTest.java
@@ -28,7 +28,7 @@
"servlet-filter-mapping-with-servletname-and-urlpattern";
private static final String EXPECTED_RESPONSE = "true";
-
+
private static SimpleReporterAdapter stat
= new SimpleReporterAdapter("appserv-tests");
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for filter-mapping with both "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -80,7 +80,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -98,6 +98,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties
index 93bb1df..32a17cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/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}-servlet-filter-mapping-with-servletname-and-urlpattern"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/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/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
index 15219c5..3698331 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/descriptor/web.xml
@@ -18,24 +18,24 @@
-->
<web-app version="2.5" 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">
-
+
<filter>
<filter-name>TestFilter</filter-name>
<filter-class>test.TestFilter</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>TestFilter</filter-name>
<url-pattern>/TestServlet</url-pattern>
<servlet-name>TestServlet</servlet-name>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
-
+
<servlet>
<servlet-name>TestServlet</servlet-name>
<servlet-class>test.TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
index 65aae70..833637f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestFilter.java
@@ -26,7 +26,7 @@
private AtomicInteger count;
public void init(FilterConfig filterConfig) throws ServletException {
- count = new AtomicInteger();
+ count = new AtomicInteger();
}
public void doFilter (ServletRequest request,
diff --git a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
index e510f63..c745127 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletFilterMappingWithServletNameAndURLPattern/servlet/test/TestServlet.java
@@ -27,7 +27,7 @@
throws IOException, ServletException {
boolean success = false;
-
+
AtomicInteger count = (AtomicInteger) req.getAttribute("filterCount");
if (count != null && count.intValue() == 2) {
success = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
index e1db611..fe7d656 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6356813");
WebTest webTest = new WebTest(args);
@@ -77,6 +77,6 @@
+ ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties
index 267f521..887aeae 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/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="web"/>
-<property name="appname" value="${module}-servlet-get-server-port"/>
+<property name="appname" value="${module}-servlet-get-server-port"/>\u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml
index faf7f55..51a1cba 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/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,15 +42,15 @@
</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>
@@ -58,7 +58,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
@@ -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/servletGetServerPort/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
index 04bdfc5..ea0f620 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/descriptor/web.xml
@@ -22,12 +22,12 @@
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>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
index 86836c3..c4d9646 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletGetServerPort/servlet/TestServlet.java
@@ -19,7 +19,7 @@
import jakarta.servlet.http.*;
public class TestServlet extends HttpServlet {
-
+
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
index dc4f59d..56acc97 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 17216");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties
index abe9692..8f7a4b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/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}-servlet-init-before-get-servlet-config"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml
index 86f51ed..7aab77a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,19 +47,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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -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/servletInitBeforeGetServletConfig/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
index c0f337e..20ddacf 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletInitBeforeGetServletConfig/servlet/TestServlet.java
@@ -27,7 +27,7 @@
public class TestServlet extends HttpServlet {
private volatile Integer i = null;
private volatile Boolean initBeforeGetConfig = null;
-
+
public void init() {
i = new Integer(1);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
index b1abeb5..43dd5cb 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 8557");
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties
index ebf82d2..dd007b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/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}-servlet-load-on-startup-multiple-init"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml
index 8d2adf9..bcfb19f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletLoadOnStartupMultipleInit/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/servletMappingWithMultipleURLPatterns/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
index 1851301..b597b3d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for servlet-mapping with "
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
boolean fail = false;
URL url = null;
HttpURLConnection conn = null;
@@ -88,6 +88,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties
index f5d521b..ca57f7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/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}-servlet-mapping-with-multiple-url-patterns"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletMappingWithMultipleURLPatterns/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/servletRelativeContextURLsEquals/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
index 927a63f..06f9c3b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6318494");
@@ -52,18 +52,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties
index 3ff66f2..42c1bc2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/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}-servlet-relative-context-urls-equals"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/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/servletRelativeContextURLsEquals/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
index b6a71d0..73c3164 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRelativeContextURLsEquals/servlet/test/TestServlet.java
@@ -34,8 +34,8 @@
throws IOException, ServletException {
boolean passed = false;
-
- try {
+
+ try {
URL main = context.getResource("/test/res1.jsp");
URL sub = new URL(main, "res2.jsp");
URL sub1 = context.getResource("/test/res2.jsp");
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
index 5a3af0d..e7b7b57 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish issue 3505");
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet/http://www.sun.com/");
System.out.println("Connecting to: " + url.toString());
@@ -77,10 +77,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties
index fd4415f..2143d20 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/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}-servlet-request-get-path-info-collapse-contiguous-slashes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
index 6b61a09..3e10e16 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoCollapseContiguousSlashes/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/servletRequestGetPathInfoGetPathTranslated/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
index 3d2b0d5..0d71272 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/WebTest.java
@@ -61,8 +61,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -92,7 +92,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
@@ -143,7 +143,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
fail = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties
index ba34d35..b4b49d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/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}-servlet-request-getPathInfo-getPathTranslated"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml
index ebdcf2f..5a3b223 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestGetPathInfoGetPathTranslated/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}"/>
@@ -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/servletRequestLongUri/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
index acc6e6d..eac4a22 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for testing very long request URI");
@@ -58,7 +58,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String pathInfo, String expected) throws Exception {
@@ -68,7 +68,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties
index 6f2c607..664df3c 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/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}-servlet-request-long-uri"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestLongUri/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servletRequestParamsPreserveOrder/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
index 785d888..add6099 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6057385");
@@ -57,7 +57,7 @@
}
public void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet?param1=value1¶m2=value2¶m3=value3";
HttpURLConnection conn = (HttpURLConnection)
@@ -66,7 +66,7 @@
int code = conn.getResponseCode();
if (code != 200) {
throw new Exception("Unexpected return code: " + code);
- }
+ }
InputStream is = null;
BufferedReader input = null;
@@ -93,6 +93,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties
index 0bd0177..2276394 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/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}-servlet-request-params-preserve-order"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml
index 8542e91..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/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,17 +42,17 @@
</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">
@@ -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/servletRequestParamsPreserveOrder/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
index 4d9d4a0..98d1684 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestParamsPreserveOrder/descriptor/web.xml
@@ -27,7 +27,7 @@
<display-name>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
index 0593cf4..be0adbe 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/WebTest.java
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4936855");
@@ -71,18 +71,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties
index 7ad1d3c..b2c1b65 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/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}-servlet-request-setcharencoding-illegal-state-exception"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestSetCharEncodingIllegalStateException/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/servletRequestURIMultipleSemicolons/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
index 885340e..742e43a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/WebTest.java
@@ -49,7 +49,7 @@
expectedResponse = contextRoot + "/test.jsp;jsessionwhatever=456";
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -63,11 +63,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test.jsp;jsessionid=12;jsessionwhatever=456");
System.out.println("Connecting to: " + url.toString());
@@ -87,7 +87,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!expectedResponse.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
}
} finally {
@@ -105,6 +105,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties
index 05aa72b..9fe3ad2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/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}-servlet-request-uri-multiple-semicolons"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletRequestURIMultipleSemicolons/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/servletResourceInjectionContextAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
index 1ab490e..d5a1427 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties
index 52eac49..144c2ab 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/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}-servlet-resource-injection-context-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/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/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
index e2751a1..cf19313 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextAttributeListener/servlet/test/MyListener.java
@@ -49,7 +49,7 @@
public void attributeAdded(ServletContextAttributeEvent scae) {
ServletContext sc = scae.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
index 33b3c72..b700c66 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties
index 9cdfa09..91efe80 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/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}-servlet-resource-injection-context-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/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/servletResourceInjectionContextListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
index 57d6466..118e726 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionContextListener/servlet/test/MyListener.java
@@ -49,7 +49,7 @@
public void contextInitialized(ServletContextEvent sce) {
ServletContext sc = sce.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
index c0fa7b6..fbd57e5 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into servlet "
@@ -51,18 +51,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties
index f1ec168..362f50e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/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}-servlet-resource-injection-filter"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
index 214c30a..67a4f7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionFilter/servlet/myfilter/MyFilter.java
@@ -40,7 +40,7 @@
public void init(FilterConfig filterConfig) throws ServletException {
ServletContext sc = filterConfig.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
index 0161bd6..b96fba4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,7 +79,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -97,6 +97,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties
index 674399e..9cfe85a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/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}-servlet-resource-injection-http-session-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/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/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
index 976aa13..0ff22e3 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionAttributeListener/servlet/test/MyListener.java
@@ -51,7 +51,7 @@
HttpSession session = hsbe.getSession();
ServletContext sc = session.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
index 9c7ba9a..4b0eb8a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,7 +79,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -97,6 +97,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties
index 72e501c..c09cca2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/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}-servlet-resource-injection-http-session-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/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/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
index 82c13ed..13e4652 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionHttpSessionListener/servlet/test/MyListener.java
@@ -50,7 +50,7 @@
HttpSession session = hse.getSession();
ServletContext sc = session.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
index 6bbf958..f6d1b78 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties
index 6753392..3b004a9 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/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}-servlet-resource-injection-request-attribute-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/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/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
index 9b255d5..362aead 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestAttributeListener/servlet/test/MyListener.java
@@ -50,7 +50,7 @@
ServletRequest sr = srae.getServletRequest();
ServletContext sc = srae.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
index aab7a6c..8d59943 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -55,11 +55,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,7 +78,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties
index 940444b..9a0265a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/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}-servlet-resource-injection-request-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/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/servletResourceInjectionRequestListener/servlet/test/MyListener.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
index d6af67b..b6dd55d 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionRequestListener/servlet/test/MyListener.java
@@ -51,7 +51,7 @@
ServletRequest sr = sre.getServletRequest();
ServletContext sc = sre.getServletContext();
-
+
try {
int loginTimeout = ds1.getLoginTimeout();
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
index 56abc77..891a70b 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -54,11 +54,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -78,9 +78,9 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
- }
+ }
} finally {
try {
if (is != null) {
@@ -96,6 +96,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties
index 2b53dac..a5b81d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/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}-servlet-resource-injection-servlet-instance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstance/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/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
index 463dc3e..e8d3441 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for resource injection into "
@@ -56,11 +56,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -79,10 +79,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.err.println("Wrong response. Expected: " +
+ System.err.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties
index c94a47a..4fb6007 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/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}-servlet-resource-injection-servlet-instance-load-on-startup"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResourceInjectionServletInstanceLoadOnStartup/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/servletResponseQuotedContentTypeImbalance/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
index 99f5481..db200d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6316254");
@@ -50,18 +50,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties
index f253827..2b3f9d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/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}-servlet-response-quoted-content-type-imbalance"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletResponseQuotedContentTypeImbalance/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/servletSSLRequestAttributes/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
index 124badc..9b7df80 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/WebTest.java
@@ -22,7 +22,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test related to
+ * Unit test related to
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=562
* ("HttpServletRequest does not return any attribute in JAX-WS web service"):
*
@@ -64,7 +64,7 @@
String contextRoot = args[2];
String keyStorePath = args[3];
String trustStorePath = args[4];
-
+
try {
SSLSocketFactory ssf = getSSLSocketFactory(keyStorePath,
trustStorePath);
@@ -72,9 +72,9 @@
+ port + contextRoot
+ "/TestServlet",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -117,7 +117,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -133,7 +133,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties
index 3d22a6b..8fc607f 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/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}-servlet-ssl-request-attributes"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
index a7eab9d..656dddc 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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>
@@ -77,10 +77,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
index c2a768e..f55cb9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/descriptor/web.xml
@@ -22,13 +22,13 @@
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>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
index a04aa9a..b45f952 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletSSLRequestAttributes/servlet/TestServlet.java
@@ -28,7 +28,7 @@
Enumeration<String> e = req.getAttributeNames();
while (e.hasMoreElements()) {
attrs.append(e.nextElement() + ";");
- }
+ }
res.getWriter().print(attrs);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
index 4ef2656..e2fe2d2 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4924326");
WebTest webTest = new WebTest(args);
@@ -53,7 +53,7 @@
}
public void doTest() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot;
int code = invokeServlet(url + "/TestServlet1");
if (code != 200) {
@@ -67,7 +67,7 @@
}
private int invokeServlet(String url) throws Exception {
-
+
System.out.println("Invoking servlet at: " + url);
HttpURLConnection conn = (HttpURLConnection)
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties
index 5e530df..ca80b81 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/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="web"/>
-<property name="appname" value="${module}-servlet-to-jsp-file-mapping"/>
+<property name="appname" value="${module}-servlet-to-jsp-file-mapping"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
index 4edc9cc..4ab7865 100644
--- a/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/servletToJspFileMapping/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -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/sessionDestroyed/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
index 01a5921..d0afdec 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/WebTest.java
@@ -24,7 +24,7 @@
* too late according to Servlet Spec").
*/
public class WebTest {
-
+
private static final SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
private static final String TEST_NAME = "session-destroyed";
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
index 8cfd8d4..875cfae 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.properties
@@ -15,11 +15,11 @@
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}-session-destroyed"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
index 02e27d7..c14cf33 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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/sessionDestroyed/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
index 7eb5ec0..42f4929 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,14 +31,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
index b7c9637..7029616 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyed/servlet/ServletTest.java
@@ -22,10 +22,10 @@
import jakarta.servlet.http.*;
public class ServletTest extends HttpServlet implements HttpSessionListener {
-
+
public void doGet(HttpServletRequest request,
HttpServletResponse response)
- throws ServletException, IOException {
+ throws ServletException, IOException {
request.getSession().setAttribute("response", response);
request.getSession().invalidate();
}
@@ -33,7 +33,7 @@
public void sessionCreated(HttpSessionEvent httpSessionEvent) {
// Do nothing
}
-
+
public void sessionDestroyed(HttpSessionEvent httpSessionEvent) {
// Make sure IllegalStateException is not thrown
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
index f42c552..6bb3f37 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/WebTest.java
@@ -19,8 +19,8 @@
import com.sun.ejte.ccl.reporter.*;
/*
- *
- *
+ *
+ *
*/
public class WebTest {
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for classloader in"
+ "HttpSessionListener.sessionDestroyed()");
@@ -49,7 +49,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,7 +60,7 @@
}
private void invoke() throws Exception {
-
+
String baseUrl = "http://" + host + ":" + port + contextRoot + "/test";
HttpURLConnection conn = (HttpURLConnection)(new URL(baseUrl + "?timeout=1")).openConnection();
@@ -89,7 +89,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
@@ -109,7 +109,7 @@
}
}
}
-
+
private String getSessionId(HttpURLConnection conn) {
String sessionId = null;
String cookieString = conn.getHeaderField("Set-Cookie");
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties
index 8fca3c2..02e10e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/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}-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/sessionDestroyedClassLoader/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
index 8880429..4a33498 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedClassLoader/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
index adbd24a..cdc5a5d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/WebTest.java
@@ -52,7 +52,7 @@
adminPassword = args[4];
run = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 834");
@@ -69,7 +69,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -128,7 +128,7 @@
responseCode + ", expected: " +
HttpURLConnection.HTTP_OK);
}
-
+
String cookie = conn.getHeaderField("set-cookie");
if (cookie == null) {
throw new Exception("Missing Set-Cookie response header");
@@ -160,7 +160,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -208,7 +208,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -260,7 +260,7 @@
String cookie = "Cookie: " + jsessionIdSSO + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -277,7 +277,7 @@
*/
String line = null;
String redirectUrl = "Location: http://" + host + ":" + port
- + contextRoot + "/login.jsp";
+ + contextRoot + "/login.jsp";
while ((line = br.readLine()) != null) {
System.out.println(line);
if (line.equals(redirectUrl)
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties
index 2436933..41149b6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/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}-session-destroyed-during-undeploy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml
index 0bca0af..501545a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/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"/>
@@ -55,10 +55,10 @@
</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
@@ -66,10 +66,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.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>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runFirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -107,14 +107,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="undeploy-again" depends="init-common">
<antcall target="undeploy"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionDestroyedDuringUndeploy/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
index df18aa7..8137f5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Make sure HttpSessionListener's sessionDestroyed(), and
+ * Make sure HttpSessionListener's sessionDestroyed(), and
* HttpSessionBindingListener's valueUnbound() methods are called when
* session expires.
*
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for "
+ "HttpSessionListener.sessionDestroyed()");
@@ -55,7 +55,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -66,7 +66,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,7 +93,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties
index d09b66a..cd6da55 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/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}-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml
index cf93fa4..28275a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/sessionExpired/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
index a4eec27..6aa8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
@@ -46,7 +46,7 @@
<servlet-name>CheckResult</servlet-name>
<url-pattern>/CheckResult</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
index fd0610c..f6f32ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionExpired/servlet/test/MyObject.java
@@ -27,17 +27,17 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
index ebc0faf..d4e6455 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/WebTest.java
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6275709");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
} catch (Exception ex) {
ex.printStackTrace();
@@ -76,14 +76,14 @@
}
private void invokeServlet() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/createSession");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties
index 1e8d33f..b086f5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/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}-session-id-custom-generator"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
index 314cbd5..a3aa8db 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdCustomGenerator/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="copy-jar" depends="init-common">
<copy file="uuidGeneratorImpl.jar" todir="${env.S1AS_HOME}/domains/domain1/lib"
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
index 7c26050..4611335 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 4394");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
runTest();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -72,7 +72,7 @@
}
private void runTest() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/createSession" + " HTTP/1.0\n";
@@ -84,7 +84,7 @@
BufferedReader bis = null;
String locationHeader = null;
String cookieHeader = null;
- try {
+ try {
is = sock.getInputStream();
bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -116,7 +116,7 @@
if (cookieHeader == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (locationHeader == null) {
throw new Exception("Missing Location response header");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties
index 84e7866..44efe12 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/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}-session-id-present-in-both-rewritten-url-and-cookie-by-default"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentInBothRewrittenUrlAndCookieByDefault/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
index 766d281..e005dc3 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 4394");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
runTest();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,14 +63,14 @@
}
private void runTest() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/createSession" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -88,7 +88,7 @@
if (cookieHeader == null) {
throw new Exception("Missing Set-Cookie response header");
}
-
+
if (locationHeader == null) {
throw new Exception("Missing Location response header");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties
index 78f8c58..2f9a81a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/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}-session-id-present-only-in-cookie-if-url-rewriting-disabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdPresentOnlyInCookieIfUrlRewritingDisabled/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/sessionIdUrlRewrite/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
index 91dd8b6..f2d61ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/WebTest.java
@@ -41,15 +41,15 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
new WebTest(args).doTest();
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -61,14 +61,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -88,7 +88,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -105,7 +105,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
index a702087..12e3e1c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.properties
@@ -16,7 +16,7 @@
<property name="module" value="web"/>
-<property name="appname" value="${module}-session-id-url-rewrite"/>
+<property name="appname" value="${module}-session-id-url-rewrite"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
index 1dd1a6a..5c4cd34 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build-ng.xml
@@ -80,7 +80,7 @@
<delete dir="test-report"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -90,16 +90,16 @@
<target name="build" depends="compile">
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties
index 78f220f..90acd9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/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="web"/>
-<property name="appname" value="${module}-session-id-url-rewrite"/>
+<property name="appname" value="${module}-session-id-url-rewrite"/> \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"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/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/sessionIdUrlRewrite/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
index f5ee9d4..13980d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/WebTestNG.java
@@ -40,7 +40,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -63,7 +63,7 @@
conn.connect();
int responseCode = conn.getResponseCode();
- assert responseCode == 200;
+ assert responseCode == 200;
bis = new BufferedReader(new InputStreamReader(conn.getInputStream()));
while ((line = bis.readLine()) != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
index 8a7df52..415d25a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionIdUrlRewrite/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
index 6582d5b..77beccb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish 896");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
}
public void doTest() {
-
- try {
+
+ try {
run();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -72,7 +72,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -91,7 +91,7 @@
System.err.println("Wrong number of cookie response headers. ");
System.err.println("Expected 1, got " + cookieCount);
stat.addStatus(TEST_NAME, stat.FAIL);
- } else if (!EXPECTED_COOKIE_HEADER.equals(cookieHeader)) {
+ } else if (!EXPECTED_COOKIE_HEADER.equals(cookieHeader)) {
System.err.println("Wrong cookie response header. ");
System.err.println("Expected: " + EXPECTED_COOKIE_HEADER
+ ", got: " + cookieHeader);
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties
index 532a5d1..63802a5 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/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}-session-invalidate-no-cookie-in-response"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionInvalidateNoCookieInResponse/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/sessionJvmRoute/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
index ab84cff..38a53eb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/WebTest.java
@@ -58,7 +58,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3796");
new WebTest(args).doTest();
@@ -66,7 +66,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -88,7 +88,7 @@
/*
* Create session
- */
+ */
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
System.out.println("Connecting to: " + url);
@@ -109,19 +109,19 @@
throw new Exception("Session cookie does not have any JVMROUTE");
}
- String clientCookie = sessionCookieHeader.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
+ String clientCookie = sessionCookieHeader.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
/*
* Resume session
- */
+ */
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String getRequestLine = "GET " + contextRoot + "/CheckSession" +
" HTTP/1.0\n";
- System.out.println("\nConnecting to: " + getRequestLine);
+ System.out.println("\nConnecting to: " + getRequestLine);
os.write(getRequestLine.getBytes());
os.write(("Cookie: " + clientCookie + "\n").getBytes());
os.write("\n".getBytes());
-
+
sessionCookieHeader = null;
InputStream is = null;
BufferedReader bis = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties
index c128703..b6dd224 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/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}-session-jvm-route"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
index e90661e..3173bdb 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionJvmRoute/build.xml
@@ -36,7 +36,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"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,7 +73,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
index 8bb40de..c851994 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/WebTest.java
@@ -53,7 +53,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for (de)serialization of "
@@ -73,7 +73,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -84,7 +84,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -129,7 +129,7 @@
System.out.println(cookie);
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties
index 48c2178..4ed1d90 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/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}-session-memory-persist"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
index 9d30387..d3e4691 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/build.xml
@@ -36,7 +36,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"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/sessionMemoryPersist/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
index 21fb832..997fc25 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersist/servlet/test/ResumeSession.java
@@ -32,7 +32,7 @@
InitialContext ic = (InitialContext)
session.getAttribute("JNDIInitialContext");
- boolean passed = false;
+ boolean passed = false;
if ("value1".equals(map.get("name1"))
&& "value2".equals(map.get("name2"))
&& (ic != null)) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
index 15b0e52..ce0480a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/WebTest.java
@@ -44,7 +44,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6716503");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -74,7 +74,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -118,7 +118,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties
index f2ebd32..4016e14 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/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}-session-memory-persist-primitive-class"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
index 9d30387..d3e4691 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/build.xml
@@ -36,7 +36,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"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="runfirst" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -84,10 +84,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/sessionMemoryPersistPrimitiveClass/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
index e0409f2..fe853f6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionMemoryPersistPrimitiveClass/descriptor/web.xml
@@ -34,5 +34,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
index e067e45..a3b236c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/WebTest.java
@@ -46,7 +46,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6005");
@@ -66,7 +66,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -77,7 +77,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -120,7 +120,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties
index 75e11bf..5e62771 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/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}-session-preserve-across-redeploy"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
index aaa2d79..6b3b7d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -67,7 +67,7 @@
<param name="operand.props" value="--properties keepSessions=true --name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeployKeepState" depends="init-common">
<echo message="Redeploying keepState ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -94,7 +94,7 @@
<param name="run.name" value="third"/>
</antcall>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -110,7 +110,7 @@
<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/sessionPreserveAcrossRedeploy/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
index f6d8fab..73455ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeploy/servlet/test/ResumeSession.java
@@ -32,7 +32,7 @@
InitialContext ic = (InitialContext)
session.getAttribute("JNDIInitialContext");
- boolean passed = false;
+ boolean passed = false;
if ("value1".equals(map.get("name1"))
&& "value2".equals(map.get("name2"))
&& (ic != null)) {
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
index 3bbbaeb..ca4139f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/WebTest.java
@@ -44,7 +44,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for keepSessions in session-config/session-properties");
@@ -70,7 +70,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -81,7 +81,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -124,7 +124,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties
index 57fceed..f514187 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/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}-session-preserve-across-redeploy-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
index 380e6d8..9e11af6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/build.xml
@@ -39,7 +39,7 @@
<delete file="RepRunConf.txt" failonerror="false"/>
<delete file="JSESSIONID" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,16 +47,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -70,7 +70,7 @@
<param name="operand.props" value="--name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeploy2" depends="init-common">
<echo message="Redeploying with keepState=false ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="runthird" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -121,7 +121,7 @@
<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/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index 18ed3aa..ce4fc59 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -27,7 +27,7 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
- boolean resume = false;
+ boolean resume = false;
HttpSession session = req.getSession(false);
if (session != null) {
HashMap map = (HashMap) session.getAttribute("map");
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
index a9f6858..ab56fc6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/WebTest.java
@@ -23,7 +23,7 @@
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=3137
* (Changing "enableCookies" session property has no effect)
- *
+ *
* Make sure that if the "enableCookies" property at the domain instance level
* is set to FALSE, and the webapp does not override this property to TRUE in
* its sun-web.xml, there will be no session cookie present in the response,
@@ -49,7 +49,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("URL rewriting with session id");
WebTest webTest = new WebTest(args);
@@ -58,8 +58,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeServlet();
} catch (Exception ex) {
ex.printStackTrace();
@@ -84,7 +84,7 @@
}
private void invokeServlet() throws Exception {
-
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
@@ -132,7 +132,7 @@
fail = true;
return;
}
-
+
System.out.println("redirectLine: " + redirectLine);
if (redirectLine == null) {
System.err.println("Missing Location response header");
@@ -154,7 +154,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
fail = true;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties
index 622bf9a..b2da22e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/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}-session-property-enableCookies-instance-level"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
index 225c94d..91d9d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionPropertyEnableCookiesInstanceLevel/build.xml
@@ -36,7 +36,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"/>
@@ -44,19 +44,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>
@@ -64,7 +64,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}"/>
@@ -76,10 +76,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties
index 53e75b2..d30bc91 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSerializeOnShutdownOnly/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}-session-serialize-on-shutdown-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
index faceec8..09aae08 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2003");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
@@ -71,6 +71,6 @@
stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties
index e2b0db8..1d983b0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/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}-session-set-attribute-javax-naming-context"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml
index 48e3bf0..227cffc 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/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,21 +42,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
index a9f146d..3f39148 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetAttributeJavaxNamingContext/servlet/test/TestServlet.java
@@ -33,7 +33,7 @@
throw new ServletException(e);
}
- HttpSession httpSession = req.getSession();
+ HttpSession httpSession = req.getSession();
httpSession.setAttribute("JNDIInitialContext", ic);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
index d6e94a3..0824817 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4661001");
WebTest webTest = new WebTest(args);
@@ -48,7 +48,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -66,7 +66,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -84,9 +84,9 @@
Thread.sleep(5 * 1000);
- // translate server -> client cookie
- String clientCookie = cookie.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
-
+ // translate server -> client cookie
+ String clientCookie = cookie.replace("Path", "$Path").replace("HttpOnly", "$HttpOnly");
+
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
os.write(("GET " + contextRoot + "/CheckSession"
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties
index 4485e86..8529117 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/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}-session-set-max-inactive-interval-expire"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalExpire/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
index 6d748e5..7805133 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 4688277");
WebTest webTest = new WebTest(args);
@@ -47,7 +47,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -57,7 +57,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/TestServlet";
HttpURLConnection conn = (HttpURLConnection)
@@ -79,6 +79,6 @@
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties
index c2bedaf..c8923b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/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}-session-set-max-inactive-interval-to-zero-and-invalidate"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
index f27c7cd..3ee35e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionSetMaxInactiveIntervalToZeroAndInvalidate/servlet/TestServlet.java
@@ -28,7 +28,7 @@
try {
HttpSession session = req.getSession(true);
session.setMaxInactiveInterval(0);
- session.invalidate();
+ session.invalidate();
} catch (IllegalStateException ise) {
passed = true;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
index 878dbed..f36b0fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/WebTest.java
@@ -38,7 +38,7 @@
private static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
-
+
private static final String TEST_NAME = "session-with-cookie-persistence-type";
private String host;
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for cookie-based session persistence");
new WebTest(args).doTest();
@@ -59,7 +59,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -81,7 +81,7 @@
/*
* Create session
- */
+ */
String url = "http://" + host + ":" + port + contextRoot + "/CreateSession";
System.out.println("Connecting to: " + url);
HttpURLConnection conn = (HttpURLConnection)
@@ -117,12 +117,12 @@
/*
* Resume session
- */
+ */
sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String getRequestLine = "GET " + contextRoot + "/CheckSession" +
" HTTP/1.0\n";
- System.out.print("\nConnecting to: " + getRequestLine);
+ System.out.print("\nConnecting to: " + getRequestLine);
os.write(getRequestLine.getBytes());
String cookieHeaderLine = "Cookie: " + jsessionIdCookie + "\n";
System.out.print(cookieHeaderLine);
@@ -131,7 +131,7 @@
System.out.print(cookieHeaderLine);
os.write(cookieHeaderLine.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = null;
BufferedReader bis = null;
String line = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties
index 05bca5b..a1b1611 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/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}-session-with-cookie-persistence-type"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
index cba8bbf..af217ac 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/build.xml
@@ -36,7 +36,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"/>
@@ -44,21 +44,21 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,7 +73,7 @@
<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/sessionWithCookiePersistenceType/descriptor/sun-web.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
index 282a9f9..c40d036 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithCookiePersistenceType/descriptor/sun-web.xml
@@ -25,6 +25,6 @@
<store-properties>
<property name="cookieName" value="ABC"/>
</store-properties>
- </session-manager>
+ </session-manager>
</session-config>
</sun-web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
index ad1d70a..78a2fc8 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 13129, session without cookie");
WebTest webTest = new WebTest(args);
@@ -48,8 +48,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
int a = invoke("/index.jsp");
int b = invoke("/index.jsp;jsessionid=" + sessionId);
int c = invoke("/;jsessionid=" + sessionId);
@@ -69,7 +69,7 @@
*/
private int invoke(String uri)
throws Exception {
-
+
Integer result = null;
URL url = new URL("http://" + host + ":" + port + contextRoot + uri);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties
index 8142350..74679c5 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/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}-session-without-cookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
index 49a5508..5b43ff7 100644
--- a/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sessionWithoutCookie/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,16 +45,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -75,11 +75,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -91,10 +91,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
index 8d6d806..892c14f 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 34113");
WebTest webTest = new WebTest(args);
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties
index 15e22d8..f49625d 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/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}-set-multi-valued-response-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setMultiValuedResponseHeader/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/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
index f272b64..12aa395 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/WebTest.java
@@ -43,16 +43,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 32604");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
@@ -72,10 +72,10 @@
if (conn.getHeaderField("A") == null) {
System.err.println("Missing response header 'A'");
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
} else if (conn.getHeaderField("B") == null) {
System.err.println("Missing response header 'B'");
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
} else {
stat.addStatus(TEST_NAME, stat.PASS);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties
index 535ca76..e835b01 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/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}-set-response-content-length-to-zero-keep-response-headers"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setResponseContentLengthToZeroKeepResponseHeaders/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/setWebContextParam/WebTest.java b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
index 86bb551..24475ff 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 16222");
WebTest webTest = new WebTest(args);
@@ -46,7 +46,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
} catch (Exception ex) {
System.out.println(TEST_NAME + " test failed");
@@ -56,7 +56,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/myurl";
HttpURLConnection conn = (HttpURLConnection)
@@ -93,10 +93,10 @@
if (EXPECTED_RESPONSE.equals(line)) {
stat.addStatus(TEST_NAME, stat.PASS);
} else {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
stat.addStatus(TEST_NAME, stat.FAIL);
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties
index 46d34ab..0c176f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/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}-set-web-context-param"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml
index 4f38331..aedb100 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,19 +47,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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -108,7 +108,7 @@
value="--name ${param.name} --value ${param.value} ${appname}-web"/>
</antcall>
</target>
-
+
<target name="unset-web-context-param" depends="init-common">
<antcall target="asadmin-common">
<param name="admin.command" value="unset-web-context-param"/>
@@ -128,10 +128,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/setWebContextParam/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
index 28eb734..71617ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/setWebContextParam/descriptor/web.xml
@@ -46,5 +46,5 @@
<servlet-name>mytest</servlet-name>
<url-pattern>/myurl</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
index 1e050b0..9fffe81 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3823");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties
index 3cd067a..9482b37 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/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}-single-sign-on-cookie-http-only"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
index 896f092..112d670 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -63,10 +63,10 @@
</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
@@ -74,14 +74,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -98,7 +98,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieHttpOnly/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
index 5099fef..15e8305 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3823");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties
index 613e26d..8a91956 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/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}-single-sign-on-cookie-secure"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
index 70bad26..2802489 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/build.xml
@@ -36,7 +36,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"/>
@@ -62,10 +62,10 @@
</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
@@ -73,14 +73,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -97,7 +97,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnCookieSecure/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
index dad2d8e..6a696b2 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/WebTest.java
@@ -26,7 +26,7 @@
* dynamically reconfigurable"):
*
* This unit test sets the sso-enabled property of http-service to false and
- * restarts the server. It then removes the sso-enabled property of
+ * restarts the server. It then removes the sso-enabled property of
* virtual server "server", so that the sso-enabled property of http-service
* (previously set to false) will take effect. It then sets that property to
* true, and tests whether SSO has been enabled for virtual server "server".
@@ -54,7 +54,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 2911");
@@ -67,7 +67,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -94,7 +94,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -130,7 +130,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -165,7 +165,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties
index 5259d76..ab7f720 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/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}-single-sign-on-http-service-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
index bf5df00..4307a0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -70,23 +70,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -103,7 +103,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleSignOnHttpServiceDynamicReconfig/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java b/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
index d64449b..d3df280 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/WebTest.java
@@ -32,7 +32,7 @@
private static final SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private String host;
private String port;
private String contextRoot;
@@ -53,7 +53,7 @@
try {
webTest.doTest(webTest.port, 200);
webTest.doTest(webTest.adminPort, 202);
- // Sleep long enough for the admin console to have been
+ // Sleep long enough for the admin console to have been
// installed and deployed
Thread.currentThread().sleep(60000);
webTest.doTest(webTest.adminPort, 404);
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties b/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties
index 26a5288..f4bb49a 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/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}-single-engine"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml b/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
index 53f93a0..5ed865b 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/build.xml
@@ -38,7 +38,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"/>
@@ -46,10 +46,10 @@
</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
@@ -57,10 +57,10 @@
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>
@@ -68,7 +68,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}"/>
@@ -81,10 +81,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/singleengine/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
index 0cfe812..81b1455 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,7 +31,7 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
index 860bcc4..e7a7c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/singleengine/servlet/ServletTest.java
@@ -33,7 +33,7 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -44,7 +44,7 @@
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("[Servlet.doPost]");
}
@@ -52,7 +52,7 @@
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
index c89d422..528ef75 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for SSI Escape Character");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -64,7 +64,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.shtml HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties
index 9949dac..e72ae94 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/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}-ssi-escape-character"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssiEscapeCharacter/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/ssiHtmlEntity/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
index 74430ba..e018c2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for SSI Html Entity");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -64,7 +64,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/index.shtml HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties
index 63e6389..ea80535 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/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}-ssi-html-entity"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssiHtmlEntity/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/ssl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
index bdc9336..50cc760 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
@@ -43,12 +43,12 @@
SSLSocketFactory ssf = getSSLSocketFactory(trustStorePath);
HttpsURLConnection connection = doSSLHandshake(
"https://" + host + ":" + port + "/", ssf);
- checkStatus(connection);
+ checkStatus(connection);
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest", ssf);
-
+
parseResponse(connection);
} catch (Throwable t) {
t.printStackTrace();
@@ -56,7 +56,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("ssl", stat.FAIL);
- }
+ }
stat.printSummary("web/ssl ---> expect 4 PASS");
}
@@ -89,7 +89,7 @@
throws Exception{
int responseCode= connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (connection.getResponseCode() != 200){
stat.addStatus("ssl-responseCode", stat.FAIL);
} else {
@@ -101,7 +101,7 @@
throws Exception{
BufferedReader in = null;
-
+
String line = "";
int index;
try {
@@ -129,7 +129,7 @@
stat.addStatus("ssl-FILTER", stat.FAIL);
}
count++;
- }
+ }
}
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/build.properties b/appserver/tests/appserv-tests/devtests/web/ssl/build.properties
index d177c6d..90ee4d0 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/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}-ssl"/>
+<property name="appname" value="${module}-ssl"/> \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-ssl"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/build.xml b/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
index 3dab601..437726f 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/ssl/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/ssl/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
index 8d111ac..14c8e29 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,23 +39,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
index c5a381a..1a9e687 100644
--- a/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/ssl/servlet/ServletTest3.java
@@ -25,11 +25,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
index fc433a6..5b6739f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/WebTest.java
@@ -33,7 +33,7 @@
public class WebTest {
private static final String TEST_NAME
- = "ssl-client-auth-unprotected-resource-get-client-cert";
+ = "ssl-client-auth-unprotected-resource-get-client-cert";
private static final String EXPECTED_RESPONSE
= "[Ljava.security.cert.X509Certificate;";
@@ -49,7 +49,7 @@
String contextRoot = args[2];
String keyStorePath = args[3];
String trustStorePath = args[4];
-
+
try {
SSLSocketFactory ssf = getSSLSocketFactory(keyStorePath,
trustStorePath);
@@ -57,9 +57,9 @@
+ port + contextRoot
+ "/TestServlet",
ssf);
-
+
parseResponse(connection);
-
+
} catch (Throwable t) {
stat.addStatus(TEST_NAME, stat.FAIL);
t.printStackTrace();
@@ -76,7 +76,7 @@
try {
in = new BufferedReader(new InputStreamReader(
connection.getInputStream()));
-
+
String line = null;
while ((line = in.readLine()) != null) {
if (EXPECTED_RESPONSE.equals(line)) {
@@ -105,7 +105,7 @@
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -121,7 +121,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties
index b179cce..14681ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/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}-ssl-client-auth-unprotected-resource-get-client-cert"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
index fa5becc..0929bbd 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/build.xml
@@ -36,7 +36,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"/>
@@ -44,18 +44,18 @@
</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="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -85,10 +85,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
index c2a768e..f55cb9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/descriptor/web.xml
@@ -22,13 +22,13 @@
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>TestServlet</display-name>
<servlet-name>TestServlet</servlet-name>
<servlet-class>TestServlet</servlet-class>
- </servlet>
-
+ </servlet>
+
<servlet-mapping>
<servlet-name>TestServlet</servlet-name>
<url-pattern>/TestServlet</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
index 5588468..8a3cb11 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslClientAuthUnprotectedResourceGetClientCert/servlet/TestServlet.java
@@ -29,7 +29,7 @@
String clName = null;
if (cert != null) {
clName = cert.getClass().getName();
- }
+ }
res.getWriter().print(clName);
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
index 85202a3..6802188 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
private static boolean firstConnection = true;
@@ -51,19 +51,19 @@
+ "/ServletTest;jsessionid=01A960C22480CE9F445CDE48DE333F31", ssf);
parseResponse(connection);
-
+
firstConnection = false;
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest;jsessionid=" + sessionFalseId, ssf);
parseResponse(connection);
-
+
} catch (Throwable t) {
t.printStackTrace();
} finally {
if (count != EXPECTED_COUNT){
stat.addStatus("web-sslCookie", stat.FAIL);
- }
+ }
}
@@ -101,8 +101,8 @@
throws Exception{
BufferedReader in = null;
-
- String line= "";
+
+ String line= "";
int index = 0;
try {
in = new BufferedReader(
@@ -116,7 +116,7 @@
System.out.println("context: " + context + " status: " + status);
if (firstConnection){
if ( context.equalsIgnoreCase("getRequestSessionId") )
- requestedSessionId = status;
+ requestedSessionId = status;
else if ( context.equalsIgnoreCase("getSession(false).getId")) {
sessionFalseId = status;
} else if ( context.equalsIgnoreCase("getRequestURI"))
@@ -148,7 +148,7 @@
}
}
count++;
- }
+ }
}
lineNum++;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties
index c7a6de5..58b7e31 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/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}-sslCookie"/>
+<property name="appname" value="${module}-sslCookie"/> \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-sslCookie"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
index 49c2e2e..437726f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,14 +55,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -75,10 +75,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/sslCookie/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/descriptor/web.xml
@@ -22,13 +22,13 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
index bdf5138..92f449e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslCookie/servlet/ServletTest.java
@@ -24,11 +24,11 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,9 +39,9 @@
private static boolean sessionCreated = false;
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
System.out.println("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
@@ -49,7 +49,7 @@
System.out.println("Create session: " + request.getSession(true).getId());
sessionCreated = true;
}
-
+
out.println("getRequestSessionId::" + request.getRequestedSessionId());
System.out.println("getRequestSessionId::" + request.getRequestedSessionId());
@@ -59,13 +59,13 @@
}
out.println("getRequestURI::" + request.getRequestURI());
System.out.println("getRequestURI::" + request.getRequestURI());
-
+
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
index 09ecb96..d41aaf0 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/WebTest.java
@@ -27,7 +27,7 @@
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
@@ -43,12 +43,12 @@
SSLSocketFactory ssf = getSSLSocketFactory(trustStorePath);
HttpsURLConnection connection = doSSLHandshake(
"https://" + host + ":" + port + "/", ssf);
- checkStatus(connection);
+ checkStatus(connection);
connection = doSSLHandshake(
- "https://" + host + ":" + port + "/" + contextRoot
+ "https://" + host + ":" + port + "/" + contextRoot
+ "/ServletTest", ssf);
-
+
parseResponse(connection);
} catch (Throwable t) {
t.printStackTrace();
@@ -56,7 +56,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("multiSelector-ssl", stat.FAIL);
- }
+ }
stat.printSummary("sslMultiSelector");
}
@@ -89,7 +89,7 @@
throws Exception{
int responseCode= connection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (connection.getResponseCode() != 200){
stat.addStatus("multiSelector-responseCode", stat.FAIL);
} else {
@@ -102,7 +102,7 @@
BufferedReader in = new BufferedReader(
new InputStreamReader(connection.getInputStream()));
-
+
String line = "";
int index;
while ((line = in.readLine()) != null) {
@@ -111,15 +111,15 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("multiSelector-" + line.substring(0,index),
stat.PASS);
} else {
- stat.addStatus("multiSelector-filter", stat.FAIL);
+ stat.addStatus("multiSelector-filter", stat.FAIL);
}
count++;
- }
+ }
}
in.close();
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties
index 4acc4d3..0cc2e0c 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/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}-sslMultiSelector"/>
+<property name="appname" value="${module}-sslMultiSelector"/> \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="/sslMultiSelector"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
index c70cafc..dfbd656 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/build.xml
@@ -36,7 +36,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"/>
@@ -44,10 +44,10 @@
</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
@@ -55,7 +55,7 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -72,7 +72,7 @@
value="configs.config.server-config.network-config.transports.transport.tcp.acceptor-threads="/>
</antcall>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="re-deploy" depends="init-common">
@@ -82,7 +82,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -95,10 +95,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/sslMultiSelector/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/sslMultiSelector/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
index 8d111ac..14c8e29 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest.java
@@ -25,13 +25,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -39,23 +39,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
index c5a381a..1a9e687 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslMultiSelector/servlet/ServletTest3.java
@@ -25,11 +25,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -37,12 +37,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties
index 6e23320..82283e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/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}-serverName"/>
+<property name="appname" value="${module}-serverName"/> \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-serverName"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml b/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml
index 0a5a20b..54ea946 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/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,26 +42,26 @@
</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="."
- debug="true"
+ debug="true"
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-keystore-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/sslServerName/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/sslServerName/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
index 280499c..c82073c 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/WebTest.java
@@ -22,10 +22,10 @@
public class WebTest
{
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 3;
-
+
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("Standalone Servlet/Filter war test");
String host = args[0];
@@ -43,7 +43,7 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "FILTER", contextRoot + "/ServletTest" );
} catch (Throwable t) {
@@ -52,7 +52,7 @@
if (count != EXPECTED_COUNT){
stat.addStatus("web-requestdispatcher", stat.FAIL);
- }
+ }
stat.printSummary("web-requestdispatcher");
}
@@ -68,7 +68,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));
@@ -81,18 +81,18 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-requestdispatcher: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
ex.printStackTrace();
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties
index 12ef4ba..214c62b 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/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}-requestdispatcher"/>
+<property name="appname" value="${module}-requestdispatcher"/> \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-requestdispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml b/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml
index 1d98269..6b80157 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -78,11 +78,11 @@
</target>
<target name="clobber" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
-
+ </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/standalonewar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
index f9861df..1f84cee 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/descriptor/web.xml
@@ -22,37 +22,37 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
-
+
<filter>
<filter-name>FilterTest</filter-name>
<filter-class>test.FilterTest</filter-class>
- </filter>
-
+ </filter>
+
<filter-mapping>
<filter-name>FilterTest</filter-name>
<url-pattern>/*</url-pattern>
<dispatcher>REQUEST</dispatcher>
<dispatcher>INCLUDE</dispatcher>
- <dispatcher>FORWARD</dispatcher>
- <dispatcher>ERROR</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>ERROR</dispatcher>
</filter-mapping>
-
+
<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>
@@ -65,7 +65,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/standalonewar/servlet/FilterTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
index fcf3624..eec957e 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/FilterTest.java
@@ -19,25 +19,25 @@
import jakarta.servlet.*;
import jakarta.servlet.http.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
-
+
public void destroy() {
System.out.println("[Filter.destroy]");
- }
-
+ }
+
public void doFilter(ServletRequest request, ServletResponse response, FilterChain filterChain) throws java.io.IOException, jakarta.servlet.ServletException {
System.out.println("[Filter.doFilter]");
-
+
((HttpServletRequest)request).getSession().setAttribute("FILTER", "PASS");
filterChain.doFilter(request, response);
-
- }
-
-
+
+ }
+
+
public void init(jakarta.servlet.FilterConfig filterConfig) throws jakarta.servlet.ServletException {
System.out.println("[Filter.init]");
context = filterConfig.getServletContext();
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
index d4a3174..daa8053 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest.java
@@ -46,13 +46,13 @@
public class ServletTest extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
+ System.out.println("[Servlet.init]");
context = config.getServletContext();
System.out.println("[Servlet.init] " + context.getMajorVersion());
-
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -60,23 +60,23 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-REQUEST", request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = context.getRequestDispatcher("/ServletTest2");
- rd.forward(request, response);
+ rd.forward(request, response);
}
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
index db2cb50..00775a6 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest2.java
@@ -25,10 +25,10 @@
public class ServletTest2 extends HttpServlet implements HttpSessionListener {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet2.init]");
+ System.out.println("[Servlet2.init]");
context = config.getServletContext();
}
@@ -37,23 +37,23 @@
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("[Servlet2.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
request.getSession().setAttribute("FILTER-FORWARD",request.getSession().getAttribute("FILTER"));
- request.getSession().setAttribute("FILTER", "FAIL");
-
+ request.getSession().setAttribute("FILTER", "FAIL");
+
RequestDispatcher rd = request.getRequestDispatcher("/ServletTest3");
- rd.include(request, response);
+ rd.include(request, response);
}
-
+
public void sessionCreated(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionCreated]");
}
-
+
public void sessionDestroyed(jakarta.servlet.http.HttpSessionEvent httpSessionEvent) {
System.out.println("[Servlet.sessionDestroyed]");
System.out.println("Attributes: " + httpSessionEvent.getSession().getAttribute("test"));
diff --git a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
index 3e8d25b..e78fec2 100644
--- a/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
+++ b/appserver/tests/appserv-tests/devtests/web/standalonewar/servlet/ServletTest3.java
@@ -46,11 +46,11 @@
public class ServletTest3 extends HttpServlet{
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet3.init]");
- context = config.getServletContext();
+ System.out.println("[Servlet3.init]");
+ context = config.getServletContext();
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,12 +58,12 @@
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("[Servlet3.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("FILTER-REQUEST:" + request.getSession().getAttribute("FILTER-REQUEST"));
out.println("FILTER-FORWARD:" + request.getSession().getAttribute("FILTER-FORWARD"));
out.println("FILTER-INCLUDE:" + request.getSession().getAttribute("FILTER"));
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
index dc1b115..d5ef651 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/WebTest.java
@@ -66,17 +66,17 @@
/*
* Returns true in case of success, false otherwise.
*/
- private static boolean doTest(String urlString,
+ private static boolean doTest(String urlString,
String expected1,
String expected2,
String expected3) {
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
@@ -96,8 +96,8 @@
if (!found) {
System.out.println("Invalid response. Response did not " +
- "contain one of the expected strings: " +
- expected1 + "," +
+ "contain one of the expected strings: " +
+ expected1 + "," +
expected2 + "," +
expected3);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
index d7ec091..87bcd9d 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.properties
@@ -18,7 +18,7 @@
<property name="module" value="web"/>
<property name="appname" value="${module}-tag-plugin-for-each"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
index 72f4fcb..9609ac8 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build-ng.xml
@@ -88,16 +88,16 @@
<target name="build" depends="compile">
<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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
</project>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
index 96217b3..7c66b08 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.properties
@@ -15,12 +15,12 @@
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}-tag-plugin-for-each"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml
index f6e78fb..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/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,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -72,10 +72,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/tagPluginForEach/test/WebTestNG.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
index 435a0b0..6c74770 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/WebTestNG.java
@@ -54,13 +54,13 @@
* Returns true in case of success, false otherwise.
*/
private static boolean doTest(String urlString, String expected) {
- try {
+ try {
URL url = new URL(urlString);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.out.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
return false;
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
index 354f426..6b2204d 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEach/test/testng.xml
@@ -17,7 +17,7 @@
-->
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd" >
-
+
<suite name="web" >
<parameter name="host" value="localhost"/>
<parameter name="port" value="8080"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
index 93789b3..c1a0efa 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/WebTest.java
@@ -21,7 +21,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for Bugzilla 28361 ("foreach no longer works in tag file")
+ * Unit test for Bugzilla 28361 ("foreach no longer works in tag file")
*/
public class WebTest {
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugzilla 28361");
WebTest webTest = new WebTest(args);
@@ -62,7 +62,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
@@ -83,7 +83,7 @@
if (br != null) br.close();
} catch (IOException ex) {}
}
-
+
if (!found) {
throw new Exception("Invalid response. Response did not " +
"contain expected: " + EXPECTED);
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
index d3c6b09..086699f 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.properties
@@ -15,12 +15,12 @@
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}-tag-plugin-for-each-tag-file"/>
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml
index f6e78fb..9b4e543 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagPluginForEachTagFile/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,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -72,10 +72,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/tagfileInclude/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
index 59e47ba..9d49174 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/WebTest.java
@@ -20,7 +20,7 @@
import com.sun.ejte.ccl.reporter.*;
-public class WebTest {
+public class WebTest {
static SimpleReporterAdapter stat =
new SimpleReporterAdapter("appserv-tests");
@@ -36,7 +36,7 @@
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus(TEST_NAME, stat.PASS);
@@ -73,7 +73,7 @@
if (line.indexOf("PASS") >= 0) {
pass = true;
break;
- }
+ }
}
} finally {
try {
diff --git a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
index ed4e907..609d2ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.properties
@@ -15,12 +15,12 @@
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}-tagfile-include"/>
+<property name="appname" value="${module}-tagfile-include"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="contextroot" value="/${appname}"/>
<property name="tagfiles" value="descriptor/tags"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
index dbbff4e..2196088 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagfileInclude/build.xml
@@ -37,7 +37,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"/>
@@ -45,10 +45,10 @@
</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
@@ -56,10 +56,10 @@
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>
@@ -67,7 +67,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}"/>
@@ -79,10 +79,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/tagplugin/WebTest.java b/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
index 3cb8c23..3d6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/WebTest.java
@@ -22,9 +22,9 @@
public class WebTest
{
-
+
private static boolean pass = false;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -33,14 +33,14 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Tag Plugin test");
String host = args[0];
String portS = args[1];
String contextRoot = args[2];
int port = new Integer(portS).intValue();
-
+
try {
goGet(host, port, contextRoot + "/test.jsp" );
stat.addStatus("Tag Plugin test", pass? stat.PASS: stat.FAIL);
@@ -61,7 +61,7 @@
System.out.println("GET " + contextPath + " HTTP/1.0");
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -73,10 +73,10 @@
int index = line.indexOf("PASS");
if (index >= 0) {
pass = true;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties
index 2a958e4..36601e9 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/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}-tagplugin"/>
+<property name="appname" value="${module}-tagplugin"/> \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="tagPlugins.xml" value="descriptor/tagPlugins.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml b/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml
index 87dbd4c..5a1f0c7 100644
--- a/appserver/tests/appserv-tests/devtests/web/tagplugin/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/tagplugin/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/testFormAuthenticator/WebTest.java b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
index b307f08..c968f7c 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/WebTest.java
@@ -44,7 +44,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat bug 49779");
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties
index c20c66e..536c1c0 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/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}-test-form-authenticator"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
index 3af87a2..54ee385 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/build.xml
@@ -37,7 +37,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -53,24 +53,24 @@
</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:${env.APS_HOME}/lib/webtest.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<sysproperty key="debug" value="false"/>
@@ -89,7 +89,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="setup">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
index 7fc605e..5e78032 100644
--- a/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/testFormAuthenticator/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
index fdde2ef..e307291 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/WebTest.java
@@ -20,33 +20,33 @@
import com.sun.appserv.test.util.results.SimpleReporterAdapter;
public class WebTest {
- private static final SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", "thread-pool-idle-timeout");
+ private static final SimpleReporterAdapter stat = new SimpleReporterAdapter("appserv-tests", "thread-pool-idle-timeout");
- public static void main(String args[]) {
- stat.addDescription("HTTP thread timeout");
+ public static void main(String args[]) {
+ stat.addDescription("HTTP thread timeout");
- String host = args[0];
- String portS = args[1];
- String contextRoot = args[2];
- boolean noTimeout = args.length == 4;
+ String host = args[0];
+ String portS = args[1];
+ String contextRoot = args[2];
+ boolean noTimeout = args.length == 4;
- int port = new Integer(portS);
+ int port = new Integer(portS);
- goGet(host, port, contextRoot + "/ServletTest", noTimeout );
+ goGet(host, port, contextRoot + "/ServletTest", noTimeout );
- stat.printSummary("web-thread-timeout");
- }
+ stat.printSummary("web-thread-timeout");
+ }
- private static void goGet(String host, int port, String contextPath, boolean noTimeout) {
- try {
- URL url = new URL("http://" + host + ":" + port + contextPath);
- url.getContent();
- stat.addStatus("web-thread-timeout" + (noTimeout ? "-debug" : ""), noTimeout ? SimpleReporterAdapter.PASS : SimpleReporterAdapter.FAIL);
- } catch( IOException ex){
- stat.addStatus("web-thread-timeout", noTimeout ? SimpleReporterAdapter.FAIL : SimpleReporterAdapter.PASS);
- } catch( Exception ex){
- stat.addStatus("web-thread-timeout", SimpleReporterAdapter.FAIL);
- ex.printStackTrace();
- }
- }
+ private static void goGet(String host, int port, String contextPath, boolean noTimeout) {
+ try {
+ URL url = new URL("http://" + host + ":" + port + contextPath);
+ url.getContent();
+ stat.addStatus("web-thread-timeout" + (noTimeout ? "-debug" : ""), noTimeout ? SimpleReporterAdapter.PASS : SimpleReporterAdapter.FAIL);
+ } catch( IOException ex){
+ stat.addStatus("web-thread-timeout", noTimeout ? SimpleReporterAdapter.FAIL : SimpleReporterAdapter.PASS);
+ } catch( Exception ex){
+ stat.addStatus("web-thread-timeout", SimpleReporterAdapter.FAIL);
+ ex.printStackTrace();
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
index 3dbc077..771a4ed 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/build.xml
@@ -75,7 +75,7 @@
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar" includes="WebTest.java"/>
</target>
-
+
<target name="build-publish-war" depends="build, publish-war-common"/>
<target name="deploy" depends="init-common">
@@ -118,7 +118,7 @@
<target name="usage">
<antcall target="usage-common"/>
</target>
-
+
<target name="startDomainDebug" depends="startDomainDebugUnix, startDomainDebugWindows"/>
<target name="startDomainDebugUnix" depends="init-common" if="isUnix">
diff --git a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
index e854149..157c4b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/threadPoolIdleTimeout/src/servlet/ServletTest.java
@@ -24,17 +24,17 @@
public class ServletTest extends HttpServlet {
- public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- doPost(request, response);
- }
+ public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ doPost(request, response);
+ }
- public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
- try {
- Thread.sleep(10000);
+ public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+ try {
+ Thread.sleep(10000);
response.setContentType("text/plain");
- response.getWriter().println("Here's your content.");
- } catch(InterruptedException ie) {
- throw new IOException(ie);
- }
- }
+ response.getWriter().println("Here's your content.");
+ } catch(InterruptedException ie) {
+ throw new IOException(ie);
+ }
+ }
}
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java b/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
index 4c0474b..09cfd6e 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/WebTest.java
@@ -32,7 +32,7 @@
private static SimpleReporterAdapter stat = new SimpleReporterAdapter(
"appserv-tests");
-
+
public static void main(String args[]) {
String host = args[0];
@@ -41,7 +41,7 @@
try {
stat.addDescription("Trace not allowed test");
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/ServletTest");
System.out.println("Invoking url: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties
index af173ff..0dded5f 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/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}-traceEnabled"/>
+<property name="appname" value="${module}-traceEnabled"/> \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-traceEnabled"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
index 0481197..f341ad4 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/build.xml
@@ -36,7 +36,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"/>
@@ -60,16 +60,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>
@@ -77,7 +77,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -94,10 +94,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/traceEnabled/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
index 196a604..81e62e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/traceEnabled/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java b/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
index 03dcc4e..3a6258b 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT GLASSFISH-16768");
@@ -74,7 +74,7 @@
// trailing headers size limit
// need to set maxTrailerSize = 10
String dummy = "01234567890";
-
+
req = new String[] {
"POST /" + webTest.contextRoot + " HTTP/1.1" + CRLF +
"Host: any" + CRLF +
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties
index e6f18e2..579be17 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/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}-trailer-header"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
index 05c71d8..82ae005 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/build.xml
@@ -37,7 +37,7 @@
<fileset dir="${basedir}" includes="WebTest*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -45,23 +45,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -73,10 +73,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/trailerHeader/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
index d0af1b2..0093c09 100644
--- a/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/trailerHeader/descriptor/web.xml
@@ -22,7 +22,7 @@
xsi:schemaLocation="http://java.sun.com/xml/ns/javaee
http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd"
version="3.0">
-
+
<servlet>
<servlet-name>EchoHeaderServlet</servlet-name>
<servlet-class>EchoHeaderServlet</servlet-class>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
index b0b163e..8a0a5d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/WebTest.java
@@ -21,10 +21,10 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 2;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -32,7 +32,7 @@
// The stat reporter writes out the test info and results
// into the top-level quicklook directory during a run.
-
+
stat.addDescription("Package protection unit test.");
String host = args[0];
@@ -41,13 +41,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
@@ -64,7 +64,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -76,20 +76,20 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-unprotectedClass: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties
index c6accbe..ffa0d0d 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/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}-unprotectedClass"/>
+<property name="appname" value="${module}-unprotectedClass"/> \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-unprotectedClass"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml
index a908918..e2fc254 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/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,10 +42,10 @@
</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
@@ -53,14 +53,14 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -72,10 +72,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/unprotectedClasses/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
index 7eb5ec0..42f4929 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.ServletTest</listener-class>
</listener>
@@ -31,14 +31,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
index 2e827b5..f1226cd 100644
--- a/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/unprotectedClasses/servlet/ServletTest.java
@@ -35,7 +35,7 @@
private ServletContext context;
private static String status = "EXPIRED:FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -46,7 +46,7 @@
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("[Servlet.doPost]");
PrintWriter out = response.getWriter();
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
index 28f728f..490f606 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7246");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties
index 65e38aa..2c83bb1 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/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}-use-bundled-jsf-with-tag-compilationn"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
index da25b1a..89664d7 100644
--- a/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/useBundledJsfWithTagCompilation/build.xml
@@ -36,7 +36,7 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="build" depends="init-common">
<property name="hasWebclient" value="yes"/>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
@@ -50,7 +50,7 @@
dest="jsf-cardemo.war"/>
<antcall target="deploy-war-name"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -62,10 +62,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-name"/>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
index d4ef135..f11bb88 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (responseCode == 200){
stat.addStatus("v3HttpListenerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
index a32d62e..7e987df 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/WebTest2.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest2 {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() == 200){
stat.addStatus("v3HttpListenerDynamicConfig-afterReconf", stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties
index 715c022..1141e80 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/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}-v3HttpListenerDynamicConfig"/>
+<property name="appname" value="${module}-v3HttpListenerDynamicConfig"/> \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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
index 7df95f7..e97cccd 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/build.xml
@@ -50,7 +50,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"/>
@@ -58,10 +58,10 @@
</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
@@ -69,10 +69,10 @@
classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="*.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>
@@ -80,7 +80,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run-again" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -92,7 +92,7 @@
</classpath>
</java>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest2">
<arg value="${http.host}"/>
@@ -107,7 +107,7 @@
<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/v3HttpListenerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/v3HttpListenerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
index 85babbf..b0f98f2 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/WebTest.java
@@ -24,11 +24,11 @@
* prior to V3), which has been renamed to
* org.glassfish.web.valve.GlassFishValve in V3, continue to work in V3
* (in a binary-compatible way).
- *
+ *
* This test deploys a webapp that specifies a GlassFish-style valve
* (compiled against the "old" Valve interface) in its sun-web.xml.
* The valve adds an attribute to the request.
- *
+ *
* When the test accesses the webapp's servlet, the servlet checks for the
* presence of this attribute in the request, and will cause the test to fail
* if the attribute is missing.
@@ -51,7 +51,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for ensuring binary compatibility " +
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -91,7 +91,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
}
@@ -110,6 +110,6 @@
} catch (IOException ioe) {
// ignore
}
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties
index 479b58e..af12b4f 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/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}-valve-glassFish-style-backward-compatible"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveGlassFishStyleBackwardCompatible/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/valveTomcatStyle/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
index 6d6d8ca..cdc346d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/WebTest.java
@@ -20,12 +20,12 @@
/*
* Unit test for testing support for Tomcat-style valves.
- *
+ *
* This test deploys a webapp that specifies 3 valves in its sun-web.xml:
* 2 Tomcat-style valves, and 1 GlassFish-style valve. The GlassFish-style
* valve is added in between the two Tomcat-style valves, causing it to be
* wrapped (by the container) inside a TomcatValveAdapter.
- *
+ *
* Each of the valves adds an attribute to the request.
*
* When the test accesses the webapp's servlet, it checks for the presence
@@ -50,7 +50,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Tomcat-style valves");
@@ -64,11 +64,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -88,7 +88,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties
index 3d49adc..c261924 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/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}-valve-tomcat-style"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/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/valveTomcatStyle/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
index b9aaf64..9a0ef31 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_1.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_1 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
index ef2df6e..1b735b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveTomcatStyle/lib/valves/TomcatValveBase_2.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_2 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
index 8cfe849..8c6ecae 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/WebTest.java
@@ -23,12 +23,12 @@
*
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=7177
* ("Add valve configuration support to sun-web.xml")
- *
+ *
* This test deploys a webapp that specifies 3 valves in its sun-web.xml:
* 2 Tomcat-style valves, and 1 GlassFish-style valve. The GlassFish-style
* valve is added in between the two Tomcat-style valves, causing it to be
* wrapped (by the container) inside a TomcatValveAdapter.
- *
+ *
* Each of the valves adds an attribute to the request.
*
* When the test accesses the webapp's servlet, it checks for the presence
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 7177");
@@ -67,11 +67,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -91,10 +91,10 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " +
line);
- }
+ }
} finally {
try {
if (is != null) {
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties
index 7c2c918..52508d8 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/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}-valve-with-properties"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml b/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/valveWithParams/lib/valves/TestValve2.java b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
index ef48b6b..892ab9a 100644
--- a/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
+++ b/appserver/tests/appserv-tests/devtests/web/valveWithParams/lib/valves/TestValve2.java
@@ -34,10 +34,10 @@
if (testProperty == null) {
request.getRequest().setAttribute("valve6", "null_value");
}
- else if ("".equals(testProperty)) {
+ else if ("".equals(testProperty)) {
request.getRequest().setAttribute("valve5", "empty_value");
}
- else {
+ else {
request.getRequest().setAttribute("valve4", testProperty);
}
return GlassFishValve.INVOKE_NEXT;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
index 1d376ac..7859edc 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/WebTest.java
@@ -78,7 +78,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -86,8 +86,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -104,7 +104,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties
index f88a2e9..07c321f 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/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}-virtual-server-alternate-docroot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
index 7878c20..950db36 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocroot/build.xml
@@ -36,14 +36,14 @@
<target name="clean" depends="init-common">
<antcall target="clean-common"/>
</target>
-
+
<target name="compile" depends="clean">
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
</target>
<target name="build" depends="compile"/>
-
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -54,12 +54,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="run" depends="init-common">
@@ -72,7 +72,7 @@
</classpath>
</java>
</target>
-
+
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
index baf8f80..19374c8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/WebTest.java
@@ -81,7 +81,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -89,8 +89,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -107,7 +107,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties
index 8d466b6..b01fa65 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/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}-virtual-server-alternate-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
index 280e705..645eb18 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -64,12 +64,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -81,7 +81,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}"/>
@@ -93,10 +93,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
index 18bfcef..3a635f4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/**
- * Unit test for issue 16252
+ * Unit test for issue 16252
*
* Unit test for dynamic reconfiguration of alternate docroot support.
*
@@ -77,7 +77,7 @@
private String host;
private String port;
private String contextRoot;
- private String expectedResponseCode;
+ private String expectedResponseCode;
private boolean result = true;
public WebTest(String[] args) {
@@ -86,7 +86,7 @@
contextRoot = args[2];
expectedResponseCode = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -94,8 +94,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
invoke("/config/login.conf", "fileRealm");
@@ -113,7 +113,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
try {
URL url = new URL("http://" + host + ":" + port + uri);
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties
index 8d466b6..b01fa65 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/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}-virtual-server-alternate-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
index 16d6f1e..a28f8d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootRestart/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -64,12 +64,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=*.policy dir=${env.S1AS_HOME}/domains/${admin.domain}/config""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_3="from=/config/* dir=${env.S1AS_HOME}/domains/${admin.domain}""/>
- </antcall>
+ </antcall>
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -96,7 +96,7 @@
<target name="restart" depends="init-common">
<antcall target="restart-server"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -143,7 +143,7 @@
<arg line="${as.props}"/>
<arg line="test"/>
</exec>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
index e0b4497..995894e 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/WebTest.java
@@ -53,7 +53,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties
index d812d56..002aa72 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/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}-virtual-server-alternate-docroot-welcomepage-redirect"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
index 1ef146e..3fa5f52 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAlternateDocrootWelcomePageRedirect/build.xml
@@ -40,7 +40,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -48,28 +48,28 @@
</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="setup" depends="init-common">
<antcall target="create-alternate-resources"/>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_1="from=/mytest dir=/tmp""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.alternatedocroot_2="from=/mytest/* dir=/tmp""/>
- </antcall>
+ </antcall>
</target>
<target name="create-alternate-resources" depends="init-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
index 290a1d0..56a1259 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/WebTest.java
@@ -56,7 +56,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1537");
@@ -69,7 +69,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -99,7 +99,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -147,7 +147,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -195,7 +195,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
@@ -247,7 +247,7 @@
String cookie = "Cookie: " + jsessionIdSSO + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties
index fc27c60..fd77e5c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/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}-virtual-server-auth-realm-property"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
index 34927d2..d5fe00c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -97,7 +97,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}"/>
@@ -111,10 +111,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/virtualServerAuthRealmProperty/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
index df4cebd..e567e6c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerAuthRealmProperty/descriptor/web.xml
@@ -24,12 +24,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
<role-name>admin</role-name>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
index 519ca89..b53ff8c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Issue 4408");
WebTest webTest = new WebTest(args);
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -71,7 +71,7 @@
private void invoke() throws Exception {
- System.out.println("Host=" + host + ", port=" + port);
+ System.out.println("Host=" + host + ", port=" + port);
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties
index fce9a95..97dd757 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/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}-virtual-server-change-http-listener-webapp-no-longer-accessible"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
index bb9281b..2a33dba 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerChangeHttpListenerWebappNoLongerAccessible/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
@@ -91,7 +91,7 @@
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -99,11 +99,11 @@
<arg line="${as.props}"/>
<arg line="--contextroot ${contextroot}"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -115,10 +115,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="delete-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
index 944e2fd..835cf55 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/WebTest.java
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 6043");
WebTest webTest = new WebTest(args);
@@ -53,8 +53,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -64,7 +64,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/ HTTP/1.0\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties
index d16cf3e..cd246d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/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}-virtual-server-create-upper-case-deploy-exclusive"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
index 6e23871..0799220 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerCreateUpperCaseDeployExclusive/build.xml
@@ -36,7 +36,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"/>
@@ -44,20 +44,20 @@
</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="deploy" depends="init-common">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
@@ -65,11 +65,11 @@
<arg line="--contextroot ${contextroot}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers TestServer"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="create-vs" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
index 8c1a7d4..8fd8847 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/WebTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for virtual server default-web-module");
WebTest webTest = new WebTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/index.html");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties
index 62791be..63ec5b4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/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}-virtual-server-default-web-module"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
index 4688ce0..4ce95ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModule/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
index 8d31ad2..6cb2aab 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/WebTest.java
@@ -49,7 +49,7 @@
adminUser = args[2];
adminPassword = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4438");
@@ -63,7 +63,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -123,7 +123,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties
index ec4ba2e..e012098 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/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}-virtual-server-default-web-module-form-login-jsecurity-check-direct-access"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
index 74e9ecc..c0b9e44 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -72,7 +72,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}"/>
@@ -85,10 +85,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
index 162e843..bc6dc26 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleFormLoginJSecurityCheckDirectAccess/descriptor/web.xml
@@ -25,12 +25,12 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
- <url-pattern>/*</url-pattern>
- <http-method>DELETE</http-method>
- <http-method>GET</http-method>
- <http-method>POST</http-method>
- <http-method>PUT</http-method>
+ <web-resource-name>Protected Area</web-resource-name>
+ <url-pattern>/*</url-pattern>
+ <http-method>DELETE</http-method>
+ <http-method>GET</http-method>
+ <http-method>POST</http-method>
+ <http-method>PUT</http-method>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
index e527a01..c4817fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/WebTest.java
@@ -46,7 +46,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6526113");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/index.html");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties
index afd4a3d..a9518b3 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/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}-virtual-server-default-web-module-restart"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
index c8286c7..eae9d4c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setDefaultWebModule" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -111,10 +111,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="unsetDefaultWebModule" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -122,7 +122,7 @@
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.${new-virtual-server}.default-web-module="/>
</antcall>
- </target>
+ </target>
<target name="usage">
<antcall target="usage-common"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
index 01ac453..53a318b 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/WebTest.java
@@ -44,7 +44,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for virtual server default-web-module");
WebTest webTest = new WebTest(args);
@@ -52,8 +52,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -63,7 +63,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties
index 2ec5523..60c4fef 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/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}-virtual-server-default-web-module-request-dispatcher"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
index 4688ce0..4ce95ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestDispatcher/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
index 4b62e35..c6f3256 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 3710");
WebTest webTest = new WebTest(args);
@@ -54,8 +54,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeAtRootContext();
invokeAtContextRoot();
stat.addStatus(TEST_NAME, stat.PASS);
@@ -66,7 +66,7 @@
}
private void invokeAtRootContext() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port +
"/checkRequestPath?run=first");
System.out.println("Connecting to: " + url.toString());
@@ -91,7 +91,7 @@
}
private void invokeAtContextRoot() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot +
"/checkRequestPath?run=second");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties
index d050c26..62e068b 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/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}-virtual-server-default-web-module-request-path"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
index 284c29d..567cda8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="reconfig" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -67,7 +67,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}"/>
@@ -79,10 +79,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="reconfig">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
index 1449e96..00d5001 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDefaultWebModuleRequestPath/servlet/CheckRequestPath.java
@@ -30,7 +30,7 @@
String expectedCtxtRoot = null;
String expectedRequestURL = null;
String expectedRequestURI = null;
-
+
String run = req.getParameter("run");
if ("first".equals(run)) {
expectedCtxtRoot = "";
@@ -41,7 +41,7 @@
expectedCtxtRoot =
"/web-virtual-server-default-web-module-request-path";
expectedRequestURI = expectedCtxtRoot + servletPath;
- expectedRequestURL = "http://" + host + ":" + port +
+ expectedRequestURL = "http://" + host + ":" + port +
expectedRequestURI;
} else {
throw new ServletException();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
index 028b83a..a3d5104 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for dynamic reconfiguration of docroot");
WebTest webTest = new WebTest(args);
@@ -45,8 +45,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke("/domain.xml", "<domain ");
invoke("/server.policy", "grant codeBase");
stat.addStatus(TEST_NAME, stat.PASS);
@@ -62,7 +62,7 @@
* in order for the test to pass
*/
private void invoke(String uri, String expected) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties
index 85541f7..e121a25 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/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}-virtual-server-docroot-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
index 73d8a77..ccfb256 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDocrootDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -75,7 +75,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}"/>
@@ -87,10 +87,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/virtualServerDynamicConfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
index 7bd70b0..4b3fe77 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/WebTest.java
@@ -21,16 +21,16 @@
import com.sun.ejte.ccl.reporter.*;
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
+ private static ObjectInputStream objectReader = null;
public static void main(String args[]) {
@@ -51,7 +51,7 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
int responseCode= urlConnection.getResponseCode();
- System.out.println("Response code: " + responseCode + " Expected code: 200");
+ System.out.println("Response code: " + responseCode + " Expected code: 200");
if (urlConnection.getResponseCode() != 200){
stat.addStatus("virtualServerDynamicConfig", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties
index a481b53..5ab3519 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/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}-virtualServerDynamicConfig"/>
+<property name="appname" value="${module}-virtualServerDynamicConfig"/> \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-virtualServerDynamicConfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
index a1f5c19..4184fb3 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/build.xml
@@ -66,7 +66,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"/>
@@ -74,10 +74,10 @@
</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
@@ -85,10 +85,10 @@
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>
@@ -96,7 +96,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}"/>
@@ -108,10 +108,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/virtualServerDynamicConfig/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
index fdb0c17..c1d4bb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
index 781bccf..c073270 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerDynamicConfig/servlet/ServletTest.java
@@ -24,7 +24,7 @@
public class ServletTest extends HttpServlet {
private ServletContext context;
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
context = config.getServletContext();
@@ -34,12 +34,12 @@
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("[Servlet.doPost]");
-
+
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println("TEST::PASS");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
index 62ddc52..5eb1f02 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/WebTest.java
@@ -25,7 +25,7 @@
* ("WAR from an EAR as default webapp no more working after stop/start")
*
* This unit test deploys an EAR, dynamically configures the EAR's embedded
- * WAR as the default-web-module of virtual server "server", accesses the
+ * WAR as the default-web-module of virtual server "server", accesses the
* WAR's JSP resource under both the WAR's context root and the empty context
* root, stops and restarts the domain, and accesses the WAR's JSP resouce
* again (under both the WAR's context root and the empty context root).
@@ -46,7 +46,7 @@
host = args[0];
port = args[1];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 542");
@@ -65,13 +65,13 @@
}
public void doTest(String uri) throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties
index 0c820e8..2444cd2 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/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}-virtual-server-ear-wrapped-default-web-module-restart"/>
+<property name="appname" value="${module}-virtual-server-ear-wrapped-default-web-module-restart"/> \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="application"/>
+<property name="apptype" value="application"/> \u0020
<property name="web.xml" value="descriptor/web.xml"/>
<property name="sun-web.xml" value="descriptor/sun-web.xml"/>
<property name="contextroot" value="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
index 7694f01..99882c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerEarWrappedDefaultWebModuleRestart/build.xml
@@ -36,7 +36,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"/>
@@ -64,11 +64,11 @@
<ear destfile="${assemble.dir}/${appname}App.ear" appxml="${application.xml}">
<fileset dir="${assemble.dir}" includes="*.jar, *.war"/>
</ear>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-common"/>
- </target>
+ </target>
<target name="runfirst" depends="init-common">
<java classname="WebTest">
@@ -93,7 +93,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
index ec6ab2c..dc5aff6 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest.java
@@ -34,14 +34,14 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
WebTest webTest = new WebTest(args);
webTest.doTest();
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
ex.printStackTrace();
@@ -49,14 +49,14 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/index.jsp");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
index fcff499..67edb9c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/WebTest2.java
@@ -42,7 +42,7 @@
contextRoot = args[2];
location = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Virtual Server log file");
WebTest2 webTest = new WebTest2(args);
@@ -50,8 +50,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -61,7 +61,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/CheckAccessLog?location="
+ URLEncoder.encode(location));
@@ -69,7 +69,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties
index 3a84c05..d90df30 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/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}-virtual-server-log-file"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
index efaa760..90a2003 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/build.xml
@@ -36,7 +36,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"/>
@@ -130,7 +130,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}"/>
@@ -157,7 +157,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<delete dir="${env.S1AS_HOME}/domains/domain1/logs/vslogs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
index b6cc341..d9c2dd8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerLogFile/servlet/CheckAccessLog.java
@@ -28,6 +28,6 @@
System.out.println("Checking file location "+location+"/domains/domain1/logs/vslogs");
if (files != null && files.length == 2) {
resp.getWriter().println("SUCCESS!");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
index a3e7265..03301d1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/WebTest.java
@@ -26,7 +26,7 @@
* virtual servers get lost")
*
* This unit test does the following:
- *
+ *
* - Creates virtual server myvs, and associates it with http-listener-1
* - Deploys webapp to myvs, and assigns this webapp as the default-web-module
* of myvs
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 4407");
WebTest webTest = new WebTest(args);
@@ -61,8 +61,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeAtContextRoot();
invokeAtRootContext();
stat.addStatus(TEST_NAME, stat.PASS);
@@ -73,7 +73,7 @@
}
private void invokeAtContextRoot() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/ HTTP/1.1\n";
@@ -102,7 +102,7 @@
}
private void invokeAtRootContext() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET / HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties
index 33e21ae..b5dad7d 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/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}-virtual-server-default-web-module-modify-http-listener-port"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
index 8e5baf8..0bcef64 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerModifyHttpListenerPortAccessWebapp/build.xml
@@ -36,7 +36,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"/>
@@ -44,20 +44,20 @@
</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="deploy" depends="init-common">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<exec executable="${ASADMIN}" failonerror="false">
<arg line="deploy"/>
@@ -65,11 +65,11 @@
<arg line="--contextroot ${contextroot}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -81,10 +81,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="create-vs" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
index 7d56a38..3291680 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/WebTest.java
@@ -55,7 +55,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6861682");
WebTest webTest = new WebTest(args);
@@ -63,8 +63,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet("/portal/directory",
EXPECTED_LOCATION_RESPONSE_HEADER);
stat.addStatus(TEST_NAME, stat.PASS);
@@ -78,7 +78,7 @@
private void invokeServlet(String uri, String expectedRedirect)
throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + uri);
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties
index eef5e41..e6367ae 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/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}-virtual-server-redirect-property-no-substring-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
index 5e01576..1d0707d 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyNoSubstringMatch/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
index 8b96562..116084c 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/WebTest.java
@@ -52,7 +52,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6330300");
WebTest webTest = new WebTest(args);
@@ -60,8 +60,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -70,14 +70,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET /someprefix/1234 HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties
index 89b33d0..966f5fd 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/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}-virtual-server-redirect-property-url"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
index e0961c3..617e791 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrl/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
index 9ce067e..03396e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/WebTest.java
@@ -54,7 +54,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6330300");
WebTest webTest = new WebTest(args);
@@ -62,8 +62,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invokeServlet();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -72,14 +72,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET /someprefix/5678 HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties
index b66e7df..a6177a7 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/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}-virtual-server-redirect-property-url-prefix"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
index 134c6c5..bde88a8 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerRedirectPropertyUrlPrefix/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -71,7 +71,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}"/>
@@ -83,10 +83,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
index fef22e6..f8f3286 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/WebTest.java
@@ -53,7 +53,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6324911");
WebTest webTest = new WebTest(args);
@@ -82,7 +82,7 @@
os.write("\n".getBytes());
boolean statusHeaderFound = false;
- boolean bodyLineFound = false;
+ boolean bodyLineFound = false;
BufferedReader br = null;
try {
InputStream is = sock.getInputStream();
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties
index 4da4357..bfc8031 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/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}-virtual-server-send-error-property"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
index 5f8dd01..0541bb2 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorProperty/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
@@ -76,7 +76,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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
index 157e7d9..fa5f618 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/WebTest.java
@@ -29,8 +29,8 @@
private static URLConnection conn = null;
private static URL url;
private static ObjectOutputStream objectWriter = null;
- private static ObjectInputStream objectReader = null;
-
+ private static ObjectInputStream objectReader = null;
+
public static void main(String args[]) throws Exception{
String host = args[0];
String port = args[1];
@@ -47,12 +47,12 @@
HttpURLConnection urlConnection = (HttpURLConnection)conn;
urlConnection.setDoOutput(true);
- DataOutputStream out =
+ DataOutputStream out =
new DataOutputStream(urlConnection.getOutputStream());
out.writeByte(1);
int responseCode= urlConnection.getResponseCode();
- System.out.println("virtual-server-send-error-property-broken-webapp: " + responseCode + " Expected code: 404");
+ System.out.println("virtual-server-send-error-property-broken-webapp: " + responseCode + " Expected code: 404");
if (urlConnection.getResponseCode() != 404){
stat.addStatus("Test virtual-server-send-error-property-broken-webapp", stat.FAIL);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties
index 47810cc..a79b307 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/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}-virtual-server-send-error-property-broken-webapp"/>
<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="/${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
index 7ba9afb..de29066 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/build.xml
@@ -54,7 +54,7 @@
value="${appserver.instance.name}.http-service.virtual-server.server.property.send-error_1="/>
</antcall>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -62,24 +62,24 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -91,10 +91,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/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
index 29ac78b..c7df9d5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
index 0b9e2e9..d89beab 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerSendErrorPropertyBrokenWebapp/servlet/ServletTest.java
@@ -46,11 +46,11 @@
public class ServletTest extends HttpServlet{
private String status = "virtual-server-send-error-property-broken-webapp::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -58,16 +58,16 @@
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("[Servlet.doPost]");
-
+
PrintWriter out = response.getWriter();
out.println(status);
response.setContentType("text/html");
-
+
status = "virtual-server-send-error-property-broken-webapp:::FAIL";
out.println(status);
-
+
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
index dec3635..d33dc1a 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/WebTest.java
@@ -66,12 +66,12 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for disabling a virtual server");
WebTest webTest = new WebTest(args);
- try {
+ try {
if ("on".equals(webTest.run)) {
TEST_NAME = TEST_ROOT_NAME + "-on";
webTest.onRun();
@@ -96,7 +96,7 @@
* server.
*/
private void onRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties
index 0783426..c5a22d4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/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}-virtual-server-state-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
index 746fad3..757ce1f 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerStateDynamicReconfig/build.xml
@@ -42,7 +42,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"/>
@@ -50,17 +50,17 @@
</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="deploy" depends="init-common">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -70,14 +70,14 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers myvs"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-virtual-server-myvs"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
index e4a9758..3c18557 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/WebTest.java
@@ -26,7 +26,7 @@
* "myhost", deploys a webapp to it, and accesses the webapp by specifying
* a Host header equal to "myhost" in the request.
*
- * The test then updates the virtual server's "hosts" attribute to
+ * The test then updates the virtual server's "hosts" attribute to
* "mynewhost", and ensures that the webapp may still be accessed when
* specifying a Host header equal to "mynewhost" in the request.
*/
@@ -52,7 +52,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6712778");
@@ -80,7 +80,7 @@
* is mapped to the virtual server.
*/
private void firstRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
@@ -115,7 +115,7 @@
* is mapped to the updated virtual server.
*/
private void secondRun() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties
index 4210a58..0e977d9 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/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}-virtual-server-update-hosts-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
index a326061..ecb11f1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHostsDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="create-virtual-server"/>
</target>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="create-virtual-server" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
index a4ecf81..ad09bf5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6573545");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
@@ -59,7 +59,7 @@
}
private void invoke() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/test.txt HTTP/1.1\n";
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties
index b04c3f9..584e26e 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/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}-virtual-server-update-http-listeners-dynamic-reconfig"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
index 3305679..eb654b1 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerUpdateHttpListenersDynamicReconfig/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="create-virtual-server-vs1" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="create-virtual-server" />
@@ -96,7 +96,7 @@
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
- <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
+ <echo message="Deploying ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
<property name="precompilejsp" value="true"/>
<exec executable="${ASADMIN}" failonerror="false">
@@ -106,11 +106,11 @@
<arg line="--precompilejsp=${precompilejsp}"/>
<arg line="--upload=true"/>
<arg line="--virtualservers vs2"/>
- <arg line="--target ${appserver.instance.name}"/>
+ <arg line="--target ${appserver.instance.name}"/>
<arg line="${assemble.dir}/${appname}-web.war"/>
</exec>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -122,10 +122,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="delete-virtual-server-vs1" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
index 4db1fae..bb82ac4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/WebTest.java
@@ -40,7 +40,7 @@
port = Integer.parseInt(args[1]);
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 17093");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
Socket sock = null;
OutputStream os = null;
InputStream is = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties
index 5fbb9ac..9a781fe 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/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}-virtual-server-with-custom-error-report-valve"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
index bd294be..dc0aa37 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomErrorReportValve/build.xml
@@ -37,7 +37,7 @@
<antcall target="clean-common"/>
<delete file="WebTest.class"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -51,16 +51,16 @@
</jar>
<delete dir="${build.classes.dir}/custom"/>
- <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="setup" depends="init-common">
<antcall target="copyJarToDomainLib"/>
<antcall target="restart-server-instance-common"/>
@@ -82,7 +82,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}"/>
@@ -94,10 +94,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeJarFromDomainLib"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
index ffabb26..c39f0c4 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/WebTest.java
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11674");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + "/test");
System.out.println("Connecting to: " + url.toString());
@@ -77,7 +77,7 @@
String line = input.readLine();
System.out.println(line);
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties
index f446ac4..93c3c99 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/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}-virtual-server-with-custom-valves"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
index 89d7332..e972aff 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/build.xml
@@ -36,7 +36,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"/>
@@ -44,16 +44,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
-
+ </target>
+
<target name="setup" depends="init-common">
<antcall target="copyJarToDomainLib"/>
<antcall target="asadmin-common-ignore-fail">
@@ -65,12 +65,12 @@
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.valve_2="valves.GlassFishValveImpl""/>
- </antcall>
+ </antcall>
<antcall target="asadmin-common-ignore-fail">
<param name="admin.command" value="set" />
<param name="operand.props"
value="${appserver.instance.name}.http-service.virtual-server.server.property.valve_3="valves.TomcatValveBase_2""/>
- </antcall>
+ </antcall>
<antcall target="restart-server-instance-common"/>
</target>
@@ -85,7 +85,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}"/>
@@ -97,10 +97,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeJarFromDomainLib"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
index b9aaf64..9a0ef31 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_1.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_1 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
index ef2df6e..1b735b5 100644
--- a/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
+++ b/appserver/tests/appserv-tests/devtests/web/virtualServerWithCustomValves/lib/valves/TomcatValveBase_2.java
@@ -24,7 +24,7 @@
public class TomcatValveBase_2 extends ValveBase {
public String getInfo() {
- return getClass().getName();
+ return getClass().getName();
}
public void invoke(Request request, Response response)
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
index 6ff42f5..c9a9252 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/WebTest.java
@@ -84,7 +84,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support");
WebTest webTest = new WebTest(args);
@@ -92,8 +92,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke(contextRoot, "/domain.xml", "<domain ");
invoke(contextRoot, "/server.policy", "grant codeBase");
invoke(contextRoot, "/config/login.conf", "fileRealm");
@@ -114,7 +114,7 @@
*/
private void invoke(String contextRoot, String uri, String expected)
throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot + uri);
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties
index 46b2984..7c14a68 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/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}-webapp-alternate-docroot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml
index 6fd1bb7..4f481ce 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocroot/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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="copyResources"/>
@@ -72,11 +72,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="removeResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
index 21b7402..d354b29 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for alternate docroot support for tag files");
WebTest webTest = new WebTest(args);
@@ -49,8 +49,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties
index a586741..77e362d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/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}-webapp-alternate-docroot-tagfile"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml
index 9eb99b6..e6b5f94 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappAlternateDocrootTagFile/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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="setup" depends="init-common">
<antcall target="moveResources"/>
@@ -64,7 +64,7 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="re-deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
@@ -72,7 +72,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}"/>
@@ -84,10 +84,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="restoreResources"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
index 965ad77..496f3f7 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6329415");
@@ -53,11 +53,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties
index aeca50e..6b6cf53 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/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}-webapp-deploy-dash-dash-libraries"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
index 5c9778c..47ba965 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappDeployDashDashLibraries/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-libraries"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -72,10 +72,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/webappLoaderConsiderHiddenJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
index dcc4ecb..9d82071 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/WebTest.java
@@ -46,7 +46,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314481");
@@ -57,18 +57,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
System.err.println("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties
index 15edd7b..2758269 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/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}-webapp-loader-consider-hidden-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderConsiderHiddenJarFiles/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/webappLoaderEmptyJar/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
index e5fc5bd..c76a0cc 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Bugtraq 4670099 and 4649821");
WebTest webTest = new WebTest(args);
@@ -50,8 +50,8 @@
}
public void doTest() {
-
- try {
+
+ try {
invokeJSP();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -71,7 +71,7 @@
int code = conn.getResponseCode();
if (code != 200) {
throw new Exception("Unexpected response code: " + code);
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties
index 6a5cf92..3e34220 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/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}-webapploader-empty-jar"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/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/webappLoaderEmptyJar/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
index 3bcbccd..8ed934f 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderEmptyJar/descriptor/web.xml
@@ -22,13 +22,13 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
index e0a4beb..2ba6900 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Unit test for
+ * Unit test for
* https://glassfish.dev.java.net/issues/show_bug.cgi?id=6810
* ("WebappClassLoader can not resolve resource with "." suffix")
*/
@@ -40,7 +40,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish IT 6810");
@@ -52,11 +52,11 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties
index 553da07..fa51102 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/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}-webapp-loader-getresource-dot"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml
index 00fdad3..c39776d 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderGetResourceDot/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,23 +42,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -70,10 +70,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/webappLoaderIgnoreHiddenJarFiles/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
index 5e264d7..1e30194 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for 6314481");
@@ -51,18 +51,18 @@
stat.addStatus(TEST_NAME, stat.FAIL);
ex.printStackTrace();
}
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port
+ contextRoot + "/TestServlet");
System.out.println("Connecting to: " + url.toString());
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties
index e0149ca..0984f88 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/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}-webapp-loader-ignore-hidden-jar-files"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webappLoaderIgnoreHiddenJarFiles/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/webdavCopyDelete/WebTest.java b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
index d8c7d71..390711f 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/WebTest.java
@@ -42,7 +42,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for WebDAV copy and delete");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
try {
String tmplate = "/data.html";
String page = "/index.html";
- invoke(new String[] { "COPY " + contextRoot + tmplate + " HTTP/1.1",
+ invoke(new String[] { "COPY " + contextRoot + tmplate + " HTTP/1.1",
"Destination: http://" + host + ":" + port + contextRoot + page }, null, false);
boolean status = invoke(new String[] { "GET " + contextRoot + page + " HTTP/1.1"}, EXPECTED, false);
@@ -92,7 +92,7 @@
for (String reqLine : reqLines) {
System.out.println(reqLine);
os.write((reqLine + "\n").getBytes());
- }
+ }
os.write("Host: localhost\n".getBytes());
os.write("Connection: close\n".getBytes());
diff --git a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties
index a93a482..c4e9f26 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/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}-webdav-copy-delete"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
index ad025d9..de1dcfa 100644
--- a/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/webdavCopyDelete/build.xml
@@ -36,7 +36,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"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/weblogicDD/contextRoot/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
index b565433..3d98fc5 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for context root in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -77,11 +77,11 @@
}
boolean testStatus = EXPECTED_RESPONSE.equals(line);
if (!testStatus) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
testStatus = false;
}
-
+
stat.addStatus(TEST_NAME, (testStatus)? stat.PASS : stat.FAIL);
} catch (Exception ex) {
stat.addStatus(TEST_NAME, stat.FAIL);
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties
index 0b5e843..eb9c816 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/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}-wl-context-root"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
index c51b5a0..e72bd27 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/contextRoot/build.xml
@@ -39,9 +39,9 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -52,11 +52,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-no-context-root"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -68,10 +68,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/weblogicDD/delegate/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
index 7b59827..cff3d9b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/WebTest.java
@@ -23,10 +23,10 @@
* Unit test for prefer-web-inf-classes in weblogic.xml.
*/
public class WebTest {
-
+
private static int count = 0;
private static int EXPECTED_COUNT = 1;
-
+
static SimpleReporterAdapter stat=
new SimpleReporterAdapter("appserv-tests");
@@ -40,16 +40,16 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "delegate-flag", contextRoot + "/ServletTest" );
-
+
} catch (Throwable t) {
System.out.println(t.getMessage());
}
if (count != EXPECTED_COUNT){
stat.addStatus("delegate", stat.FAIL);
- }
+ }
stat.printSummary("web/delegateFlag---> expect " + EXPECTED_COUNT + " PASS");
}
@@ -63,7 +63,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -75,18 +75,18 @@
System.out.println(lineNum + ": " + line);
if (index != -1) {
String status = line.substring(index+2);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus(result +": " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
+ stat.addStatus(result +": " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
lineNum++;
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
index 8c417fb..3a25601 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.properties
@@ -15,12 +15,12 @@
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}-wl-delegate"/>
+<property name="appname" value="${module}-wl-delegate"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<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="weblogic.xml" value="descriptor/weblogic.xml"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
index e9888a8..6417d0b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/build.xml
@@ -44,11 +44,11 @@
<javac srcdir="./shared/test"
destdir="./shared" includes="*.java"/>
<jar destfile="shared.jar" basedir="shared"/>
- <copy file="shared.jar"
+ <copy file="shared.jar"
todir="${env.S1AS_HOME}/lib"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -56,24 +56,24 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -85,14 +85,14 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore-appserv" depends="setup-appserv">
<delete file="${env.S1AS_HOME}/lib/shared.jar"/>
- <antcall target="restart-server-instance-common"/>
+ <antcall target="restart-server-instance-common"/>
</target>
<target name="usage">
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
index 734697a..c07efc8 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/descriptor/web.xml
@@ -22,12 +22,12 @@
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-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
index b939583..f3eecb6 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/delegate/servlet/test/ServletTest.java
@@ -26,11 +26,11 @@
private static final String PASS = "WLDelegateTest::PASS";
private static final String FAIL = "WLDelegateTest::FAIL";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
- System.out.println("[Servlet.init]");
-
+ System.out.println("[Servlet.init]");
+
}
public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
@@ -38,12 +38,12 @@
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("[Servlet.doPost]");
-
+
String status = FAIL;
response.setContentType("text/html");
-
+
DelegateTest delegate = null;
try{
Class clazz = Class.forName("test.DelegateTest");
@@ -56,7 +56,7 @@
if (delegate != null){
try{
- System.out.println("Delegate: " + delegate.getChildName());
+ System.out.println("Delegate: " + delegate.getChildName());
status = PASS;
} catch (Exception ex){
status = FAIL;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
index 2eb2ffa..c217a96 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/WebTest.java
@@ -26,7 +26,7 @@
* container-descriptor:index-directory-sort-by
*/
public class WebTest {
-
+
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("WeblogicDD: index-directory-enabled, index-directory-sort-by");
String host = args[0];
@@ -43,10 +43,10 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
boolean ok = goGet(host, port, "", contextRoot + "/" );
-
+
stat.addStatus("wl-web-directoryListing",
((ok)? stat.PASS : stat.FAIL));
} catch (Throwable t) {
@@ -72,7 +72,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -94,11 +94,11 @@
}
System.out.println("a, b, c: " + a + ", " + b + ", " + c);
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
return (listDir && (b < c) && (c < a));
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
index ced2db1..529ba8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.properties
@@ -15,12 +15,12 @@
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}-wl-directoryListing"/>
+<property name="appname" value="${module}-wl-directoryListing"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
<property name="sun-application.xml" value="descriptor/sun-application.xml"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="weblogic.xml" value="descriptor/weblogic.xml"/>
<property name="contextroot" value="/web-directoryListing"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
index 1619c99..67cfe32 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/dirListing/build.xml
@@ -36,21 +36,21 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
- </target>
-
+ </target>
+
<target name="build-publish-war" depends="build, publish-war-common" />
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<javac
srcdir="."
@@ -67,10 +67,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/weblogicDD/jspDescriptor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
index 1f22199..7990d2e 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/WebTest.java
@@ -35,12 +35,12 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for jsp-descriptor in weblogic.xml");
WebTest webTest = new WebTest(args);
webTest.doTest("/test.jsp");
- stat.printSummary();
+ stat.printSummary();
}
public void doTest(String path) {
@@ -83,7 +83,7 @@
// Test 3. Make sure that spaces are trimmed.
testName = "wl jsp desc: compress-html-template";
String line = input.readLine();
-
+
if (line.equals("pass!")) {
stat.addStatus(testName, stat.PASS);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
index c84aadf..7794595 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.properties
@@ -15,12 +15,12 @@
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}-WLjspDescriptor"/>
+<property name="appname" value="${module}-WLjspDescriptor"/> \u0020
<property name="assemble" value="${build.classes.dir}/archive"/>
-<property name="apptype" value="web"/>
+<property name="apptype" value="web"/> \u0020
<property name="weblogic.xml" value="descriptor/weblogic.xml"/>
<property name="contextroot" value="${appname}"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
index 057fe00..f4dab8f 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/jspDescriptor/build.xml
@@ -39,9 +39,9 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="build" depends="clean">
- <property name="hasWebclient" value="yes"/>
+ <property name="hasWebclient" value="yes"/>
<antcall target="webclient-war-common">
<param name="hasWebclient" value="yes"/>
</antcall>
@@ -52,11 +52,11 @@
</target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -68,10 +68,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/weblogicDD/referenceDescriptor/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
index df3492d..9709053 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/WebTest.java
@@ -39,7 +39,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for run-as-principal-name in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -101,7 +101,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties
index 27950b9..4d06006 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/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}-wl-reference-descriptor"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml
index fe21857..c4e782c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,16 +47,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
@@ -77,7 +77,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}"/>
@@ -89,10 +89,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common-ignore-fail">
@@ -105,7 +105,7 @@
<param name="operand.props" value="--desttype queue my_queue"/>
</antcall>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
index 7948418..9375869 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/referenceDescriptor/servlet/test/TestServlet.java
@@ -36,7 +36,7 @@
public void init() throws ServletException {
try {
InitialContext ic = new InitialContext();
- queue = (Queue)ic.lookup("java:comp/env/jms/QueueName");
+ queue = (Queue)ic.lookup("java:comp/env/jms/QueueName");
} catch(Exception ex) {
throw new ServletException(ex);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
index c856945..6bdab18 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/WebTest.java
@@ -37,7 +37,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for run-as-principal-name in weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -99,7 +99,7 @@
}
}
if (!expectedResponse.equals(line)) {
- System.out.println("Wrong response. Expected: " +
+ System.out.println("Wrong response. Expected: " +
expectedResponse + ", received: " + line);
testStatus = false;
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties
index 412ab05..1718108 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/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}-wl-run-as-principal-name"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml
index f0b17c0..ca80b05 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/runAsPrincipalName/build.xml
@@ -39,7 +39,7 @@
<fileset dir="." includes="*.class"/>
</delete>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -60,23 +60,23 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -88,10 +88,10 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
index 1903e97..441c9fc 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/WebTest.java
@@ -38,7 +38,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for customizing complete list of " +
@@ -54,7 +54,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties
index 020dd45..be11ffa 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/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}-wl-session-cookie-config-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
index 1ca0c33..a8d8814 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/build.xml
@@ -38,7 +38,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -46,15 +46,15 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -74,7 +74,7 @@
<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/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
index 67b4f0c..a0fe69c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionCookieConfigDeclarative/servlet/test/CreateSession.java
@@ -40,32 +40,32 @@
// comment
if (sessionCookie.indexOf("Comment=myComment") == -1) {
throw new ServletException("Missing cookie comment");
- }
+ }
// domain
if (sessionCookie.indexOf("Domain=mydomain") == -1) {
throw new ServletException("Missing cookie domain");
- }
+ }
// path
if (sessionCookie.indexOf("Path=/myPath") == -1) {
throw new ServletException("Missing cookie path");
- }
+ }
// secure
if (sessionCookie.indexOf("Secure") == -1) {
throw new ServletException("Missing Secure attribute");
- }
+ }
// http-only
if (sessionCookie.indexOf("HttpOnly") == -1) {
throw new ServletException("Missing HttpOnly attribute");
- }
+ }
// max-age
if (sessionCookie.indexOf("Max-Age=123") == -1) {
throw new ServletException("Missing max-age");
- }
+ }
}
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
index 3f62a8c..44fc4ca 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/WebTest.java
@@ -19,7 +19,7 @@
import com.sun.ejte.ccl.reporter.*;
/*
- * Make sure HttpSessionListener's sessionDestroyed(), and
+ * Make sure HttpSessionListener's sessionDestroyed(), and
* HttpSessionBindingListener's valueUnbound() methods are called when
* session expires.
*
@@ -45,7 +45,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for timeout-secs, invalidation-interval-secs");
WebTest webTest = new WebTest(args);
@@ -54,7 +54,7 @@
}
public void doTest() {
- try {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -65,7 +65,7 @@
}
private void invoke() throws Exception {
-
+
String url = "http://" + host + ":" + port + contextRoot
+ "/CreateSession";
HttpURLConnection conn = (HttpURLConnection)
@@ -92,7 +92,7 @@
input = new BufferedReader(new InputStreamReader(is));
String line = input.readLine();
if (!EXPECTED_RESPONSE.equals(line)) {
- throw new Exception("Wrong response. Expected: " +
+ throw new Exception("Wrong response. Expected: " +
EXPECTED_RESPONSE + ", received: " + line);
}
} finally {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties
index 5196d0d..3777c41 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/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}-wl-session-expired"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
index 8ca1a07..c8515c6 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,10 +44,10 @@
</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
@@ -55,10 +55,10 @@
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>
@@ -66,7 +66,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}"/>
@@ -78,10 +78,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/weblogicDD/sessionExpired/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
index a4eec27..6aa8b7b 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/descriptor/web.xml
@@ -23,7 +23,7 @@
http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
version="2.4">
- <listener>
+ <listener>
<listener-class>test.MyHttpSessionListener</listener-class>
</listener>
@@ -46,7 +46,7 @@
<servlet-name>CheckResult</servlet-name>
<url-pattern>/CheckResult</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
index fd0610c..f6f32ea 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionExpired/servlet/test/MyObject.java
@@ -27,17 +27,17 @@
* Notifies the object that it is being bound to a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueBound(HttpSessionBindingEvent event) {
// do nothing
}
-
+
/*
* Notifies the object that it is being unbound from a session, and
* identifies the session.
*
- * @param event The event that identifies the session
+ * @param event The event that identifies the session
*/
public void valueUnbound(HttpSessionBindingEvent event) {
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
index 4c34510..47929e0 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/WebTest.java
@@ -41,7 +41,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for URL session tracking mode configured via weblogic.xml");
WebTest webTest = new WebTest(args);
@@ -50,7 +50,7 @@
}
public void doTest() {
- try {
+ try {
invokeServlet();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -60,14 +60,14 @@
}
private void invokeServlet() throws Exception {
-
+
Socket sock = new Socket(host, new Integer(port).intValue());
OutputStream os = sock.getOutputStream();
String get = "GET " + contextRoot + "/redirectFrom" + " HTTP/1.0\n";
System.out.println(get);
os.write(get.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
@@ -87,7 +87,7 @@
if (cookieLine != null) {
throw new Exception("Unexpected Set-Cookie response header");
}
-
+
if (redirectLine == null) {
throw new Exception("Missing Location response header");
}
@@ -107,7 +107,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200" +
", received: " + responseCode);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
index 02af0c8..7fb9b49 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/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}-wl-session-id-url-rewrite-session-tracking-mode-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
index a824be0..cdd5cdf 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionIdUrlRewriteSessionTrackingModeDeclarative/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -44,22 +44,22 @@
</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="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -71,10 +71,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/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
index 205b4b2..cef68ec 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/WebTest.java
@@ -45,7 +45,7 @@
contextRoot = args[2];
run = args[3];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for Weblogic DD: save-sessions-enabled");
@@ -71,7 +71,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void firstRun() throws Exception {
@@ -82,7 +82,7 @@
System.out.println(get);
os.write(get.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
@@ -125,7 +125,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\r\n".getBytes());
-
+
InputStream is = sock.getInputStream();
br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties
index 500347d..1491363 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/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}-wl-session-preserve-across-redeploy-declarative"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
index 226749a..1de719c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/build.xml
@@ -39,7 +39,7 @@
<delete file="RepRunConf.txt" failonerror="false"/>
<delete file="JSESSIONID" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="servlet"/>
@@ -47,16 +47,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>
<javac srcdir="." classpath="${env.APS_HOME}/lib/reportbuilder.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
@@ -70,7 +70,7 @@
<param name="operand.props" value="--name=${appname}-web ${assemble.dir}/${appname}-web.war"/>
</antcall>
</target>
-
+
<target name="redeploy2" depends="init-common">
<echo message="Redeploying with keepState=false ${assemble.dir}/${appname}-web.war from ${basedir}."
level="verbose"/>
@@ -105,7 +105,7 @@
</classpath>
</java>
</target>
-
+
<target name="runthird" depends="init-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -121,7 +121,7 @@
<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/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
index ed78b2a..a3bf349 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/descriptor/web.xml
@@ -44,5 +44,5 @@
<servlet-name>ResumeSession</servlet-name>
<url-pattern>/ResumeSession</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
index 897957e..cdd87c9 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/CreateSession.java
@@ -30,8 +30,8 @@
HttpSession session = req.getSession(true);
HashMap map = new HashMap();
- map.put("name1", "value1");
- map.put("name2", "value2");
+ map.put("name1", "value1");
+ map.put("name2", "value2");
session.setAttribute("map", map);
InitialContext ic = null;
diff --git a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
index 18ed3aa..ce4fc59 100644
--- a/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
+++ b/appserver/tests/appserv-tests/devtests/web/weblogicDD/sessionPreserveAcrossRedeployDeclarative/servlet/test/ResumeSession.java
@@ -27,7 +27,7 @@
public void doGet(HttpServletRequest req, HttpServletResponse res)
throws ServletException, IOException {
- boolean resume = false;
+ boolean resume = false;
HttpSession session = req.getSession(false);
if (session != null) {
HashMap map = (HashMap) session.getAttribute("map");
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
index d1d401c..e28297b 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/WebTest.java
@@ -40,16 +40,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for issue 8535");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties
index 2ed57bc..2198e5a 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/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}-welcome-page-extension-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageExtensionMatch/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/welcomePageSecurityConstraintExactMatch/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
index 52d10be..871355a 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/WebTest.java
@@ -42,16 +42,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6233276");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties
index 6cb0eda..6b565d3 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/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}-welcome-page-security-constraint-exact-match"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintExactMatch/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/welcomePageSecurityConstraintJspExtension/WebTest.java b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
index b8a7cf0..7fd65da 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/WebTest.java
@@ -42,16 +42,16 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for CR 6233276");
WebTest webTest = new WebTest(args);
webTest.doTest();
- stat.printSummary();
+ stat.printSummary();
}
public void doTest() {
-
+
try {
URL url = new URL("http://" + host + ":" + port
@@ -67,7 +67,7 @@
System.err.println("Wrong response code. Expected: "
+ HttpURLConnection.HTTP_UNAUTHORIZED
+ ", received: " + responseCode);
- stat.addStatus(TEST_NAME, stat.FAIL);
+ stat.addStatus(TEST_NAME, stat.FAIL);
}
} catch( Exception ex) {
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties
index 9174e7c..fcc549f 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/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}-welcome-page-security-constraint-jsp-extension"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml
index 84556b0..fb6a2e4 100644
--- a/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/welcomePageSecurityConstraintJspExtension/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/weldJsfFormLoginHttpSessionListener/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
index e58a916..0defcd2 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/WebTest.java
@@ -46,7 +46,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -60,7 +60,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -111,7 +111,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties
index bdd7ed7..0817995 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/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}-weld-jsf-form-login-http-session-listener"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
index d816699..6c27a04 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="src"/>
@@ -65,14 +65,14 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -89,7 +89,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="delete-user-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
index a277891..fdd4c38 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/descriptor/web.xml
@@ -37,7 +37,7 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
index 07a1d8d..5102602 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfFormLoginHttpSessionListener/src/test/TestHttpSessionListener.java
@@ -28,10 +28,10 @@
String value = myBean.getText();
if (!"CDI_VALUE".equals(value)) {
throw new RuntimeException();
- }
+ }
se.getSession().setAttribute("myAttr", value);
System.out.println(">>> sessionCreated: " + value);
- }
+ }
public void sessionDestroyed(HttpSessionEvent se) {
System.out.println(">>> sessionDestroyed");
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
index 6fe27d6..9c88f8d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/WebTest.java
@@ -45,7 +45,7 @@
keyStorePath = args[4];
trustStorePath = args[5];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for IT 11504");
WebTest webTest = new WebTest(args);
@@ -70,7 +70,7 @@
URLConnection conn = url.openConnection();
String redirectLocation = conn.getHeaderField("Location");
System.out.println("Location: " + redirectLocation);
-
+
String expectedRedirectLocation = "https://" + host + ":" + httpsPort +
contextRoot + "/protected.txt";
if (!expectedRedirectLocation.equals(redirectLocation)) {
@@ -112,7 +112,7 @@
String trustStorePath) throws Exception {
SSLContext ctx = SSLContext.getInstance("TLS");
- // Keystore
+ // Keystore
KeyStore ks = KeyStore.getInstance("JKS");
char[] passphrase = "changeit".toCharArray();
ks.load(new FileInputStream(keyStorePath), passphrase);
@@ -128,7 +128,7 @@
tmf.init(trustStore);
ctx.init(kmf.getKeyManagers(),tmf.getTrustManagers(), null);
-
+
return ctx.getSocketFactory();
}
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties
index 8818328..3314ee8 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/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}-weld-jsf-form-login-page"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
index 98e4e61..6cc8326 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/build.xml
@@ -36,7 +36,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"/>
@@ -44,23 +44,23 @@
</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:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common,prepare-truststore-common,prepare-keystore-common">
<java classname="WebTest">
<arg value="${http.host}"/>
@@ -78,7 +78,7 @@
<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/weldJsfLoginPage/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
index 4badc45..dc73f51 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfLoginPage/descriptor/web.xml
@@ -55,7 +55,7 @@
<form-error-page>/login_error.jsf</form-error-page>
</form-login-config>
</login-config>
-
+
<security-role>
<role-name>admin</role-name>
</security-role>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
index eaeac1d..af6783c 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/WebTest.java
@@ -46,7 +46,7 @@
adminUser = args[3];
adminPassword = args[4];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 1933");
@@ -60,7 +60,7 @@
stat.addStatus(TEST_NAME, stat.FAIL);
}
- stat.printSummary();
+ stat.printSummary();
}
public void run() throws Exception {
@@ -110,7 +110,7 @@
String cookie = "Cookie: " + jsessionId + "\n";
os.write(cookie.getBytes());
os.write("\n".getBytes());
-
+
InputStream is = sock.getInputStream();
BufferedReader br = new BufferedReader(new InputStreamReader(is));
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties
index 11e7098..ea6813d 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/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}-weld-jsf-server-auth-module-redirect"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
index 0ee4318..db103fb 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/build.xml
@@ -36,7 +36,7 @@
<delete file="WebTest.class" failonerror="false"/>
<delete file="RepRunConf.txt" failonerror="false"/>
</target>
-
+
<target name="compile" depends="clean">
<antcall target="compile-common">
<param name="src" value="src"/>
@@ -70,14 +70,14 @@
srcdir="."
classpath="${env.APS_HOME}/lib/reportbuilder.jar:${env.S1AS_HOME}/lib/appserv-rt.jar"
includes="WebTest.java"/>
- </target>
+ </target>
<target name="build-publish-war" depends="build, publish-war-common" />
-
+
<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}"/>
@@ -94,7 +94,7 @@
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
- </target>
+ </target>
<target name="restore" depends="init-common">
<antcall target="asadmin-common">
diff --git a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
index 40c6f63..3138874 100644
--- a/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/weldJsfServerAuthModuleRedirect/descriptor/web.xml
@@ -33,7 +33,7 @@
<security-constraint>
<web-resource-collection>
- <web-resource-name>Protected Area</web-resource-name>
+ <web-resource-name>Protected Area</web-resource-name>
<url-pattern>/*</url-pattern>
</web-resource-collection>
<auth-constraint>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java b/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
index dd3b24f..44e0acb 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/WebTest.java
@@ -23,10 +23,10 @@
* Unit test for bugtraq 4933984 Exception on Redeploy on WinXP
*/
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("Standalone Win2k Locking war test");
String host = args[0];
@@ -43,13 +43,13 @@
int port = new Integer(portS).intValue();
String name;
-
+
try {
goGet(host, port, "Win2kLock", contextRoot + "/ServletTest" );
-
+
if (count != EXPECTED_COUNT){
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
- }
+ }
} catch (Throwable t) {
System.out.println(t.getMessage());
stat.addStatus("Test UNPREDICTED-FAILURE", stat.FAIL);
@@ -67,7 +67,7 @@
System.out.println(("GET " + contextPath + " HTTP/1.0\n"));
os.write(("GET " + contextPath + " HTTP/1.0\n").getBytes());
os.write("\n".getBytes());
-
+
InputStream is = s.getInputStream();
BufferedReader bis = new BufferedReader(new InputStreamReader(is));
String line = null;
@@ -80,19 +80,19 @@
if (index != -1) {
index = line.indexOf(":");
String status = line.substring(index+1);
-
+
if (status.equalsIgnoreCase("PASS")){
stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.PASS);
} else {
- stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.FAIL);
+ stat.addStatus("web-Win2kLock: " + line.substring(0,index), stat.FAIL);
}
count++;
- }
+ }
}
} catch( Exception ex){
- ex.printStackTrace();
+ ex.printStackTrace();
throw new Exception("Test UNPREDICTED-FAILURE");
}
}
-
+
}
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties
index 1d2295c..9244315 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/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}-win2kLock"/>
+<property name="appname" value="${module}-win2kLock"/> \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-win2kLock"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml b/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml
index e5d8403..8da606c 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/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,10 +42,10 @@
</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
@@ -53,10 +53,10 @@
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>
@@ -64,7 +64,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}"/>
@@ -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/win2kLock/descriptor/web.xml b/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
index 6be4073..3dcff7e 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/descriptor/web.xml
@@ -27,14 +27,14 @@
<display-name>ServletTest</display-name>
<servlet-name>ServletTest</servlet-name>
<servlet-class>test.ServletTest</servlet-class>
- </servlet>
+ </servlet>
<servlet-mapping>
<servlet-name>ServletTest</servlet-name>
<url-pattern>/ServletTest</url-pattern>
</servlet-mapping>
-
+
</web-app>
diff --git a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
index 2d4408c..d6f2fb5 100644
--- a/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/win2kLock/servlet/ServletTest.java
@@ -34,7 +34,7 @@
private ServletContext context;
private static String status = "Win2kLock:PASS";
-
+
public void init(ServletConfig config) throws ServletException {
super.init(config);
System.out.println("[Servlet.init]");
@@ -45,14 +45,14 @@
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("[Servlet.doPost]");
request.getSession().setAttribute("test","Win2kLock:PASS");
request.getSession().invalidate();
response.setContentType("text/html");
PrintWriter out = response.getWriter();
-
+
out.println(status);
}
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties b/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties
index 161cada..885bd75 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransport/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransport/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}-wrongProtocol"/>
+<property name="appname" value="${module}-wrongProtocol"/> \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="/wrongProtocol"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java b/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
index d05cba7..31f0435 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransport/src/main/java/wrongtransport/WrongTransport.java
@@ -94,7 +94,7 @@
report("delete-http-redirect", asadmin("delete-protocol",
"http-redirect"));
}
-
+
private void checkStatus(HttpURLConnection connection)
throws Exception {
int responseCode = connection.getResponseCode();
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties
index 6fcd4df..d64a501 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/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}-wrongProtocolTarget"/>
+<property name="appname" value="${module}-wrongProtocolTarget"/> \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="/wrongProtocolTarget"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
index 9f7119f..976de3a 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/build.xml
@@ -80,7 +80,7 @@
<target name="delete-cluster" depends="init-common">
<antcall target="delete-cluster-common"/>
</target>
-
+
<target name="usage">
<antcall target="usage-common"/>
</target>
diff --git a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
index 51776a5..0115af6 100644
--- a/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
+++ b/appserver/tests/appserv-tests/devtests/web/wrongTransportTarget/src/main/java/wrongtransporttarget/WrongTransport.java
@@ -102,7 +102,7 @@
report("delete-http-redirect", asadmin("delete-protocol", "--target", clusterName,
"http-redirect"));
}
-
+
private void checkStatus(HttpURLConnection connection)
throws Exception {
int responseCode = connection.getResponseCode();
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java b/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
index 00e6a96..17f2c1b 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/YassonTest.java
@@ -43,7 +43,7 @@
port = args[1];
contextRoot = args[2];
}
-
+
public static void main(String[] args) {
stat.addDescription("Unit test for GlassFish Issue 21922");
YassonTest yassonTest = new YassonTest(args);
@@ -51,8 +51,8 @@
stat.printSummary(TEST_NAME);
}
- public void doTest() {
- try {
+ public void doTest() {
+ try {
invoke();
stat.addStatus(TEST_NAME, stat.PASS);
} catch (Exception ex) {
@@ -62,7 +62,7 @@
}
private void invoke() throws Exception {
-
+
URL url = new URL("http://" + host + ":" + port + contextRoot
+ "/TransformToJson?parameter="
+ URLEncoder.encode(PARAMETER));
@@ -70,7 +70,7 @@
HttpURLConnection conn = (HttpURLConnection) url.openConnection();
conn.connect();
int responseCode = conn.getResponseCode();
- if (responseCode != 200) {
+ if (responseCode != 200) {
throw new Exception("Wrong response code. Expected: 200"
+ ", received: " + responseCode);
} else {
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/build.properties b/appserver/tests/appserv-tests/devtests/web/yasson/build.properties
index 93138a3..5d422e2 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/build.properties
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/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}-yasson-loaded"/>
diff --git a/appserver/tests/appserv-tests/devtests/web/yasson/build.xml b/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
index 726e03e..9a7592f 100644
--- a/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
+++ b/appserver/tests/appserv-tests/devtests/web/yasson/build.xml
@@ -40,7 +40,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"/>
@@ -48,10 +48,10 @@
</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"
@@ -63,7 +63,7 @@
<target name="deploy" depends="init-common">
<antcall target="deploy-war-common"/>
</target>
-
+
<target name="run" depends="init-common">
<java classname="YassonTest">
<arg value="${http.host}"/>
@@ -75,7 +75,7 @@
</classpath>
</java>
</target>
-
+
<target name="undeploy" depends="init-common">
<antcall target="undeploy-war-common"/>
</target>
