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/community/web/helloworld/build.xml b/appserver/tests/community/web/helloworld/build.xml
index a21bf41..76ebfce 100644
--- a/appserver/tests/community/web/helloworld/build.xml
+++ b/appserver/tests/community/web/helloworld/build.xml
@@ -20,38 +20,38 @@
<project name="hello-jsp" default="default" basedir=".">
<property file="build.properties"/>
<property file="${ws.root}/gfproject/${deploy.platform}-config.properties"/>
-
-
+
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
- <import file="${ws.root}/gfproject/build-impl.xml"/>
+ <import file="${ws.root}/gfproject/build-impl.xml"/>
<import file="${ws.root}/gfproject/${deploy.platform}-targets.xml"/>
-
+
<target name="all"/>
-
-
+
+
<target name="build">
<property name="war.file.ext" value="${war.file}.war"/>
<antcall target="build-impl"/>
</target>
-
+
<target name="deploy">
<antcall target="deploy-${deploy.platform}-impl">
<param name="deployed.app" value="${war.file}.war"/>
</antcall>
</target>
-
- <target name="runtest">
+
+ <target name="runtest">
<antcall target="runtest-impl">
<param name="contextroot" value="hellojsp"/>
<param name="testng.test.name" value="${testng.test.name}"/>
<param name="testng.testclient" value="HelloJSPTestNG"/>
</antcall>
-
+
</target>
-
+
<target name="undeploy">
<antcall target="undeploy-${deploy.platform}-impl"/>
</target>
-
-
+
+
</project>
diff --git a/appserver/tests/community/web/helloworld/metadata/web.xml b/appserver/tests/community/web/helloworld/metadata/web.xml
index 083301f..a23ba0b 100644
--- a/appserver/tests/community/web/helloworld/metadata/web.xml
+++ b/appserver/tests/community/web/helloworld/metadata/web.xml
@@ -32,7 +32,7 @@
<url-pattern>/simpleservlet</url-pattern>
</servlet-mapping>
<welcome-file-list>
- <welcome-file>hello.jsp</welcome-file>
+ <welcome-file>hello.jsp</welcome-file>
</welcome-file-list>
<login-config>
<auth-method>BASIC</auth-method>
@@ -42,6 +42,6 @@
<form-error-page></form-error-page>
</form-login-config>
</login-config>
-
+
</web-app>
diff --git a/appserver/tests/community/web/helloworld/src/java/HelloServlet.java b/appserver/tests/community/web/helloworld/src/java/HelloServlet.java
index 61f4288..8881a75 100644
--- a/appserver/tests/community/web/helloworld/src/java/HelloServlet.java
+++ b/appserver/tests/community/web/helloworld/src/java/HelloServlet.java
@@ -51,45 +51,45 @@
HttpServletResponse response)
throws IOException, ServletException {
- System.out.println("Servlet processing do get..");
+ System.out.println("Servlet processing do get..");
- response.setContentType("text/html");
- PrintWriter writer = response.getWriter();
+ response.setContentType("text/html");
+ PrintWriter writer = response.getWriter();
- writer.println("<html>");
- writer.println("<head>");
- writer.println("<title>Sample Application Servlet Page</title>");
- writer.println("</head>");
- writer.println("<body bgcolor=white>");
+ writer.println("<html>");
+ writer.println("<head>");
+ writer.println("<title>Sample Application Servlet Page</title>");
+ writer.println("</head>");
+ writer.println("<body bgcolor=white>");
- writer.println("<table border=\"0\">");
- writer.println("<tr>");
- writer.println("<td>");
- //writer.println("<img src=\"images/tomcat.gif\">");
- writer.println("</td>");
- writer.println("<td>");
- writer.println("<h1>Sample Application Servlet</h1>");
- writer.println("This is the output of a servlet that is part of");
- writer.println("the Hello, World application. It displays the");
- writer.println("request headers from the request we are currently");
- writer.println("processing.");
- writer.println("</td>");
- writer.println("</tr>");
- writer.println("</table>");
+ writer.println("<table border=\"0\">");
+ writer.println("<tr>");
+ writer.println("<td>");
+ //writer.println("<img src=\"images/tomcat.gif\">");
+ writer.println("</td>");
+ writer.println("<td>");
+ writer.println("<h1>Sample Application Servlet</h1>");
+ writer.println("This is the output of a servlet that is part of");
+ writer.println("the Hello, World application. It displays the");
+ writer.println("request headers from the request we are currently");
+ writer.println("processing.");
+ writer.println("</td>");
+ writer.println("</tr>");
+ writer.println("</table>");
- writer.println("<table border=\"0\" width=\"100%\">");
- Enumeration names = request.getHeaderNames();
- while (names.hasMoreElements()) {
- String name = (String) names.nextElement();
- writer.println("<tr>");
- writer.println(" <th align=\"right\">" + name + ":</th>");
- writer.println(" <td>" + request.getHeader(name) + "</td>");
- writer.println("</tr>");
- }
- writer.println("</table>");
+ writer.println("<table border=\"0\" width=\"100%\">");
+ Enumeration names = request.getHeaderNames();
+ while (names.hasMoreElements()) {
+ String name = (String) names.nextElement();
+ writer.println("<tr>");
+ writer.println(" <th align=\"right\">" + name + ":</th>");
+ writer.println(" <td>" + request.getHeader(name) + "</td>");
+ writer.println("</tr>");
+ }
+ writer.println("</table>");
- writer.println("</body>");
- writer.println("</html>");
+ writer.println("</body>");
+ writer.println("</html>");
}
diff --git a/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java b/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
index b340dd1..b14e39c 100644
--- a/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
+++ b/appserver/tests/community/web/helloworld/src/test/HelloJSPTestNG.java
@@ -34,13 +34,13 @@
private static final String TEST_NAME =
"simple-webapp-jspservlet-noresource";
-
+
private String strContextRoot="hellojsp";
static String result = "";
String host=System.getProperty("http.host");
String port=System.getProperty("http.port");
-
+
/*
*If two asserts are mentioned in one method, then last assert is taken in
*to account.
@@ -52,9 +52,9 @@
@Test(groups ={ "pulse"} ) // test method
//public void webtest(String host, String port, String contextroot) throws Exception{
public void simpleJSPTestPage() throws Exception{
-
+
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/hello.jsp";
System.out.println("URL is: "+testurl);
@@ -70,20 +70,20 @@
String line = null;
boolean result=false;
- String testLine = null;
- String EXPECTED_RESPONSE ="JSP Test Page";
+ String testLine = null;
+ String EXPECTED_RESPONSE ="JSP Test Page";
while ((line = input.readLine()) != null) {
if(line.indexOf(EXPECTED_RESPONSE)!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
@@ -93,9 +93,9 @@
@Test(groups={"pulse"}) //test method for server
public void testServerRunning() throws Exception{
- //Your server is up and running!
- //
- String testurl = "http://" + host + ":" + port;
+ //Your server is up and running!
+ //
+ String testurl = "http://" + host + ":" + port;
System.out.println("URL is: "+testurl);
URL url = new URL(testurl);
echo("Connecting to: " + url.toString());
@@ -103,12 +103,12 @@
conn.connect();
int responseCode = conn.getResponseCode();
- InputStream is = conn.getInputStream();
+ InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
echo(line);
if(line.indexOf("Your Application Server is now running")!=-1){
@@ -116,17 +116,17 @@
testLine = line;
echo(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
}
-
-
+
+
@Test(groups ={ "pulse"} ) // test method
public void staticHTMLPageTest() throws Exception{
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/first.html";
System.out.println("URL is: "+testurl);
@@ -143,30 +143,30 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Welcome to HTML Test Program")!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
-
+
@Test(groups ={ "pulse"} ) // test method
public void simpleServletTest() throws Exception{
try{
-
+
String testurl = "http://" + host + ":" + port + "/"+ strContextRoot + "/simpleservlet";
System.out.println("URL is: "+testurl);
@@ -182,24 +182,24 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Sample Application Servlet")!=-1){
result=true;
testLine = line;
echo(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
public static void echo(String msg) {
diff --git a/appserver/tests/community/web/jsfastrologer/build.xml b/appserver/tests/community/web/jsfastrologer/build.xml
index 9960a55..e63f704 100644
--- a/appserver/tests/community/web/jsfastrologer/build.xml
+++ b/appserver/tests/community/web/jsfastrologer/build.xml
@@ -18,37 +18,37 @@
-->
<project name="jsfbasic-jsp" default="default" basedir=".">
-
+
<property file="build.properties"/>
<property file="${ws.root}/gfproject/${deploy.platform}-config.properties"/>
-
-
+
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
- <import file="${ws.root}/gfproject/build-impl.xml"/>
+ <import file="${ws.root}/gfproject/build-impl.xml"/>
<import file="${ws.root}/gfproject/${deploy.platform}-targets.xml"/>
-
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
<!-- <import file="nbproject/build-impl.xml"/>-->
-
+
<target name="build">
<property name="war.file.ext" value="${war.file}.war"/>
<antcall target="build-impl"/>
</target>
-
+
<target name="deploy">
<antcall target="deploy-${deploy.platform}-impl">
<param name="deployed.app" value="${war.file}.war"/>
</antcall>
</target>
-
- <target name="runtest">
+
+ <target name="runtest">
<antcall target="runtest-impl">
<param name="testng.test.name" value="${testng.test.name}"/>
<param name="testng.testclient" value="JSFWebTestNG"/>
</antcall>
-
+
</target>
-
+
<target name="undeploy">
<antcall target="undeploy-${deploy.platform}-impl"/>
</target>
@@ -57,5 +57,5 @@
-
+
</project>
diff --git a/appserver/tests/community/web/jsfastrologer/metadata/faces-config.xml b/appserver/tests/community/web/jsfastrologer/metadata/faces-config.xml
index 299cd4d..cb9bb26 100644
--- a/appserver/tests/community/web/jsfastrologer/metadata/faces-config.xml
+++ b/appserver/tests/community/web/jsfastrologer/metadata/faces-config.xml
@@ -42,5 +42,5 @@
<managed-bean-class>web.jsf.bean.UserBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
+
</faces-config>
diff --git a/appserver/tests/community/web/jsfastrologer/metadata/web.xml b/appserver/tests/community/web/jsfastrologer/metadata/web.xml
index 67504d6..e7a78ee 100644
--- a/appserver/tests/community/web/jsfastrologer/metadata/web.xml
+++ b/appserver/tests/community/web/jsfastrologer/metadata/web.xml
@@ -45,7 +45,7 @@
</session-timeout>
</session-config>
<welcome-file-list>
- <welcome-file>
+ <welcome-file>
index.jsp
</welcome-file>
<welcome-file>
diff --git a/appserver/tests/community/web/jsfastrologer/src/java/web/jsf/bean/UserBean.java b/appserver/tests/community/web/jsfastrologer/src/java/web/jsf/bean/UserBean.java
index e13e9ab..9640558 100644
--- a/appserver/tests/community/web/jsfastrologer/src/java/web/jsf/bean/UserBean.java
+++ b/appserver/tests/community/web/jsfastrologer/src/java/web/jsf/bean/UserBean.java
@@ -26,10 +26,10 @@
package web.jsf.bean;
public class UserBean {
-
+
private String name;
private String birthday;
-
+
/** Creates a new instance of UserBean */
public UserBean() {
}
@@ -49,5 +49,5 @@
public void setBirthday(String birthday) {
this.birthday = birthday;
}
-
+
}
diff --git a/appserver/tests/community/web/jsfastrologer/src/test/JSFWebTestNG.java b/appserver/tests/community/web/jsfastrologer/src/test/JSFWebTestNG.java
index 94db22e..5b3c425 100644
--- a/appserver/tests/community/web/jsfastrologer/src/test/JSFWebTestNG.java
+++ b/appserver/tests/community/web/jsfastrologer/src/test/JSFWebTestNG.java
@@ -39,21 +39,21 @@
private static final String EXPECTED_RESPONSE =
"JSP Page Test";
-
+
private String strContextRoot="jsfastrologer";
static String result = "";
String m_host="";
- String m_port="";
+ String m_port="";
//HttpClient httpclient = new HttpClient();
-
+
//@Parameters({"host","port"})
@BeforeMethod
public void beforeTest(){
m_host=System.getProperty("http.host");
m_port=System.getProperty("http.port");
}
-
+
/*
*If tw
o asserts are mentioned in one method, then last assert is taken in
@@ -65,7 +65,7 @@
@Test(groups ={ "pulse"} ) // test method
//public void webtest(String host, String port, String contextroot) throws Exception{
public void jsfAppDeployedFirstPagetest() throws Exception{
-
+
try{
System.out.println("Running TestMethod webtest");
@@ -83,33 +83,33 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Welcome to jAstrologer")!=-1){
- result=true;
+ result=true;
testLine = line;
-
+
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
}
-
-
+
+
@Test(groups ={ "pulse"} ) // test method
public void jsfIndexPageBasicTest() throws Exception{
try{
-
+
System.out.println("Running TestMethod SimpleHTMLTest");
-
+
String testurl = "http://" + m_host + ":" + m_port + "/"+ strContextRoot + "/index.jsp";
System.out.println("URL is: "+testurl);
@@ -119,36 +119,36 @@
conn.connect();
int responseCode = conn.getResponseCode();
-
+
InputStream is = conn.getInputStream();
BufferedReader input = new BufferedReader(new InputStreamReader(is));
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("JavaServer Faces Greetings Page")!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true);
-
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
public static void echo(String msg) {
System.out.println(msg);
}
-
-
+
+
/*
@Test(groups={"pulse"})
public void testRequestResponse() throws Exception{
@@ -164,34 +164,34 @@
httpget = new GetMethod(testurl);
post=new PostMethod("http://localhost:8080/jsfastrologer/faces/greetings.jsp");
-
+
NameValuePair[] mydata = {
// new NameValuePair("loginID", itUser),
// new NameValuePair("password", itPwd), Not working for editing of bug
-
+
new NameValuePair("name",name),
new NameValuePair("birthday",birthday)
};
-
+
post.setRequestBody(mydata);
int statusCode = httpclient.executeMethod(post);
System.out.println("print status ok "+statusCode);
Assert.assertEquals(statusCode, 200);
-
+
if (statusCode != HttpStatus.SC_OK) {
System.err.println("Method failed: " + post.getStatusLine());
}
post.getStatusLine();
-
+
String response=post.getResponseBodyAsString();
System.out.println(response);
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
*/
diff --git a/appserver/tests/community/web/jsfinjection/build.xml b/appserver/tests/community/web/jsfinjection/build.xml
index 16d2f99..e68c32a 100644
--- a/appserver/tests/community/web/jsfinjection/build.xml
+++ b/appserver/tests/community/web/jsfinjection/build.xml
@@ -20,39 +20,39 @@
<project name="jsfinjection" default="default" basedir=".">
<property file="build.properties"/>
<property file="${ws.root}/gfproject/${deploy.platform}-config.properties"/>
-
-
+
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
- <import file="${ws.root}/gfproject/build-impl.xml"/>
+ <import file="${ws.root}/gfproject/build-impl.xml"/>
<import file="${ws.root}/gfproject/${deploy.platform}-targets.xml"/>
-
+
<target name="all"/>
-
-
+
+
<target name="build">
<property name="war.file.ext" value="${war.file}.war"/>
<antcall target="build-impl"/>
</target>
-
+
<target name="deploy">
<antcall target="deploy-${deploy.platform}-impl">
<param name="deployed.app" value="${war.file}.war"/>
</antcall>
</target>
-
- <target name="runtest">
+
+ <target name="runtest">
<!-- ADD htmlunit CLASSPATH -->
<antcall target="runtest-impl">
<param name="contextroot" value="hellomy"/>
<param name="testng.test.name" value="${testng.test.name}"/>
<param name="testng.testclient" value="JSFInjectionTestNG"/>
</antcall>
-
+
</target>
-
+
<target name="undeploy">
<antcall target="undeploy-${deploy.platform}-impl"/>
</target>
-
-
+
+
</project>
diff --git a/appserver/tests/community/web/jsfinjection/metadata/faces-config.xml b/appserver/tests/community/web/jsfinjection/metadata/faces-config.xml
index 95ee5c4..d70ecd8 100644
--- a/appserver/tests/community/web/jsfinjection/metadata/faces-config.xml
+++ b/appserver/tests/community/web/jsfinjection/metadata/faces-config.xml
@@ -27,5 +27,5 @@
<managed-bean-class>jsfinjection.TestBean</managed-bean-class>
<managed-bean-scope>request</managed-bean-scope>
</managed-bean>
-
+
</faces-config>
diff --git a/appserver/tests/community/web/jsfinjection/src/java/FilterTest.java b/appserver/tests/community/web/jsfinjection/src/java/FilterTest.java
index 898240a..0e80129 100644
--- a/appserver/tests/community/web/jsfinjection/src/java/FilterTest.java
+++ b/appserver/tests/community/web/jsfinjection/src/java/FilterTest.java
@@ -23,15 +23,15 @@
import javax.naming.*;
public class FilterTest implements Filter{
-
+
private ServletContext context;
private @Resource(name="jdbc/__default") DataSource ds;
// private DataSource ds;
-
+
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]");
@@ -58,13 +58,13 @@
((HttpServletRequest)request).getSession().setAttribute("FILTER", msg);
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/community/web/jsfinjection/src/test/JSFInjectionTestNG.java b/appserver/tests/community/web/jsfinjection/src/test/JSFInjectionTestNG.java
index 4024e37..420b5d0 100644
--- a/appserver/tests/community/web/jsfinjection/src/test/JSFInjectionTestNG.java
+++ b/appserver/tests/community/web/jsfinjection/src/test/JSFInjectionTestNG.java
@@ -34,13 +34,13 @@
private static final String TEST_NAME =
"simple-webapp-jsf-injection";
-
+
private String strContextRoot="jsfinjection";
static String result = "";
String host=System.getProperty("http.host");
String port=System.getProperty("http.port");
-
+
/*
*If two asserts are mentioned in one method, then last assert is taken in
*to account.
@@ -51,7 +51,7 @@
//@Parameters({ "host", "port", "contextroot" })
@Test(groups ={ "pulse"} ) // test method
public void injectedValuesTestPage() throws Exception {
-
+
try {
String errorText = "";
@@ -77,8 +77,8 @@
String line = null;
String line2 = null;
boolean result=false;
- String EXPECTED_RESPONSE = "Injected entry";
- String DIVIDER = "===";
+ String EXPECTED_RESPONSE = "Injected entry";
+ String DIVIDER = "===";
while ((line = input.readLine()) != null) {
//echo (line);
if (line.indexOf(EXPECTED_RESPONSE)!= -1) {
@@ -101,7 +101,7 @@
String injectedNumber = injection2Array[1].trim();
echo("injectedNumber = " + injectedNumber);
int num = Integer.parseInt(injectedNumber);
-
+
if ( num < 0 ) {
echo("ERROR: injection 2 is less than zero.");
errorText = errorText + "ERROR: injection 2 is less than zero";
@@ -116,7 +116,7 @@
}
Assert.assertEquals(testPass, true, errorText);
-
+
}catch(Exception e){
echo("ERROR: caught exception!");
e.printStackTrace();
diff --git a/appserver/tests/community/web/strutsbasic/build.xml b/appserver/tests/community/web/strutsbasic/build.xml
index f71634e..7ad4b3e 100644
--- a/appserver/tests/community/web/strutsbasic/build.xml
+++ b/appserver/tests/community/web/strutsbasic/build.xml
@@ -19,14 +19,14 @@
<project name="struts-jsp" default="default" basedir=".">
<property file="build.properties"/>
-
+
<property file="${ws.root}/gfproject/${deploy.platform}-config.properties"/>
-
-
+
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
- <import file="${ws.root}/gfproject/build-impl.xml"/>
+ <import file="${ws.root}/gfproject/build-impl.xml"/>
<import file="${ws.root}/gfproject/${deploy.platform}-targets.xml"/>
-
+
<description>Builds, tests, and runs the project Hello JSP Application</description>
<!-- <import file="nbproject/build-impl.xml"/>-->
@@ -35,21 +35,21 @@
<property name="add.struts.jar" value="true"/>
<antcall target="build-impl"/>
</target>
-
+
<target name="deploy">
<antcall target="deploy-${deploy.platform}-impl">
<param name="deployed.app" value="${war.file}.war"/>
</antcall>
</target>
-
- <target name="runtest">
+
+ <target name="runtest">
<antcall target="runtest-impl">
<param name="testng.test.name" value="${testng.test.name}"/>
<param name="testng.testclient" value="StrutsWebTestNG"/>
</antcall>
-
+
</target>
-
+
<target name="undeploy">
<antcall target="undeploy-${deploy.platform}-impl"/>
</target>
diff --git a/appserver/tests/community/web/strutsbasic/metadata/struts-config.xml b/appserver/tests/community/web/strutsbasic/metadata/struts-config.xml
index affded1..0431828 100644
--- a/appserver/tests/community/web/strutsbasic/metadata/struts-config.xml
+++ b/appserver/tests/community/web/strutsbasic/metadata/struts-config.xml
@@ -24,11 +24,11 @@
<struts-config>
<form-beans>
-
+
</form-beans>
-
+
<global-exceptions>
-
+
</global-exceptions>
<global-forwards>
@@ -38,11 +38,11 @@
<action-mappings>
<action path="/Welcome" forward="/welcomeStruts.jsp"/>
</action-mappings>
-
+
<controller processorClass="org.apache.struts.tiles.TilesRequestProcessor"/>
- <message-resources parameter="ApplicationResource"/>
-
+ <message-resources parameter="ApplicationResource"/>
+
<!-- ========================= Tiles plugin ===============================-->
<!--
This plugin initialize Tiles definition factory. This later can takes some
@@ -71,15 +71,15 @@
Paths found in Tiles definitions are relative to the main context.
-->
<plug-in className="org.apache.struts.tiles.TilesPlugin" >
- <set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml" />
+ <set-property property="definitions-config" value="/WEB-INF/tiles-defs.xml" />
<set-property property="moduleAware" value="true" />
</plug-in>
-
+
<!-- ========================= Validator plugin ================================= -->
<plug-in className="org.apache.struts.validator.ValidatorPlugIn">
<set-property
property="pathnames"
value="/WEB-INF/validator-rules.xml,/WEB-INF/validation.xml"/>
</plug-in>
-
+
</struts-config>
diff --git a/appserver/tests/community/web/strutsbasic/metadata/web.xml b/appserver/tests/community/web/strutsbasic/metadata/web.xml
index a7a97af..58e3725 100644
--- a/appserver/tests/community/web/strutsbasic/metadata/web.xml
+++ b/appserver/tests/community/web/strutsbasic/metadata/web.xml
@@ -45,7 +45,7 @@
</session-timeout>
</session-config>
<welcome-file-list>
- <welcome-file>
+ <welcome-file>
index.jsp
</welcome-file>
</welcome-file-list>
diff --git a/appserver/tests/community/web/strutsbasic/src/test/StrutsWebTestNG.java b/appserver/tests/community/web/strutsbasic/src/test/StrutsWebTestNG.java
index 078f729..d985406 100644
--- a/appserver/tests/community/web/strutsbasic/src/test/StrutsWebTestNG.java
+++ b/appserver/tests/community/web/strutsbasic/src/test/StrutsWebTestNG.java
@@ -34,7 +34,7 @@
private static final String EXPECTED_RESPONSE =
"JSP Page Test";
-
+
private String strContextRoot="strutsbasic";
static String result = "";
@@ -42,7 +42,7 @@
String m_port="";
String host=System.getProperty("http.host");
String port=System.getProperty("http.port");
-
+
//@Parameters({"host","port"})
@BeforeMethod
//public void beforeTest(String httpHost,String httpPort){
@@ -52,7 +52,7 @@
System.out.println("Host is-->"+m_host);
System.out.println("Port is-->"+m_port);
}
-
+
/*
*If two asserts are mentioned in one method, then last assert is taken in
*to account.
@@ -63,9 +63,9 @@
@Test(groups ={ "pulse"} ) // test method
//public void webtest(String host, String port, String contextroot) throws Exception{
public void strutsAppDeployedtest() throws Exception{
-
+
try{
-
+
String testurl = "http://" + m_host + ":" + m_port + "/"+ strContextRoot + "/index.jsp";
System.out.println("URL is: "+testurl);
@@ -80,31 +80,31 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Struts Welcome Page")!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
}
-
-
+
+
@Test(groups ={ "pulse"} ) // test method
public void strutsBasicHTMLTest() throws Exception{
try{
-
+
String testurl = "http://" + m_host + ":" + m_port + "/"+ strContextRoot + "/Welcome.do";
System.out.println("URL is: "+testurl);
@@ -119,24 +119,24 @@
String line = null;
boolean result=false;
- String testLine = null;
+ String testLine = null;
while ((line = input.readLine()) != null) {
if(line.indexOf("Struts Applications in Netbeans!")!=-1){
result=true;
testLine = line;
System.out.println(testLine);
}
-
- }
-
+
+ }
+
Assert.assertEquals(result, true,"Unexpected HTML");
-
-
+
+
}catch(Exception e){
e.printStackTrace();
throw new Exception(e);
}
-
+
}
public static void echo(String msg) {
