geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664175 [13/13] - in /geronimo/samples/branches/2.1/samples: ./ app-per-port/ app-per-port/app-per-port-connector-war/ app-per-port/app-per-port-connector-war/src/main/webapp/WEB-INF/ app-per-port/app-per-port-ear/ app-per-port/app-per-port...
Date Fri, 06 Jun 2008 22:43:53 GMT
Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 15:43:44 2008
@@ -17,32 +17,32 @@
 -->
 
 <!DOCTYPE web-app
-    PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
-    "http://java.sun.com/dtd/web-app_2_3.dtd">
+        PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
+        "http://java.sun.com/dtd/web-app_2_3.dtd">
 
 <web-app>
 
     <display-name>Servlet 2.4 Examples</display-name>
     <description>
-      Servlet 2.4 Examples.
+        Servlet 2.4 Examples.
     </description>
 
     <!-- Define servlet-mapped and path-mapped example filters -->
     <filter>
         <filter-name>Servlet Mapped Filter</filter-name>
         <filter-class>filters.ExampleFilter</filter-class>
-	<init-param>
-	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
-	</init-param>
+        <init-param>
+            <param-name>attribute</param-name>
+            <param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
+        </init-param>
     </filter>
     <filter>
         <filter-name>Path Mapped Filter</filter-name>
         <filter-class>filters.ExampleFilter</filter-class>
-	<init-param>
-	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
-	</init-param>
+        <init-param>
+            <param-name>attribute</param-name>
+            <param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
+        </init-param>
     </filter>
     <filter>
         <filter-name>Request Dumper Filter</filter-name>
@@ -64,48 +64,48 @@
         <filter-class>compressionFilters.CompressionFilter</filter-class>
 
         <init-param>
-          <param-name>compressionThreshold</param-name>
-          <param-value>10</param-value>
+            <param-name>compressionThreshold</param-name>
+            <param-value>10</param-value>
         </init-param>
         <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
         </init-param>
     </filter>
 
     <!-- Define filter mappings for the defined filters -->
     <filter-mapping>
         <filter-name>Servlet Mapped Filter</filter-name>
-	<servlet-name>CompressionFilterTestServlet</servlet-name>
+        <servlet-name>CompressionFilterTestServlet</servlet-name>
     </filter-mapping>
     <filter-mapping>
         <filter-name>Path Mapped Filter</filter-name>
