geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664175 [9/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/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/el/implicit-objects.jsp Fri Jun  6 15:43:44 2008
@@ -1,89 +1,99 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="fn" uri="http://java.sun.com/jsp/jstl/functions" %>
 
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Expression Language - Implicit Objects</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Expression Language - Implicit Objects</h1>
-    <hr>
-    This example illustrates some of the implicit objects available 
-    in the Expression Lanaguage.  The following implicit objects are 
-    available (not all illustrated here):
-    <ul>
-      <li>pageContext - the PageContext object</li>
-      <li>pageScope - a Map that maps page-scoped attribute names to 
-          their values</li>
-      <li>requestScope - a Map that maps request-scoped attribute names 
-          to their values</li>
-      <li>sessionScope - a Map that maps session-scoped attribute names 
-          to their values</li>
-      <li>applicationScope - a Map that maps application-scoped attribute 
-          names to their values</li>
-      <li>param - a Map that maps parameter names to a single String 
-          parameter value</li>
-      <li>paramValues - a Map that maps parameter names to a String[] of 
-          all values for that parameter</li>
-      <li>header - a Map that maps header names to a single String 
-          header value</li>
-      <li>headerValues - a Map that maps header names to a String[] of 
-          all values for that header</li>
-      <li>initParam - a Map that maps context initialization parameter 
-          names to their String parameter value</li>
-      <li>cookie - a Map that maps cookie names to a single Cookie object.</li>
-    </ul>
+</head>
+<body>
+<h1>JSP 2.0 Expression Language - Implicit Objects</h1>
+<hr>
+This example illustrates some of the implicit objects available
+in the Expression Lanaguage. The following implicit objects are
+available (not all illustrated here):
+<ul>
+    <li>pageContext - the PageContext object</li>
+    <li>pageScope - a Map that maps page-scoped attribute names to
+        their values
+    </li>
+    <li>requestScope - a Map that maps request-scoped attribute names
+        to their values
+    </li>
+    <li>sessionScope - a Map that maps session-scoped attribute names
+        to their values
+    </li>
+    <li>applicationScope - a Map that maps application-scoped attribute
+        names to their values
+    </li>
+    <li>param - a Map that maps parameter names to a single String
+        parameter value
+    </li>
+    <li>paramValues - a Map that maps parameter names to a String[] of
+        all values for that parameter
+    </li>
+    <li>header - a Map that maps header names to a single String
+        header value
+    </li>
+    <li>headerValues - a Map that maps header names to a String[] of
+        all values for that header
+    </li>
+    <li>initParam - a Map that maps context initialization parameter
+        names to their String parameter value
+    </li>
+    <li>cookie - a Map that maps cookie names to a single Cookie object.</li>
+</ul>
 
-    <blockquote>
-      <u><b>Change Parameter</b></u>
-      <form action="implicit-objects.jsp" method="GET">
-	  foo = <input type="text" name="foo" value="${fn:escapeXml(param["foo"])}">
-          <input type="submit">
-      </form>
-      <br>
-      <code>
+<blockquote>
+    <u><b>Change Parameter</b></u>
+
+    <form action="implicit-objects.jsp" method="GET">
+        foo = <input type="text" name="foo" value="${fn:escapeXml(param["foo"])}">
+        <input type="submit">
+    </form>
+    <br>
+    <code>
         <table border="1">
-          <thead>
-	    <td><b>EL Expression</b></td>
-	    <td><b>Result</b></td>
-	  </thead>
-	  <tr>
-	    <td>\${param.foo}</td>
-	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
-	  </tr>
-	  <tr>
-	    <td>\${param["foo"]}</td>
-	    <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
-	  </tr>
-	  <tr>
-	    <td>\${header["host"]}</td>
-	    <td>${fn:escapeXml(header["host"])}&nbsp;</td>
-	  </tr>
-	  <tr>
-	    <td>\${header["accept"]}</td>
-	    <td>${fn:escapeXml(header["accept"])}&nbsp;</td>
-	  </tr>
-	  <tr>
-	    <td>\${header["user-agent"]}</td>
-	    <td>${fn:escapeXml(header["user-agent"])}&nbsp;</td>
-	  </tr>
-	</table>
-      </code>
-    </blockquote>
-  </body>
+            <thead>
+                <td><b>EL Expression</b></td>
+                <td><b>Result</b></td>
+            </thead>
+            <tr>
+                <td>\${param.foo}</td>
+                <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
+            </tr>
+            <tr>
+                <td>\${param["foo"]}</td>
+                <td>${fn:escapeXml(param["foo"])}&nbsp;</td>
+            </tr>
+            <tr>
+                <td>\${header["host"]}</td>
+                <td>${fn:escapeXml(header["host"])}&nbsp;</td>
+            </tr>
+            <tr>
+                <td>\${header["accept"]}</td>
+                <td>${fn:escapeXml(header["accept"])}&nbsp;</td>
+            </tr>
+            <tr>
+                <td>\${header["user-agent"]}</td>
+                <td>${fn:escapeXml(header["user-agent"])}&nbsp;</td>
+            </tr>
+        </table>
+    </code>
+</blockquote>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.html Fri Jun  6 15:43:44 2008
@@ -16,22 +16,22 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="jspattribute.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="jspattribute.jsp.html">Source Code for jspattribute.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="HelloWorldSimpleTag.java.html">Source Code for HelloWorldSimpleTag.java<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="FooBean.java.html">Source Code for FooBean.java<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/jspattribute.jsp Fri Jun  6 15:43:44 2008
@@ -1,46 +1,47 @@
 <!--
- 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.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib" %>
 
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - jsp:attribute and jsp:body</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - jsp:attribute and jsp:body</h1>
-    <hr>
-    <p>The new &lt;jsp:attribute&gt; and &lt;jsp:body&gt; 
+</head>
+<body>
+<h1>JSP 2.0 Examples - jsp:attribute and jsp:body</h1>
+<hr>
+<p>The new &lt;jsp:attribute&gt; and &lt;jsp:body&gt;
     standard actions can be used to specify the value of any standard
     action or custom action attribute.</p>
-    <p>This example uses the &lt;jsp:attribute&gt;
+
+<p>This example uses the &lt;jsp:attribute&gt;
     standard action to use the output of a custom action invocation
     (one that simply outputs "Hello, World!") to set the value of a
-    bean property.  This would normally require an intermediary
+    bean property. This would normally require an intermediary
     step, such as using JSTL's &lt;c:set&gt; action.</p>
-    <br>
-    <jsp:useBean id="foo" class="jsp2.examples.FooBean">
-      Bean created!  Setting foo.bar...<br>
-      <jsp:setProperty name="foo" property="bar">
+<br>
+<jsp:useBean id="foo" class="jsp2.examples.FooBean">
+    Bean created! Setting foo.bar...<br>
+    <jsp:setProperty name="foo" property="bar">
         <jsp:attribute name="value">
 	  <my:helloWorld/>
         </jsp:attribute>
-      </jsp:setProperty>
-    </jsp:useBean>
-    <br>
-    Result: ${foo.bar}
-  </body>
+    </jsp:setProperty>
+</jsp:useBean>
+<br>
+Result: ${foo.bar}
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.html Fri Jun  6 15:43:44 2008
@@ -16,22 +16,22 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="shuffle.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="shuffle.jsp.html">Source Code for shuffle.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="ShuffleSimpleTag.java.html">Source Code for ShuffleSimpleTag.java<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="TileSimpleTag.java.html">Source Code for TileSimpleTag.java<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspattribute/shuffle.jsp Fri Jun  6 15:43:44 2008
@@ -1,45 +1,46 @@
 <!--
- 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.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib" %>
 
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Shuffle Example</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Shuffle Example</h1>
-    <hr>
-    <p>Try reloading the page a few times.  Both the rows and the columns
+</head>
+<body>
+<h1>JSP 2.0 Examples - Shuffle Example</h1>
+<hr>
+<p>Try reloading the page a few times. Both the rows and the columns
     are shuffled and appear different each time.</p>
-    <p>Here's how the code works.  The SimpleTag handler called 
-    &lt;my:shuffle&gt; accepts three attributes.  Each attribute is a 
+
+<p>Here's how the code works. The SimpleTag handler called
+    &lt;my:shuffle&gt; accepts three attributes. Each attribute is a
     JSP Fragment, meaning it is a fragment of JSP code that can be
-    dynamically executed by the shuffle tag handler on demand.  The 
+    dynamically executed by the shuffle tag handler on demand. The
     shuffle tag handler executes the three fragments in a random order.
     To shuffle both the rows and the columns, the shuffle tag is used
     with itself as a parameter.</p>
-    <hr>
-    <blockquote>
-     <font color="#ffffff">
-      <table>
-        <my:shuffle>
+<hr>
+<blockquote>
+    <font color="#ffffff">
+        <table>
+            <my:shuffle>
           <jsp:attribute name="fragment1">
             <tr>
-              <my:shuffle>
+                <my:shuffle>
                 <jsp:attribute name="fragment1">
                   <my:tile color="#ff0000" label="A"/>
                 </jsp:attribute>
@@ -49,12 +50,12 @@
                 <jsp:attribute name="fragment3">
                   <my:tile color="#0000ff" label="C"/>
                 </jsp:attribute>
-              </my:shuffle>
+                </my:shuffle>
             </tr>
           </jsp:attribute>
           <jsp:attribute name="fragment2">
             <tr>
-              <my:shuffle>
+                <my:shuffle>
                 <jsp:attribute name="fragment1">
                   <my:tile color="#ff0000" label="1"/>
                 </jsp:attribute>
@@ -64,12 +65,12 @@
                 <jsp:attribute name="fragment3">
                   <my:tile color="#0000ff" label="3"/>
                 </jsp:attribute>
-              </my:shuffle>
+                </my:shuffle>
             </tr>
           </jsp:attribute>
           <jsp:attribute name="fragment3">
             <tr>
-              <my:shuffle>
+                <my:shuffle>
                 <jsp:attribute name="fragment1">
                   <my:tile color="#ff0000" label="!"/>
                 </jsp:attribute>
@@ -79,12 +80,12 @@
                 <jsp:attribute name="fragment3">
                   <my:tile color="#0000ff" label="#"/>
                 </jsp:attribute>
-              </my:shuffle>
+                </my:shuffle>
             </tr>
           </jsp:attribute>
-        </my:shuffle>
-      </table>
-     </font>
-    </blockquote>
-  </body>
+            </my:shuffle>
+        </table>
+    </font>
+</blockquote>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.html Fri Jun  6 15:43:44 2008
@@ -16,16 +16,16 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="basic.jspx"><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>
+        href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="basic.jspx.html">Source Code for XHTML Basic Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/basic.jspx Fri Jun  6 15:43:44 2008
@@ -17,21 +17,21 @@
 <tags:xhtmlbasic xmlns:tags="urn:jsptagdir:/WEB-INF/tags"
                  xmlns:jsp="http://java.sun.com/JSP/Page"
                  xmlns:fmt="http://java.sun.com/jsp/jstl/fmt"
-		 xmlns="http://www.w3.org/1999/xhtml">
-  <jsp:directive.page contentType="text/html" />
-  <head>
-    <title>JSPX - XHTML Basic Example</title>
-  </head>
-  <body>
+                 xmlns="http://www.w3.org/1999/xhtml">
+    <jsp:directive.page contentType="text/html"/>
+    <head>
+        <title>JSPX - XHTML Basic Example</title>
+    </head>
+    <body>
     <h1>JSPX - XHTML Basic Example</h1>
     <hr/>
     This example illustrates how to use JSPX to produce an XHTML basic
-    document suitable for use with mobile phones, televisions, 
+    document suitable for use with mobile phones, televisions,
     PDAs, vending machines, pagers, car navigation systems,
     mobile game machines, digital book readers, smart watches, etc.
     <p/>
     JSPX lets you create dynamic documents in a pure XML syntax compatible
-    with existing XML tools.  The XML syntax in JSP 1.2 was awkward and
+    with existing XML tools. The XML syntax in JSP 1.2 was awkward and
     required &amp;lt;jsp:root&amp;gt; to be the root element of the document.
     This is no longer the case in JSP 2.0.
     <p/>
@@ -40,7 +40,7 @@
     Basic document.
     <p/>
     Just to prove this is live, here's some dynamic content:
-    <jsp:useBean id="now" class="java.util.Date" />
+    <jsp:useBean id="now" class="java.util.Date"/>
     <fmt:formatDate value="${now}" pattern="MMMM d, yyyy, H:mm:ss"/>
-  </body>
+    </body>
 </tags:xhtmlbasic>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/svgexample.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/svgexample.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/svgexample.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/svgexample.html Fri Jun  6 15:43:44 2008
@@ -15,38 +15,40 @@
   limitations under the License.
 -->
 <html>
-  <head>
+<head>
     <title>JSP 2.0 SVG Example</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 SVG Example</h1>
-    <hr>
-    This example uses JSP 2.0's new, simplified JSPX syntax to render a
-    Scalable Vector Graphics (SVG) document.  When you view the source,
-    notice the lack of a &lt;jsp:root&gt; element!  The text to be rendered 
-    can be modified by changing the value of the name parameter.
-    <p>
+</head>
+<body>
+<h1>JSP 2.0 SVG Example</h1>
+<hr>
+This example uses JSP 2.0's new, simplified JSPX syntax to render a
+Scalable Vector Graphics (SVG) document. When you view the source,
+notice the lack of a &lt;jsp:root&gt; element! The text to be rendered
+can be modified by changing the value of the name parameter.
+<p>
     SVG has many potential uses, such as searchable images, or images
     customized with the name of your site's visitor (e.g. a "Susan's Store"
-    tab image).  JSPX is a natural fit for generating dynamic XML content
+    tab image). JSPX is a natural fit for generating dynamic XML content
     such as SVG.
