geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664120 [10/13] - in /geronimo/samples/trunk/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-tomcat...
Date Fri, 06 Jun 2008 20:53:33 GMT
Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.html Fri Jun  6 13:53:24 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/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/num/numguess.jsp Fri Jun  6 13:53:24 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>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.html Fri Jun  6 13:53:24 2008
@@ -16,15 +16,15 @@
   limitations under the License.
 -->
 <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="plugin.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="plugin.jsp.html">Source Code for Plugin Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/plugin/plugin.jsp Fri Jun  6 13:53:24 2008
@@ -16,19 +16,20 @@
   limitations under the License.
 -->
 <title> Plugin example </title>
+
 <body bgcolor="white">
 <h3> Current time is : </h3>
-<jsp:plugin type="applet" code="Clock2.class" codebase="applet" jreversion="1.2" width="160" height="150" >
+<jsp:plugin type="applet" code="Clock2.class" codebase="applet" jreversion="1.2" width="160" height="150">
     <jsp:fallback>
         Plugin tag OBJECT or EMBED not supported by browser.
     </jsp:fallback>
 </jsp:plugin>
 <p>
 <h4>
-<font color=red> 
-The above applet is loaded using the Java Plugin from a jsp page using the
-plugin tag.
-</font>
+    <font color=red>
+        The above applet is loaded using the Java Plugin from a jsp page using the
+        plugin tag.
+    </font>
 </h4>
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/error.jsp Fri Jun  6 13:53:24 2008
@@ -1,22 +1,22 @@
 <!--
- 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>Error Page For Examples</title>
+    <title>Error Page For Examples</title>
 </head>
 <body bgcolor="white">
 Invalid username and/or password, please try

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/index.jsp Fri Jun  6 13:53:24 2008
@@ -1,71 +1,76 @@
 <!--
- 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.
 -->
 <%
-  if (request.getParameter("logoff") != null) {
-    session.invalidate();
-    response.sendRedirect("index.jsp");
-    return;
-  }
+    if (request.getParameter("logoff") != null) {
+        session.invalidate();
+        response.sendRedirect("index.jsp");
+        return;
+    }
 %>
 <html>
 <head>
-<title>Protected Page for Examples</title>
+    <title>Protected Page for Examples</title>
 </head>
 <body bgcolor="white">
 
-You are logged in as remote user <b><%= request.getRemoteUser() %></b>
-in session <b><%= session.getId() %></b><br><br>
+You are logged in as remote user <b><%= request.getRemoteUser() %>
+</b>
+in session <b><%= session.getId() %>
+</b><br><br>
 
 <%
-  if (request.getUserPrincipal() != null) {
+    if (request.getUserPrincipal() != null) {
 %>
-    Your user principal name is
-    <b><%= request.getUserPrincipal().getName() %></b><br><br>
+Your user principal name is
+<b><%= request.getUserPrincipal().getName() %>
+</b><br><br>
 <%
-  } else {
+} else {
 %>
-    No user principal could be identified.<br><br>
+No user principal could be identified.<br><br>
 <%
-  }
+    }
 %>
 
 <%