-	<url-pattern>/servlet/*</url-pattern>
+        <url-pattern>/servlet/*</url-pattern>
     </filter-mapping>
 
 
-<!-- Example filter mapping to apply the "Set Character Encoding" filter
-     to *all* requests processed by this web application -->
-<!--
-    <filter-mapping>
-        <filter-name>Set Character Encoding</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
-
-<!--
-    <filter-mapping>
-      <filter-name>Compression Filter</filter-name>
-      <url-pattern>/CompressionTest</url-pattern>
-    </filter-mapping>
--->
-
-<!--
-    <filter-mapping>
-        <filter-name>Request Dumper Filter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
+    <!-- Example filter mapping to apply the "Set Character Encoding" filter
+to *all* requests processed by this web application -->
+    <!--
+        <filter-mapping>
+            <filter-name>Set Character Encoding</filter-name>
+            <url-pattern>/*</url-pattern>
+        </filter-mapping>
+    -->
+
+    <!--
+        <filter-mapping>
+          <filter-name>Compression Filter</filter-name>
+          <url-pattern>/CompressionTest</url-pattern>
+        </filter-mapping>
+    -->
+
+    <!--
+        <filter-mapping>
+            <filter-name>Request Dumper Filter</filter-name>
+            <url-pattern>/*</url-pattern>
+        </filter-mapping>
+    -->
 
     <!-- Define example application events listeners -->
     <listener>
@@ -176,40 +176,40 @@
     </servlet-mapping>
 
     <security-constraint>
-      <display-name>Example Security Constraint</display-name>
-      <web-resource-collection>
-         <web-resource-name>Protected Area</web-resource-name>
-	 <!-- Define the context-relative URL(s) to be protected -->
-         <url-pattern>/jsp/security/protected/*</url-pattern>
-	 <!-- If you list http methods, only those methods are protected -->
-	 <http-method>DELETE</http-method>
-         <http-method>GET</http-method>
-         <http-method>POST</http-method>
-	 <http-method>PUT</http-method>
-      </web-resource-collection>
-      <auth-constraint>
-         <!-- Anyone with one of the listed roles may access this area -->
-         <role-name>tomcat</role-name>
-	 <role-name>role1</role-name>
-      </auth-constraint>
+        <display-name>Example Security Constraint</display-name>
+        <web-resource-collection>
+            <web-resource-name>Protected Area</web-resource-name>
+            <!-- Define the context-relative URL(s) to be protected -->
+            <url-pattern>/jsp/security/protected/*</url-pattern>
+            <!-- If you list http methods, only those methods are protected -->
+            <http-method>DELETE</http-method>
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+            <http-method>PUT</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <!-- Anyone with one of the listed roles may access this area -->
+            <role-name>tomcat</role-name>
+            <role-name>role1</role-name>
+        </auth-constraint>
     </security-constraint>
 
     <!-- Default login configuration uses form-based authentication -->
     <login-config>
-      <auth-method>FORM</auth-method>
-      <realm-name>Example Form-Based Authentication Area</realm-name>
-      <form-login-config>
-        <form-login-page>/jsp/security/protected/login.jsp</form-login-page>
-        <form-error-page>/jsp/security/protected/error.jsp</form-error-page>
-      </form-login-config>
+        <auth-method>FORM</auth-method>
+        <realm-name>Example Form-Based Authentication Area</realm-name>
+        <form-login-config>
+            <form-login-page>/jsp/security/protected/login.jsp</form-login-page>
+            <form-error-page>/jsp/security/protected/error.jsp</form-error-page>
+        </form-login-config>
     </login-config>
 
     <!-- Security roles referenced by this web application -->
     <security-role>
-      <role-name>role1</role-name>
+        <role-name>role1</role-name>
     </security-role>
     <security-role>
-      <role-name>tomcat</role-name>
+        <role-name>tomcat</role-name>
     </security-role>
 
     <!-- Environment entry examples -->
@@ -222,29 +222,29 @@
       <env-entry-type>java.lang.Integer</env-entry-type>
     </env-entry-->
     <env-entry>
-      <env-entry-name>minExemptions</env-entry-name>
-      <env-entry-value>1</env-entry-value>
-      <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-name>minExemptions</env-entry-name>
+        <env-entry-value>1</env-entry-value>
+        <env-entry-type>java.lang.Integer</env-entry-type>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/name1</env-entry-name>
-      <env-entry-value>value1</env-entry-value>
-      <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-name>foo/name1</env-entry-name>
+        <env-entry-value>value1</env-entry-value>
+        <env-entry-type>java.lang.String</env-entry-type>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/bar/name2</env-entry-name>
-      <env-entry-value>true</env-entry-value>
-      <env-entry-type>java.lang.Boolean</env-entry-type>
+        <env-entry-name>foo/bar/name2</env-entry-name>
+        <env-entry-value>true</env-entry-value>
+        <env-entry-type>java.lang.Boolean</env-entry-type>
     </env-entry>
     <env-entry>
-      <env-entry-name>name3</env-entry-name>
-      <env-entry-value>1</env-entry-value>
-      <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-name>name3</env-entry-name>
+        <env-entry-value>1</env-entry-value>
+        <env-entry-type>java.lang.Integer</env-entry-type>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/name4</env-entry-name>
-      <env-entry-value>10</env-entry-value>
-      <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-name>foo/name4</env-entry-name>
+        <env-entry-value>10</env-entry-value>
+        <env-entry-type>java.lang.Integer</env-entry-type>
     </env-entry>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/cookies.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/cookies.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/cookies.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/cookies.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/CookieExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for Cookie Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font> 
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> javax.servlet.*;

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/helloworld.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/helloworld.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/helloworld.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/helloworld.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/HelloWorldExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for HelloWorld Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font>
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> javax.servlet.*;

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/index.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/index.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/index.html Fri Jun  6 15:43:44 2008
@@ -17,105 +17,109 @@
 <!doctype html public "-//w3c//dtd html 4.0 transitional//en">
 <html>
 <head>
-   <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
-   <meta name="GENERATOR" content="Mozilla/4.61 [en] (WinNT; I) [Netscape]">
-   <meta name="Author" content="Anil K. Vijendran">
-   <title>Servlet Examples</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <meta name="GENERATOR" content="Mozilla/4.61 [en] (WinNT; I) [Netscape]">
+    <meta name="Author" content="Anil K. Vijendran">
+    <title>Servlet Examples</title>
 </head>
 <body bgcolor="#FFFFFF">
 <b><font face="Arial, Helvetica, sans-serif"><font size=+2>Servlet
-Examples with Code</font></font></b>
+    Examples with Code</font></font></b>
+
 <p>This is a collection of examples which demonstrate some of the more
-frequently used parts of the Servlet API. Familiarity with the Java(tm)
-Programming Language is assumed.
+    frequently used parts of the Servlet API. Familiarity with the Java(tm)
+    Programming Language is assumed.
+
 <p>These examples will only work when viewed via an http URL. They will
-not work if you are viewing these pages via a "file://..." URL. Please
-refer to the <i>README</i> file provide with this Tomcat release regarding
-how to configure and start the provided web server.
+    not work if you are viewing these pages via a "file://..." URL. Please
+    refer to the <i>README</i> file provide with this Tomcat release regarding
+    how to configure and start the provided web server.
+
 <p>Wherever you see a form, enter some data and see how the servlet reacts.
-When playing with the Cookie and Session Examples, jump back to the Headers
-Example to see exactly what your browser is sending the server.
+    When playing with the Cookie and Session Examples, jump back to the Headers
+    Example to see exactly what your browser is sending the server.
+
 <p>To navigate your way through the examples, the following icons will
-help:
-<br>&nbsp;
-<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
-<tr VALIGN=TOP>
-<td WIDTH="30"><img SRC="images/execute.gif" ></td>
-
-<td>Execute the example</td>
-</tr>
-
-<tr VALIGN=TOP>
-<td WIDTH="30"><img SRC="images/code.gif" height=24 width=24></td>
+    help:
+    <br>&nbsp;
+<table BORDER=0 CELLSPACING=5 WIDTH="85%">
+    <tr VALIGN=TOP>
+        <td WIDTH="30"><img SRC="images/execute.gif"></td>
+
+        <td>Execute the example</td>
+    </tr>
+
+    <tr VALIGN=TOP>
+        <td WIDTH="30"><img SRC="images/code.gif" height=24 width=24></td>
 
-<td>Look at the source code for the example</td>
-</tr>
+        <td>Look at the source code for the example</td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td WIDTH="30"><img SRC="images/return.gif" height=24 width=24></td>
+    <tr VALIGN=TOP>
+        <td WIDTH="30"><img SRC="images/return.gif" height=24 width=24></td>
 
-<td>Return to this screen</td>
-</tr>
+        <td>Return to this screen</td>
+    </tr>
 </table>
 
 <p>Tip: To see the cookie interactions with your browser, try turning on
-the "notify when setting a cookie" option in your browser preferences.
-This will let you see when a session is created and give some feedback
-when looking at the cookie demo.
-<br>&nbsp;
-<table BORDER=0 CELLSPACING=5 WIDTH="85%" >
-<tr VALIGN=TOP>
-<td>Hello World</td>
+    the "notify when setting a cookie" option in your browser preferences.
+    This will let you see when a session is created and give some feedback
+    when looking at the cookie demo.
+    <br>&nbsp;
+<table BORDER=0 CELLSPACING=5 WIDTH="85%">
+    <tr VALIGN=TOP>
+        <td>Hello World</td>
 
-<td VALIGN=TOP WIDTH="30%"><a href="servlet/HelloWorldExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/HelloWorldExample">Execute</a></td>
+        <td VALIGN=TOP WIDTH="30%"><a href="servlet/HelloWorldExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/HelloWorldExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="helloworld.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="helloworld.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="helloworld.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="helloworld.html">Source</a></td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td>Request Info</td>
+    <tr VALIGN=TOP>
+        <td>Request Info</td>
 
-<td WIDTH="30%"><a href="servlet/RequestInfoExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/RequestInfoExample">Execute</a></td>
+        <td WIDTH="30%"><a href="servlet/RequestInfoExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/RequestInfoExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="reqinfo.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqinfo.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="reqinfo.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqinfo.html">Source</a></td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td>Request Headers</td>
+    <tr VALIGN=TOP>
+        <td>Request Headers</td>
 
-<td WIDTH="30%"><a href="servlet/RequestHeaderExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/RequestHeaderExample">Execute</a></td>
+        <td WIDTH="30%"><a href="servlet/RequestHeaderExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/RequestHeaderExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="reqheaders.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqheaders.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="reqheaders.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqheaders.html">Source</a></td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td>Request Parameters</td>
+    <tr VALIGN=TOP>
+        <td>Request Parameters</td>
 
-<td WIDTH="30%"><a href="servlet/RequestParamExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/RequestParamExample">Execute</a></td>
+        <td WIDTH="30%"><a href="servlet/RequestParamExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/RequestParamExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="reqparams.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqparams.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="reqparams.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="reqparams.html">Source</a></td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td>Cookies</td>
+    <tr VALIGN=TOP>
+        <td>Cookies</td>
 
-<td WIDTH="30%"><a href="servlet/CookieExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/CookieExample">Execute</a></td>
+        <td WIDTH="30%"><a href="servlet/CookieExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/CookieExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="cookies.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="cookies.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="cookies.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="cookies.html">Source</a></td>
+    </tr>
 
-<tr VALIGN=TOP>
-<td>Sessions</td>
+    <tr VALIGN=TOP>
+        <td>Sessions</td>
 
-<td WIDTH="30%"><a href="servlet/SessionExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0  align=TOP></a><a href="servlet/SessionExample">Execute</a></td>
+        <td WIDTH="30%"><a href="servlet/SessionExample"><img SRC="images/execute.gif" HSPACE=4 BORDER=0 align=TOP></a><a href="servlet/SessionExample">Execute</a></td>
 
-<td WIDTH="30%"><a href="sessions.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="sessions.html">Source</a></td>
-</tr>
+        <td WIDTH="30%"><a href="sessions.html"><img SRC="images/code.gif" HSPACE=4 BORDER=0 height=24 width=24 align=TOP></a><a href="sessions.html">Source</a></td>
+    </tr>
 </table>
 
 <p>Note: The source code for these examples does not contain all of the
-source code that is actually in the example, only the important sections
-of code. Code not important to understand the example has been removed
-for clarity.
+    source code that is actually in the example, only the important sections
+    of code. Code not important to understand the example has been removed
+    for clarity.
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqheaders.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqheaders.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqheaders.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqheaders.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/RequestHeaderExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for RequestHeader Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font>
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> java.util.*;

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqinfo.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqinfo.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqinfo.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqinfo.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/RequestInfoExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for Request Info Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font> 
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> javax.servlet.*;
@@ -52,11 +53,11 @@
         out.println(&quot;<font color="#009900">&lt;/html&gt;</font>&quot;);
     }
 
-<font color="#FF0000">    /**
-     * We are going to perform the same operations for POST requests
-     * as for GET methods, so this method just sends the request to
-     * the doGet method.
-     */</font>
+<font color="#FF0000"> /**
+    * We are going to perform the same operations for POST requests
+    * as for GET methods, so this method just sends the request to
+    * the doGet method.
+    */</font>
 
     <font color="#0000FF">public void</font> doPost(HttpServletRequest request, HttpServletResponse response)
     <font color="#0000FF">throws</font> IOException, ServletException

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqparams.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqparams.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqparams.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/reqparams.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/RequestParamExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for Request Parameter Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font> 
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> java.util.*;