-    <p>
+
+<p>
     To execute this example, follow these steps:
-    <ol>
-      <li>Download <a href="http://xml.apache.org/batik/index.html">Batik</a>,
-          or any other SVG viewer.</li>
-      <li>Copy the following URL:
-      <a href="http://localhost:8080/jsp-examples/jsp2/jspx/textRotate.jspx?name=JSPX">
-      http://localhost:8080/jsp-examples/jsp2/jspx/textRotate.jspx?name=JSPX</a>
-      </li>
-      <li>Paste the URL into Batik's Location field and press Enter</li>
-      <li>Customize by changing the name=JSPX parameter</li>
-    </ol>
-    <br>
-    The following is a screenshot of the resulting image, for those that
-    don't have an SVG viewer:
-    <blockquote>
-      <img src="textRotate.jpg" border="1">
-    </blockquote>
-  </body>
+<ol>
+    <li>Download <a href="http://xml.apache.org/batik/index.html">Batik</a>,
+        or any other SVG viewer.
+    </li>
+    <li>Copy the following URL:
+        <a href="http://localhost:8080/jsp-examples/jsp2/jspx/textRotate.jspx?name=JSPX">
+            http://localhost:8080/jsp-examples/jsp2/jspx/textRotate.jspx?name=JSPX</a>
+    </li>
+    <li>Paste the URL into Batik's Location field and press Enter</li>
+    <li>Customize by changing the name=JSPX parameter</li>
+</ol>
+<br>
+The following is a screenshot of the resulting image, for those that
+don't have an SVG viewer:
+<blockquote>
+    <img src="textRotate.jpg" border="1">
+</blockquote>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.html Fri Jun  6 15:43:44 2008
@@ -16,17 +16,17 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="textRotate.jspx"><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>
+        href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="textRotate.jspx.html">Source Code for SVG (Scalable Vector Graphics)
-Example<font color="#0000FF"></a>
-  </font> </h3>
+    Example<font color="#0000FF"></a>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/jspx/textRotate.jspx Fri Jun  6 15:43:44 2008
@@ -24,29 +24,32 @@
      xmlns:c="http://java.sun.com/jsp/jstl/core"
      xmlns:fn="http://java.sun.com/jsp/jstl/functions"
      xmlns:jsp="http://java.sun.com/JSP/Page">
