You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by xi...@apache.org on 2010/04/14 11:07:23 UTC
svn commit: r933887 - in
/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main:
java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java
webapp/index.html webapp/sample-docu.jsp
Author: xiaming
Date: Wed Apr 14 09:07:23 2010
New Revision: 933887
URL: http://svn.apache.org/viewvc?rev=933887&view=rev
Log:
GERONIMO-5238 change content type encoding to UTF-8 and fix annoying context root issue
Modified:
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/index.html
geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/sample-docu.jsp
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java?rev=933887&r1=933886&r2=933887&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/java/org/apache/geronimo/samples/javaee6/cviewer/CviewerRegis.java Wed Apr 14 09:07:23 2010
@@ -25,7 +25,7 @@ import javax.servlet.http.HttpServlet;
import javax.servlet.http.HttpServletRequest;
import javax.servlet.http.HttpServletResponse;
-@WebServlet(name="CviewerRegis", urlPatterns={"/"})
+//@WebServlet(name="CviewerRegis", urlPatterns={"/"})
public class CviewerRegis extends HttpServlet {
@@ -40,7 +40,7 @@ public class CviewerRegis extends HttpSe
out.println("</head>");
out.println("<body>");
out.println("<h1>Demostrate promatically registering servlet, filter."+ "</h1>");
- out.println("<form action=ClassViewer><br>");
+ out.println("<form action=./ClassViewer><br>");
out.println("<input type=\"text\" name=\"class\"/>Input a classname<br>");
out.println("<input type=\"submit\">");
out.println("</form>");
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/index.html?rev=933887&r1=933886&r2=933887&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/index.html Wed Apr 14 09:07:23 2010
@@ -18,7 +18,7 @@
<html>
<head>
<title>Apache Geronimo Sample Application</title>
- <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+ <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
</head>
<FRAMESET rows="86px,*" frameborder="0">
Modified: geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/sample-docu.jsp?rev=933887&r1=933886&r2=933887&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/sample-docu.jsp (original)
+++ geronimo/samples/trunk/samples/javaee6/cviewer-javaee6/cviewer-javaee6-war/src/main/webapp/sample-docu.jsp Wed Apr 14 09:07:23 2010
@@ -15,22 +15,27 @@
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=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
<html>
<head>
<title>cviewer-javaee6</title>
- <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+ <meta content="text/html; CHARSET=UTF-8" http-equiv="Content-Type">
</head>
<BODY>
- <font face="Verdana, Helvetica, Arial">
+<font face="Verdana, Helvetica, Arial">
-This is a sample to demo servlet 3.0 new feature: dynamically register servlet and filter in listener class. <p>
+<h1>This is a sample to demo servlet 3.0 new feature: dynamically register servlet and filter in listener class.</h1>
<br>
-Click <a href="./ClassViewer">here</a> to try this sample.
+<form action="./ClassViewer" method="get">
+<BR>
+<input type="text" name="class"/>Input a classname
+<BR>
+<input type="submit">
+</form>
<br>
- </FONT>
+</font>
</body>
</html>