-  String role = request.getParameter("role");
-  if (role == null)
-    role = "";
-  if (role.length() > 0) {
-    if (request.isUserInRole(role)) {
-%>
-      You have been granted role
-      <b><%= util.HTMLFilter.filter(role) %></b><br><br>
-<%
-    } else {
-%>
-      You have <i>not</i> been granted role
-      <b><%= util.HTMLFilter.filter(role) %></b><br><br>
+    String role = request.getParameter("role");
+    if (role == null)
+        role = "";
+    if (role.length() > 0) {
+        if (request.isUserInRole(role)) {
+%>
+You have been granted role
+<b><%= util.HTMLFilter.filter(role) %>
+</b><br><br>
+<%
+} else {
+%>
+You have <i>not</i> been granted role
+<b><%= util.HTMLFilter.filter(role) %>
+</b><br><br>
 <%
+        }
     }
-  }
 %>
 
 To check whether your username has been granted a particular role,
 enter it here:
 <form method="GET" action='<%= response.encodeURL("index.jsp") %>'>
-<input type="text" name="role" value="<%= util.HTMLFilter.filter(role) %>">
+    <input type="text" name="role" value="<%= util.HTMLFilter.filter(role) %>">
 </form>
 <br><br>
 

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/security/protected/login.jsp Fri Jun  6 13:53:24 2008
@@ -1,38 +1,38 @@
 <!--
- 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>Login Page for Examples</title>
+    <title>Login Page for Examples</title>
 <body bgcolor="white">
-<form method="POST" action='<%= response.encodeURL("j_security_check") %>' >
-  <table border="0" cellspacing="5">
-    <tr>
-      <th align="right">Username:</th>
-      <td align="left"><input type="text" name="j_username"></td>
-    </tr>
-    <tr>
-      <th align="right">Password:</th>
-      <td align="left"><input type="password" name="j_password"></td>
-    </tr>
-    <tr>
-      <td align="right"><input type="submit" value="Log In"></td>
-      <td align="left"><input type="reset"></td>
-    </tr>
-  </table>
+<form method="POST" action='<%= response.encodeURL("j_security_check") %>'>
+    <table border="0" cellspacing="5">
+        <tr>
+            <th align="right">Username:</th>
+            <td align="left"><input type="text" name="j_username"></td>
+        </tr>
+        <tr>
+            <th align="right">Password:</th>
+            <td align="left"><input type="password" name="j_password"></td>
+        </tr>
+        <tr>
+            <td align="right"><input type="submit" value="Log In"></td>
+            <td align="left"><input type="reset"></td>
+        </tr>
+    </table>
 </form>
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/DummyCart.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/DummyCart.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/DummyCart.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/DummyCart.html Fri Jun  6 13:53:24 2008
@@ -17,16 +17,18 @@
 -->
 
 <HEAD>
-<title>
-sessions.DummyCart Bean Properties
-</title>
+    <title>
+        sessions.DummyCart Bean Properties
+    </title>
 <BODY BGCOLOR="white">
 <H2>
-sessions.DummyCart Bean Properties
+    sessions.DummyCart Bean Properties
 </H2>
 <HR>
 <DL>
-<DT>public class <B>DummyCart</B><DT>extends Object</DL>
+    <DT>public class <B>DummyCart</B>
+    <DT>extends Object
+</DL>
 
 <P>
 <HR>
@@ -34,22 +36,22 @@
 <P>
 
 <TABLE BORDER="1" WIDTH="100%" CELLPADDING="3" CELLSPACING="0">
-<TR BGCOLOR="#EEEEFF">
-<TD COLSPAN=3><FONT SIZE="+2">
-<B>Properties Summary</B></FONT></TD>
-</TR>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-String
-</FONT></TD>
-<TD><B>DummyCart:items</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Multi
-</FONT></TD>
+    <TR BGCOLOR="#EEEEFF">
+        <TD COLSPAN=3><FONT SIZE="+2">
+            <B>Properties Summary</B></FONT></TD>
+    </TR>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                String
+            </FONT></TD>
+        <TD><B>DummyCart:items</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Multi
+            </FONT></TD>
 </TABLE>
 <HR>
 </BODY>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.html Fri Jun  6 13:53:24 2008
@@ -20,34 +20,34 @@
     <title>carts</title>
 </head>
 
- <body bgcolor="white">
-<font size = 5 color="#CC0000">
+<body bgcolor="white">
+<font size=5 color="#CC0000">
 
-<form type=POST action=carts.jsp>
-<BR>
-Please enter item to add or remove:
-<br>
-Add Item:
-
-<SELECT NAME="item">
-<OPTION>Beavis & Butt-head Video collection
-<OPTION>X-files movie
-<OPTION>Twin peaks tapes
-<OPTION>NIN CD
-<OPTION>JSP Book
-<OPTION>Concert tickets
-<OPTION>Love life
-<OPTION>Switch blade
-<OPTION>Rex, Rugs & Rock n' Roll
-</SELECT>
-
-
-<br> <br>
-<INPUT TYPE=submit name="submit" value="add">
-<INPUT TYPE=submit name="submit" value="remove">
+    <form type=POST action=carts.jsp>
+        <BR>
+        Please enter item to add or remove:
+        <br>
+        Add Item:
+
+        <SELECT NAME="item">
+            <OPTION>Beavis & Butt-head Video collection
+            <OPTION>X-files movie
+            <OPTION>Twin peaks tapes
+            <OPTION>NIN CD
+            <OPTION>JSP Book
+            <OPTION>Concert tickets
+            <OPTION>Love life
+            <OPTION>Switch blade
+            <OPTION>Rex, Rugs & Rock n' Roll
+        </SELECT>
+
+
+        <br> <br>
+        <INPUT TYPE=submit name="submit" value="add">
+        <INPUT TYPE=submit name="submit" value="remove">
+
+    </form>
 
-</form>
-       
 </FONT>
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/carts.jsp Fri Jun  6 13:53:24 2008
@@ -16,29 +16,31 @@
   limitations under the License.
 -->
 
-<jsp:useBean id="cart" scope="session" class="sessions.DummyCart" />
+<jsp:useBean id="cart" scope="session" class="sessions.DummyCart"/>
 
-<jsp:setProperty name="cart" property="*" />
+<jsp:setProperty name="cart" property="*"/>
 <%
-	cart.processRequest(request);
+    cart.processRequest(request);
 %>
 
 
-<FONT size = 5 COLOR="#CC0000">
-<br> You have the following items in your cart:
-<ol>
-<% 
-	String[] items = cart.getItems();
-	for (int i=0; i<items.length; i++) {
-%>
-<li> <% out.print(util.HTMLFilter.filter(items[i])); %> 
-<%
-	}
-%>
-</ol>
+<FONT size=5 COLOR="#CC0000">
+    <br> You have the following items in your cart:
+    <ol>
+        <%
+            String[] items = cart.getItems();
+            for (int i = 0; i < items.length; i++) {
+        %>
+        <li> <% out.print(util.HTMLFilter.filter(items[i])); %>
+            <%
+
+                    }
+
+            %>
+    </ol>
 
 </FONT>
 
 <hr>
-<%@ include file ="/sessions/carts.html" %>
+<%@ include file="/sessions/carts.html" %>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/crt.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/crt.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/crt.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/sessions/crt.html Fri Jun  6 13:53:24 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="carts.html"><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="carts.jsp.html">Source Code for Cart Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="DummyCart.html">Property Sheet for DummyCart
-<font color="#0000FF"></a> </font> </h3>
+    <font color="#0000FF"></a> </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.html Fri Jun  6 13:53:24 2008
@@ -16,15 +16,15 @@
   limitations under the License.
 -->
 <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="foo.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="foo.jsp.html">Source Code for the Simple Tag Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/simpletag/foo.jsp Fri Jun  6 13:53:24 2008
@@ -16,22 +16,23 @@
   limitations under the License.
 -->
 <body>
-<%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib" prefix="eg"%>
+<%@ taglib uri="http://jakarta.apache.org/tomcat/examples-taglib" prefix="eg" %>
 
 Radio stations that rock:
 
 <ul>
-<eg:foo att1="98.5" att2="92.3" att3="107.7">
-<li><%= member %></li>
-</eg:foo>
+    <eg:foo att1="98.5" att2="92.3" att3="107.7">
+        <li><%= member %>
+        </li>
+    </eg:foo>
 </ul>
 
 <eg:log>
-Did you see me on the stderr window?
+    Did you see me on the stderr window?
 </eg:log>
 
 <eg:log toBrowser="true">
-Did you see me on the browser window as well?
+    Did you see me on the browser window as well?
 </eg:log>
 
 </body>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.html Fri Jun  6 13:53:24 2008
@@ -17,15 +17,15 @@
 -->
 
 <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="snoop.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="snoop.jsp.html">Source Code for Request Parameters Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/snp/snoop.jsp Fri Jun  6 13:53:24 2008
@@ -19,38 +19,38 @@
 <body bgcolor="white">
 <h1> Request Information </h1>
 <font size="4">
-JSP Request Method: <% out.print(util.HTMLFilter.filter(request.getMethod())); %>
-<br>
-Request URI: <%= request.getRequestURI() %>
-<br>
-Request Protocol: <%= request.getProtocol() %>
-<br>
-Servlet path: <%= request.getServletPath() %>
-<br>
-Path info: <% out.print(util.HTMLFilter.filter(request.getPathInfo())); %>
-<br>
-Query string: <% out.print(util.HTMLFilter.filter(request.getQueryString())); %>
-<br>
-Content length: <%= request.getContentLength() %>
-<br>
-Content type: <% out.print(util.HTMLFilter.filter(request.getContentType())); %>
-<br>
-Server name: <%= request.getServerName() %>
-<br>
-Server port: <%= request.getServerPort() %>
-<br>
-Remote user: <%= request.getRemoteUser() %>
-<br>
-Remote address: <%= request.getRemoteAddr() %>
-<br>
-Remote host: <%= request.getRemoteHost() %>
-<br>
-Authorization scheme: <%= request.getAuthType() %> 
-<br>
-Locale: <%= request.getLocale() %>
-<hr>
-The browser you are using is <% out.print(util.HTMLFilter.filter(request.getHeader("User-Agent"))); %>
-<hr>
+    JSP Request Method: <% out.print(util.HTMLFilter.filter(request.getMethod())); %>
+    <br>
+    Request URI: <%= request.getRequestURI() %>
+    <br>
+    Request Protocol: <%= request.getProtocol() %>
+    <br>
+    Servlet path: <%= request.getServletPath() %>
+    <br>
+    Path info: <% out.print(util.HTMLFilter.filter(request.getPathInfo())); %>
+    <br>
+    Query string: <% out.print(util.HTMLFilter.filter(request.getQueryString())); %>
+    <br>
+    Content length: <%= request.getContentLength() %>
+    <br>
+    Content type: <% out.print(util.HTMLFilter.filter(request.getContentType())); %>
+    <br>
+    Server name: <%= request.getServerName() %>
+    <br>
+    Server port: <%= request.getServerPort() %>
+    <br>
+    Remote user: <%= request.getRemoteUser() %>
+    <br>
+    Remote address: <%= request.getRemoteAddr() %>
+    <br>
+    Remote host: <%= request.getRemoteHost() %>
+    <br>
+    Authorization scheme: <%= request.getAuthType() %>
+    <br>
+    Locale: <%= request.getLocale() %>
+    <hr>
+    The browser you are using is <% out.print(util.HTMLFilter.filter(request.getHeader("User-Agent"))); %>
+    <hr>
 </font>
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/source.jsp Fri Jun  6 13:53:24 2008
@@ -1,20 +1,20 @@
 <!--
- 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 uri="http://jakarta.apache.org/tomcat/examples-taglib"
-        prefix="eg" %>
+           prefix="eg" %>
 
 <eg:ShowSource jspFile="<%= request.getQueryString() %>"/>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.html Fri Jun  6 13:53:24 2008
@@ -16,20 +16,20 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
+    <title>View Source Code</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF">
-  <a href="choose.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>
+    <a href="choose.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="choose.jsp.html">Source Code for choose.jsp<font color="#0000FF"/></a>
+    <a href="choose.jsp.html">Source Code for choose.jsp<font color="#0000FF"/></a>
 </h3>
 
 </body>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/choose.jsp Fri Jun  6 13:53:24 2008
@@ -1,30 +1,30 @@
 <!--
- 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>
+<head>
     <title>Tag Examples - choose</title>
-  </head>
-  <body>
-    <h1>Tag Plugin Examples - &lt;c:choose></h1>
-
-    <hr>
-    </br>
-    <a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></
-a>
+</head>
+<body>
+<h1>Tag Plugin Examples - &lt;c:choose></h1>
+
+<hr>
+</br>
+<a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></
+    a>
     <br/>
     <a href="howto.html">Brief Instructions for Writing Plugins<font color="#000
 0
@@ -38,21 +38,21 @@
     <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
 
     <c:forEach var="index" begin="0" end="4">
-      # ${index}: 
-      <c:choose>
-	<c:when test="${index == 1}">
-          One!</br>
-	</c:when>
-	<c:when test="${index == 4}">
-          Four!</br>
-	</c:when>
-	<c:when test="${index == 3}">
-          Three!</br>
-	</c:when>
-	<c:otherwise>
-          Huh?</br>
-	</c:otherwise>
-      </c:choose>
+    # ${index}:
+    <c:choose>
+    <c:when test="${index == 1}">
+    One!</br>
+    </c:when>
+    <c:when test="${index == 4}">
+    Four!</br>
+    </c:when>
+    <c:when test="${index == 3}">
+    Three!</br>
+    </c:when>
+    <c:otherwise>
+    Huh?</br>
+    </c:otherwise>
+    </c:choose>
     </c:forEach>
-  </body>
+</body>
 </html> 

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.html Fri Jun  6 13:53:24 2008
@@ -16,20 +16,20 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
+    <title>View Source Code</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF">
-  <a href="foreach.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>
+    <a href="foreach.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="foreach.jsp.html">Source Code for foreach.jsp<font color="#0000FF"/></a>
+    <a href="foreach.jsp.html">Source Code for foreach.jsp<font color="#0000FF"/></a>
 </h3>
 
 </body>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/foreach.jsp Fri Jun  6 13:53:24 2008
@@ -1,30 +1,30 @@
 <!--
- 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>
+<head>
     <title>Tag Plugin Examples: forEach</title>
-  </head>
-  <body>
-    <h1>Tag Plugin Examples - &lt;c:forEach></h1>
-
-    <hr>
-    </br>
-    <a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></
-a>
+</head>
+<body>
+<h1>Tag Plugin Examples - &lt;c:forEach></h1>
+
+<hr>
+</br>
+<a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></
+    a>
     <br/>
     <a href="howto.html">Brief Instructions for Writing Plugins<font color="#0000
 FF"></a>
@@ -42,16 +42,18 @@
         ${item}
     </c:forEach>
 
-    <% Vector v = new Vector();
-	v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
+    <%
+    Vector v = new Vector();
+        v.add("One"); v.add("Two"); v.add("Three"); v.add("Four");
+
+        pageContext.setAttribute("vector", v);
 
-	pageContext.setAttribute("vector", v);
     %>
 
     <h3>Iterating over a Vector</h3>
 
-    <c:forEach items="${vector}" var="item" >
-	${item}
+    <c:forEach items="${vector}" var="item">
+        ${item}
     </c:forEach>
-  </body>
+</body>
 </html> 

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/howto.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/howto.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/howto.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/howto.html Fri Jun  6 13:53:24 2008
@@ -15,29 +15,33 @@
   limitations under the License.
 -->
 <html>
-  <head>
+<head>
     <title>Tag Plugin Implementation</title>
+
     <h2>How to write tag plugins</h2>
+
     <p>
-      To write a plugin, you'll need to download the source for Tomcat 5.
-      There are two steps:
+        To write a plugin, you'll need to download the source for Tomcat 5.
+        There are two steps:
     <ol>
-      <li>
-        Implement the plugin class.<p/>
-        This class, which implements 
-        <tt>org.apache.jasper.compiler.tagplugin.TagPlugin</tt>
-        instructs Jasper what Java codes to generate in place of the tag
-        handler calls.
-        See Javadoc for <tt>org.apache.jasper.compiler.tagplugin.TagPlugin</tt>
-        for details.
-      </li>
+        <li>
+            Implement the plugin class.<p/>
+            This class, which implements
+            <tt>org.apache.jasper.compiler.tagplugin.TagPlugin</tt>
+            instructs Jasper what Java codes to generate in place of the tag
+            handler calls.
+            See Javadoc for <tt>org.apache.jasper.compiler.tagplugin.TagPlugin</tt>
+            for details.
+        </li>
+
+        <li>
+            Create the plugin descriptor file <tt> WEB-INF/tagPlugins.xml</tt>
 
-      <li>
-        Create the plugin descriptor file <tt> WEB-INF/tagPlugins.xml</tt><p/>
-        This file
-        specifies the plugin classes and their corresponding tag handler
-        classes.
-      </li>
+            <p/>
+            This file
+            specifies the plugin classes and their corresponding tag handler
+            classes.
+        </li>
     </ol>
-  </head>
+</head>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.html Fri Jun  6 13:53:24 2008
@@ -16,20 +16,20 @@
 -->
 <html>
 <head>
-<title>View Source Code</title>
+    <title>View Source Code</title>
 </head>
 
 <body bgcolor="#FFFFFF">
 <p><font color="#0000FF">
-  <a href="if.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>
+    <a href="if.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="if.jsp.html">Source Code for if.jsp<font color="#0000FF"/></a>
+    <a href="if.jsp.html">Source Code for if.jsp<font color="#0000FF"/></a>
 </h3>
 
 </body>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/if.jsp Fri Jun  6 13:53:24 2008
@@ -1,45 +1,45 @@
 <!--
- 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>
+<head>
     <title>Tag Plugin Examples: if</title>
-  </head>
-  <body>
-    <h1>Tag Plugin Examples - &lt;c:if></h1>
-
-    <hr>
-    </br>
-    <a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></a>
-    <br/>
-    <a href="howto.html">Brief Instructions for Wrieting Plugins<font color="#0000FF"></a>
-    <br/> <br/>
-    <hr>
-
-    <font color="#000000"/>
-    </br>
-    <%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
-
-    <h3>Set the test result to a variable</h3>
-    <c:if test="${1==1}" var="theTruth" scope="session"/>
-    The result of testing for (1==1) is: ${theTruth}
-
-    <h3>Conditionally execute the body</h3>
-    <c:if test="${2>0}">
-	It's true that (2>0)!
-    </c:if>
-  </body>
+</head>
+<body>
+<h1>Tag Plugin Examples - &lt;c:if></h1>
+
+<hr>
+</br>
+<a href="notes.html">Plugin Introductory Notes<font <font color="#0000FF"></a>
+<br/>
+<a href="howto.html">Brief Instructions for Wrieting Plugins<font color="#0000FF"></a>
+<br/> <br/>
+<hr>
+
+<font color="#000000"/>
+</br>
+<%@ taglib uri="http://java.sun.com/jsp/jstl/core" prefix="c" %>
+
+<h3>Set the test result to a variable</h3>
+<c:if test="${1==1}" var="theTruth" scope="session"/>
+The result of testing for (1==1) is: ${theTruth}
+
+<h3>Conditionally execute the body</h3>
+<c:if test="${2>0}">
+    It's true that (2>0)!
+</c:if>
+</body>
 </html> 

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/notes.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/notes.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/notes.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/tagplugin/notes.html Fri Jun  6 13:53:24 2008
@@ -15,25 +15,28 @@
   limitations under the License.
 -->
 <html>
-  <head>
+<head>
     <title>Tag Plugin Introduction</title>
+
     <h2>Tag Plugins: Introductory Notes</h2>
+
     <p>
-      Tomcat 5 provides a framework for implementing tag plugins.  The
-      plugins instruct Jasper, at translation time, to replace tag handler
-      calls with Java scriptlets.
-      The framework allows tag library authors to implement plugins for
-      their tags.
+        Tomcat 5 provides a framework for implementing tag plugins. The
+        plugins instruct Jasper, at translation time, to replace tag handler
+        calls with Java scriptlets.
+        The framework allows tag library authors to implement plugins for
+        their tags.
     </p>
+
     <p>
-      Tomcat 5 is released with plugins for several JSTL tags.  Note
-      that these plugins work with JSTL 1.1 as well as JSTL 1.0, though
-      the examples uses JSTL 1.1 and JSP 2.0.  
-      These plugins are not complete (for instance, some item types not
-      handled in &lt;c:if>).
-      They do serve as examples to show plugins in action (just
-      examine the generated Java files), and how they can be implemented.
+        Tomcat 5 is released with plugins for several JSTL tags. Note
+        that these plugins work with JSTL 1.1 as well as JSTL 1.0, though
+        the examples uses JSTL 1.1 and JSP 2.0.
+        These plugins are not complete (for instance, some item types not
+        handled in &lt;c:if>).
+        They do serve as examples to show plugins in action (just
+        examine the generated Java files), and how they can be implemented.
     </p>
-  </head>
+</head>
 </html>
 

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.html (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.html Fri Jun  6 13:53:24 2008
@@ -17,15 +17,15 @@
 -->
 
 <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="xml.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="xml.jsp.html">Source Code for XML syntax Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp (original)
+++ geronimo/samples/trunk/samples/jsp-examples/jsp-examples-war/src/main/webapp/xml/xml.jsp Fri Jun  6 13:53:24 2008
@@ -1,70 +1,72 @@
 <?xml version="1.0"?>
 <!--
- 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.
 -->
 <jsp:root xmlns:jsp="http://java.sun.com/JSP/Page"
-  version="1.2">
-<jsp:directive.page contentType="text/html"/>
-<jsp:directive.page import="java.util.Date, java.util.Locale"/>
-<jsp:directive.page import="java.text.*"/>
-
-<jsp:declaration>
-  String getDateTimeStr(Locale l) {
-    DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, l);
-    return df.format(new Date());
-  }
-</jsp:declaration>
-
-<html>
-<head>
-  <title>Example JSP in XML format</title>
-</head>
-
-<body>
-This is the output of a simple JSP using XML format. 
-<br />
-
-<div>Use a jsp:scriptlet to loop from 1 to 10: </div>
-<jsp:scriptlet>
-// Note we need to declare CDATA because we don't escape the less than symbol
-<![CDATA[
-  for (int i = 1; i<=10; i++) {
-    out.println(i);
-    if (i < 10) {
-      out.println(", ");
-    }
-  }
-]]>
-</jsp:scriptlet>
-
-<!-- Because I omit br's end tag, declare it as CDATA -->
-<![CDATA[
-  <br><br>
-]]>
-
-<div align="left">
-  Use a jsp:expression to write the date and time in the browser's locale: 
-  <jsp:expression>getDateTimeStr(request.getLocale())</jsp:expression>
-</div>
-
-
-<jsp:text>
-  &lt;p&gt;This sentence is enclosed in a jsp:text element.&lt;/p&gt;
-</jsp:text>
+          version="1.2">
+    <jsp:directive.page contentType="text/html"/>
 
-</body>
-</html>
+    <jsp:declaration>
+
+          String getDateTimeStr(Locale l) {
+            DateFormat df = SimpleDateFormat.getDateTimeInstance(DateFormat.MEDIUM, DateFormat.MEDIUM, l);
+            return df.format(new Date());
+          }
+
+    </jsp:declaration>
+
+    <html>
+    <head>
+        <title>Example JSP in XML format</title>
+    </head>
+
+    <body>
+    This is the output of a simple JSP using XML format.
+    <br/>
+
+    <div>Use a jsp:scriptlet to loop from 1 to 10:</div>
+    <jsp:scriptlet>
+
+        // Note we need to declare CDATA because we don't escape the less than symbol
+        <![CDATA[
+          for (int i = 1; i<=10; i++) {
+            out.println(i);
+            if (i < 10) {
+              out.println(", ");
+            }
+          }
+        ]]>
+
+    </jsp:scriptlet>
+
+    <!-- Because I omit br's end tag, declare it as CDATA -->
+    <![CDATA[
+    <br><br>
+    ]]>
+
+    <div align="left">
+        Use a jsp:expression to write the date and time in the browser's locale:
+        <jsp:expression>getDateTimeStr(request.getLocale())</jsp:expression>
+    </div>
+
+
+    <jsp:text>
+        &lt;p&gt;This sentence is enclosed in a jsp:text element.&lt;/p&gt;
+    </jsp:text>
+
+    </body>
+    </html>
 </jsp:root>

Modified: geronimo/samples/trunk/samples/jsp-examples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/jsp-examples/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/jsp-examples/pom.xml (original)
+++ geronimo/samples/trunk/samples/jsp-examples/pom.xml Fri Jun  6 13:53:24 2008
@@ -21,23 +21,23 @@
 <!-- $Rev: 580474 $ $Date: 2007-09-28 16:15:23 -0400 (Fri, 28 Sep 2007) $ -->
 
 <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.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>jsp-examples</artifactId>
     <name>Geronimo Samples :: JSP Examples</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo JSP Examples
     </description>
-    
+
     <modules>
         <module>jsp-examples-war</module>
         <module>jsp-examples-jetty</module>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-jetty/pom.xml Fri Jun  6 13:53:24 2008
@@ -32,7 +32,7 @@
     <artifactId>ldap-sample-app-jetty</artifactId>
     <name>Geronimo Samples :: LDAP Sample for Jetty</name>
     <packaging>car</packaging>
-    
+
     <description>
         A web application that walks you through configuring the sample
         data in the embedded Apache Directory LDAP server, and then tests logins
@@ -42,7 +42,7 @@
     </description>
 
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-war</artifactId>
@@ -50,7 +50,7 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-realm</artifactId>
@@ -88,7 +88,7 @@
         </dependency>
 
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -96,7 +96,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -121,17 +121,17 @@
                     <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> -->
+                            <!--<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>
@@ -139,13 +139,13 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <profiles>
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>jetty-minimal</it-server>-->
-                <!--<it-server>framework</it-server>-->
+            <!--<it-server>jetty-minimal</it-server>-->
+            <!--<it-server>framework</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/pom.xml Fri Jun  6 13:53:24 2008
@@ -21,7 +21,7 @@
 <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>ldap-sample-app</artifactId>
@@ -34,12 +34,12 @@
 
     <description>
         A sample security realm pointing to an embedded Apache Directory
-        LDAP server.  This is normally used with the LDAP Example Web Application,
+        LDAP server. This is normally used with the LDAP Example Web Application,
         which has instructions for setting up the LDAP server and screens to test
-        logins.  You don't need this plugin in order to create LDAP security realms,
+        logins. You don't need this plugin in order to create LDAP security realms,
         this is just a sample.
     </description>
-    
+
     <dependencies>
 
         <dependency>
@@ -57,17 +57,17 @@
             <type>car</type>
         </dependency>
 
-<!--
-        <dependency>
-            <groupId>org.apache.geronimo.configs</groupId>
-            <artifactId>directory</artifactId>
-            <version>${geronimoVersion}</version>
-            <type>car</type>
-        </dependency>
--->
-    
+        <!--
+                <dependency>
+                    <groupId>org.apache.geronimo.configs</groupId>
+                    <artifactId>directory</artifactId>
+                    <version>${geronimoVersion}</version>
+                    <type>car</type>
+                </dependency>
+        -->
+
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -94,5 +94,5 @@
             </plugin>
         </plugins>
     </build>
-    
+
 </project>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-realm/src/main/plan/plan.xml Fri Jun  6 13:53:24 2008
@@ -17,9 +17,9 @@
     under the License.
 -->
 <module xmlns="http://geronimo.apache.org/xml/ns/deployment-1.2">
-    <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" 
-                                    xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 
-                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
+           xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <attribute name="realmName">LDAP_Sample_Realm</attribute>
         <reference name="ServerInfo">
             <name>ServerInfo</name>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-tomcat/pom.xml Fri Jun  6 13:53:24 2008
@@ -42,7 +42,7 @@
     </description>
 
     <dependencies>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-war</artifactId>
@@ -50,7 +50,7 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.samples</groupId>
             <artifactId>ldap-sample-app-realm</artifactId>
@@ -75,10 +75,10 @@
         </dependency>
 
         <!--<dependency>-->
-            <!--<groupId>org.apache.geronimo.configs</groupId>-->
-            <!--<artifactId>jasper</artifactId>-->
-            <!--<version>${geronimoVersion}</version>-->
-            <!--<type>car</type>-->
+        <!--<groupId>org.apache.geronimo.configs</groupId>-->
+        <!--<artifactId>jasper</artifactId>-->
+        <!--<version>${geronimoVersion}</version>-->
+        <!--<type>car</type>-->
         <!--</dependency>-->
 
         <dependency>
@@ -88,7 +88,7 @@
             <type>car</type>
         </dependency>
     </dependencies>
-    
+
     <build>
         <resources>
             <resource>
@@ -96,7 +96,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -121,17 +121,17 @@
                     <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> -->
+                            <!--<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>
@@ -139,13 +139,13 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <profiles>
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>jetty-minimal</it-server>-->
-                <!--<it-server>framework</it-server>-->
+            <!--<it-server>jetty-minimal</it-server>-->
+            <!--<it-server>framework</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 13:53:24 2008
@@ -18,14 +18,14 @@
     under the License.
 -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.2">
-	<environment>
-		<moduleId>
-			<groupId>${pom.groupId}</groupId>
-			<artifactId>${pom.artifactId}</artifactId>
-			<version>${version}</version>
-                        <type>war</type>
-		</moduleId>		
-	</environment>
+    <environment>
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </moduleId>
+    </environment>
     <context-root>/LDAP_Sample</context-root>
 
     <security-realm-name>LDAP_Sample_Realm</security-realm-name>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 13:53:24 2008
@@ -27,34 +27,34 @@
     </welcome-file-list>
 
     <security-constraint>
-      <web-resource-collection>
-        <web-resource-name>Admin Role</web-resource-name>
-        <url-pattern>/protect/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint>
-        <role-name>content-administrator</role-name>
-      </auth-constraint>
+        <web-resource-collection>
+            <web-resource-name>Admin Role</web-resource-name>
+            <url-pattern>/protect/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint>
+            <role-name>content-administrator</role-name>
+        </auth-constraint>
     </security-constraint>
-    
+
     <security-constraint>
-      <web-resource-collection>
-        <web-resource-name>No Access</web-resource-name>
-        <url-pattern>/forbidden/*</url-pattern>
-      </web-resource-collection>
-      <auth-constraint/>
+        <web-resource-collection>
+            <web-resource-name>No Access</web-resource-name>
+            <url-pattern>/forbidden/*</url-pattern>
+        </web-resource-collection>
+        <auth-constraint/>
     </security-constraint>
 
     <login-config>
-      <auth-method>FORM</auth-method>
-      <realm-name>ldap-realm-1</realm-name>
-      <form-login-config>
-         <form-login-page>/auth/logon.html?param=test</form-login-page>
-         <form-error-page>/auth/logonError.html?param=test</form-error-page>
-      </form-login-config>
+        <auth-method>FORM</auth-method>
+        <realm-name>ldap-realm-1</realm-name>
+        <form-login-config>
+            <form-login-page>/auth/logon.html?param=test</form-login-page>
+            <form-error-page>/auth/logonError.html?param=test</form-error-page>
+        </form-login-config>
     </login-config>
 
-  <security-role>
-      <role-name>content-administrator</role-name>
-  </security-role>
+    <security-role>
+        <role-name>content-administrator</role-name>
+    </security-role>
 
 </web-app>
\ No newline at end of file

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/auth/logon.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/auth/logon.html (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/auth/logon.html Fri Jun  6 13:53:24 2008
@@ -16,21 +16,22 @@
 -->
 <HTML>
 <H1>FORM Authentication demo</H1>
+
 <form method="POST" action="j_security_check">
-<table border="0" cellspacing="2" cellpadding="1">
-<tr>
-  <td>Username:</td>
-  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
-</tr>
-<tr>
-  <td>Password:</td>
-  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
-</tr>
-<tr>
-  <td colspan="2" align="center">
-    <input name="submit" type="submit" value="Login">
-  </td>
-</tr>
-</table>
+    <table border="0" cellspacing="2" cellpadding="1">
+        <tr>
+            <td>Username:</td>
+            <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+        </tr>
+        <tr>
+            <td>Password:</td>
+            <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+        </tr>
+        <tr>
+            <td colspan="2" align="center">
+                <input name="submit" type="submit" value="Login">
+            </td>
+        </tr>
+    </table>
 </form>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/header.html Fri Jun  6 13:53:24 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/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/index.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/index.html (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/index.html Fri Jun  6 13:53:24 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="./welcome.html" name="sampleDocumentFrame" title="Sample Document Description" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
 </FRAMESET>
-  
+
 </html>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/ldap-realm.xml Fri Jun  6 13:53:24 2008
@@ -25,9 +25,9 @@
             <type>car</type>
         </moduleId>
     </environment>
-    <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm" 
-                                    xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 
-                                    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
+    <gbean name="LDAP_Sample_Realm" class="org.apache.geronimo.security.realm.GenericSecurityRealm"
+           xsi:type="dep:gbeanType" xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2"
+           xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
         <attribute name="realmName">LDAP_Sample_Realm</attribute>
         <reference name="ServerInfo">
             <name>ServerInfo</name>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/welcome.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/welcome.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/welcome.html (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/ldap-sample-app-war/src/main/webapp/welcome.html Fri Jun  6 13:53:24 2008
@@ -17,12 +17,15 @@
 <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.0 Transitional//EN">
 <HTML>
 <HEAD>
-<TITLE> LDAP demo </TITLE>
+    <TITLE> LDAP demo </TITLE>
 </HEAD>
 <BODY>
 <h1>Welcome to the LDAP sample Web application</h1>
+
 <p>The following resources are protected:</p>
+
 <p><a href="protect">Protect</a>, for this resource you should be prompted with a username and password, use the same values you use to access the Geronimo Console (system/manager)</p>
+
 <p><a href="forbidden">Forbidden</a>, you should never get access to this directory.</p>
 </BODY>
 </HTML>

Modified: geronimo/samples/trunk/samples/ldap-sample-app/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/ldap-sample-app/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/ldap-sample-app/pom.xml (original)
+++ geronimo/samples/trunk/samples/ldap-sample-app/pom.xml Fri Jun  6 13:53:24 2008
@@ -21,23 +21,23 @@
 <!-- $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.2-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>ldap-sample-app</artifactId>
     <name>Geronimo Samples :: LDAP Sample</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo ldap-sample-app sample created from an archetype.
     </description>
-    
+
     <modules>
         <module>ldap-sample-app-war</module>
         <module>ldap-sample-app-realm</module>
@@ -51,7 +51,7 @@
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message