-  <jsp:directive.page contentType="image/svg+xml" />
-  <title>JSP 2.0 JSPX</title>
-  <!-- select name parameter, or default to JSPX -->
-  <c:set var="name" value='${empty fn:escapeXml(param["name"]) ? "JSPX" : fn:escapeXml(param["name"])}'/>
-  <g id="testContent">
-    <text class="title" x="50%" y="10%" font-size="15" text-anchor="middle" >
-            JSP 2.0 XML Syntax (.jspx) Demo</text>
-    <text class="title" x="50%" y="15%" font-size="15" text-anchor="middle" >
-            Try changing the name parameter!</text>
-    <g opacity="1.0" transform="translate(225, 250)" id="rotatedText">
-      <c:forEach var="i" begin="1" end="24">
-        <jsp:text>
-          <![CDATA[<g opacity="0.95" transform="scale(1.05) rotate(15)">]]>
-        </jsp:text>
-        <text x="0" y="0" transform="scale(1.6, 1.6)" fill="DarkSlateBlue" 
-              text-anchor="middle" font-size="40" font-family="Serif" 
-              id="words">${name}</text>
-      </c:forEach>
-      <c:forEach var="i" begin="1" end="24">
-        <jsp:text><![CDATA[</g>]]></jsp:text>
-      </c:forEach>
-      <text style="font-size:75;font-family:Serif;fill:white" 
-            text-anchor="middle">${name}</text>
+    <jsp:directive.page contentType="image/svg+xml"/>
+    <title>JSP 2.0 JSPX</title>
+    <!-- select name parameter, or default to JSPX -->
+    <c:set var="name" value='${empty fn:escapeXml(param["name"]) ? "JSPX" : fn:escapeXml(param["name"])}'/>
+    <g id="testContent">
+        <text class="title" x="50%" y="10%" font-size="15" text-anchor="middle">
+            JSP 2.0 XML Syntax (.jspx) Demo
+        </text>
+        <text class="title" x="50%" y="15%" font-size="15" text-anchor="middle">
+            Try changing the name parameter!
+        </text>
+        <g opacity="1.0" transform="translate(225, 250)" id="rotatedText">
+            <c:forEach var="i" begin="1" end="24">
+                <jsp:text>
+                    <![CDATA[<g opacity="0.95" transform="scale(1.05) rotate(15)">]]>
+                </jsp:text>
+                <text x="0" y="0" transform="scale(1.6, 1.6)" fill="DarkSlateBlue"
+                      text-anchor="middle" font-size="40" font-family="Serif"
+                      id="words">${name}</text>
+            </c:forEach>
+            <c:forEach var="i" begin="1" end="24">
+                <jsp:text><![CDATA[</g>]]>
+                </jsp:text>
+            </c:forEach>
+            <text style="font-size:75;font-family:Serif;fill:white"
+                  text-anchor="middle">${name}</text>
+        </g>
     </g>