Modified: geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/sessions.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/sessions.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/sessions.html (original)
+++ geronimo/samples/branches/2.1/samples/servlet-examples/servlet-examples-war/src/main/webapp/sessions.html Fri Jun  6 15:43:44 2008
@@ -16,14 +16,15 @@
 -->
 <html>
 <head>
-<title>Untitled Document</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>Untitled Document</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="servlet/SessionExample"><img src="images/execute.gif" align="right" border="0"></a><a href="index.html"><img src="images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
+
 <h3>Source Code for Session Example<font color="#0000FF"><br>
-  </font> </h3>
+</font></h3>
 <font color="#0000FF"></font> 
 <pre><font color="#0000FF">import</font> java.io.*;
 <font color="#0000FF">import</font> java.util.*;

Modified: geronimo/samples/branches/2.1/samples/timereport/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/pom.xml Fri Jun  6 15:43:44 2008
@@ -21,36 +21,36 @@
 <!-- $Rev$ $Date$ -->
 
 <project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
-    
+
     <modelVersion>4.0.0</modelVersion>
-    
+
     <parent>
         <groupId>org.apache.geronimo.samples</groupId>
         <artifactId>samples</artifactId>
         <version>2.1-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>timereport</artifactId>
     <name>Geronimo Samples :: timereport</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo timereport sample created from an archetype.
     </description>
