You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xu...@apache.org on 2010/11/04 03:58:33 UTC
svn commit: r1030812 - in
/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test: ./
servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/
servlet3.0-test-war/src/main/webapp/
servlet3.0-test-war/src/test/java/org/ap...
Author: xuhaihong
Date: Thu Nov 4 02:58:32 2010
New Revision: 1030812
URL: http://svn.apache.org/viewvc?rev=1030812&view=rev
Log:
No function change, replace the tab with four spaces
Modified:
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddedServletOnStartup.java
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/CViewerServlet.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerFilter.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerRegis.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerServletListener.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileMessageFilter.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowFileServlet.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.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/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentMessageRecord.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentWelcomePage.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp
geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp
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/TestMultiPartAnnotation.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/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.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/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/pom.xml Thu Nov 4 02:58:32 2010
@@ -50,6 +50,6 @@
<module>fragment2</module>
<module>fragment3</module>
<module>servlet3.0-test-jar</module>
- <module>servlet3.0-test-war</module>
+ <module>servlet3.0-test-war</module>
</modules>
</project>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.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/AddServletInitializer.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddServletInitializer.java Thu Nov 4 02:58:32 2010
@@ -29,13 +29,13 @@ import javax.servlet.http.HttpServlet;
@HandlesTypes(HttpServlet.class)
public class AddServletInitializer implements ServletContainerInitializer {
- public void onStartup(Set<Class<?>> classes, ServletContext ctx)
- throws ServletException {
- for (Class tc : classes) {
- System.out.println(tc.getName());
- }
-
- ServletRegistration reg = ctx.addServlet("testAdd", AddedServletOnStartup.class);
- reg.addMapping("/add");
- }
+ public void onStartup(Set<Class<?>> classes, ServletContext ctx)
+ throws ServletException {
+ for (Class tc : classes) {
+ System.out.println(tc.getName());
+ }
+
+ ServletRegistration reg = ctx.addServlet("testAdd", AddedServletOnStartup.class);
+ reg.addMapping("/add");
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddedServletOnStartup.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/AddedServletOnStartup.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddedServletOnStartup.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/AddedServletOnStartup.java Thu Nov 4 02:58:32 2010
@@ -22,7 +22,6 @@ 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;
@@ -34,11 +33,11 @@ import javax.servlet.http.HttpServletRes
*/
public class AddedServletOnStartup extends HttpServlet {
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- PrintWriter out = resp.getWriter();
- out.println("<html>");
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ PrintWriter out = resp.getWriter();
+ out.println("<html>");
out.println("<head>");
out.println("<title>Test ServletContainerInitializer.</title>");
out.println("</head>");
@@ -48,13 +47,13 @@ public class AddedServletOnStartup exten
out.println("</p>");
out.println("</body>");
out.println("</html>");
-
- }
+
+ }
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- // TODO Auto-generated method stub
- doGet(req, resp);
- }
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ // TODO Auto-generated method stub
+ doGet(req, resp);
+ }
}
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -23,47 +23,50 @@ import java.io.IOException;
import java.io.PrintWriter;
import java.util.Date;
-import javax.servlet.*;
+import javax.servlet.AsyncContext;
+import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
-import javax.servlet.http.*;
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
@WebServlet(urlPatterns = "/async",asyncSupported = true)
public class AsyncServlet extends HttpServlet {
- @Override
- protected void doGet(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- resp.setContentType("text/html;charset=UTF-8");
- PrintWriter out = resp.getWriter();
- out.println("<html>");
+ @Override
+ protected void doGet(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ resp.setContentType("text/html;charset=UTF-8");
+ PrintWriter out = resp.getWriter();
+ out.println("<html>");
out.println("<head>");
out.println("<title>Test AsyncServlet.</title>");
out.println("</head>");
out.println("<body>");
out.println("<p id='a'>");
- out.println("Servlet starts at: " + "<font color='red'><b id='sst'>" + new Date() + "</b></font>" + ".");
+ out.println("Servlet starts at: " + "<font color='red'><b id='sst'>" + new Date() + "</b></font>" + ".");
out.println("</p>");
- out.println("<br><br>");
+ out.println("<br><br>");
- out.flush();
-
- AsyncContext ctx =req.startAsync();
- new Thread(new TaskExecutor(ctx)).start();
-
- out.println("<p id='b'>");
- out.println("Task assigned to executor.Servlet finishes at: " + "<font color='red'><b id='sft'>" + new Date() + "</b></font>" + ".");
+ out.flush();
+
+ AsyncContext ctx =req.startAsync();
+ new Thread(new TaskExecutor(ctx)).start();
+
+ out.println("<p id='b'>");
+ out.println("Task assigned to executor.Servlet finishes at: " + "<font color='red'><b id='sft'>" + new Date() + "</b></font>" + ".");
out.println("</p>");
- out.println("<br><br>");
- out.flush();
- }
-
- @Override
- protected void doPost(HttpServletRequest req, HttpServletResponse resp)
- throws ServletException, IOException {
- doGet(req,resp);
- }
-
-
-
+ out.println("<br><br>");
+ out.flush();
+ }
+
+ @Override
+ protected void doPost(HttpServletRequest req, HttpServletResponse resp)
+ throws ServletException, IOException {
+ doGet(req,resp);
+ }
+
+
+
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CViewerServlet.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/CViewerServlet.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CViewerServlet.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CViewerServlet.java Thu Nov 4 02:58:32 2010
@@ -17,11 +17,11 @@
package org.apache.geronimo.testsuite.servlet3.app;
-import java.io.PrintWriter;
import java.io.IOException;
-import javax.servlet.ServletException;
+import java.io.PrintWriter;
import java.lang.reflect.Method;
-import javax.servlet.annotation.WebServlet;
+
+import javax.servlet.ServletException;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerFilter.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/CviewerFilter.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerFilter.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerFilter.java Thu Nov 4 02:58:32 2010
@@ -17,6 +17,7 @@
package org.apache.geronimo.testsuite.servlet3.app;
import java.io.IOException;
+
import javax.servlet.Filter;
import javax.servlet.FilterChain;
import javax.servlet.FilterConfig;
@@ -29,7 +30,7 @@ public class CviewerFilter implements Fi
public CviewerFilter() {
}
-
+
public void doFilter(ServletRequest request, ServletResponse response,
FilterChain chain)
throws IOException, ServletException {
@@ -48,7 +49,7 @@ public class CviewerFilter implements Fi
className = "java.lang.Integer";
}
- Class clazz = null;
+ Class<?> clazz = null;
try {
clazz = Class.forName(className);
@@ -67,16 +68,16 @@ public class CviewerFilter implements Fi
}
}
-
-
+
+
public void init(FilterConfig filterConfig) {
}
-
+
public void destroy() {
}
-
+
@Override
public String toString() {
// if (filterConfig == null) {
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerRegis.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/CviewerRegis.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerRegis.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerRegis.java Thu Nov 4 02:58:32 2010
@@ -19,8 +19,8 @@ package org.apache.geronimo.testsuite.se
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;
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerServletListener.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/CviewerServletListener.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerServletListener.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/CviewerServletListener.java Thu Nov 4 02:58:32 2010
@@ -18,6 +18,7 @@
package org.apache.geronimo.testsuite.servlet3.app;
import java.util.EnumSet;
+
import javax.servlet.DispatcherType;
import javax.servlet.FilterRegistration;
import javax.servlet.ServletContext;
@@ -29,22 +30,22 @@ import javax.servlet.annotation.WebListe
@WebListener()
public class CviewerServletListener implements ServletContextListener {
- public void contextInitialized(ServletContextEvent sce) {
- ServletContext sc = sce.getServletContext();
- // Regist servlet
- ServletRegistration sr = sc.addServlet("ClassViewer",
- "org.apache.geronimo.testsuite.servlet3.app.CViewerServlet");
- sr.addMapping("/ClassViewer");
-
- // Register Filter
- FilterRegistration fr = sc.addFilter("CViewerFilter",
- "org.apache.geronimo.testsuite.servlet3.app.CviewerFilter");
- fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), true,
- "ClassViewer");
-
- }
-
- public void contextDestroyed(ServletContextEvent sce) {
-// throw new UnsupportedOperationException("Not supported yet.");
- }
+ public void contextInitialized(ServletContextEvent sce) {
+ ServletContext sc = sce.getServletContext();
+ // Regist servlet
+ ServletRegistration sr = sc.addServlet("ClassViewer",
+ "org.apache.geronimo.testsuite.servlet3.app.CViewerServlet");
+ sr.addMapping("/ClassViewer");
+
+ // Register Filter
+ FilterRegistration fr = sc.addFilter("CViewerFilter",
+ "org.apache.geronimo.testsuite.servlet3.app.CviewerFilter");
+ fr.addMappingForServletNames(EnumSet.of(DispatcherType.REQUEST), true,
+ "ClassViewer");
+
+ }
+
+ public void contextDestroyed(ServletContextEvent sce) {
+// throw new UnsupportedOperationException("Not supported yet.");
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileMessageFilter.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/FileMessageFilter.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileMessageFilter.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/FileMessageFilter.java Thu Nov 4 02:58:32 2010
@@ -31,111 +31,111 @@ import javax.servlet.http.Part;
@WebFilter(filterName = "MessageFilter", urlPatterns = { "/showServlet", "/showServletWa" })
public class FileMessageFilter implements Filter {
- private FilterConfig filterConfig;
+ private FilterConfig filterConfig;
public static final String FILTERED_STRING = "b, it's filtered because the file size is limited to 10 kb";
public FileMessageFilter() {
- }
+ }
- public void doFilter(ServletRequest request, ServletResponse response,
- FilterChain chain) throws IOException, ServletException {
+ public void doFilter(ServletRequest request, ServletResponse response,
+ FilterChain chain) throws IOException, ServletException {
- 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();
- String targetDirectory = ((HttpServletRequest) request).getServletContext().getRealPath("/test-3.0-servlet-war");
- if (size > 10000) {
- message += "The file size is "
- + size
- + FILTERED_STRING + targetDirectory;
- } 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);
- } catch (Throwable t) {
- problem = t;
- t.printStackTrace();
- }
-
- }
-
- public void destroy() {
- }
-
- public void init(FilterConfig filterConfig) {
- 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);
- }
+ 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();
+ String targetDirectory = ((HttpServletRequest) request).getServletContext().getRealPath("/test-3.0-servlet-war");
+ if (size > 10000) {
+ message += "The file size is "
+ + size
+ + FILTERED_STRING + targetDirectory;
+ } 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);
+ } catch (Throwable t) {
+ problem = t;
+ t.printStackTrace();
+ }
+
+ }
+
+ public void destroy() {
+ }
+
+ public void init(FilterConfig filterConfig) {
+ 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);
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowFileServlet.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/ShowFileServlet.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowFileServlet.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowFileServlet.java Thu Nov 4 02:58:32 2010
@@ -17,9 +17,8 @@
package org.apache.geronimo.testsuite.servlet3.app;
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.ServletException;
-import javax.servlet.annotation.MultipartConfig;
-import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
@@ -43,7 +42,7 @@ public class ShowFileServlet extends Htt
out.println("<h3>Currently,there are " + "<font color=\"green\">" + getServletContext().getAttribute("onLineNumber") + "</font> people visiting this file upload system!<br/><hr></h3>");
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("<h2><font color=\"green\">Attributes and content of the file:</font></h2>");
}
out.println(message + "<br/>");
out.println("</body>");
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/ShowServletWithAnnotation.java (original)
+++ 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 Nov 4 02:58:32 2010
@@ -20,6 +20,7 @@ package org.apache.geronimo.testsuite.se
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.ServletException;
import javax.servlet.annotation.MultipartConfig;
import javax.servlet.annotation.WebServlet;
@@ -33,64 +34,64 @@ import javax.servlet.http.HttpServletRes
@WebServlet(name = "showServletWa", urlPatterns = { "/showServletWa" })
@MultipartConfig(fileSizeThreshold = 1000)
public class ShowServletWithAnnotation extends HttpServlet {
- private static final long serialVersionUID = 1L;
+ 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";
- }
+ /**
+ * @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";
+ }
}
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -26,45 +26,45 @@ import java.util.Date;
import javax.servlet.AsyncContext;
public class TaskExecutor implements Runnable {
- private AsyncContext ctx = null;
-
- public TaskExecutor(AsyncContext ctx) {
- this.ctx = ctx;
- }
-
+ private AsyncContext ctx = null;
+
+ public TaskExecutor(AsyncContext ctx) {
+ this.ctx = ctx;
+ }
+
- public void run(){
- PrintWriter out = null;
- try {
- out = ctx.getResponse().getWriter();
-
- } catch (IOException e) {
-
- e.printStackTrace();
- }
- out.println("<p id='c'>");
- out.println("TaskExecutor starts at: " + "<font color='red'><b id='tst'>" + new Date() + "</b></font>" + "." + "Task starts executing" + ".");
- out.println("</p>");
- out.println("<br><br>");
- out.flush();
- try {
- Thread.sleep(10000);
- } catch (InterruptedException e) {
-
- e.printStackTrace();
- }
- out.println("<p id='d'>");
- out.println("Task finishes.");
- out.println("</p>");
- out.println("<p>");
- out.println("TaskExecutor finishes at: " + "<font color='red'><b id='tft'>" + new Date() + "</b></font>" + ".");
- out.println("</p>");
- out.println("<br><br>");
+ public void run(){
+ PrintWriter out = null;
+ try {
+ out = ctx.getResponse().getWriter();
+
+ } catch (IOException e) {
+
+ e.printStackTrace();
+ }
+ out.println("<p id='c'>");
+ out.println("TaskExecutor starts at: " + "<font color='red'><b id='tst'>" + new Date() + "</b></font>" + "." + "Task starts executing" + ".");
+ out.println("</p>");
+ out.println("<br><br>");
+ out.flush();
+ try {
+ Thread.sleep(10000);
+ } catch (InterruptedException e) {
+
+ e.printStackTrace();
+ }
+ out.println("<p id='d'>");
+ out.println("Task finishes.");
+ out.println("</p>");
+ out.println("<p>");
+ out.println("TaskExecutor finishes at: " + "<font color='red'><b id='tft'>" + new Date() + "</b></font>" + ".");
+ out.println("</p>");
+ out.println("<br><br>");
out.println("</body>");
out.println("</html>");
out.flush();
out.close();
ctx.complete();
- }
+ }
}
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentMessageRecord.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/WebFragmentMessageRecord.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentMessageRecord.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentMessageRecord.java Thu Nov 4 02:58:32 2010
@@ -19,6 +19,7 @@ package org.apache.geronimo.testsuite.se
import java.io.IOException;
import java.io.PrintWriter;
+
import javax.servlet.ServletException;
import javax.servlet.annotation.WebServlet;
import javax.servlet.http.HttpServlet;
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentWelcomePage.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/WebFragmentWelcomePage.java?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentWelcomePage.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebFragmentWelcomePage.java Thu Nov 4 02:58:32 2010
@@ -17,8 +17,8 @@
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;
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/java/org/apache/geronimo/testsuite/servlet3/app/WebInitParamSample.java (original)
+++ 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 Nov 4 02:58:32 2010
@@ -22,50 +22,50 @@ import java.io.IOException;
import javax.servlet.RequestDispatcher;
import javax.servlet.ServletException;
-
+import javax.servlet.annotation.WebInitParam;
+import javax.servlet.annotation.WebServlet;
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;
+ 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);
- }
+ /**
+ * @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);
+ }
}
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/index.jsp Thu Nov 4 02:58:32 2010
@@ -26,15 +26,15 @@
<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 />
+ <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>
Modified: geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp?rev=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/sample-docu.jsp Thu Nov 4 02:58:32 2010
@@ -26,15 +26,15 @@
<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">Test AsyncServlet.</a>
- <br>
+ <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">Test AsyncServlet.</a>
+ <br>
<a href="add">Test Add Servlet Mapping through ServletContainerInitializer.</a>
<br>
<a href="./WelcomePage">Test WebFragment.</a>
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/main/webapp/webinitparam.jsp Thu Nov 4 02:58:32 2010
@@ -25,13 +25,13 @@
<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>
+ <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
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -19,165 +19,164 @@
package org.apache.geronimo.testsuite.servlet3;
-import org.testng.annotations.Test;
-
import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
public class TestAnnotationsAndServletContextListener extends
- SeleniumTestSupport {
+ SeleniumTestSupport {
- @Test
- public void testNewServletAnnotationsNullClass() throws Exception {
- // System.out.println("Start testing!");
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- 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(
- "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:"));
- assertTrue(selenium.isTextPresent("class java.lang.Number"));
- 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"));
- }
-
- @Test
- public void testNewServletAnnotationsValidClass() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
-
- 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(
- "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"));
- assertTrue(selenium.isTextPresent("Implements:"));
- assertTrue(selenium.isTextPresent("interface java.util.List"));
- assertTrue(selenium.isTextPresent("interface java.util.RandomAccess"));
- 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()"));
- }
-
- @Test
- public void testNewServletAnnotationsInvalidClass() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
-
- 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(
- "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("Methods:"));
+ @Test
+ public void testNewServletAnnotationsNullClass() throws Exception {
+ // System.out.println("Start testing!");
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ 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(
+ "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:"));
+ assertTrue(selenium.isTextPresent("class java.lang.Number"));
+ 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"));
+ }
+
+ @Test
+ public void testNewServletAnnotationsValidClass() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+
+ 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(
+ "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"));
+ assertTrue(selenium.isTextPresent("Implements:"));
+ assertTrue(selenium.isTextPresent("interface java.util.List"));
+ assertTrue(selenium.isTextPresent("interface java.util.RandomAccess"));
+ 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()"));
+ }
+
+ @Test
+ public void testNewServletAnnotationsInvalidClass() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+
+ 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(
+ "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("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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -19,41 +19,40 @@
package org.apache.geronimo.testsuite.servlet3;
-import org.testng.annotations.Test;
-
import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
public class TestAsync extends SeleniumTestSupport {
- @Test
- public void testAsyncServlet() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
-
- selenium.click("link=Test AsyncServlet.");
- waitForPageLoad();
-
- assertTrue(selenium.isTextPresent("Servlet starts at:"));
- assertTrue(selenium
- .isTextPresent("Task assigned to executor.Servlet finishes at:"));
- assertTrue(selenium.isTextPresent("TaskExecutor starts at:"));
- assertTrue(selenium.isTextPresent("Task finishes."));
- assertTrue(selenium.isTextPresent("TaskExecutor finishes at:"));
-
- String[] sftSplit = selenium.getText("xpath=//b[@id='sft']").split(":");
- int sfti = getTime(sftSplit);
- String[] tstSplit = selenium.getText("xpath=//b[@id='tst']").split(":");
- int tsti = getTime(tstSplit);
- String[] tftSplit = selenium.getText("xpath=//b[@id='tft']").split(":");
- int tfti = getTime(tftSplit);
- assertTrue(sfti == tsti);
- assertTrue(Math.abs(tfti - sfti) == 10);
- }
-
- private int getTime(String[] timeSplit) {
- String time = timeSplit[timeSplit.length - 1].substring(0, 2);
- int timei = Integer.parseInt(time);
- return timei;
- }
+ @Test
+ public void testAsyncServlet() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+
+ selenium.click("link=Test AsyncServlet.");
+ waitForPageLoad();
+
+ assertTrue(selenium.isTextPresent("Servlet starts at:"));
+ assertTrue(selenium
+ .isTextPresent("Task assigned to executor.Servlet finishes at:"));
+ assertTrue(selenium.isTextPresent("TaskExecutor starts at:"));
+ assertTrue(selenium.isTextPresent("Task finishes."));
+ assertTrue(selenium.isTextPresent("TaskExecutor finishes at:"));
+
+ String[] sftSplit = selenium.getText("xpath=//b[@id='sft']").split(":");
+ int sfti = getTime(sftSplit);
+ String[] tstSplit = selenium.getText("xpath=//b[@id='tst']").split(":");
+ int tsti = getTime(tstSplit);
+ String[] tftSplit = selenium.getText("xpath=//b[@id='tft']").split(":");
+ int tfti = getTime(tftSplit);
+ assertTrue(sfti == tsti);
+ assertTrue(Math.abs(tfti - sfti) == 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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -23,12 +23,12 @@ import org.apache.geronimo.testsupport.S
import org.testng.annotations.Test;
public class TestInitializer extends SeleniumTestSupport {
- @Test
- public void testServletContainerInitializerClass() throws Exception {
+ @Test
+ public void testServletContainerInitializerClass() throws Exception {
String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Test Add Servlet Mapping through ServletContainerInitializer.");
- waitForPageLoad();
- assertTrue(selenium.isTextPresent("Add this servlet correctly through ServletContainerInitializer."));
- }
+ 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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -19,20 +19,19 @@
package org.apache.geronimo.testsuite.servlet3;
-import org.testng.annotations.Test;
-
import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
public class TestJarresource extends SeleniumTestSupport{
- @Test
- public void testJarResources() throws Exception {
- String appContextStr = System.getProperty("appContext");
- 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. "));
+ @Test
+ public void testJarResources() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ 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. "));
//if the machine is using ipv6, this is apt to be "The remote host is 0:0:0:0:0:0:0:1%0. "
-// assertTrue(selenium.isTextPresent("The remote host is 127.0.0.1."));
- }
+// assertTrue(selenium.isTextPresent("The remote host is 127.0.0.1."));
+ }
}
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -23,9 +23,8 @@ import java.io.File;
import java.io.IOException;
import org.apache.geronimo.testsuite.servlet3.app.FileMessageFilter;
-import org.testng.annotations.Test;
-
import org.apache.geronimo.testsupport.SeleniumTestSupport;
+import org.testng.annotations.Test;
/**
* Test MultiPart through File upload.
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestMultiPartAnnotation.java Thu Nov 4 02:58:32 2010
@@ -19,15 +19,14 @@
package org.apache.geronimo.testsuite.servlet3;
+import static org.apache.geronimo.testsuite.servlet3.TestMultiPart.DEFAULT_URL;
+
import java.io.File;
import java.io.IOException;
import org.apache.geronimo.testsuite.servlet3.app.FileMessageFilter;
-import org.testng.annotations.Test;
-
import org.apache.geronimo.testsupport.SeleniumTestSupport;
-
-import static org.apache.geronimo.testsuite.servlet3.TestMultiPart.DEFAULT_URL;
+import org.testng.annotations.Test;
/**
* Test MultiPart through File upload.
@@ -36,12 +35,12 @@ public class TestMultiPartAnnotation ext
@Test
public void testUploadSuccess() throws Exception {
String appContextStr = System.getProperty("appContext", DEFAULT_URL);
- selenium.open(appContextStr);
+ selenium.open(appContextStr);
selenium.click("multiAnnotation");
waitForPageLoad();
uploadFile("small.txt");
waitForPageLoad();
- assertEquals("File Upload System", selenium.getTitle());
+ assertEquals("File Upload System", selenium.getTitle());
//assertTrue(selenium.isTextPresent("Size=35"));
assertTrue(selenium.isTextPresent("This is a file no larger than 10k."));
}
@@ -49,7 +48,7 @@ public class TestMultiPartAnnotation ext
@Test
public void testNoFileInput() throws Exception {
String appContextStr = System.getProperty("appContext", DEFAULT_URL);
- selenium.open(appContextStr);
+ selenium.open(appContextStr);
selenium.click("multiAnnotation");
waitForPageLoad();
selenium.click("//input[@value='Submit The File!']");
@@ -61,7 +60,7 @@ public class TestMultiPartAnnotation ext
@Test
public void testFileTooLarge() throws Exception {
String appContextStr = System.getProperty("appContext", DEFAULT_URL);
- selenium.open(appContextStr);
+ selenium.open(appContextStr);
selenium.click("multiAnnotation");
waitForPageLoad();
uploadFile("large.txt");
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -23,50 +23,50 @@ import org.apache.geronimo.testsupport.S
import org.testng.annotations.Test;
public class TestWebFragment extends SeleniumTestSupport {
- @Test
- public void testWebFragmentSuccess() throws Exception {
- String appContextStr = System.getProperty("appContext");
- selenium.open(appContextStr);
- selenium.click("link=Test WebFragment.");
- waitForPageLoad();
- selenium.click("QueryAll");
- selenium.waitForPageToLoad("30000");
- selenium.type("ID", "1");
- selenium.type("quantity", "6");
- selenium.click("addToCart");
- waitForPageLoad();
- selenium.click("link=>>Continue shopping!");
- waitForPageLoad();
- selenium.type("ID", "6");
- selenium.type("quantity", "1");
- selenium.click("addToCart");
- waitForPageLoad();
- 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(
- "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."));
+ @Test
+ public void testWebFragmentSuccess() throws Exception {
+ String appContextStr = System.getProperty("appContext");
+ selenium.open(appContextStr);
+ selenium.click("link=Test WebFragment.");
+ waitForPageLoad();
+ selenium.click("QueryAll");
+ selenium.waitForPageToLoad("30000");
+ selenium.type("ID", "1");
+ selenium.type("quantity", "6");
+ selenium.click("addToCart");
+ waitForPageLoad();
+ selenium.click("link=>>Continue shopping!");
+ waitForPageLoad();
+ selenium.type("ID", "6");
+ selenium.type("quantity", "1");
+ selenium.click("addToCart");
+ waitForPageLoad();
+ 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(
+ "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."));
+ }
}
Modified: 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=1030812&r1=1030811&r2=1030812&view=diff
==============================================================================
--- geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java (original)
+++ geronimo/server/trunk/testsuite/javaee6-testsuite/servlet3.0-test/servlet3.0-test-war/src/test/java/org/apache/geronimo/testsuite/servlet3/TestWebInitParam.java Thu Nov 4 02:58:32 2010
@@ -22,14 +22,14 @@ import org.apache.geronimo.testsupport.S
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!"));
- }
+
+ @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!"));
+ }
}
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=1030812&r1=1030811&r2=1030812&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 Nov 4 02:58:32 2010
@@ -23,10 +23,10 @@
<!DOCTYPE suite SYSTEM "http://testng.org/testng-1.0.dtd">
<suite name="Suite1" verbose="1">
- <test name="javaee6-testsuite-3.0-servlet">
- <packages>
- <package name="org.apache.geronimo.testsuite.servlet3" />
- </packages>
- </test>
+ <test name="javaee6-testsuite-3.0-servlet">
+ <packages>
+ <package name="org.apache.geronimo.testsuite.servlet3" />
+ </packages>
+ </test>
</suite>