-  </g>
 </svg>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/coda.jspf Fri Jun  6 15:43:44 2008
@@ -1,21 +1,21 @@
 <!--
-   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.
 -->
 <hr>
 <center>
-This banner included with &lt;include-coda&gt;
+    This banner included with &lt;include-coda&gt;
 </center>
 <hr>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.html Fri Jun  6 15:43:44 2008
@@ -16,20 +16,22 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="config.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="config.jsp.html">Source Code for config.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="prelude.jspf.html">Source Code for prelude.jspf<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="coda.jspf.html">Source Code for coda.jspf<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/config.jsp Fri Jun  6 15:43:44 2008
@@ -1,32 +1,33 @@
 <!--
- 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.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
-    <h1>JSP 2.0 Examples - JSP Configuration</h1>
-    <hr>
-    <p>Using a &lt;jsp-property-group&gt; element in the web.xml 
+<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib" %>
+<h1>JSP 2.0 Examples - JSP Configuration</h1>
+<hr>
+<p>Using a &lt;jsp-property-group&gt; element in the web.xml
     deployment descriptor, this JSP page has been configured in the
     following ways:</p>
-    <ul>
-      <li>Uses &lt;include-prelude&gt; to include the top banner.</li>
-      <li>Uses &lt;include-coda&gt; to include the bottom banner.</li>
-      <li>Uses &lt;scripting-invalid&gt; true to disable 
-	  &lt;% scripting %&gt; elements</li>
-      <li>Uses &lt;el-ignored&gt; true to disable ${EL} elements</li>
-      <li>Uses &lt;page-encoding&gt; ISO-8859-1 to set the page encoding (though this is the default anyway)</li>
-    </ul>
-    There are various other configuration options that can be used.
+<ul>
+    <li>Uses &lt;include-prelude&gt; to include the top banner.</li>
+    <li>Uses &lt;include-coda&gt; to include the bottom banner.</li>
+    <li>Uses &lt;scripting-invalid&gt; true to disable
+        &lt;% scripting %&gt; elements
+    </li>
+    <li>Uses &lt;el-ignored&gt; true to disable ${EL} elements</li>
+    <li>Uses &lt;page-encoding&gt; ISO-8859-1 to set the page encoding (though this is the default anyway)</li>
+</ul>
+There are various other configuration options that can be used.
 

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="dynamicattrs.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="dynamicattrs.jsp.html">Source Code for dynamicattrs.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="EchoAttributesTag.java.html">Source Code for EchoAttributesTag.java<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/dynamicattrs.jsp Fri Jun  6 15:43:44 2008
@@ -1,44 +1,44 @@
 <!--