-    
-   <modules>
+
+    <modules>
         <module>timereport-war</module>
         <module>timereport-jetty</module>
         <module>timereport-tomcat</module>
     </modules>
 
-   <build>
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-jetty/pom.xml Fri Jun  6 15:43:44 2008
@@ -89,7 +89,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -113,21 +113,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>jetty6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
-                                    <!--There is a separate version of the application that works with Tomcat. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>jetty6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Jetty distribution. -->
+                    <!--It is not intended to run in the Geronimo/Tomcat distribution. -->
+                    <!--There is a separate version of the application that works with Tomcat. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-tomcat/pom.xml Fri Jun  6 15:43:44 2008
@@ -51,7 +51,7 @@
             <version>${version}</version>
             <type>car</type>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -89,7 +89,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -113,21 +113,21 @@
                     </useMavenDependencies>
                     <category>Sample</category>
                     <!--<instance>-->
-                        <!--<plugin-artifact>-->
-                            <!--<prerequisite>-->
-                                <!--<id>-->
-                                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
-                                    <!--<artifactId>tomcat6</artifactId>-->
-                                <!--</id>-->
-                                <!--<resource-type>Web Container</resource-type>-->
-                                <!--<description>-->
-                                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
-                                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
-                                    <!--There is a separate version of the application that works with Jetty. -->
-                                    <!--Please install the version appropriate to your Geronimo distribution.-->
-                                <!--</description> -->
-                            <!--</prerequisite>-->
-                        <!--</plugin-artifact>-->
+                    <!--<plugin-artifact>-->
+                    <!--<prerequisite>-->
+                    <!--<id>-->
+                    <!--<groupId>org.apache.geronimo.configs</groupId>-->
+                    <!--<artifactId>tomcat6</artifactId>-->
+                    <!--</id>-->
+                    <!--<resource-type>Web Container</resource-type>-->
+                    <!--<description>-->
+                    <!--This version of the application works with the Geronimo/Tomcat distribution. -->
+                    <!--It is not intended to run in the Geronimo/Jetty distribution. -->
+                    <!--There is a separate version of the application that works with Jetty. -->
+                    <!--Please install the version appropriate to your Geronimo distribution.-->
+                    <!--</description> -->
+                    <!--</prerequisite>-->
+                    <!--</plugin-artifact>-->
                     <!--</instance>-->
                 </configuration>
             </plugin>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/pom.xml Fri Jun  6 15:43:44 2008
