geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r982456 - in /geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src: main/java/org/apache/geronimo/testsuite/servlet3/app/ main/webapp/ main/webapp/WEB-INF/ test/java/org/apache/geronimo/testsuite/servlet...
Date Thu, 05 Aug 2010 02:52:15 GMT
Author: xiaming
Date: Thu Aug  5 02:52:14 2010
New Revision: 982456

URL: http://svn.apache.org/viewvc?rev=982456&view=rev
Log:
GERONIMO-5471 more test cases about @WebInitParam and @MultipartConfig provided by Wang Guang Zhe

Added:
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt   (with props)
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt   (with props)
Modified:
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java
    geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AsyncServlet.java Thu Aug  5 02:52:14 2010
@@ -41,7 +41,7 @@ public class AsyncServlet extends HttpSe
         out.println("</head>");
         out.println("<body>");
         out.println("<p id=a>");
-		out.println("Servlet starts at: " + new Date() + ".");
+		out.println("Servlet starts at: " + "<font color=red><b id=sst>" + new Date() + "</b></font>" + ".");
         out.println("</p>");
 		out.println("<br><br>");
 
@@ -51,7 +51,7 @@ public class AsyncServlet extends HttpSe
 		new Thread(new TaskExecutor(ctx)).start();
 		
 		out.println("<p id=b>");