- 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.
 -->
-<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib"%>
+<%@ taglib prefix="my" uri="http://jakarta.apache.org/tomcat/jsp2-example-taglib" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Dynamic Attributes</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Dynamic Attributes</h1>
-    <hr>
-    <p>This JSP page invokes a custom tag that accepts a dynamic set 
-    of attributes.  The tag echoes the name and value of all attributes
+</head>
+<body>
+<h1>JSP 2.0 Examples - Dynamic Attributes</h1>
+<hr>
+<p>This JSP page invokes a custom tag that accepts a dynamic set
+    of attributes. The tag echoes the name and value of all attributes
     passed to it.</p>
-    <hr>
-    <h2>Invocation 1 (six attributes)</h2>
-    <ul>
-      <my:echoAttributes x="1" y="2" z="3" r="red" g="green" b="blue"/>
-    </ul>
-    <h2>Invocation 2 (zero attributes)</h2>
-    <ul>
-      <my:echoAttributes/>
-    </ul>
-    <h2>Invocation 3 (three attributes)</h2>
-    <ul>
-      <my:echoAttributes dogName="Scruffy" 
-	   		 catName="Fluffy" 
-			 blowfishName="Puffy"/>
-    </ul>
-  </body>
+<hr>
+<h2>Invocation 1 (six attributes)</h2>
+<ul>
+    <my:echoAttributes x="1" y="2" z="3" r="red" g="green" b="blue"/>
+</ul>
+<h2>Invocation 2 (zero attributes)</h2>
+<ul>
+    <my:echoAttributes/>
+</ul>
+<h2>Invocation 3 (three attributes)</h2>
+<ul>
+    <my:echoAttributes dogName="Scruffy"
+                       catName="Fluffy"
+                       blowfishName="Puffy"/>
+</ul>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/misc/prelude.jspf Fri Jun  6 15:43:44 2008
@@ -1,21 +1,21 @@
 <!--
-   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.
 -->
 <hr>
 <center>
-This banner included with &lt;include-prelude&gt;
+    This banner included with &lt;include-prelude&gt;
 </center>
 <hr>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.html Fri Jun  6 15:43:44 2008
@@ -16,22 +16,25 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="book.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="book.jsp.html">Source Code for the Book Example JSP<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="FindBookSimpleTag.java.html">Source Code for the FindBook SimpleTag Handler<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="BookBean.java.html">Source Code for BookBean<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="Functions.java.html">Source Code for the EL Functions<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/book.jsp Fri Jun  6 15:43:44 2008
@@ -1,55 +1,55 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="my" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Book SimpleTag Handler</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Book SimpleTag Handler</h1>
-    <hr>
-    <p>Illustrates a semi-realistic use of SimpleTag and the Expression 
-    Language.  First, a &lt;my:findBook&gt; tag is invoked to populate 
-    the page context with a BookBean.  Then, the books fields are printed 
+</head>
+<body>
+<h1>JSP 2.0 Examples - Book SimpleTag Handler</h1>
+<hr>
+<p>Illustrates a semi-realistic use of SimpleTag and the Expression
+    Language. First, a &lt;my:findBook&gt; tag is invoked to populate
+    the page context with a BookBean. Then, the books fields are printed
     in all caps.</p>