@@ -38,11 +38,11 @@
 
     <dependencies>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -53,7 +53,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                              <echo>Copying site directory from parent</echo>
+                                <echo>Copying site directory from parent</echo>
                                 <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddEmployeeServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddEmployeeServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddEmployeeServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddEmployeeServlet.java Fri Jun  6 15:43:44 2008
@@ -25,29 +25,29 @@
 
 public class AddEmployeeServlet extends HttpServlet {
 
-	
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		handleRequest(req,res);
-	}
-
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		doGet(req,res);
-	}
-	
-	private void handleRequest(HttpServletRequest req, HttpServletResponse res) throws IOException{
-		String name = req.getParameter("name");
-		String username = req.getParameter("username");
-		String password = req.getParameter("password");
-		
-		//TODO: Save employee information to a Database
-		
-		System.out.println("Name = "+name);
-		System.out.println("Username = "+username);
-		System.out.println("Password = "+password);
-		
-		
-		res.sendRedirect("../manager/index.jsp");		
-		
-	}
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        handleRequest(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void handleRequest(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        String name = req.getParameter("name");
+        String username = req.getParameter("username");
+        String password = req.getParameter("password");
+
+        //TODO: Save employee information to a Database
+
+        System.out.println("Name = " + name);
+        System.out.println("Username = " + username);
+        System.out.println("Password = " + password);
+
+
+        res.sendRedirect("../manager/index.jsp");
+
+    }
 
 }

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddTimeRecordServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddTimeRecordServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddTimeRecordServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/java/org/apache/geronimo/samples/timereport/web/AddTimeRecordServlet.java Fri Jun  6 15:43:44 2008
@@ -26,32 +26,30 @@
 
 public class AddTimeRecordServlet extends HttpServlet {
 
-	
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		handleRequest(req,res);
-	}
-
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		doGet(req,res);
-	}
-	
-	private void handleRequest(HttpServletRequest req, HttpServletResponse res) throws IOException{
-		String date = req.getParameter("date");
-		String project = req.getParameter("project");
-		String hours = req.getParameter("hours");
-		
-		System.out.println("Date = "+date);
-		System.out.println("Project = "+project);
-		System.out.println("Hours = "+hours);
-		
-		//TODO: Save time record information to a Database
-		
-		
-		res.sendRedirect("../employee/index.jsp");		
-		
-	}
-	
-	
-	
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        handleRequest(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void handleRequest(HttpServletRequest req, HttpServletResponse res) throws IOException {
+        String date = req.getParameter("date");
+        String project = req.getParameter("project");
+        String hours = req.getParameter("hours");
+
+        System.out.println("Date = " + date);
+        System.out.println("Project = " + project);
+        System.out.println("Hours = " + hours);
+
+        //TODO: Save time record information to a Database
+
+
+        res.sendRedirect("../employee/index.jsp");
+
+    }
+
 
 }

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 15:43:44 2008
@@ -20,24 +20,24 @@
 <web-app
         xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
 