-		out.println("Task assigned to executor.Servlet ends at: " + new Date() + ".");
+		out.println("Task assigned to executor.Servlet fineshes at: " + "<font color=red><b id=sft>" + new Date() + "</b></font>" + ".");
         out.println("</p>");
 		out.println("<br><br>");
 		out.flush();

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java Thu Aug  5 02:52:14 2010
@@ -0,0 +1,158 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.testsuite.servlet3.app;
+
+import java.io.IOException;
+import java.util.Collection;
+
+import javax.servlet.Filter;
+import javax.servlet.FilterChain;
+import javax.servlet.FilterConfig;
+import javax.servlet.ServletException;
+import javax.servlet.ServletRequest;
+import javax.servlet.ServletResponse;
+import javax.servlet.annotation.WebFilter;
+import javax.servlet.annotation.MultipartConfig;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.Part;
+
+/**
+ * Servlet implementation class FileUploadFilter
+ */
+@WebFilter(filterName = "FileUploadFilterWa", urlPatterns = { "/showServletWa" })
+@MultipartConfig(location = "c:\\data")
+public class FileUploadFilterWithAnnotation implements Filter {
+	private static final long serialVersionUID = 1L;
+	private FilterConfig filterConfig;
+
+	public FileUploadFilterWithAnnotation() {
+	}
+
+	@Override
+	public void destroy() {
+		// TODO Auto-generated method stub
+
+	}
+
+	@Override
+	public void doFilter(ServletRequest request, ServletResponse response,
+			FilterChain chain) throws IOException, ServletException {
+		// TODO Auto-generated method stub
+
+		String message = "";
+		HttpServletRequest httpServletRequest = null;
+		if (request instanceof HttpServletRequest) {
+			httpServletRequest = (HttpServletRequest) request;
+			message += "<p>" + "Http Servlet Request content type: "
+					+ httpServletRequest.getContentType() + "</p><br>";
+		}
+
+		Collection<Part> parts = httpServletRequest.getParts();
+		if (!parts.isEmpty()) {
+			int i = 0;
+			for (Part apart : parts) {
+				message += "<p>" + (++i) + ". Name=" + apart.getName()
+						+ ";ContentType=" + apart.getContentType() + ";Size="
+						+ apart.getSize() + "</p><br>";
+			}
+		} else {
+			message += "<p><b>HttpServletRequest.getParts() returns an empty collection!</b></p><br>";
+		}
+
+		// Throwable problem = null;
+		try {
+			Part p = ((HttpServletRequest) request).getPart("testFile");
+			if (null != p) {
+				String part = p.toString();
+				String pname = p.getName();
+				long size = p.getSize();
+				String contentType = p.getContentType();
+				if (size > 10000) {
+					message += "The file size is "
+							+ size
+							+ "b, it's filterd because the file size is limited to 10 kb";
+				} else {
+					message += "<font color=green><b>Part:</b> </font>"
+							+ part
+							+ "<br><font color=green><b>Part Name:</b> </font>"
+							+ pname
+							+ "<br><font color=green><b>Size:</b> </font>"
+							+ size
+							+ "<br><font color=green><b>ContentType:</b> </font>"
+							+ contentType
+							+ "<br><font color=green><b>HeadNames:</b> </font>";
+					for (String name : p.getHeaderNames()) {
+						message += name + ";";
+					}
+					java.io.InputStreamReader in = new java.io.InputStreamReader(
+							p.getInputStream());
+					String content = "";
+					int c = in.read();
+					while (c != -1) {
+						if (c == '\n') {
+							content += "<br>";
+						}
+						content += (char) c;
+						c = in.read();
+					}
+					if (content.equals("")) {
+						message += "<br> Sorry, this is not a plain text, so we can not display it.";
+					} else {
+						message += "<br><font color=green><b>The text file content is:</b></font><br>"
+								+ content;
+						message += "<hr>";
+					}
+				}
+			} else {
+				message += "<p><b>HttpServletRequest.getPart(String name) returns null!</b></p><br>";
+			}
+			request.setAttribute("message", message);
+			chain.doFilter(request, response);
+
+			// request.getRequestDispatcher("/showServlet").forward(request,
+			// response);
+		} catch (Throwable t) {
+			// problem = t;
+			// t.printStackTrace();
+		}
+
+	}
+
+	@Override
+	public void init(FilterConfig filterConfig) throws ServletException {
+		// TODO Auto-generated method stub
+		this.filterConfig = filterConfig;
+
+	}
+
+	@Override
+	public String toString() {
+		if (filterConfig == null) {
+			return ("MessageFilter()");
+		}
+		StringBuffer sb = new StringBuffer("MessageFilter()");
+		sb.append(filterConfig);
+		sb.append(")");
+		return (sb.toString());
+	}
+
+	public void log(String msg) {
+		filterConfig.getServletContext().log(msg);
+	}
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileUploadFilterWithAnnotation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java Thu Aug  5 02:52:14 2010
@@ -0,0 +1,94 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.testsuite.servlet3.app;
+
+import java.io.IOException;
+import java.io.PrintWriter;
+import javax.servlet.ServletException;
+import javax.servlet.annotation.WebServlet;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+/**
+ * Servlet implementation class ShowServlet
+ */
+@WebServlet(name = "showServletWa", urlPatterns = { "/showServletWa" })
+public class ShowServletWithAnnotation extends HttpServlet {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * @see HttpServlet#HttpServlet()
+	 */
+	public ShowServletWithAnnotation() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	protected void processRequest(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		response.setContentType("text/html;charset=UTF-8");
+		PrintWriter out = response.getWriter();
+
+		try {
+			out.println("<html>");
+			out.println("<head>");
+			out.println("<title>File Upload System</title>");
+			out.println("</head>");
+			out.println("<body>");
+			out.println("<h2><font color=\"green\">A listener is dectecting online person number.</font></h2>");
+			String message = request.getAttribute("message").toString();
+			if (message.indexOf("returns null!") < 0) {
+				out.println("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
+			}
+			out.println(message + "<br/>");
+			out.println("</body>");
+			out.println("</html>");
+
+		} finally {
+			out.close();
+		}
+	}
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		processRequest(request, response);
+
+	}
+
+	/**
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		processRequest(request, response);
+	}
+
+	@Override
+	public String getServletInfo() {
+		return "Short description";
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/TaskExecutor.java Thu Aug  5 02:52:14 2010
@@ -43,7 +43,7 @@ public class TaskExecutor implements Run
 			e.printStackTrace();
 		}
 		out.println("<p id=c>");
-		out.println("TaskExecutor starts at: " + new Date() + "." + "Task stars executing" + ".");
+		out.println("TaskExecutor starts at: " + "<font color=red><b id=tst>" + new Date() + "</b></font>" + "." + "Task stars executing" + ".");
 		out.println("</p>");
 		out.println("<br><br>");
 		out.flush();
@@ -57,7 +57,7 @@ public class TaskExecutor implements Run
 		out.println("Task finishes.");
 		out.println("</p>");
 		out.println("<p>");
-		out.println("TaskExecutor ends at: " + new Date() + ".");
+		out.println("TaskExecutor fineshes at: " + "<font color=red><b id=tft>" + new Date() + "</b></font>" + ".");
 		out.println("</p>");
 		out.println("<br><br>");
         out.println("</body>");

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java Thu Aug  5 02:52:14 2010
@@ -0,0 +1,71 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.testsuite.servlet3.app;
+
+import java.io.IOException;
+
+import javax.servlet.RequestDispatcher;
+import javax.servlet.ServletException;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.annotation.*;
+
+/**
+ * Servlet implementation class TestWebInitParam
+ */
+@WebServlet(value = "/webInitParam", initParams = { @WebInitParam(name = "foo", value = "Hello World!") })
+public class WebInitParamSample extends HttpServlet {
+	private static final long serialVersionUID = 1L;
+
+	/**
+	 * @see HttpServlet#HttpServlet()
+	 */
+	public WebInitParamSample() {
+		super();
+		// TODO Auto-generated constructor stub
+	}
+
+	/**
+	 * @see HttpServlet#doGet(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	protected void doGet(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		response.setContentType("text/html;charset=UTF-8");
+		request.setAttribute("output", getInitParameter("foo"));
+		RequestDispatcher view = request
+				.getRequestDispatcher("webinitparam.jsp");
+		view.forward(request, response);
+
+	}
+
+	/**
+	 * @see HttpServlet#doPost(HttpServletRequest request, HttpServletResponse
+	 *      response)
+	 */
+	protected void doPost(HttpServletRequest request,
+			HttpServletResponse response) throws ServletException, IOException {
+		// TODO Auto-generated method stub
+		doGet(request, response);
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/WEB-INF/web.xml Thu Aug  5 02:52:14 2010
@@ -24,7 +24,7 @@
 
     <description>test-3.0-servlet Servlet Sample</description>
     <welcome-file-list>
-        <welcome-file>index.html</welcome-file>
+        <welcome-file>index.jsp</welcome-file>
     </welcome-file-list>
         <servlet>
         <servlet-name>WelcomePage</servlet-name>

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp Thu Aug  5 02:52:14 2010
@@ -0,0 +1,48 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
+<html>
+<head>
+  <title>Sample for test-3.0-servlet</title>
+  <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
+</head>
+
+<body>
+  <font face="Verdana, Helvetica, Arial">  
+	<br />
+	<a href="./sample-docu-cv.jsp" id="cviewer">Test Annotations and ServletContextListener.</a>
+	<br />
+	<a href="./selectFile.jsp" id="fileupload">Test File Upload.</a>
+	<br />
+	<a href="./jarresource.jsp" id="jarresource">Test Access Jar Resource.</a>
+	<br />
+	<a href="./async" id="async">Test AsyncServlet.</a>
+	<br />
+    <a href="./add" id="add">Test Add Servlet Mapping through ServletContainerInitializer.</a>
+    <br />
+    <a href="./WelcomePage" id="welcome">Test WebFragment.</a>
+    <br />
+    <a href="./webInitParam" id="webInitParam">Test Annotation @WebInitParam.</a>
+    <br />
+    <a href="./mulitipartannotation.html" id="multiAnnotation">Test Annotation @MultiPart.</a>
+    
+  </font>
+</body>
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html Thu Aug  5 02:52:14 2010
@@ -0,0 +1,43 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"
+    "http://www.w3.org/TR/html4/loose.dtd">
+
+<html>
+    <head>
+        <meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+        <title>form Page</title>
+    </head>
+    <body>
+        <form action="showServletWa" method="post" enctype="multipart/form-data">
+            <h2>This File Upload system demonstrates following new features.</h2>
+            <ul>
+                <li>Better file upload support in JavaEE6.</li>
+                <li>Use <b>@WebFilter</b> to register a filter.</li>
+                <li>Use <b>@WebListener</b> to register a listener.</li>
+                <li>Use <b>@WebServlet</b> to register servlet.</li>
+            </ul>
+            <h2>Try to upload a file less then <font color="green"><b>10kb</b></font>,Otherwise,it will be filtered and you could not see the detail information.</h2>
+            <hr>
+            <input name="testFile" type="file"/>
+            <br/>
+            <input type="submit" value="Submit The File!" />
+        </form>
+    </body>
+</html>

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/mulitipartannotation.html
------------------------------------------------------------------------------
    svn:mime-type = text/html

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp Thu Aug  5 02:52:14 2010
@@ -0,0 +1,37 @@
+<!--
+    Licensed to the Apache Software Foundation (ASF) under one
+    or more contributor license agreements.  See the NOTICE file
+    distributed with this work for additional information
+    regarding copyright ownership.  The ASF licenses this file
+    to you under the Apache License, Version 2.0 (the
+    "License"); you may not use this file except in compliance
+    with the License.  You may obtain a copy of the License at
+    
+     http://www.apache.org/licenses/LICENSE-2.0
+    
+    Unless required by applicable law or agreed to in writing,
+    software distributed under the License is distributed on an
+    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+    KIND, either express or implied.  See the License for the
+    specific language governing permissions and limitations
+    under the License.
+-->
+<%@ page import = "java.util.*" language="java" contentType="text/html; charset=ISO-8859-1"
+    pageEncoding="ISO-8859-1"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=ISO-8859-1">
+<title>Welcome TO Apache Geronimo Sample Application</title>
+</head>
+<body>
+	<h1 align = "center">Welcome To Apache Geronimo Sample Application</h1>
+	<p>
+	<h2>
+	<% 
+		String output = (String)request.getAttribute("output");
+		out.println(output);
+	%>
+	</h2>
+</body>
+</html>
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAnnotationsAndServletContextListener.java Thu Aug  5 02:52:14 2010
@@ -16,32 +16,30 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
- 
+
 package org.apache.geronimo.testsuite.servlet3;
 
 import org.testng.annotations.Test;
 
 import org.apache.geronimo.testsupport.SeleniumTestSupport;
 
-public class TestAnnotationsAndServletContextListener extends SeleniumTestSupport{
+public class TestAnnotationsAndServletContextListener extends
+		SeleniumTestSupport {
 
 	@Test
 	public void testNewServletAnnotationsNullClass() throws Exception {
-		//System.out.println("Start testing!");
+		// System.out.println("Start testing!");
 		String appContextStr = System.getProperty("appContext");
 		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
 		selenium.click("link=Test Annotations and ServletContextListener.");
 		waitForPageLoad();
-
 		selenium.click("//input[@type='submit']");
 		waitForPageLoad();
 		assertEquals("Class Viewer Servlet", selenium.getTitle());
-		assertEquals("Message:", selenium
-				.getText("xpath=/html/body/font[1]/b"));
+		assertEquals("Message:", selenium.getText("xpath=/html/body/font[1]/b"));
 		assertEquals(
-						"You have input nothing.We set it to the default class :java.lang.Integer.\nThe class java.lang.Integer is valid.The detail information is:",
-						selenium.getText("xpath=/html/body/font[2]/b"));
+				"You have input nothing.We set it to the default class :java.lang.Integer.\nThe class java.lang.Integer is valid.The detail information is:",
+				selenium.getText("xpath=/html/body/font[2]/b"));
 		assertTrue(selenium.isTextPresent("ClassName:"));
 		assertTrue(selenium.isTextPresent("java.lang.Integer"));
 		assertTrue(selenium.isTextPresent("Extends:"));
@@ -49,42 +47,57 @@ public class TestAnnotationsAndServletCo
 		assertTrue(selenium.isTextPresent("Implements:"));
 		assertTrue(selenium.isTextPresent("interface java.lang.Comparable"));
 		assertTrue(selenium.isTextPresent("Methods:"));
-		assertTrue(selenium.isTextPresent("public static int java.lang.Integer.numberOfLeadingZeros(int)"));
-		assertTrue(selenium.isTextPresent("public static int java.lang.Integer.numberOfTrailingZeros(int)"));
-		assertTrue(selenium.isTextPresent("public static int java.lang.Integer.bitCount(int)"));
-		assertTrue(selenium.isTextPresent("public boolean java.lang.Integer.equals(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public static java.lang.String java.lang.Integer.toString(int,int)"));
-		assertTrue(selenium.isTextPresent("public static java.lang.String java.lang.Integer.toString(int)"));
-		assertTrue(selenium.isTextPresent("public java.lang.String java.lang.Integer.toString()"));
-		assertTrue(selenium.isTextPresent("public int java.lang.Integer.hashCode()"));
-		assertTrue(selenium.isTextPresent("public static int java.lang.Integer.reverseBytes(int)"));
-		assertTrue(selenium.isTextPresent("public int java.lang.Integer.compareTo(java.lang.Integer)"));
-		assertTrue(selenium.isTextPresent("public int java.lang.Integer.compareTo(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public static java.lang.String java.lang.Integer.toHexString(int)"));
-		assertTrue(selenium.isTextPresent("public static java.lang.Integer java.lang.Integer.decode(java.lang.String) throws java.lang.NumberFormatException"));
-		assertTrue(selenium.isTextPresent("static void java.lang.Integer.getChars(int,int,char[])"));
-		assertTrue(selenium.isTextPresent("public static java.lang.Integer java.lang.Integer.valueOf(java.lang.String,int) throws java.lang.NumberFormatException"));
-		assertTrue(selenium.isTextPresent("public static java.lang.Integer java.lang.Integer.valueOf(java.lang.String) throws java.lang.NumberFormatException"));
+		assertTrue(selenium
+				.isTextPresent("public static int java.lang.Integer.numberOfLeadingZeros(int)"));
+		assertTrue(selenium
+				.isTextPresent("public static int java.lang.Integer.numberOfTrailingZeros(int)"));
+		assertTrue(selenium
+				.isTextPresent("public static int java.lang.Integer.bitCount(int)"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.lang.Integer.equals(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.String java.lang.Integer.toString(int,int)"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.String java.lang.Integer.toString(int)"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.String java.lang.Integer.toString()"));
+		assertTrue(selenium
+				.isTextPresent("public int java.lang.Integer.hashCode()"));
+		assertTrue(selenium
+				.isTextPresent("public static int java.lang.Integer.reverseBytes(int)"));
+		assertTrue(selenium
+				.isTextPresent("public int java.lang.Integer.compareTo(java.lang.Integer)"));
+		assertTrue(selenium
+				.isTextPresent("public int java.lang.Integer.compareTo(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.String java.lang.Integer.toHexString(int)"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.Integer java.lang.Integer.decode(java.lang.String) throws java.lang.NumberFormatException"));
+		assertTrue(selenium
+				.isTextPresent("static void java.lang.Integer.getChars(int,int,char[])"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.Integer java.lang.Integer.valueOf(java.lang.String,int) throws java.lang.NumberFormatException"));
+		assertTrue(selenium
+				.isTextPresent("public static java.lang.Integer java.lang.Integer.valueOf(java.lang.String) throws java.lang.NumberFormatException"));
 	}
 
 	@Test
 	public void testNewServletAnnotationsValidClass() throws Exception {
 		String appContextStr = System.getProperty("appContext");
 		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
+
 		selenium.click("link=Test Annotations and ServletContextListener.");
 		waitForPageLoad();
 		selenium.type("class", "java.util.ArrayList");
 		selenium.click("//input[@type='submit']");
 		waitForPageLoad();
 		assertEquals("Class Viewer Servlet", selenium.getTitle());
-		assertEquals("Message:", selenium
-				.getText("xpath=/html/body/font[1]/b"));
+		assertEquals("Message:", selenium.getText("xpath=/html/body/font[1]/b"));
 		assertEquals(
-						"The class java.util.ArrayList is valid.The detail information is:",
-						selenium.getText("xpath=/html/body/font[2]/b"));
-		assertEquals("ClassName:", selenium
-				.getText("xpath=/html/body/font[3]/b"));
+				"The class java.util.ArrayList is valid.The detail information is:",
+				selenium.getText("xpath=/html/body/font[2]/b"));
+		assertEquals("ClassName:",
+				selenium.getText("xpath=/html/body/font[3]/b"));
 		assertTrue(selenium.isTextPresent("java.util.ArrayList"));
 		assertTrue(selenium.isTextPresent("Extends:"));
 		assertTrue(selenium.isTextPresent("class java.util.AbstractList"));
@@ -94,56 +107,77 @@ public class TestAnnotationsAndServletCo
 		assertTrue(selenium.isTextPresent("interface java.lang.Cloneable"));
 		assertTrue(selenium.isTextPresent("interface java.io.Serializable"));
 		assertTrue(selenium.isTextPresent("Methods:"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.add(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public void java.util.ArrayList.add(int,java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object java.util.ArrayList.get(int)"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object java.util.ArrayList.clone()"));
-		assertTrue(selenium.isTextPresent("public int java.util.ArrayList.indexOf(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public void java.util.ArrayList.clear()"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.contains(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.isEmpty()"));
-		assertTrue(selenium.isTextPresent("public int java.util.ArrayList.lastIndexOf(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.addAll(int,java.util.Collection)"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.addAll(java.util.Collection)"));
-		assertTrue(selenium.isTextPresent("public int java.util.ArrayList.size()"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object[] java.util.ArrayList.toArray(java.lang.Object[])"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object[] java.util.ArrayList.toArray()"));
-		assertTrue(selenium.isTextPresent("public boolean java.util.ArrayList.remove(java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object java.util.ArrayList.remove(int)"));
-		assertTrue(selenium.isTextPresent("private void java.util.ArrayList.writeObject(java.io.ObjectOutputStream) throws java.io.IOException"));
-		assertTrue(selenium.isTextPresent("private void java.util.ArrayList.readObject(java.io.ObjectInputStream) throws java.io.IOException,java.lang.ClassNotFoundException"));
-		assertTrue(selenium.isTextPresent("public java.lang.Object java.util.ArrayList.set(int,java.lang.Object)"));
-		assertTrue(selenium.isTextPresent("public void java.util.ArrayList.ensureCapacity(int)"));
-		assertTrue(selenium.isTextPresent("protected void java.util.ArrayList.removeRange(int,int)"));
-		assertTrue(selenium.isTextPresent("public void java.util.ArrayList.trimToSize()"));		
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.add(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public void java.util.ArrayList.add(int,java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object java.util.ArrayList.get(int)"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object java.util.ArrayList.clone()"));
+		assertTrue(selenium
+				.isTextPresent("public int java.util.ArrayList.indexOf(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public void java.util.ArrayList.clear()"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.contains(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.isEmpty()"));
+		assertTrue(selenium
+				.isTextPresent("public int java.util.ArrayList.lastIndexOf(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.addAll(int,java.util.Collection)"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.addAll(java.util.Collection)"));
+		assertTrue(selenium
+				.isTextPresent("public int java.util.ArrayList.size()"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object[] java.util.ArrayList.toArray(java.lang.Object[])"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object[] java.util.ArrayList.toArray()"));
+		assertTrue(selenium
+				.isTextPresent("public boolean java.util.ArrayList.remove(java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object java.util.ArrayList.remove(int)"));
+		assertTrue(selenium
+				.isTextPresent("private void java.util.ArrayList.writeObject(java.io.ObjectOutputStream) throws java.io.IOException"));
+		assertTrue(selenium
+				.isTextPresent("private void java.util.ArrayList.readObject(java.io.ObjectInputStream) throws java.io.IOException,java.lang.ClassNotFoundException"));
+		assertTrue(selenium
+				.isTextPresent("public java.lang.Object java.util.ArrayList.set(int,java.lang.Object)"));
+		assertTrue(selenium
+				.isTextPresent("public void java.util.ArrayList.ensureCapacity(int)"));
+		assertTrue(selenium
+				.isTextPresent("protected void java.util.ArrayList.removeRange(int,int)"));
+		assertTrue(selenium
+				.isTextPresent("public void java.util.ArrayList.trimToSize()"));
 	}
 
 	@Test
 	public void testNewServletAnnotationsInvalidClass() throws Exception {
 		String appContextStr = System.getProperty("appContext");
 		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
+
 		selenium.click("link=Test Annotations and ServletContextListener.");
 		waitForPageLoad();
 		selenium.type("class", "Integer");
 		selenium.click("//input[@type='submit']");
 		waitForPageLoad();
 		assertEquals("Class Viewer Servlet", selenium.getTitle());
-		assertEquals("Message:", selenium
-				.getText("xpath=/html/body/font[1]/b"));
+		assertEquals("Message:", selenium.getText("xpath=/html/body/font[1]/b"));
 		assertEquals(
-						"You have input an invalid class.So we set it to default class:java.lang.String",
-						selenium.getText("xpath=/html/body/font[2]/b"));
-		assertEquals("ClassName:", selenium
-				.getText("xpath=/html/body/font[3]/b"));
+				"You have input an invalid class.So we set it to default class:java.lang.String",
+				selenium.getText("xpath=/html/body/font[2]/b"));
+		assertEquals("ClassName:",
+				selenium.getText("xpath=/html/body/font[3]/b"));
 		assertTrue(selenium.isTextPresent("java.lang.String"));
 		assertTrue(selenium.isTextPresent("Extends:"));
 		assertTrue(selenium.isTextPresent("class java.lang.Object"));
 		assertTrue(selenium.isTextPresent("Implements:"));
-		assertTrue(selenium.isTextPresent("interface java.io.Serializable interface java.lang.Comparable interface java.lang.CharSequence"));
+		assertTrue(selenium
+				.isTextPresent("interface java.io.Serializable interface java.lang.Comparable interface java.lang.CharSequence"));
 		assertTrue(selenium.isTextPresent("Methods:"));
-		
-	}
 
+	}
 
 }

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestAsync.java Thu Aug  5 02:52:14 2010
@@ -16,7 +16,7 @@
  *  specific language governing permissions and limitations
  *  under the License.
  */
- 
+
 package org.apache.geronimo.testsuite.servlet3;
 
 import org.testng.annotations.Test;
@@ -24,33 +24,36 @@ import org.testng.annotations.Test;
 import org.apache.geronimo.testsupport.SeleniumTestSupport;
 
 public class TestAsync extends SeleniumTestSupport {
-	
-		@Test
+
+	@Test
 	public void testAsyncServlet() throws Exception {
 		String appContextStr = System.getProperty("appContext");
 		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
+
 		selenium.click("link=Test AsyncServlet.");
 		waitForPageLoad();
-		
+
 		assertTrue(selenium.isTextPresent("Servlet starts at:"));
-		assertTrue(selenium.isTextPresent("Task assigned to executor.Servlet ends at:"));
+		assertTrue(selenium
+				.isTextPresent("Task assigned to executor.Servlet fineshes at:"));
 		assertTrue(selenium.isTextPresent("TaskExecutor starts at:"));
 		assertTrue(selenium.isTextPresent("Task finishes."));
-		assertTrue(selenium.isTextPresent("TaskExecutor ends at:"));
-		
+		assertTrue(selenium.isTextPresent("TaskExecutor fineshes at:"));
+
+		String[] sftSplit = selenium.getText("xpath=//p[2]").split(":");
+		int sfti = getTime(sftSplit);
+		String[] tstSplit = selenium.getText("xpath=//p[3]").split(":");
+		int tsti = getTime(tstSplit);
+		String[] tftSplit = selenium.getText("xpath=//p[5]").split(":");
+		int tfti = getTime(tftSplit);
+		assertTrue(sfti == tsti);
+		assertTrue(Math.abs(tfti - sfti) == 10);
+	}
 
-        // servlet finish time
-		String set = selenium.getText("xpath=//p[2]").substring(60, 62);
-        // servlet task start time
-	    String tst = selenium.getText("xpath=//p[3]").substring(41, 43);
-        // servlet task finish time
-        String tet = selenium.getText("xpath=//p[5]").substring(39, 41);
-        int seti = Integer.parseInt(set);
-        int tsti = Integer.parseInt(tst);
-        int teti = Integer.parseInt(tet);        
-        assertTrue(seti==tsti);
-        assertTrue(seti==teti - 10);       
+	private int getTime(String[] timeSplit) {
+		String time = timeSplit[timeSplit.length - 1].substring(0, 2);
+		int timei = Integer.parseInt(time);
+		return timei;
 	}
 
 }

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestInitializer.java Thu Aug  5 02:52:14 2010
@@ -26,8 +26,7 @@ public class TestInitializer extends Sel
 	@Test
 	public void testServletContainerInitializerClass() throws Exception {
         String appContextStr = System.getProperty("appContext");
-		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
+		selenium.open(appContextStr);		
 		selenium.click("link=Test Add Servlet Mapping through ServletContainerInitializer.");
 		waitForPageLoad();
 		assertTrue(selenium.isTextPresent("Add this servlet correctly through ServletContainerInitializer."));

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestJarresource.java Thu Aug  5 02:52:14 2010
@@ -28,9 +28,7 @@ public class TestJarresource extends Sel
 	@Test
 	public void testJarResources() throws Exception {
 		String appContextStr = System.getProperty("appContext");
-		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
-		
+		selenium.open(appContextStr);		
 		selenium.click("link=Test Access Jar Resource.");
 		waitForPageLoad();
 		assertTrue(selenium.isTextPresent("This is a JSP executed inside a jar file of the web module. "));

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPart.java Thu Aug  5 02:52:14 2010
@@ -19,12 +19,6 @@
 
 package org.apache.geronimo.testsuite.servlet3;
 
-import java.io.File;
-import java.io.FileInputStream;
-import java.io.FileNotFoundException;
-import java.io.FileOutputStream;
-import java.io.IOException;
-
 import org.testng.annotations.Test;
 
 import org.apache.geronimo.testsupport.SeleniumTestSupport;
@@ -33,74 +27,54 @@ import org.apache.geronimo.testsupport.S
  * Test MultiPart through File upload.
  */
 public class TestMultiPart extends SeleniumTestSupport {
-
     @Test
     public void testUploadSuccess() throws Exception {
-        copyFile("small.txt");
         String appContextStr = System.getProperty("appContext");
-		selenium.open(appContextStr);
-        selenium.selectFrame("sampleDocumentFrame");
+		selenium.open(appContextStr);        
         selenium.click("link=Test File Upload.");
         waitForPageLoad();
-        // TODO: Figure out how to upload a file
-        selenium.type("testFile", "c:\\test_file\\small.txt");
-        selenium.click("//input[@value='Submit The File!']");
+        uploadFile("small.txt");
         waitForPageLoad();
-        assertEquals("File Upload System", selenium.getTitle());
-        assertEquals("A listener is dectecting online person number.", selenium.getText("xpath=/html/body/h2[1]"));
-        // assertEquals("Currently,there are 1 people visiting this file upload system!",
-        // selenium.getText("xpath=/html/body/h3"));
+		assertEquals("File Upload System", selenium.getTitle());
+        assertTrue(selenium.isTextPresent("This is a file no larger than 10k."));
     }
 
     @Test
     public void testNoFileInput() throws Exception {
         String appContextStr = System.getProperty("appContext");
-		selenium.open(appContextStr);
-        selenium.selectFrame("sampleDocumentFrame");
+		selenium.open(appContextStr);        
         selenium.click("link=Test File Upload.");
         waitForPageLoad();
         selenium.click("//input[@value='Submit The File!']");
         waitForPageLoad();
         assertEquals("File Upload System", selenium.getTitle());
-        assertEquals("A listener is dectecting online person number.", selenium.getText("xpath=/html/body/h2[1]"));
+        assertTrue(selenium.isTextPresent("ContentType=application/octet-stream"));
     }
 
     @Test
     public void testFileTooLarge() throws Exception {
         String appContextStr = System.getProperty("appContext");
-		selenium.open(appContextStr);
-        selenium.selectFrame("sampleDocumentFrame");
+		selenium.open(appContextStr);        
         selenium.click("fileupload");
         waitForPageLoad();
-        // TODO: Figure out how to upload a file
-        selenium.type("testFile", "D:\\allServers\\apache-james-2.3.2.zip");
-        selenium.click("//input[@value='Submit The File!']");
+        uploadFile("large.txt");
         waitForPageLoad();
-        //assertTrue(selenium.isTextPresent("The file size is 7996381b, it's filterd because the file size is limited to 10 kb"));
+        assertTrue(selenium.isTextPresent("The file size is 12110b, it's filterd because the file size is limited to 10 kb"));
     }
 
-    private void copyFile(String fileName) {
-        File file = new File(fileName);
-        FileInputStream fis;
-        FileOutputStream fos;
-        try {
-            fis = new FileInputStream(file);
-/*            byte[] buffer = new byte[(int) file.length()];
-            fis.read(buffer);
-            File localFile = new File("c:\\test_file\\" + fileName);
-            localFile.mkdirs();
-            fos = new FileOutputStream(localFile);
-            fos.write(buffer);*/
-
-        } catch (FileNotFoundException e) {
-            System.out.println("File not found.");
-        } catch (IOException e) {
-            // TODO Auto-generated catch block
-            
+    private void uploadFile(String fileName) {
+        String testFileLocation = System.getProperty("testFileLocation");
+        //Test under Linux
+        if (testFileLocation.contains("/")) {
+        	 selenium.type("testFile", testFileLocation + "/" + fileName);
+             selenium.click("//input[@value='Submit The File!']");
+        }
+        //Test under Windows
+        else {
+            testFileLocation = testFileLocation.replace("\\", "\\"+"\\");
+        	selenium.type("testFile", testFileLocation + "\\" + "\\" + fileName);
+            selenium.click("//input[@value='Submit The File!']");
         }
-
-        File filel = new File("c://test_file//" + fileName);
-        System.out.println(filel.getName());
     }
 
 }

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java Thu Aug  5 02:52:14 2010
@@ -0,0 +1,81 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+
+package org.apache.geronimo.testsuite.servlet3;
+
+import org.testng.annotations.Test;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+
+/**
+ * Test MultiPart through File upload.
+ */
+public class TestMultiPartAnnotation extends SeleniumTestSupport {
+    @Test
+    public void testUploadSuccess() throws Exception {
+        String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);        
+        selenium.click("multiAnnotation");
+        waitForPageLoad();
+        uploadFile("small.txt");
+        waitForPageLoad();
+		assertEquals("File Upload System", selenium.getTitle());
+        //assertTrue(selenium.isTextPresent("Size=35"));
+        assertTrue(selenium.isTextPresent("This is a file no larger than 10k."));
+    }
+
+    @Test
+    public void testNoFileInput() throws Exception {
+        String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);        
+        selenium.click("multiAnnotation");
+        waitForPageLoad();
+        selenium.click("//input[@value='Submit The File!']");
+        waitForPageLoad();
+        assertEquals("File Upload System", selenium.getTitle());
+        assertTrue(selenium.isTextPresent("ContentType=application/octet-stream"));
+    }
+
+    @Test
+    public void testFileTooLarge() throws Exception {
+        String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);        
+        selenium.click("multiAnnotation");
+        waitForPageLoad();
+        uploadFile("large.txt");
+        waitForPageLoad();
+        assertTrue(selenium.isTextPresent("The file size is 12110b, it's filterd because the file size is limited to 10 kb"));
+    }
+
+    private void uploadFile(String fileName) {
+        String testFileLocation = System.getProperty("testFileLocation");
+        //Test under Linux
+        if (testFileLocation.contains("/")) {
+        	 selenium.type("testFile", testFileLocation + "/" + fileName);
+             selenium.click("//input[@value='Submit The File!']");
+        }
+        //Test under Windows
+        else {
+            testFileLocation = testFileLocation.replace("\\", "\\"+"\\");
+        	selenium.type("testFile", testFileLocation + "\\" + "\\" + fileName);
+            selenium.click("//input[@value='Submit The File!']");
+        }
+    }
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebFragment.java Thu Aug  5 02:52:14 2010
@@ -27,7 +27,6 @@ public class TestWebFragment extends Sel
 	public void testWebFragmentSuccess() throws Exception {
 		String appContextStr = System.getProperty("appContext");
 		selenium.open(appContextStr);
-		selenium.selectFrame("sampleDocumentFrame");
 		selenium.click("link=Test WebFragment.");
 		waitForPageLoad();
 		selenium.click("QueryAll");
@@ -45,25 +44,29 @@ public class TestWebFragment extends Sel
 		selenium.click("link=>>Go to pay!");
 		waitForPageLoad();
 		assertEquals("Servlet Payment", selenium.getTitle());
-		assertEquals("Dear Customer,\nYou have to pay 120.", selenium
-				.getText("xpath=/html/body/h1[1]"));
+		assertEquals("Dear Customer,\nYou have to pay 120.",
+				selenium.getText("xpath=/html/body/h1[1]"));
 		assertEquals(
-						"Congratulations!You have successfully finished the payment process.",
-						selenium.getText("xpath=/html/body/h1[2]"));
+				"Congratulations!You have successfully finished the payment process.",
+				selenium.getText("xpath=/html/body/h1[2]"));
 		assertTrue(selenium
 				.isElementPresent("link=See message generated from different fragments."));
 
-		 selenium.click("link=See message generated from different fragments.");
-		 waitForPageLoad();
-		 assertEquals("Servlet WebFragmentMessageRecord", selenium.getTitle());
-		 assertTrue(selenium
-	                .isTextPresent("The absolute-ordering of fragments in web.xml is: fragment3,fragment2,fragment1,filter chain responses in this order."));
-		 assertTrue(selenium.isTextPresent("FilterMessage is: "));
-		 assertTrue(selenium.isTextPresent("This Message is from fragment3 filter.This fragment mainly serves to pay for the items you bought."));
-		 assertTrue(selenium.isTextPresent("This Message is from fragment2 filter.This fragment mainly serves to add items to shopping cart."));
-		 assertTrue(selenium.isTextPresent("This Message is from fragment1 filter.This fragment mainly serves to query all the items."));
-		 assertTrue(selenium.isTextPresent("The Listener Message is: "));
-		 assertTrue(selenium.isTextPresent("This Message is from fragment3 listener.This fragment mainly serves to pay for the items you bought."));
+		selenium.click("link=See message generated from different fragments.");
+		waitForPageLoad();
+		assertEquals("Servlet WebFragmentMessageRecord", selenium.getTitle());
+		assertTrue(selenium
+				.isTextPresent("The absolute-ordering of fragments in web.xml is: fragment3,fragment2,fragment1,filter chain responses in this order."));
+		assertTrue(selenium.isTextPresent("FilterMessage is: "));
+		assertTrue(selenium
+				.isTextPresent("This Message is from fragment3 filter.This fragment mainly serves to pay for the items you bought."));
+		assertTrue(selenium
+				.isTextPresent("This Message is from fragment2 filter.This fragment mainly serves to add items to shopping cart."));
+		assertTrue(selenium
+				.isTextPresent("This Message is from fragment1 filter.This fragment mainly serves to query all the items."));
+		assertTrue(selenium.isTextPresent("The Listener Message is: "));
+		assertTrue(selenium
+				.isTextPresent("This Message is from fragment3 listener.This fragment mainly serves to pay for the items you bought."));
 	}
 
 }

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java Thu Aug  5 02:52:14 2010
@@ -0,0 +1,35 @@
+/**
+ *  Licensed to the Apache Software Foundation (ASF) under one
+ *  or more contributor license agreements.  See the NOTICE file
+ *  distributed with this work for additional information
+ *  regarding copyright ownership.  The ASF licenses this file
+ *  to you under the Apache License, Version 2.0 (the
+ *  "License"); you may not use this file except in compliance
+ *  with the License.  You may obtain a copy of the License at
+ *
+ *    http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *  Unless required by applicable law or agreed to in writing,
+ *  software distributed under the License is distributed on an
+ *  "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ *  KIND, either express or implied.  See the License for the
+ *  specific language governing permissions and limitations
+ *  under the License.
+ */
+package org.apache.geronimo.testsuite.servlet3;
+
+import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
+
+public class TestWebInitParam extends SeleniumTestSupport{
+	
+	@Test
+	public void testValidContent() throws Exception{
+		String appContextStr = System.getProperty("appContext");
+		selenium.open(appContextStr);		
+		selenium.click("link=Test Annotation @WebInitParam.");
+		waitForPageLoad();
+		assertTrue(selenium.isTextPresent("Hello World!"));
+	}
+
+}

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt Thu Aug  5 02:52:14 2010
@@ -0,0 +1,367 @@
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
+This is a file larger than 10k.
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/large.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Added: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt?rev=982456&view=auto
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt (added)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt Thu Aug  5 02:52:14 2010
@@ -0,0 +1 @@
+This is a file no larger than 10k.
\ No newline at end of file

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt
------------------------------------------------------------------------------
    svn:keywords = Date Revision

Propchange: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/small.txt
------------------------------------------------------------------------------
    svn:mime-type = text/plain

Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml?rev=982456&r1=982455&r2=982456&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/resources/testng.xml Thu Aug  5 02:52:14 2010
@@ -27,14 +27,6 @@
 		<packages>
 			<package name="org.apache.geronimo.testsuite.servlet3" />
 		</packages>
-		<classes>
-			<class name="org.apache.geronimo.testsuite.servlet3.TestMultiPart">
-				<methods>
-					<exclude name="fileTooLarge"></exclude>
-					<exclude name="uploadSuccess"></exclude>
-				</methods>
-			</class>
-		</classes>
 	</test>
 </suite>
 



Mime
View raw message