-    <br>
-    <b><u>Result:</u></b><br>
-    <my:findBook var="book"/>
-    <table border="1">
-        <thead>
-	    <td><b>Field</b></td>
-	    <td><b>Value</b></td>
-	    <td><b>Capitalized</b></td>
-	</thead>
-	<tr>
-	    <td>Title</td>
-	    <td>${book.title}</td>
-	    <td>${my:caps(book.title)}</td>
-	</tr>
-	<tr>
-	    <td>Author</td>
-	    <td>${book.author}</td>
-	    <td>${my:caps(book.author)}</td>
-	</tr>
-	<tr>
-	    <td>ISBN</td>
-	    <td>${book.isbn}</td>
-	    <td>${my:caps(book.isbn)}</td>
-	</tr>
-    </table>
-  </body>
+<br>
+<b><u>Result:</u></b><br>
+<my:findBook var="book"/>
+<table border="1">
+    <thead>
+        <td><b>Field</b></td>
+        <td><b>Value</b></td>
+        <td><b>Capitalized</b></td>
+    </thead>
+    <tr>
+        <td>Title</td>
+        <td>${book.title}</td>
+        <td>${my:caps(book.title)}</td>
+    </tr>
+    <tr>
+        <td>Author</td>
+        <td>${book.author}</td>
+        <td>${my:caps(book.author)}</td>
+    </tr>
+    <tr>
+        <td>ISBN</td>
+        <td>${book.isbn}</td>
+        <td>${my:caps(book.isbn)}</td>
+    </tr>
+</table>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="hello.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="hello.jsp.html">Source Code for the Hello World Tag Example JSP<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="HelloWorldSimpleTag.java.html">Source Code for the Hello World SimpleTag Handler<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/hello.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
+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.
 -->
 <%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Hello World SimpleTag Handler</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Hello World SimpleTag Handler</h1>
-    <hr>
-    <p>This tag handler simply echos "Hello, World!"  It's an example of
+</head>
+<body>
+<h1>JSP 2.0 Examples - Hello World SimpleTag Handler</h1>
+<hr>
+<p>This tag handler simply echos "Hello, World!" It's an example of
     a very basic SimpleTag handler with no body.</p>
-    <br>
-    <b><u>Result:</u></b>
-    <mytag:helloWorld/>
-  </body>
+<br>
+<b><u>Result:</u></b>
+<mytag:helloWorld/>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="repeat.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="repeat.jsp.html">Source Code for the Repeat Tag Example JSP<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="RepeatSimpleTag.java.html">Source Code for the Repeat SimpleTag Handler<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/simpletag/repeat.jsp Fri Jun  6 15:43:44 2008
@@ -1,39 +1,40 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="mytag" uri="/WEB-INF/jsp2/jsp2-example-taglib.tld" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Repeat SimpleTag Handler</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Repeat SimpleTag Handler</h1>
-    <hr>
-    <p>This tag handler accepts a "num" parameter and repeats the body of the
-    tag "num" times.  It's a simple example, but the implementation of 
-    such a tag in JSP 2.0 is substantially simpler than the equivalent 
+</head>
+<body>
+<h1>JSP 2.0 Examples - Repeat SimpleTag Handler</h1>
+<hr>
+<p>This tag handler accepts a "num" parameter and repeats the body of the
+    tag "num" times. It's a simple example, but the implementation of
+    such a tag in JSP 2.0 is substantially simpler than the equivalent
     JSP 1.2-style classic tag handler.</p>
-    <p>The body of the tag is encapsulated in a "JSP Fragment" and passed
-    to the tag handler, which then executes it five times, inside a 
-    for loop.  The tag handler passes in the current invocation in a
+
+<p>The body of the tag is encapsulated in a "JSP Fragment" and passed
+    to the tag handler, which then executes it five times, inside a
+    for loop. The tag handler passes in the current invocation in a
     scoped variable called count, which can be accessed using the EL.</p>
-    <br>
-    <b><u>Result:</u></b><br>
-    <mytag:repeat num="5">
-      Invocation ${count} of 5<br>
-    </mytag:repeat>
-  </body>
+<br>
+<b><u>Result:</u></b><br>
+<mytag:repeat num="5">
+    Invocation ${count} of 5<br>
+</mytag:repeat>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="hello.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="hello.jsp.html">Source Code for hello.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="helloWorld.tag.html">Source Code for helloWorld.tag<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/hello.jsp Fri Jun  6 15:43:44 2008
@@ -1,35 +1,36 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Hello World Using a Tag File</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Hello World Using a Tag File</h1>
-    <hr>
-    <p>This JSP page invokes a custom tag that simply echos "Hello, World!"  
+</head>
+<body>
+<h1>JSP 2.0 Examples - Hello World Using a Tag File</h1>
+<hr>
+<p>This JSP page invokes a custom tag that simply echos "Hello, World!"
     The custom tag is generated from a tag file in the /WEB-INF/tags
     directory.</p>