-  <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <dep:moduleId>
-      <dep:groupId>org.apache.geronimo.samples</dep:groupId>
-      <dep:artifactId>timereport-plugin</dep:artifactId>
-      <dep:version>${version}</dep:version>
-      <dep:type>car</dep:type>
-    </dep:moduleId>
-    <dep:dependencies>
-      <dep:dependency>
-        <dep:groupId>org.apache.geronimo.samples</dep:groupId>
-        <dep:artifactId>sample-datasource</dep:artifactId>
-        <dep:version>${version}</dep:version>
-        <dep:type>car</dep:type>
-      </dep:dependency>
-    </dep:dependencies>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
+    <dep:environment xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
+        <dep:moduleId>
+            <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+            <dep:artifactId>timereport-plugin</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>car</dep:type>
+        </dep:moduleId>
+        <dep:dependencies>
+            <dep:dependency>
+                <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+                <dep:artifactId>sample-datasource</dep:artifactId>
+                <dep:version>${version}</dep:version>
+                <dep:type>car</dep:type>
+            </dep:dependency>
+        </dep:dependencies>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
     <context-root>/timereport</context-root>
 
     <security-realm-name>TimeReportRealm</security-realm-name>
@@ -62,7 +62,7 @@
             </role>
         </role-mappings>
     </security>
-    
+
     <gbean name="TimeReportRealm" class="org.apache.geronimo.security.realm.GenericSecurityRealm">
         <attribute name="realmName">TimeReportRealm</attribute>
         <reference name="ServerInfo">

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/employee/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/employee/index.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/employee/index.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/employee/index.jsp Fri Jun  6 15:43:44 2008
@@ -1,66 +1,66 @@
 <!--
-    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
+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
+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.
+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.
 -->
 <HTML>
 <HEAD>
-<TITLE>Time Report</TITLE>
+    <TITLE>Time Report</TITLE>
 </HEAD>
 <BODY>
 <FORM action="add_timerecord" method="POST">