-    <p>Notice that we did not need to write a TLD for this tag.  We just
+
+<p>Notice that we did not need to write a TLD for this tag. We just
     created /WEB-INF/tags/helloWorld.tag, imported it using the taglib
     directive, and used it!</p>
-    <br>
-    <b><u>Result:</u></b>
-    <tags:helloWorld/>
-  </body>
+<br>
+<b><u>Result:</u></b>
+<tags:helloWorld/>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
   limitations under the License.
 -->
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="panel.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="panel.jsp.html">Source Code for panel.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="panel.tag.html">Source Code for panel.tag<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/panel.jsp Fri Jun  6 15:43:44 2008
@@ -1,58 +1,58 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Panels using Tag Files</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Panels using Tag Files</h1>
-    <hr>
-    <p>This JSP page invokes a custom tag that draws a 
-    panel around the contents of the tag body.  Normally, such a tag 
+</head>
+<body>
+<h1>JSP 2.0 Examples - Panels using Tag Files</h1>
+<hr>
+<p>This JSP page invokes a custom tag that draws a
+    panel around the contents of the tag body. Normally, such a tag
     implementation would require a Java class with many println() statements,
-    outputting HTML.  Instead, we can use a .tag file as a template,
+    outputting HTML. Instead, we can use a .tag file as a template,
     and we don't need to write a single line of Java or even a TLD!</p>
-    <hr>
-    <table border="0">
-      <tr valign="top">
+<hr>
+<table border="0">
+    <tr valign="top">
         <td>
-          <tags:panel color="#ff8080" bgcolor="#ffc0c0" title="Panel 1">
-	    First panel.<br/>
-	  </tags:panel>
+            <tags:panel color="#ff8080" bgcolor="#ffc0c0" title="Panel 1">
+                First panel.<br/>
+            </tags:panel>
         </td>
         <td>
-          <tags:panel color="#80ff80" bgcolor="#c0ffc0" title="Panel 2">
-	    Second panel.<br/>
-	    Second panel.<br/>
-	    Second panel.<br/>
-	    Second panel.<br/>
-	  </tags:panel>
+            <tags:panel color="#80ff80" bgcolor="#c0ffc0" title="Panel 2">
+                Second panel.<br/>
+                Second panel.<br/>
+                Second panel.<br/>
+                Second panel.<br/>
+            </tags:panel>
         </td>
         <td>
-          <tags:panel color="#8080ff" bgcolor="#c0c0ff" title="Panel 3">
-	    Third panel.<br/>
-            <tags:panel color="#ff80ff" bgcolor="#ffc0ff" title="Inner">
-	      A panel in a panel.
-	    </tags:panel>
-	    Third panel.<br/>
-	  </tags:panel>
+            <tags:panel color="#8080ff" bgcolor="#c0c0ff" title="Panel 3">
+                Third panel.<br/>
+                <tags:panel color="#ff80ff" bgcolor="#ffc0ff" title="Inner">
+                    A panel in a panel.
+                </tags:panel>
+                Third panel.<br/>
+            </tags:panel>
         </td>
-      </tr>
-    </table>
-  </body>
+    </tr>
+</table>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.html Fri Jun  6 15:43:44 2008
@@ -16,18 +16,19 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
-<meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
+    <title>View Source Code</title>
+    <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1">
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF"><a href="products.jsp"><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>
+    <a href="../../index.html"><img src="../../images/return.gif" width="24" height="24" align="right" border="0"></a></font></p>
 
 <h3><a href="products.jsp.html">Source Code for products.jsp<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
+
 <h3><a href="displayProducts.tag.html">Source Code for displayProducts.tag<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsp2/tagfiles/products.jsp Fri Jun  6 15:43:44 2008
@@ -1,35 +1,36 @@
 <!--
- 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.
 -->
 <%@ taglib prefix="tags" tagdir="/WEB-INF/tags" %>
 <html>
-  <head>
+<head>
     <title>JSP 2.0 Examples - Display Products Tag File</title>
-  </head>
-  <body>
-    <h1>JSP 2.0 Examples - Display Products Tag File</h1>
-    <hr>
-    <p>This JSP page invokes a tag file that displays a listing of 
-    products.  The custom tag accepts two fragments that enable
-    customization of appearance.  One for when the product is on sale
+</head>
+<body>
+<h1>JSP 2.0 Examples - Display Products Tag File</h1>
+<hr>
+<p>This JSP page invokes a tag file that displays a listing of
+    products. The custom tag accepts two fragments that enable
+    customization of appearance. One for when the product is on sale
     and one for normal price.</p>
-    <p>The tag is invoked twice, using different styles</p>
-    <hr>
-    <h2>Products</h2>
-    <tags:displayProducts>
+
+<p>The tag is invoked twice, using different styles</p>
+<hr>
+<h2>Products</h2>
+<tags:displayProducts>
       <jsp:attribute name="normalPrice">
 	Item: ${name}<br/>
 	Price: ${price}
@@ -39,16 +40,16 @@
 	<font color="red"><strike>Was: ${origPrice}</strike></font><br/>
 	<b>Now: ${salePrice}</b>
       </jsp:attribute>
-    </tags:displayProducts>
-    <hr>
-    <h2>Products (Same tag, alternate style)</h2>
-    <tags:displayProducts>
+</tags:displayProducts>
+<hr>
+<h2>Products (Same tag, alternate style)</h2>
+<tags:displayProducts>
       <jsp:attribute name="normalPrice">
 	<b>${name}</b> @ ${price} ea.
       </jsp:attribute>
       <jsp:attribute name="onSale">
 	<b>${name}</b> @ ${salePrice} ea. (was: ${origPrice})
       </jsp:attribute>
-    </tags:displayProducts>
-  </body>
+</tags:displayProducts>
+</body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/hello.jsp Fri Jun  6 15:43:44 2008
@@ -18,9 +18,9 @@
 <body bgcolor="white">
 
 <h1>
-I have been invoked by
-<% out.print (request.getAttribute("servletName").toString()); %>
-Servlet.
+    I have been invoked by
+    <% out.print(request.getAttribute("servletName").toString()); %>
+    Servlet.
 </h1>
 
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jsptoservlet.jsp Fri Jun  6 15:43:44 2008
@@ -18,6 +18,6 @@
 <body bgcolor="white">
 
 <!-- Forward to a servlet -->
-<jsp:forward page="/servletToJsp" />
+<jsp:forward page="/servletToJsp"/>
 
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jts.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jts.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jts.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/jsptoserv/jts.html Fri Jun  6 15:43:44 2008
@@ -17,18 +17,18 @@
 -->
 
 <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="jsptoservlet.jsp"><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><a href="jsptoservlet.jsp.html">Source Code for JSP calling servlet <font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
-<h3><a href="servletToJsp.java.html">Source Code for Servlet calling JSP 
-<font color="#0000FF"></a> </font> </h3>
+<h3><a href="servletToJsp.java.html">Source Code for Servlet calling JSP
+    <font color="#0000FF"></a> </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html Fri Jun  6 15:43:44 2008
@@ -20,15 +20,15 @@
   http://www.servlets.com
 -->
 <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="numguess.jsp"><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><a href="numguess.jsp.html">Source Code for Numguess Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp Fri Jun  6 15:43:44 2008
@@ -1,26 +1,24 @@
 <!--
- 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.
-
-  Number Guess Game
-  Written by Jason Hunter, CTO, K&A Software
-  http://www.servlets.com
+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.
+
+Number Guess Game
+Written by Jason Hunter, CTO, K&A Software
+http://www.servlets.com
 -->
 
-<%@ page import = "num.NumberGuessBean" %>
-
 <jsp:useBean id="numguess" class="num.NumberGuessBean" scope="session"/>
 <jsp:setProperty name="numguess" property="*"/>
 
@@ -29,40 +27,47 @@
 <body bgcolor="white">
 <font size=4>
 
-<% if (numguess.getSuccess()) { %>
+    <% if (numguess.getSuccess()) { %>
+
+    Congratulations! You got it.
+    And after just <%= numguess.getNumGuesses() %> tries.<p>
+
+    <% numguess.reset(); %>
+
+    Care to <a href="numguess.jsp">try again</a>?
 
-  Congratulations!  You got it.
-  And after just <%= numguess.getNumGuesses() %> tries.<p>
+    <% } else if (numguess.getNumGuesses() == 0) { %>
 
-  <% numguess.reset(); %>
+    Welcome to the Number Guess game.
 
-  Care to <a href="numguess.jsp">try again</a>?
+    <p>
 
-<% } else if (numguess.getNumGuesses() == 0) { %>
+        I'm thinking of a number between 1 and 100.
 
-  Welcome to the Number Guess game.<p>
+    <p>
 
-  I'm thinking of a number between 1 and 100.<p>
+    <form method=get>
+        What's your guess? <input type=text name=guess>
+        <input type=submit value="Submit">
+    </form>
 
-  <form method=get>
-  What's your guess? <input type=text name=guess>
-  <input type=submit value="Submit">
-  </form>
+    <% } else { %>
 
-<% } else { %>
+    Good guess, but nope. Try <b><%= numguess.getHint() %>
+</b>.
 
-  Good guess, but nope.  Try <b><%= numguess.getHint() %></b>.
+    You have made <%= numguess.getNumGuesses() %> guesses.<p>
 
-  You have made <%= numguess.getNumGuesses() %> guesses.<p>
+    I'm thinking of a number between 1 and 100.
 
-  I'm thinking of a number between 1 and 100.<p>
+    <p>
 
-  <form method=get>
-  What's your guess? <input type=text name=guess>
-  <input type=submit value="Submit">
-  </form>
+    <form method=get>
+        What's your guess? <input type=text name=guess>
+        <input type=submit value="Submit">
+    </form>
 
-<% } %>
+    <% } %>
 
 </font>
 </body>



Mime
View raw message