-<CENTER>
-<H1>Report Time to the System</H1>
-<TABLE bgcolor="cyan" align="center">
-	<TR>
-		<TD>Date</TD>
-		<TD><INPUT type="text" name="date" maxlength="10"></TD>
-	</TR>
-	<TR>
-		<TD>Project Name</TD>
-		<TD>
-		<SELECT name="project">
-		<OPTION value="1">Project 1</OPTION>
-		<OPTION value="2">Project 2</OPTION>					
-		<OPTION value="3">Project 3</OPTION>					
-		<OPTION value="4">Project 4</OPTION>					
-		</SELECT>
-		</TD>
-	</TR>
-	<TR>
-		<TD>Number of Hours</TD>
-		<TD><INPUT type="text" name="hours" maxlength="2"></TD>
-	</TR>
-	<TR>
-		<TD>Description</TD>
-		<TD><textarea name="description" rows="5"></textarea></TD>
-	</TR>
-</TABLE>
-<BR>
-	<INPUT type="submit" value="Save">
-	<INPUT type="reset" value="Reset">
-<BR>
-<BR>
-<%if(request.isUserInRole("manager")){%>
-<A href="../manager/index.jsp">Add Employees</A>
-<BR>
+    <CENTER>
+        <H1>Report Time to the System</H1>
+        <TABLE bgcolor="cyan" align="center">
+            <TR>
+                <TD>Date</TD>
+                <TD><INPUT type="text" name="date" maxlength="10"></TD>
+            </TR>
+            <TR>
+                <TD>Project Name</TD>
+                <TD>
+                    <SELECT name="project">
+                        <OPTION value="1">Project 1</OPTION>
+                        <OPTION value="2">Project 2</OPTION>
+                        <OPTION value="3">Project 3</OPTION>
+                        <OPTION value="4">Project 4</OPTION>
+                    </SELECT>
+                </TD>
+            </TR>
+            <TR>
+                <TD>Number of Hours</TD>
+                <TD><INPUT type="text" name="hours" maxlength="2"></TD>
+            </TR>
+            <TR>
+                <TD>Description</TD>
+                <TD><textarea name="description" rows="5"></textarea></TD>
+            </TR>
+        </TABLE>
+        <BR>
+        <INPUT type="submit" value="Save">
+        <INPUT type="reset" value="Reset">
+        <BR>
+        <BR>
+        <%if (request.isUserInRole("manager")) {%>
+        <A href="../manager/index.jsp">Add Employees</A>
+        <BR>
 
-<%}%>
-<A href="../login/logout.jsp">Logout</A>
-</CENTER>
+        <%}%>
+        <A href="../login/logout.jsp">Logout</A>
+    </CENTER>
 </FORM>
 </BODY>
 </HTML>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/header.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/header.html (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/header.html Fri Jun  6 15:43:44 2008
@@ -16,40 +16,42 @@
 -->
 
 <html>
-    <head>
-        <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
-        <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">   
-        <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script><title>Apache Geronimo Sample Applications</title>
-        <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
-    </head>
-    
-    <body onload="init()">
-        
-        <table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
-            <tbody>
-                <tr>
-                    <td valing="top" align="left">
-                        <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
-                    </td>
-                    <td width="100%">
-                        &nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
-        
-        <table border="0" cellpadding="2" cellspacing="0" width="100%">
-            <tbody>
-                <tr class="topBar">
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
-                        &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation"target="_blank">Documentation</a> | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications"target="_blank">Sample Applications</a>
-                    </td>
-                    <td class="topBarDiv" align="left" nowrap="true" valign="middle">
-                        <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
-                    </td>
-                </tr>
-            </tbody>
-        </table>
+<head>
+    <link type="text/css" rel="stylesheet" href="http://geronimo.apache.org/style/default.css">
+    <link rel="SHORTCUT ICON" href="http://geronimo.apache.org/images/favicon.ico">
+    <script src="http://geronimo.apache.org/functions.js" type="text/javascript"></script>
+    <title>Apache Geronimo Sample Applications</title>
+    <meta http-equiv="Content-Type" content="text/html;charset=UTF-8">
+</head>
 
-    </body>
+<body onload="init()">
+
+<table valign="top" background="http://geronimo.apache.org/images/header_bg_1x86.gif" border="0" cellpadding="0" cellspacing="0" width="100%">
+    <tbody>
+        <tr>
+            <td valing="top" align="left">
+                <a href="http://geronimo.apache.org/"><img src="http://geronimo.apache.org/images/topleft_logo_437x64.gif" border="0"></a>
+            </td>
+            <td width="100%">
+                &nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+<table border="0" cellpadding="2" cellspacing="0" width="100%">
+    <tbody>
+        <tr class="topBar">
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle" width="100%">
+                &nbsp;<a href="http://geronimo.apache.org/" title="Apache Geronimo Home" target="_blank">Apache Geronimo Home</a> | <a href="http://cwiki.apache.org/geronimo/" title="Geronimo Documentation" target="_blank">Documentation</a>
+                | <a href="http://cwiki.apache.org/GMOxSAMPLES/" title="Sample Applications" target="_blank">Sample Applications</a>
+            </td>
+            <td class="topBarDiv" align="left" nowrap="true" valign="middle">
+                <a href="xref/index.html" target="source_window">Source Code</a> | <a href="apidocs/index.html" target="source_window">Java Docs</a>&nbsp;&nbsp;
+            </td>
+        </tr>
+    </tbody>
+</table>
+
+</body>
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.html (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.html Fri Jun  6 15:43:44 2008
@@ -17,13 +17,13 @@
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
 <html>
 <head>
-  <title>Apache Geronimo Sample Application</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+    <title>Apache Geronimo Sample Application</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
 </head>
 
 <FRAMESET rows="86px,*" frameborder="0">
     <FRAME src="./header.html" name="headerFrame" title="Header" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
     <FRAME src="./index.jsp" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
 </FRAMESET>
-  
+
 </html>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/index.jsp Fri Jun  6 15:43:44 2008
@@ -1,31 +1,31 @@
 <!--
-  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.
+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.
 -->
 <html>
 <head>
-<title>Time Reporting System</title>
+    <title>Time Reporting System</title>
 </head>
 <body>
 <center>
-<h1>Welcome to the Time Reporting System</h1>
-<br>
-<br>
-<a href="employee/index.jsp">Time Report</a><br>
+    <h1>Welcome to the Time Reporting System</h1>
+    <br>
+    <br>
+    <a href="employee/index.jsp">Time Report</a><br>
 </center>
 </body>
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login.jsp Fri Jun  6 15:43:44 2008
@@ -1,56 +1,56 @@
 <!--
-  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.
+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.
 -->
 <HTML>
 <HEAD>
-<TITLE>Login</TITLE>
+    <TITLE>Login</TITLE>
 </HEAD>
 
 <BODY>
 <CENTER>
-   <H1>Please login ...</H1>
+    <H1>Please login ...</H1>
+
+    <FORM method="post" action="j_security_check">
+        <TABLE bgcolor="cyan">
+            <TR>
+                <TD align="left">
+                    Username:
+                </TD>
+
+                <TD align="left">
+                    <INPUT type="text" name="j_username" size="15" maxlength="15">
+                </TD>
+            </TR>
+
+            <TR>
+                <TD align="left">
+                    Password:
+                </TD>
 
-   <FORM method="post" action="j_security_check">
-   <TABLE bgcolor="cyan">
-      <TR>
-      <TD align="left">
-      Username:
-      </TD>
-
-      <TD align="left">
-      <INPUT type="text" name="j_username" size="15" maxlength="15">
-      </TD>
-      </TR>
-
-      <TR>
-      <TD align="left">
-      Password:
-      </TD>
-
-      <TD align="left">
-      <INPUT type="password" name="j_password" size="15" maxlength="15">
-      </TD>
-      </TR>
-   </TABLE>
-   <BR>
-   <INPUT type="submit" value="Login">
-   <INPUT type="reset" value="Reset"> 
-   </FORM>
+                <TD align="left">
+                    <INPUT type="password" name="j_password" size="15" maxlength="15">
+                </TD>
+            </TR>
+        </TABLE>
+        <BR>
+        <INPUT type="submit" value="Login">
+        <INPUT type="reset" value="Reset">
+    </FORM>
 </CENTER>
 </BODY>
 </HTML>

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login_error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login_error.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login_error.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/login_error.jsp Fri Jun  6 15:43:44 2008
@@ -1,31 +1,31 @@
 <!--
-  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.
+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.
 -->
 <HTML>
 <HEAD>
-   <TITLE>Login Error</TITLE>
+    <TITLE>Login Error</TITLE>
 </HEAD>
 
 <BODY bgcolor="white">
 <CENTER>
-   <H1>Invalid user name or password</H1>
-   <BR>	
-   <A href="/timereport/index.jsp">Home</A> 
+    <H1>Invalid user name or password</H1>
+    <BR>
+    <A href="/timereport/index.jsp">Home</A>
 </CENTER>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/logout.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/logout.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/login/logout.jsp Fri Jun  6 15:43:44 2008
@@ -1,34 +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.
+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.
 -->
 <HTML>
-   <HEAD>
-   <TITLE>Logout</TITLE>
-   </HEAD>
-   <BODY>
-   
-   <% session.invalidate(); %>
-
-   <CENTER>
-   <H1>Good Bye</H1>
-   <H2>You have now logged out.</H2>
-
-   <A href="/timereport/index.jsp">Return to Main Page</A>
-   <CENTER>
-   </BODY>
+<HEAD>
+    <TITLE>Logout</TITLE>
+</HEAD>
+<BODY>
+
+<% session.invalidate(); %>
+
+<CENTER>
+    <H1>Good Bye</H1>
+
+    <H2>You have now logged out.</H2>
+
+    <A href="/timereport/index.jsp">Return to Main Page</A>
+    <CENTER>
+</BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/manager/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/manager/index.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/manager/index.jsp (original)
+++ geronimo/samples/branches/2.1/samples/timereport/timereport-war/src/main/webapp/manager/index.jsp Fri Jun  6 15:43:44 2008
@@ -1,54 +1,54 @@
 <!--
-  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.
+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.
 -->
 <HTML>
 <HEAD>
-<TITLE>Add Employees</TITLE>
+    <TITLE>Add Employees</TITLE>
 </HEAD>
 <BODY>
 <FORM action="add_employee">
-<CENTER>
-<H1>Add Employees</H1>
-<BR>
-<TABLE bgcolor="cyan">
-  <TR>
-   <TD>Name</TD>
-   <TD><INPUT type="text" name="name"></TD>
-  </TR>
-  <TR>
-   <TD>Username</TD>	
-   <TD><INPUT type="text" name="username"></TD>
-  </TR>
-   <TR>
-   <TD>Password</TD>	
-   <TD><INPUT type="password" name="password"></TD>
-  </TR>  
-</TABLE>
-<BR>
-<INPUT type="submit" value="Add">
-<INPUT type="reset" value="Reset">
-<BR>
-<BR>
-<A href="../employee/index.jsp">Time Report</A>
-<BR>
-<A href="../login/logout.jsp">Logout</A>
-<BR>
-</CENTER>
+    <CENTER>
+        <H1>Add Employees</H1>
+        <BR>
+        <TABLE bgcolor="cyan">
+            <TR>
+                <TD>Name</TD>
+                <TD><INPUT type="text" name="name"></TD>
+            </TR>
+            <TR>
+                <TD>Username</TD>
+                <TD><INPUT type="text" name="username"></TD>
+            </TR>
+            <TR>
+                <TD>Password</TD>
+                <TD><INPUT type="password" name="password"></TD>
+            </TR>
+        </TABLE>
+        <BR>
+        <INPUT type="submit" value="Add">
+        <INPUT type="reset" value="Reset">
+        <BR>
+        <BR>
+        <A href="../employee/index.jsp">Time Report</A>
+        <BR>
+        <A href="../login/logout.jsp">Logout</A>
+        <BR>
+    </CENTER>
 </FORM>
 </BODY>
 </HTML>



Mime
View raw message