geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664175 [7/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/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/HelloWorldSimpleTag.java Fri Jun  6 15:43:44 2008
@@ -18,15 +18,16 @@
 
 package jsp2.examples.simpletag;
 
+import java.io.IOException;
+
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.io.IOException;
 
 /**
  * SimpleTag handler that prints "Hello, world!"
  */
 public class HelloWorldSimpleTag extends SimpleTagSupport {
     public void doTag() throws JspException, IOException {
-	getJspContext().getOut().write( "Hello, world!" );
+        getJspContext().getOut().write("Hello, world!");
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/RepeatSimpleTag.java Fri Jun  6 15:43:44 2008
@@ -18,25 +18,26 @@
 
 package jsp2.examples.simpletag;
 
+import java.io.IOException;
+
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.io.IOException;
 
 /**
- * SimpleTag handler that accepts a num attribute and 
+ * SimpleTag handler that accepts a num attribute and
  * invokes its body 'num' times.
  */
 public class RepeatSimpleTag extends SimpleTagSupport {
     private int num;
 
     public void doTag() throws JspException, IOException {
-        for (int i=0; i<num; i++) {
-            getJspContext().setAttribute("count", String.valueOf( i + 1 ) );
-	    getJspBody().invoke(null);
+        for (int i = 0; i < num; i++) {
+            getJspContext().setAttribute("count", String.valueOf(i + 1));
+            getJspBody().invoke(null);
         }
     }
 
     public void setNum(int num) {
-	this.num = num;
+        this.num = num;
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/ShuffleSimpleTag.java Fri Jun  6 15:43:44 2008
@@ -18,10 +18,11 @@
 
 package jsp2.examples.simpletag;
 
+import java.io.IOException;
+
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.JspFragment;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.io.IOException;
 
 /**
  * SimpleTag handler that accepts takes three attributes of type
@@ -33,49 +34,49 @@
     private JspFragment fragment3;
 
     public void doTag() throws JspException, IOException {
-        switch( (int)(Math.random() * 6) ) {
+        switch ((int) (Math.random() * 6)) {
             case 0:
-                fragment1.invoke( null );
-                fragment2.invoke( null );
-                fragment3.invoke( null );
+                fragment1.invoke(null);
+                fragment2.invoke(null);
+                fragment3.invoke(null);
                 break;
             case 1:
-                fragment1.invoke( null );
-                fragment3.invoke( null );
-                fragment2.invoke( null );
+                fragment1.invoke(null);
+                fragment3.invoke(null);
+                fragment2.invoke(null);
                 break;
             case 2:
-                fragment2.invoke( null );
-                fragment1.invoke( null );
-                fragment3.invoke( null );
+                fragment2.invoke(null);
+                fragment1.invoke(null);
+                fragment3.invoke(null);
                 break;
             case 3:
-                fragment2.invoke( null );
-                fragment3.invoke( null );
-                fragment1.invoke( null );
+                fragment2.invoke(null);
+                fragment3.invoke(null);
+                fragment1.invoke(null);
                 break;
             case 4:
-                fragment3.invoke( null );
-                fragment1.invoke( null );
-                fragment2.invoke( null );
+                fragment3.invoke(null);
+                fragment1.invoke(null);
+                fragment2.invoke(null);
                 break;
             case 5:
-                fragment3.invoke( null );
-                fragment2.invoke( null );
-                fragment1.invoke( null );
+                fragment3.invoke(null);
+                fragment2.invoke(null);
+                fragment1.invoke(null);
                 break;
         }
     }
 
-    public void setFragment1( JspFragment fragment1 ) {
+    public void setFragment1(JspFragment fragment1) {
         this.fragment1 = fragment1;
     }
-    
-    public void setFragment2( JspFragment fragment2 ) {
+
+    public void setFragment2(JspFragment fragment2) {
         this.fragment2 = fragment2;
     }
-    
-    public void setFragment3( JspFragment fragment3 ) {
+
+    public void setFragment3(JspFragment fragment3) {
         this.fragment3 = fragment3;
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/jsp2/examples/simpletag/TileSimpleTag.java Fri Jun  6 15:43:44 2008
@@ -18,9 +18,10 @@
 
 package jsp2.examples.simpletag;
 
+import java.io.IOException;
+
 import javax.servlet.jsp.JspException;
 import javax.servlet.jsp.tagext.SimpleTagSupport;
-import java.io.IOException;
 
 /**
  * Displays a tile as a single cell in a table.
@@ -30,17 +31,17 @@
     private String label;
 
     public void doTag() throws JspException, IOException {
-	getJspContext().getOut().write( 
-	    "<td width=\"32\" height=\"32\" bgcolor=\"" + this.color + 
-	    "\"><font color=\"#ffffff\"><center>" + this.label + 
-                "</center></font></td>" );
+        getJspContext().getOut().write(
+                "<td width=\"32\" height=\"32\" bgcolor=\"" + this.color +
+                        "\"><font color=\"#ffffff\"><center>" + this.label +
+                        "</center></font></td>");
     }
 
-    public void setColor( String color ) {
+    public void setColor(String color) {
         this.color = color;
     }
-    
-    public void setLabel( String label ) {
+
+    public void setLabel(String label) {
         this.label = label;
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/ContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/ContextListener.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/ContextListener.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/ContextListener.java Fri Jun  6 15:43:44 2008
@@ -37,8 +37,7 @@
  */
 
 public final class ContextListener
-    implements ServletContextAttributeListener, ServletContextListener {
-
+        implements ServletContextAttributeListener, ServletContextListener {
 
     // ----------------------------------------------------- Instance Variables
 
@@ -48,7 +47,6 @@
      */
     private ServletContext context = null;
 
-
     // --------------------------------------------------------- Public Methods
 
 
@@ -59,8 +57,8 @@
      */
     public void attributeAdded(ServletContextAttributeEvent event) {
 
-	log("attributeAdded('" + event.getName() + "', '" +
-	    event.getValue() + "')");
+        log("attributeAdded('" + event.getName() + "', '" +
+                event.getValue() + "')");
 
     }
 
@@ -72,8 +70,8 @@
      */
     public void attributeRemoved(ServletContextAttributeEvent event) {
 
-	log("attributeRemoved('" + event.getName() + "', '" +
-	    event.getValue() + "')");
+        log("attributeRemoved('" + event.getName() + "', '" +
+                event.getValue() + "')");
 
     }
 
@@ -85,8 +83,8 @@
      */
     public void attributeReplaced(ServletContextAttributeEvent event) {
 
-	log("attributeReplaced('" + event.getName() + "', '" +
-	    event.getValue() + "')");
+        log("attributeReplaced('" + event.getName() + "', '" +
+                event.getValue() + "')");
 
     }
 
@@ -98,8 +96,8 @@
      */
     public void contextDestroyed(ServletContextEvent event) {
 
-	log("contextDestroyed()");
-	this.context = null;
+        log("contextDestroyed()");
+        this.context = null;
 
     }
 
@@ -111,12 +109,11 @@
      */
     public void contextInitialized(ServletContextEvent event) {
 
-	this.context = event.getServletContext();
-	log("contextInitialized()");
+        this.context = event.getServletContext();
+        log("contextInitialized()");
 
     }
 
-
     // -------------------------------------------------------- Private Methods
 
 
@@ -127,10 +124,10 @@
      */
     private void log(String message) {
 
-	if (context != null)
-	    context.log("ContextListener: " + message);
-	else
-	    System.out.println("ContextListener: " + message);
+        if (context != null)
+            context.log("ContextListener: " + message);
+        else
+            System.out.println("ContextListener: " + message);
 
     }
 
@@ -139,17 +136,17 @@
      * Log a message and associated exception to the servlet context
      * application log.
      *
-     * @param message Message to be logged
+     * @param message   Message to be logged
      * @param throwable Exception to be logged
      */
     private void log(String message, Throwable throwable) {
 
-	if (context != null)
-	    context.log("ContextListener: " + message, throwable);
-	else {
-	    System.out.println("ContextListener: " + message);
-	    throwable.printStackTrace(System.out);
-	}
+        if (context != null)
+            context.log("ContextListener: " + message, throwable);
+        else {
+            System.out.println("ContextListener: " + message);
+            throwable.printStackTrace(System.out);
+        }
 
     }
 

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/SessionListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/SessionListener.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/SessionListener.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/listeners/SessionListener.java Fri Jun  6 15:43:44 2008
@@ -39,9 +39,8 @@
  */
 
 public final class SessionListener
-    implements ServletContextListener,
-	       HttpSessionAttributeListener, HttpSessionListener {
-
+        implements ServletContextListener,
+        HttpSessionAttributeListener, HttpSessionListener {
 
     // ----------------------------------------------------- Instance Variables
 
@@ -51,7 +50,6 @@
      */
     private ServletContext context = null;
 
-
     // --------------------------------------------------------- Public Methods
 
 
@@ -62,8 +60,8 @@
      */
     public void attributeAdded(HttpSessionBindingEvent event) {
 
-	log("attributeAdded('" + event.getSession().getId() + "', '" +
-	    event.getName() + "', '" + event.getValue() + "')");
+        log("attributeAdded('" + event.getSession().getId() + "', '" +
+                event.getName() + "', '" + event.getValue() + "')");
 
     }
 
@@ -75,8 +73,8 @@
      */
     public void attributeRemoved(HttpSessionBindingEvent event) {
 
-	log("attributeRemoved('" + event.getSession().getId() + "', '" +
-	    event.getName() + "', '" + event.getValue() + "')");
+        log("attributeRemoved('" + event.getSession().getId() + "', '" +
+                event.getName() + "', '" + event.getValue() + "')");
 
     }
 
@@ -88,8 +86,8 @@
      */
     public void attributeReplaced(HttpSessionBindingEvent event) {
 
-	log("attributeReplaced('" + event.getSession().getId() + "', '" +
-	    event.getName() + "', '" + event.getValue() + "')");
+        log("attributeReplaced('" + event.getSession().getId() + "', '" +
+                event.getName() + "', '" + event.getValue() + "')");
 
     }
 
@@ -101,8 +99,8 @@
      */
     public void contextDestroyed(ServletContextEvent event) {
 
-	log("contextDestroyed()");
-	this.context = null;
+        log("contextDestroyed()");
+        this.context = null;
 
     }
 
@@ -114,8 +112,8 @@
      */
     public void contextInitialized(ServletContextEvent event) {
 
-	this.context = event.getServletContext();
-	log("contextInitialized()");
+        this.context = event.getServletContext();
+        log("contextInitialized()");
 
     }
 
@@ -127,7 +125,7 @@
      */
     public void sessionCreated(HttpSessionEvent event) {
 
-	log("sessionCreated('" + event.getSession().getId() + "')");
+        log("sessionCreated('" + event.getSession().getId() + "')");
 
     }
 
@@ -139,11 +137,10 @@
      */
     public void sessionDestroyed(HttpSessionEvent event) {
 
-	log("sessionDestroyed('" + event.getSession().getId() + "')");
+        log("sessionDestroyed('" + event.getSession().getId() + "')");
 
     }
 
-
     // -------------------------------------------------------- Private Methods
 
 
@@ -154,10 +151,10 @@
      */
     private void log(String message) {
 
-	if (context != null)
-	    context.log("SessionListener: " + message);
-	else
-	    System.out.println("SessionListener: " + message);
+        if (context != null)
+            context.log("SessionListener: " + message);
+        else
+            System.out.println("SessionListener: " + message);
 
     }
 
@@ -166,17 +163,17 @@
      * Log a message and associated exception to the servlet context
      * application log.
      *
-     * @param message Message to be logged
+     * @param message   Message to be logged
      * @param throwable Exception to be logged
      */
     private void log(String message, Throwable throwable) {
 
-	if (context != null)
-	    context.log("SessionListener: " + message, throwable);
-	else {
-	    System.out.println("SessionListener: " + message);
-	    throwable.printStackTrace(System.out);
-	}
+        if (context != null)
+            context.log("SessionListener: " + message, throwable);
+        else {
+            System.out.println("SessionListener: " + message);
+            throwable.printStackTrace(System.out);
+        }
 
     }
 

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/num/NumberGuessBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/num/NumberGuessBean.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/num/NumberGuessBean.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/num/NumberGuessBean.java Fri Jun  6 15:43:44 2008
@@ -21,59 +21,56 @@
 
 package num;
 
-import java.util.*;
+import java.util.Random;
 
 public class NumberGuessBean {
 
-  int answer;
-  boolean success;
-  String hint;
-  int numGuesses;
+    int answer;
+    boolean success;
+    String hint;
+    int numGuesses;
 
-  public NumberGuessBean() {
-    reset();
-  }
+    public NumberGuessBean() {
+        reset();
+    }
 
-  public void setGuess(String guess) {
-    numGuesses++;
+    public void setGuess(String guess) {
+        numGuesses++;
 
-    int g;
-    try {
-      g = Integer.parseInt(guess);
-    }
-    catch (NumberFormatException e) {
-      g = -1;
-    }
+        int g;
+        try {
+            g = Integer.parseInt(guess);
+        }
+        catch (NumberFormatException e) {
+            g = -1;
+        }
 
-    if (g == answer) {
-      success = true;
-    }
-    else if (g == -1) {
-      hint = "a number next time";
-    }
-    else if (g < answer) {
-      hint = "higher";
+        if (g == answer) {
+            success = true;
+        } else if (g == -1) {
+            hint = "a number next time";
+        } else if (g < answer) {
+            hint = "higher";
+        } else if (g > answer) {
+            hint = "lower";
+        }
     }
-    else if (g > answer) {
-      hint = "lower";
-    }
-  }
 
-  public boolean getSuccess() {
-    return success;
-  }
+    public boolean getSuccess() {
+        return success;
+    }
 
-  public String getHint() {
-    return "" + hint;
-  }
+    public String getHint() {
+        return "" + hint;
+    }
 
-  public int getNumGuesses() {
-    return numGuesses;
-  }
+    public int getNumGuesses() {
+        return numGuesses;
+    }
 
-  public void reset() {
-    answer = Math.abs(new Random().nextInt() % 100) + 1;
-    success = false;
-    numGuesses = 0;
-  }
+    public void reset() {
+        answer = Math.abs(new Random().nextInt() % 100) + 1;
+        success = false;
+        numGuesses = 0;
+    }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/servletToJsp.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/servletToJsp.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/servletToJsp.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/servletToJsp.java Fri Jun  6 15:43:44 2008
@@ -14,19 +14,22 @@
 * See the License for the specific language governing permissions and
 * limitations under the License.
 */
-import javax.servlet.http.*;
+
+import javax.servlet.http.HttpServlet;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
 
 public class servletToJsp extends HttpServlet {
 
-    public void doGet (HttpServletRequest request,
-		       HttpServletResponse response) {
+    public void doGet(HttpServletRequest request,
+                      HttpServletResponse response) {
 
-	try {
-	    // Set the attribute and Forward to hello.jsp
-	    request.setAttribute ("servletName", "servletToJsp");
-	    getServletConfig().getServletContext().getRequestDispatcher("/jsptoserv/hello.jsp").forward(request, response);
-	} catch (Exception ex) {
-	    ex.printStackTrace ();
-	}
+        try {
+            // Set the attribute and Forward to hello.jsp
+            request.setAttribute("servletName", "servletToJsp");
+            getServletConfig().getServletContext().getRequestDispatcher("/jsptoserv/hello.jsp").forward(request, response);
+        } catch (Exception ex) {
+            ex.printStackTrace();
+        }
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/sessions/DummyCart.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/sessions/DummyCart.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/sessions/DummyCart.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/sessions/DummyCart.java Fri Jun  6 15:43:44 2008
@@ -16,54 +16,55 @@
 */
 package sessions;
 
-import javax.servlet.http.*;
 import java.util.Vector;
 
+import javax.servlet.http.HttpServletRequest;
+
 public class DummyCart {
     Vector v = new Vector();
     String submit = null;
     String item = null;
-    
+
     private void addItem(String name) {
-	v.addElement(name);
+        v.addElement(name);
     }
 
     private void removeItem(String name) {
-	v.removeElement(name);
+        v.removeElement(name);
     }
 
     public void setItem(String name) {
-	item = name;
+        item = name;
     }
-    
+
     public void setSubmit(String s) {
-	submit = s;
+        submit = s;
     }
 
     public String[] getItems() {
-	String[] s = new String[v.size()];
-	v.copyInto(s);
-	return s;
+        String[] s = new String[v.size()];
+        v.copyInto(s);
+        return s;
     }
-    
+
     public void processRequest(HttpServletRequest request) {
-	// null value for submit - user hit enter instead of clicking on 
-	// "add" or "remove"
-	if (submit == null) 
-	    addItem(item);
-
-	if (submit.equals("add"))
-	    addItem(item);
-	else if (submit.equals("remove")) 
-	    removeItem(item);
-	
-	// reset at the end of the request
-	reset();
+        // null value for submit - user hit enter instead of clicking on
+        // "add" or "remove"
+        if (submit == null)
+            addItem(item);
+
+        if (submit.equals("add"))
+            addItem(item);
+        else if (submit.equals("remove"))
+            removeItem(item);
+
+        // reset at the end of the request
+        reset();
     }
 
     // reset
     private void reset() {
-	submit = null;
-	item = null;
+        submit = null;
+        item = null;
     }
 }

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/util/HTMLFilter.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/util/HTMLFilter.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/util/HTMLFilter.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/util/HTMLFilter.java Fri Jun  6 15:43:44 2008
@@ -45,20 +45,20 @@
         StringBuffer result = new StringBuffer(content.length + 50);
         for (int i = 0; i < content.length; i++) {
             switch (content[i]) {
-            case '<':
-                result.append("&lt;");
-                break;
-            case '>':
-                result.append("&gt;");
-                break;
-            case '&':
-                result.append("&amp;");
-                break;
-            case '"':
-                result.append("&quot;");
-                break;
-            default:
-                result.append(content[i]);
+                case '<':
+                    result.append("&lt;");
+                    break;
+                case '>':
+                    result.append("&gt;");
+                    break;
+                case '&':
+                    result.append("&amp;");
+                    break;
+                case '"':
+                    result.append("&quot;");
+                    break;
+                default:
+                    result.append(content[i]);
             }
         }
         return (result.toString());

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/validators/DebugValidator.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/validators/DebugValidator.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/validators/DebugValidator.java (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/java/validators/DebugValidator.java Fri Jun  6 15:43:44 2008
@@ -19,8 +19,9 @@
 package validators;
 
 
-import java.io.InputStream;
 import java.io.IOException;
+import java.io.InputStream;
+
 import javax.servlet.jsp.tagext.PageData;
 import javax.servlet.jsp.tagext.TagLibraryValidator;
 import javax.servlet.jsp.tagext.ValidationMessage;
@@ -39,10 +40,8 @@
 
 public class DebugValidator extends TagLibraryValidator {
 
-
     // ----------------------------------------------------- Instance Variables
 
-
     // --------------------------------------------------------- Public Methods
 
 
@@ -54,14 +53,14 @@
      * also interpreted as no errors.
      *
      * @param prefix The value of the prefix argument in this directive
-     * @param uri The value of the URI argument in this directive
-     * @param page The page data for this page
+     * @param uri    The value of the URI argument in this directive
+     * @param page   The page data for this page
      */
     public ValidationMessage[] validate(String prefix, String uri,
                                         PageData page) {
 
         System.out.println("---------- Prefix=" + prefix + " URI=" + uri +
-                           "----------");
+                "----------");
 
         InputStream is = page.getInputStream();
         while (true) {

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 15:43:44 2008
@@ -21,31 +21,31 @@
          xmlns:sec="http://geronimo.apache.org/xml/ns/security-1.2"
          xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2">
 
-  <dep:environment>
-    <dep:moduleId>
-      <dep:groupId>${pom.groupId}</dep:groupId>
-      <dep:artifactId>${pom.artifactId}</dep:artifactId>
-      <dep:version>${version}</dep:version>
-      <dep:type>war</dep:type>
-    </dep:moduleId>
-    <dep:dependencies/>
-    <dep:hidden-classes/>
-    <dep:non-overridable-classes/>
-  </dep:environment>
-  
-  <context-root>/jsp-examples</context-root>
-  <!--<context-priority-classloader>false</context-priority-classloader>-->
-  <security-realm-name>geronimo-admin</security-realm-name>
-  <sec:security>
-      <sec:default-principal>
-          <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
-                         name="anonymous"/>
-      </sec:default-principal>
-      <sec:role-mappings>
-          <sec:role role-name="tomcat">
-              <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
-                             name="admin"/>
-          </sec:role>
-      </sec:role-mappings>
-  </sec:security>
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>${pom.artifactId}</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>war</dep:type>
+        </dep:moduleId>
+        <dep:dependencies/>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
+
+    <context-root>/jsp-examples</context-root>
+    <!--<context-priority-classloader>false</context-priority-classloader>-->
+    <security-realm-name>geronimo-admin</security-realm-name>
+    <sec:security>
+        <sec:default-principal>
+            <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoUserPrincipal"
+                           name="anonymous"/>
+        </sec:default-principal>
+        <sec:role-mappings>
+            <sec:role role-name="tomcat">
+                <sec:principal class="org.apache.geronimo.security.realm.providers.GeronimoGroupPrincipal"
+                               name="admin"/>
+            </sec:role>
+        </sec:role-mappings>
+    </sec:security>
 </web-app>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/debug-taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/debug-taglib.tld?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/debug-taglib.tld (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/debug-taglib.tld Fri Jun  6 15:43:44 2008
@@ -17,38 +17,38 @@
 -->
 <!DOCTYPE taglib
         PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-	"http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd">
+        "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd">
 
 <!-- a tag library descriptor -->
 
 <taglib>
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>debug</short-name>
-  <uri>http://jakarta.apache.org/tomcat/debug-taglib</uri>
-  <description>
-    This tag library defines no tags.  Instead, its purpose is encapsulated
-    in the TagLibraryValidator implementation that simply outputs the XML
-    version of a JSP page to standard output, whenever this tag library is
-    referenced in a "taglib" directive in a JSP page.
-  </description>
-  <validator>
-    <validator-class>validators.DebugValidator</validator-class>
-  </validator>
-
-  <!-- This is a dummy tag solely to satisfy DTD requirements -->  
-  <tag>
-    <name>log</name>
-    <tag-class>examples.LogTag</tag-class>
-    <body-content>tagdependent</body-content>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>debug</short-name>
+    <uri>http://jakarta.apache.org/tomcat/debug-taglib</uri>
     <description>
-	Perform a server side action; Log the message.
+        This tag library defines no tags. Instead, its purpose is encapsulated
+        in the TagLibraryValidator implementation that simply outputs the XML
+        version of a JSP page to standard output, whenever this tag library is
+        referenced in a "taglib" directive in a JSP page.
     </description>
-    <attribute>
-	<name>toBrowser</name>
-	<required>false</required>
-    </attribute>
-  </tag>
-  
+    <validator>
+        <validator-class>validators.DebugValidator</validator-class>
+    </validator>
+
+    <!-- This is a dummy tag solely to satisfy DTD requirements -->
+    <tag>
+        <name>log</name>
+        <tag-class>examples.LogTag</tag-class>
+        <body-content>tagdependent</body-content>
+        <description>
+            Perform a server side action; Log the message.
+        </description>
+        <attribute>
+            <name>toBrowser</name>
+            <required>false</required>
+        </attribute>
+    </tag>
+
 
 </taglib>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/example-taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/example-taglib.tld?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/example-taglib.tld (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp/example-taglib.tld Fri Jun  6 15:43:44 2008
@@ -17,67 +17,67 @@
 -->
 <!DOCTYPE taglib
         PUBLIC "-//Sun Microsystems, Inc.//DTD JSP Tag Library 1.2//EN"
-	"http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd">
+        "http://java.sun.com/j2ee/dtd/web-jsptaglibrary_1_2.dtd">
 
 <taglib>
 
-  <tlib-version>1.0</tlib-version>
-  <jsp-version>1.2</jsp-version>
-  <short-name>simple</short-name>
-  <uri>http://jakarta.apache.org/tomcat/example-taglib</uri>
-  <description>
-	A simple tab library for the examples
-  </description>
-
-  <tag>
-    <name>ShowSource</name>
-    <tag-class>examples.ShowSource</tag-class>
-    <description> Display JSP sources </description>
-    <attribute>
-       <name>jspFile</name>
-       <required>true</required>
-       <rtexprvalue>true</rtexprvalue>
-    </attribute>
-  </tag>       
-
-  <!-- A simple Tag -->
-  <!-- foo tag -->
-  <tag>
-    <name>foo</name>
-    <tag-class>examples.FooTag</tag-class>
-    <tei-class>examples.FooTagExtraInfo</tei-class>
-    <body-content>JSP</body-content>
+    <tlib-version>1.0</tlib-version>
+    <jsp-version>1.2</jsp-version>
+    <short-name>simple</short-name>
+    <uri>http://jakarta.apache.org/tomcat/example-taglib</uri>
     <description>
-	Perform a server side action; uses 3 mandatory attributes
+        A simple tab library for the examples
     </description>
 
-    <attribute>
-      <name>att1</name>
-      <required>true</required>
-    </attribute>
-    <attribute>
-      <name>att2</name>
-      <required>true</required>
-    </attribute>
-    <attribute>
-      <name>att3</name>
-      <required>true</required>
-    </attribute>
-  </tag>
-
-  <!-- Another simple tag -->
-  <!-- log tag -->
-  <tag>
-    <name>log</name>
-    <tag-class>examples.LogTag</tag-class>
-    <body-content>tagdependent</body-content>
-    <description>
-	Perform a server side action; Log the message.
-    </description>
-    <attribute>
-	<name>toBrowser</name>
-	<required>false</required>
-    </attribute>
-  </tag>
-  
+    <tag>
+        <name>ShowSource</name>
+        <tag-class>examples.ShowSource</tag-class>
+        <description>Display JSP sources</description>
+        <attribute>
+            <name>jspFile</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
+    </tag>
+
+    <!-- A simple Tag -->
+    <!-- foo tag -->
+    <tag>
+        <name>foo</name>
+        <tag-class>examples.FooTag</tag-class>
+        <tei-class>examples.FooTagExtraInfo</tei-class>
+        <body-content>JSP</body-content>
+        <description>
+            Perform a server side action; uses 3 mandatory attributes
+        </description>
+
+        <attribute>
+            <name>att1</name>
+            <required>true</required>
+        </attribute>
+        <attribute>
+            <name>att2</name>
+            <required>true</required>
+        </attribute>
+        <attribute>
+            <name>att3</name>
+            <required>true</required>
+        </attribute>
+    </tag>
+
+    <!-- Another simple tag -->
+    <!-- log tag -->
+    <tag>
+        <name>log</name>
+        <tag-class>examples.LogTag</tag-class>
+        <body-content>tagdependent</body-content>
+        <description>
+            Perform a server side action; Log the message.
+        </description>
+        <attribute>
+            <name>toBrowser</name>
+            <required>false</required>
+        </attribute>
+    </tag>
+
 </taglib>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp2/jsp2-example-taglib.tld
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp2/jsp2-example-taglib.tld?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp2/jsp2-example-taglib.tld (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/jsp2/jsp2-example-taglib.tld Fri Jun  6 15:43:44 2008
@@ -17,18 +17,18 @@
 -->
 
 <taglib xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
-    version="2.0">
+        xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+        xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-jsptaglibrary_2_0.xsd"
+        version="2.0">
     <description>A tag library exercising SimpleTag handlers.</description>
     <tlib-version>1.0</tlib-version>
     <short-name>SimpleTagLibrary</short-name>
     <uri>/SimpleTagLibrary</uri>
     <tag>
-	<description>Outputs Hello, World</description>
+        <description>Outputs Hello, World</description>
         <name>helloWorld</name>
-	<tag-class>jsp2.examples.simpletag.HelloWorldSimpleTag</tag-class>
-	<body-content>empty</body-content>
+        <tag-class>jsp2.examples.simpletag.HelloWorldSimpleTag</tag-class>
+        <body-content>empty</body-content>
     </tag>
     <tag>
         <description>Repeats the body of the tag 'num' times</description>
@@ -46,15 +46,15 @@
         </attribute>
     </tag>
     <tag>
-	<description>Populates the page context with a BookBean</description>
+        <description>Populates the page context with a BookBean</description>
         <name>findBook</name>
-	<tag-class>jsp2.examples.simpletag.FindBookSimpleTag</tag-class>
-	<body-content>empty</body-content>
-	<attribute>
-	    <name>var</name>
-	    <required>true</required>
-	    <rtexprvalue>true</rtexprvalue>
-	</attribute>
+        <tag-class>jsp2.examples.simpletag.FindBookSimpleTag</tag-class>
+        <body-content>empty</body-content>
+        <attribute>
+            <name>var</name>
+            <required>true</required>
+            <rtexprvalue>true</rtexprvalue>
+        </attribute>
     </tag>
     <tag>
         <description>
@@ -66,17 +66,17 @@
         <attribute>
             <name>fragment1</name>
             <required>true</required>
-	    <fragment>true</fragment>
+            <fragment>true</fragment>
         </attribute>
         <attribute>
             <name>fragment2</name>
             <required>true</required>
-	    <fragment>true</fragment>
+            <fragment>true</fragment>
         </attribute>
         <attribute>
             <name>fragment3</name>
             <required>true</required>
-	    <fragment>true</fragment>
+            <fragment>true</fragment>
         </attribute>
     </tag>
     <tag>
@@ -94,31 +94,31 @@
         </attribute>
     </tag>
     <tag>
-	<description>
-	  Tag that echoes all its attributes and body content
-	</description>
-	<name>echoAttributes</name>
-	<tag-class>jsp2.examples.simpletag.EchoAttributesTag</tag-class>
-	<body-content>empty</body-content>
-	<dynamic-attributes>true</dynamic-attributes>
+        <description>
+            Tag that echoes all its attributes and body content
+        </description>
+        <name>echoAttributes</name>
+        <tag-class>jsp2.examples.simpletag.EchoAttributesTag</tag-class>
+        <body-content>empty</body-content>
+        <dynamic-attributes>true</dynamic-attributes>
     </tag>
     <function>
         <description>Reverses the characters in the given String</description>
         <name>reverse</name>
-	<function-class>jsp2.examples.el.Functions</function-class>
-	<function-signature>java.lang.String reverse( java.lang.String )</function-signature>
+        <function-class>jsp2.examples.el.Functions</function-class>
+        <function-signature>java.lang.String reverse( java.lang.String )</function-signature>
     </function>
     <function>
         <description>Counts the number of vowels (a,e,i,o,u) in the given String</description>
         <name>countVowels</name>
-	<function-class>jsp2.examples.el.Functions</function-class>
-	<function-signature>java.lang.String numVowels( java.lang.String )</function-signature>
+        <function-class>jsp2.examples.el.Functions</function-class>
+        <function-signature>java.lang.String numVowels( java.lang.String )</function-signature>
     </function>
     <function>
-	<description>Converts the string to all caps</description>
+        <description>Converts the string to all caps</description>
         <name>caps</name>
-	<function-class>jsp2.examples.el.Functions</function-class>
-	<function-signature>java.lang.String caps( java.lang.String )</function-signature>
+        <function-class>jsp2.examples.el.Functions</function-class>
+        <function-signature>java.lang.String caps( java.lang.String )</function-signature>
     </function>
 </taglib>
 

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/displayProducts.tag
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/displayProducts.tag?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/displayProducts.tag (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/displayProducts.tag Fri Jun  6 15:43:44 2008
@@ -1,18 +1,18 @@
 <!--
- 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="c" uri="http://java.sun.com/jsp/jstl/core" %>
 <%@ attribute name="normalPrice" fragment="true" %>
@@ -23,33 +23,33 @@
 <%@ variable name-given="salePrice" %>
 
 <table border="1">
-  <tr>
-    <td> 
-      <c:set var="name" value="Hand-held Color PDA"/>
-      <c:set var="price" value="$298.86"/>
-      <jsp:invoke fragment="normalPrice"/>
-    </td>
-    <td> 
-      <c:set var="name" value="4-Pack 150 Watt Light Bulbs"/>
-      <c:set var="origPrice" value="$2.98"/>
-      <c:set var="salePrice" value="$2.32"/>
-      <jsp:invoke fragment="onSale"/>
-    </td>
-    <td> 
-      <c:set var="name" value="Digital Cellular Phone"/>
-      <c:set var="price" value="$68.74"/>
-      <jsp:invoke fragment="normalPrice"/>
-    </td>
-    <td> 
-      <c:set var="name" value="Baby Grand Piano"/>
-      <c:set var="price" value="$10,800.00"/>
-      <jsp:invoke fragment="normalPrice"/>
-    </td>
-    <td> 
-      <c:set var="name" value="Luxury Car w/ Leather Seats"/>
-      <c:set var="origPrice" value="$23,980.00"/>
-      <c:set var="salePrice" value="$21,070.00"/>
-      <jsp:invoke fragment="onSale"/>
-    </td>
-  </tr>
+    <tr>
+        <td>
+            <c:set var="name" value="Hand-held Color PDA"/>
+            <c:set var="price" value="$298.86"/>
+            <jsp:invoke fragment="normalPrice"/>
+        </td>
+        <td>
+            <c:set var="name" value="4-Pack 150 Watt Light Bulbs"/>
+            <c:set var="origPrice" value="$2.98"/>
+            <c:set var="salePrice" value="$2.32"/>
+            <jsp:invoke fragment="onSale"/>
+        </td>
+        <td>
+            <c:set var="name" value="Digital Cellular Phone"/>
+            <c:set var="price" value="$68.74"/>
+            <jsp:invoke fragment="normalPrice"/>
+        </td>
+        <td>
+            <c:set var="name" value="Baby Grand Piano"/>
+            <c:set var="price" value="$10,800.00"/>
+            <jsp:invoke fragment="normalPrice"/>
+        </td>
+        <td>
+            <c:set var="name" value="Luxury Car w/ Leather Seats"/>
+            <c:set var="origPrice" value="$23,980.00"/>
+            <c:set var="salePrice" value="$21,070.00"/>
+            <jsp:invoke fragment="onSale"/>
+        </td>
+    </tr>
 </table>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/helloWorld.tag
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/helloWorld.tag?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/helloWorld.tag (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/helloWorld.tag Fri Jun  6 15:43:44 2008
@@ -1,17 +1,17 @@
 <!--
- 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.
 -->
 Hello, world!

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/panel.tag
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/panel.tag?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/panel.tag (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/panel.tag Fri Jun  6 15:43:44 2008
@@ -1,29 +1,29 @@
 <!--
- 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.
 -->
 <%@ attribute name="color" %>
 <%@ attribute name="bgcolor" %>
 <%@ attribute name="title" %>
 <table border="1" bgcolor="${color}">
-  <tr>
-    <td><b>${title}</b></td>
-  </tr>
-  <tr>
-    <td bgcolor="${bgcolor}">
-      <jsp:doBody/>
-    </td>
-  </tr>
+    <tr>
+        <td><b>${title}</b></td>
+    </tr>
+    <tr>
+        <td bgcolor="${bgcolor}">
+            <jsp:doBody/>
+        </td>
+    </tr>
 </table>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/xhtmlbasic.tag
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/xhtmlbasic.tag?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/xhtmlbasic.tag (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/tags/xhtmlbasic.tag Fri Jun  6 15:43:44 2008
@@ -1,18 +1,18 @@
 <!--
- 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.
 -->
 <!DOCTYPE html PUBLIC "-//W3C//DTD XHTML Basic 1.0//EN"
 "http://www.w3.org/TR/xhtml-basic/xhtml-basic10.dtd">

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 15:43:44 2008
@@ -17,12 +17,12 @@
 -->
 
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
-    xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
-    xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
-    version="2.4">
+         xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+         version="2.4">
 
     <description>
-      JSP 2.0 Examples.
+        JSP 2.0 Examples.
     </description>
     <display-name>JSP 2.0 Examples</display-name>
 
@@ -31,18 +31,18 @@
     <filter>
         <filter-name>Servlet Mapped Filter</filter-name>
         <filter-class>filters.ExampleFilter</filter-class>
-	<init-param>
-	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
-	</init-param>
+        <init-param>
+            <param-name>attribute</param-name>
+            <param-value>filters.ExampleFilter.SERVLET_MAPPED</param-value>
+        </init-param>
     </filter>
     <filter>
         <filter-name>Path Mapped Filter</filter-name>
         <filter-class>filters.ExampleFilter</filter-class>
-	<init-param>
-	    <param-name>attribute</param-name>
-	    <param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
-	</init-param>
+        <init-param>
+            <param-name>attribute</param-name>
+            <param-value>filters.ExampleFilter.PATH_MAPPED</param-value>
+        </init-param>
     </filter>
     <filter>
         <filter-name>Request Dumper Filter</filter-name>
@@ -64,37 +64,37 @@
         <filter-class>compressionFilters.CompressionFilter</filter-class>
 
         <init-param>
-          <param-name>compressionThreshold</param-name>
-          <param-value>10</param-value>
+            <param-name>compressionThreshold</param-name>
+            <param-value>10</param-value>
         </init-param>
         <init-param>
-          <param-name>debug</param-name>
-          <param-value>0</param-value>
+            <param-name>debug</param-name>
+            <param-value>0</param-value>
         </init-param>
     </filter>
 
-<!-- Example filter mapping to apply the "Set Character Encoding" filter
-     to *all* requests processed by this web application -->
-<!--
-    <filter-mapping>
-        <filter-name>Set Character Encoding</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
-
-<!--
-    <filter-mapping>
-      <filter-name>Compression Filter</filter-name>
-      <url-pattern>/CompressionTest</url-pattern>
-    </filter-mapping>
--->
-
-<!--
-    <filter-mapping>
-        <filter-name>Request Dumper Filter</filter-name>
-        <url-pattern>/*</url-pattern>
-    </filter-mapping>
--->
+    <!-- Example filter mapping to apply the "Set Character Encoding" filter
+to *all* requests processed by this web application -->
+    <!--
+        <filter-mapping>
+            <filter-name>Set Character Encoding</filter-name>
+            <url-pattern>/*</url-pattern>
+        </filter-mapping>
+    -->
+
+    <!--
+        <filter-mapping>
+          <filter-name>Compression Filter</filter-name>
+          <url-pattern>/CompressionTest</url-pattern>
+        </filter-mapping>
+    -->
+
+    <!--
+        <filter-mapping>
+            <filter-name>Request Dumper Filter</filter-name>
+            <url-pattern>/*</url-pattern>
+        </filter-mapping>
+    -->
 
     <!-- Define example application events listeners -->
     <listener>
@@ -107,12 +107,12 @@
     <!-- Define servlets that are included in the example application -->
 
     <servlet>
-      <servlet-name>
-          servletToJsp
-      </servlet-name>
-      <servlet-class>
-          servletToJsp
-      </servlet-class>
+        <servlet-name>
+            servletToJsp
+        </servlet-name>
+        <servlet-class>
+            servletToJsp
+        </servlet-class>
     </servlet>
 
     <servlet>
@@ -123,7 +123,7 @@
             compressionFilters.CompressionFilterTestServlet
         </servlet-class>
     </servlet>
-    
+
     <servlet-mapping>
         <servlet-name>
             CompressionFilterTestServlet
@@ -140,82 +140,82 @@
 
     <jsp-config>
         <taglib>
-	    <taglib-uri>
-	       http://jakarta.apache.org/tomcat/debug-taglib
-	    </taglib-uri>
-	    <taglib-location>
-	       /WEB-INF/jsp/debug-taglib.tld
-	    </taglib-location>
-	</taglib>
-
-	<taglib>
-	    <taglib-uri>
-	       http://jakarta.apache.org/tomcat/examples-taglib
-	    </taglib-uri>
-	    <taglib-location>
-	       /WEB-INF/jsp/example-taglib.tld
-	    </taglib-location>
-	</taglib>
-
-	<taglib>
-	    <taglib-uri>
-	       http://jakarta.apache.org/tomcat/jsp2-example-taglib
-	    </taglib-uri>
-	    <taglib-location>
-	       /WEB-INF/jsp2/jsp2-example-taglib.tld
-	    </taglib-location>
-	</taglib>
-
-	<jsp-property-group>
-	    <description>
-		Special property group for JSP Configuration JSP example.
-	    </description>
-	    <display-name>JSPConfiguration</display-name>
-	    <url-pattern>/jsp2/misc/config.jsp</url-pattern>
-	    <el-ignored>true</el-ignored>
-	    <page-encoding>ISO-8859-1</page-encoding>
-	    <scripting-invalid>true</scripting-invalid>
-	    <include-prelude>/jsp2/misc/prelude.jspf</include-prelude>
-	    <include-coda>/jsp2/misc/coda.jspf</include-coda>
-	</jsp-property-group>
+            <taglib-uri>
+                http://jakarta.apache.org/tomcat/debug-taglib
+            </taglib-uri>
+            <taglib-location>
+                /WEB-INF/jsp/debug-taglib.tld
+            </taglib-location>
+        </taglib>
+
+        <taglib>
+            <taglib-uri>
+                http://jakarta.apache.org/tomcat/examples-taglib
+            </taglib-uri>
+            <taglib-location>
+                /WEB-INF/jsp/example-taglib.tld
+            </taglib-location>
+        </taglib>
+
+        <taglib>
+            <taglib-uri>
+                http://jakarta.apache.org/tomcat/jsp2-example-taglib
+            </taglib-uri>
+            <taglib-location>
+                /WEB-INF/jsp2/jsp2-example-taglib.tld
+            </taglib-location>
+        </taglib>
+
+        <jsp-property-group>
+            <description>
+                Special property group for JSP Configuration JSP example.
+            </description>
+            <display-name>JSPConfiguration</display-name>
+            <url-pattern>/jsp2/misc/config.jsp</url-pattern>
+            <el-ignored>true</el-ignored>
+            <page-encoding>ISO-8859-1</page-encoding>
+            <scripting-invalid>true</scripting-invalid>
+            <include-prelude>/jsp2/misc/prelude.jspf</include-prelude>
+            <include-coda>/jsp2/misc/coda.jspf</include-coda>
+        </jsp-property-group>
     </jsp-config>
-    
-   <security-constraint>
-      <display-name>Example Security Constraint</display-name>
-      <web-resource-collection>
-         <web-resource-name>Protected Area</web-resource-name>
-	 <!-- Define the context-relative URL(s) to be protected -->
-         <url-pattern>/security/protected/*</url-pattern>
-	 <!-- If you list http methods, only those methods are protected -->
-	 <http-method>DELETE</http-method>
-         <http-method>GET</http-method>
-         <http-method>POST</http-method>
-	 <http-method>PUT</http-method>
-      </web-resource-collection>
-      <auth-constraint>
-         <!-- Anyone with one of the listed roles may access this area -->
-         <role-name>tomcat</role-name>
-	 <role-name>role1</role-name>
-      </auth-constraint>
+
+    <security-constraint>
+        <display-name>Example Security Constraint</display-name>
+        <web-resource-collection>
+            <web-resource-name>Protected Area</web-resource-name>
+            <!-- Define the context-relative URL(s) to be protected -->
+            <url-pattern>/security/protected/*</url-pattern>
+            <!-- If you list http methods, only those methods are protected -->
+            <http-method>DELETE</http-method>
+            <http-method>GET</http-method>
+            <http-method>POST</http-method>
+            <http-method>PUT</http-method>
+        </web-resource-collection>
+        <auth-constraint>
+            <!-- Anyone with one of the listed roles may access this area -->
+            <role-name>tomcat</role-name>
+            <role-name>role1</role-name>
+        </auth-constraint>
     </security-constraint>
 
     <!-- Default login configuration uses form-based authentication -->
     <login-config>
-      <auth-method>FORM</auth-method>
-      <realm-name>Example Form-Based Authentication Area</realm-name>
-      <form-login-config>
-        <form-login-page>/security/protected/login.jsp</form-login-page>
-        <form-error-page>/security/protected/error.jsp</form-error-page>
-      </form-login-config>
+        <auth-method>FORM</auth-method>
+        <realm-name>Example Form-Based Authentication Area</realm-name>
+        <form-login-config>
+            <form-login-page>/security/protected/login.jsp</form-login-page>
+            <form-error-page>/security/protected/error.jsp</form-error-page>
+        </form-login-config>
     </login-config>
-        
+
     <!-- Security roles referenced by this web application -->
     <security-role>
-      <role-name>role1</role-name>
+        <role-name>role1</role-name>
     </security-role>
     <security-role>
-      <role-name>tomcat</role-name>
-    </security-role>    
+        <role-name>tomcat</role-name>
+    </security-role>
 
     <!-- Environment entry examples -->
     <!--env-entry>
@@ -227,29 +227,29 @@
       <env-entry-value>15</env-entry-value>
     </env-entry-->
     <env-entry>
-      <env-entry-name>minExemptions</env-entry-name>
-      <env-entry-type>java.lang.Integer</env-entry-type>
-      <env-entry-value>1</env-entry-value>
+        <env-entry-name>minExemptions</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>1</env-entry-value>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/name1</env-entry-name>
-      <env-entry-type>java.lang.String</env-entry-type>
-      <env-entry-value>value1</env-entry-value>
+        <env-entry-name>foo/name1</env-entry-name>
+        <env-entry-type>java.lang.String</env-entry-type>
+        <env-entry-value>value1</env-entry-value>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/bar/name2</env-entry-name>
-      <env-entry-type>java.lang.Boolean</env-entry-type>
-      <env-entry-value>true</env-entry-value>
+        <env-entry-name>foo/bar/name2</env-entry-name>
+        <env-entry-type>java.lang.Boolean</env-entry-type>
+        <env-entry-value>true</env-entry-value>
     </env-entry>
     <env-entry>
-      <env-entry-name>name3</env-entry-name>
-      <env-entry-type>java.lang.Integer</env-entry-type>
-      <env-entry-value>1</env-entry-value>
+        <env-entry-name>name3</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>1</env-entry-value>
     </env-entry>
     <env-entry>
-      <env-entry-name>foo/name4</env-entry-name>
-      <env-entry-type>java.lang.Integer</env-entry-type>
-      <env-entry-value>10</env-entry-value>
+        <env-entry-name>foo/name4</env-entry-name>
+        <env-entry-type>java.lang.Integer</env-entry-type>
+        <env-entry-value>10</env-entry-value>
     </env-entry>
 
 </web-app>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal1.jsp Fri Jun  6 15:43:44 2008
@@ -15,75 +15,77 @@
   See the License for the specific language governing permissions and
   limitations under the License.
 -->
-<HEAD><TITLE> 
-	Calendar: A JSP APPLICATION
+<HEAD><TITLE>
+    Calendar: A JSP APPLICATION
 </TITLE></HEAD>
 
 
 <BODY BGCOLOR="white">
 
-<%@ page language="java" import="cal.*" %>
-<jsp:useBean id="table" scope="session" class="cal.TableBean" />
+<%@ page language="java" %>
+<jsp:useBean id="table" scope="session" class="cal.TableBean"/>
 
 <%
-	table.processRequest(request);
-	if (table.getProcessError() == false) {
+    table.processRequest(request);
+    if (table.getProcessError() == false) {
 %>
 
 <!-- html table goes here -->
 <CENTER>
-<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER> <A HREF=cal1.jsp?date=prev> prev </A>
-<TD ALIGN=CENTER> Calendar:<%= table.getDate() %></TD>
-<TD ALIGN=CENTER> <A HREF=cal1.jsp?date=next> next </A>
-</TR>
-</TABLE>
-
-<!-- the main table -->
-<TABLE WIDTH=60% BGCOLOR=lightblue BORDER=1 CELLPADDING=10>
-<TR>
-<TH> Time </TH>
-<TH> Appointment </TH>
-</TR>
-<FORM METHOD=POST ACTION=cal1.jsp>
-<%
-	for(int i=0; i<table.getEntries().getRows(); i++) {
-	   cal.Entry entr = table.getEntries().getEntry(i);	
-%>
-	<TR>
-	<TD> 
-	<A HREF=cal2.jsp?time=<%= entr.getHour() %>>
-		<%= entr.getHour() %> </A>
-	</TD>
-	<TD BGCOLOR=<%= entr.getColor() %>>
-	<% out.print(util.HTMLFilter.filter(entr.getDescription())); %>
-	</TD> 
-	</TR>
-<%
-	}
-%>
-</FORM>
-</TABLE>
-<BR>
-
-<!-- footer -->
-<TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
-<TR>
-<TD ALIGN=CENTER>  <% out.print(util.HTMLFilter.filter(table.getName())); %> : 
-		     <% out.print(util.HTMLFilter.filter(table.getEmail())); %> </TD>
-</TR>
-</TABLE>
+    <TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
+        <TR>
+            <TD ALIGN=CENTER><A HREF=cal1.jsp?date=prev> prev </A>
+            <TD ALIGN=CENTER> Calendar:<%= table.getDate() %>
+            </TD>
+            <TD ALIGN=CENTER><A HREF=cal1.jsp?date=next> next </A>
+        </TR>
+    </TABLE>
+
+    <!-- the main table -->
+    <TABLE WIDTH=60% BGCOLOR=lightblue BORDER=1 CELLPADDING=10>
+        <TR>
+            <TH> Time</TH>
+            <TH> Appointment</TH>
+        </TR>
+        <FORM METHOD=POST ACTION=cal1.jsp>
+            <%
+                for (int i = 0; i < table.getEntries().getRows(); i++) {
+                    cal.Entry entr = table.getEntries().getEntry(i);
+            %>
+            <TR>
+                <TD>
+                    <A HREF=cal2.jsp?time=<%= entr.getHour() %>>
+                        <%= entr.getHour() %>
+                    </A>
+                </TD>
+                <TD BGCOLOR=<%= entr.getColor() %>>
+                    <% out.print(util.HTMLFilter.filter(entr.getDescription())); %>
+                </TD>
+            </TR>
+            <%
+                }
+            %>
+        </FORM>
+    </TABLE>
+    <BR>
+
+    <!-- footer -->
+    <TABLE WIDTH=60% BGCOLOR=yellow CELLPADDING=15>
+        <TR>
+            <TD ALIGN=CENTER><% out.print(util.HTMLFilter.filter(table.getName())); %> :
+                <% out.print(util.HTMLFilter.filter(table.getEmail())); %></TD>
+        </TR>
+    </TABLE>
 </CENTER>
 
 <%
-	} else {
+} else {
 %>
 <font size=5>
-	You must enter your name and email address correctly.
+    You must enter your name and email address correctly.
 </font>
 <%
-	}
+    }
 %>
 
 

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/cal2.jsp Fri Jun  6 15:43:44 2008
@@ -16,28 +16,34 @@
   limitations under the License.
 -->
 
-<HEAD><TITLE> 
-	Calendar: A JSP APPLICATION
+<HEAD><TITLE>
+    Calendar: A JSP APPLICATION
 </TITLE></HEAD>
 
 
 <BODY BGCOLOR="white">
-<jsp:useBean id="table" scope="session" class="cal.TableBean" />
+<jsp:useBean id="table" scope="session" class="cal.TableBean"/>
 
-<% 
-	String time = request.getParameter ("time");
+<%
+    String time = request.getParameter("time");
 %>
 
 <FONT SIZE=5> Please add the following event:
-<BR> <h3> Date <%= table.getDate() %>
-<BR> Time <%= util.HTMLFilter.filter(time) %> </h3>
+    <BR>
+
+    <h3> Date <%= table.getDate() %>
+        <BR> Time <%= util.HTMLFilter.filter(time) %>
+    </h3>
 </FONT>
+
 <FORM METHOD=POST ACTION=cal1.jsp>
-<BR> 
-<BR> <INPUT NAME="date" TYPE=HIDDEN VALUE="current">
-<BR> <INPUT NAME="time" TYPE=HIDDEN VALUE=<%= util.HTMLFilter.filter(time) %>
-<BR> <h2> Description of the event <INPUT NAME="description" TYPE=TEXT SIZE=20> </h2>
-<BR> <INPUT TYPE=SUBMIT VALUE="submit">
+    <BR>
+    <BR> <INPUT NAME="date" TYPE=HIDDEN VALUE="current">
+    <BR> <INPUT NAME="time" TYPE=HIDDEN VALUE=<%= util.HTMLFilter.filter(time) %>
+        <BR>
+
+    <h2> Description of the event <INPUT NAME="description" TYPE=TEXT SIZE=20></h2>
+    <BR> <INPUT TYPE=SUBMIT VALUE="submit">
 </FORM>
 
 </BODY>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/calendar.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/calendar.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/calendar.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/calendar.html Fri Jun  6 15:43:44 2008
@@ -17,27 +17,32 @@
 -->
 
 <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="login.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>
 
 <h2> Source Code for Calendar Example. <br>
-<h3><a href="cal1.jsp.html">cal1.jsp<font color="#0000FF"></a>
-  </font> </h3>
-<h3><a href="cal2.jsp.html">cal2.jsp<font color="#0000FF"></a>
-  </font> </h3>
-
-<br>
-<h2> Beans.
-<h3><a href="TableBean.java.html">TableBean<font color="#0000FF"></a>
-  </font> </h3>
-<h3><a href="Entries.java.html">Entries<font color="#0000FF"></a>
-  </font> </h3>
-<h3><a href="Entry.java.html">Entry<font color="#0000FF"></a>
-  </font> </h3>
+
+    <h3><a href="cal1.jsp.html">cal1.jsp<font color="#0000FF"></a>
+        </font> </h3>
+
+    <h3><a href="cal2.jsp.html">cal2.jsp<font color="#0000FF"></a>
+        </font> </h3>
+
+    <br>
+
+    <h2> Beans.
+        <h3><a href="TableBean.java.html">TableBean<font color="#0000FF"></a>
+            </font> </h3>
+
+        <h3><a href="Entries.java.html">Entries<font color="#0000FF"></a>
+            </font> </h3>
+
+        <h3><a href="Entry.java.html">Entry<font color="#0000FF"></a>
+            </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/login.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/login.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/login.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/cal/login.html Fri Jun  6 15:43:44 2008
@@ -17,30 +17,31 @@
 -->
 
 <head>
-	<title> Login page for the calendar. </title>
+    <title> Login page for the calendar. </title>
 </head>
 
 <body bgcolor="white">
 <center>
 
-	<font size=7 color="red"> Please Enter the following information: </font>
+    <font size=7 color="red"> Please Enter the following information: </font>
 
-<br>
-	<form method=GET action=cal1.jsp>
+    <br>
 
-		<font size=5> Name <input type=text name="name" size=20>
-		</font>
-		<br>
-		<font size=5> Email <input type=text name="email" size=20>
-		</font>
-		<br>
-		<input type=submit name=action value="Submit">
-
-	</form>
-<hr>
-<font size=3 color="red"> Note: This application does not implement the complete 
-functionality of a typical calendar application. It demostartes a way JSP can be 
-used with html tables and forms.</font>
+    <form method=GET action=cal1.jsp>
+
+        <font size=5> Name <input type=text name="name" size=20>
+        </font>
+        <br>
+        <font size=5> Email <input type=text name="email" size=20>
+        </font>
+        <br>
+        <input type=submit name=action value="Submit">
+
+    </form>
+    <hr>
+    <font size=3 color="red"> Note: This application does not implement the complete
+        functionality of a typical calendar application. It demostartes a way JSP can be
+        used with html tables and forms.</font>
 
 </center>
 </body>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/CheckTest.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/CheckTest.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/CheckTest.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/CheckTest.html Fri Jun  6 15:43:44 2008
@@ -17,16 +17,18 @@
 -->
 
 <HEAD>
-<title>
-checkbox.CheckTest Bean Properties
-</title>
+    <title>
+        checkbox.CheckTest Bean Properties
+    </title>
 <BODY BGCOLOR="white">
 <H2>
-checkbox.CheckTest Bean Properties
+    checkbox.CheckTest Bean Properties
 </H2>
 <HR>
 <DL>
-<DT>public class <B>CheckTest</B><DT>extends Object</DL>
+    <DT>public class <B>CheckTest</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>CheckTest:fruit</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>CheckTest:fruit</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Multi
+            </FONT></TD>
 </TABLE>
 <HR>
 </BODY>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/check.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/check.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/check.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/check.html Fri Jun  6 15:43:44 2008
@@ -20,19 +20,19 @@
 
 
 <FORM TYPE=POST ACTION=checkresult.jsp>
-<BR>
-<font size=5 color="red">
-Check all Favorite fruits: <br>
+    <BR>
+    <font size=5 color="red">
+        Check all Favorite fruits: <br>
 
-<input TYPE=checkbox name=fruit VALUE=apples> Apples <BR>
-<input TYPE=checkbox name=fruit VALUE=grapes> Grapes <BR>
-<input TYPE=checkbox name=fruit VALUE=oranges> Oranges <BR>
-<input TYPE=checkbox name=fruit VALUE=melons> Melons <BR>
+        <input TYPE=checkbox name=fruit VALUE=apples> Apples <BR>
+        <input TYPE=checkbox name=fruit VALUE=grapes> Grapes <BR>
+        <input TYPE=checkbox name=fruit VALUE=oranges> Oranges <BR>
+        <input TYPE=checkbox name=fruit VALUE=melons> Melons <BR>
 
 
-<br> <INPUT TYPE=submit name=submit Value="Submit">
+        <br> <INPUT TYPE=submit name=submit Value="Submit">
 
-</font>
+    </font>
 </FORM>
 </BODY>
 </HTML>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/checkresult.jsp Fri Jun  6 15:43:44 2008
@@ -18,47 +18,51 @@
 
 <body bgcolor="white">
 <font size=5 color="red">
-<%! String[] fruits; %>
-<jsp:useBean id="foo" scope="page" class="checkbox.CheckTest" />
+    <%! String[] fruits; %>
+    <jsp:useBean id="foo" scope="page" class="checkbox.CheckTest"/>
 
-<jsp:setProperty name="foo" property="fruit" param="fruit" />
-<hr>
-The checked fruits (got using request) are: <br>
-<% 
-	fruits = request.getParameterValues("fruit");
-%>
-<ul>
-<%
-    if (fruits != null) {
-	  for (int i = 0; i < fruits.length; i++) {
-%>
-<li>
-<%
-	      out.println (util.HTMLFilter.filter(fruits[i]));
-	  }
-	} else out.println ("none selected");
-%>
-</ul>
-<br>
-<hr>
-
-The checked fruits (got using beans) are <br>
-
-<% 
-		fruits = foo.getFruit();
-%>
-<ul>
-<%
-    if (!fruits[0].equals("1")) {
-	  for (int i = 0; i < fruits.length; i++) {
-%>
-<li>
-<%
-		  out.println (util.HTMLFilter.filter(fruits[i]));
-	  }
-	} else out.println ("none selected");
-%>
-</ul>
+    <jsp:setProperty name="foo" property="fruit" param="fruit"/>
+    <hr>
+    The checked fruits (got using request) are: <br>
+    <%
+        fruits = request.getParameterValues("fruit");
+    %>
+    <ul>
+        <%
+            if (fruits != null) {
+                for (int i = 0; i < fruits.length; i++) {
+        %>
+        <li>
+            <%
+
+                          out.println (util.HTMLFilter.filter(fruits[i]));
+                      }
+                    } else out.println ("none selected");
+
+            %>
+    </ul>
+    <br>
+    <hr>
+
+    The checked fruits (got using beans) are <br>
+
+    <%
+        fruits = foo.getFruit();
+    %>
+    <ul>
+        <%
+            if (!fruits[0].equals("1")) {
+                for (int i = 0; i < fruits.length; i++) {
+        %>
+        <li>
+            <%
+
+                              out.println (util.HTMLFilter.filter(fruits[i]));
+                      }
+                    } else out.println ("none selected");
+
+            %>
+    </ul>
 </font>
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/cresult.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/cresult.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/cresult.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/checkbox/cresult.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="check.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="checkresult.jsp.html">Source Code for Checkbox Example<font color="#0000FF"></a>
-  </font> </h3>
+    </font> </h3>
 
 <h3><a href="CheckTest.html">Property Sheet for CheckTest
-<font color="#0000FF"></a> </font> </h3>
+    <font color="#0000FF"></a> </font> </h3>
 
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/ColorGameBean.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/ColorGameBean.html?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/ColorGameBean.html (original)
+++ geronimo/samples/branches/2.1/samples/jsp-examples/jsp-examples-war/src/main/webapp/colors/ColorGameBean.html Fri Jun  6 15:43:44 2008
@@ -17,16 +17,18 @@
 -->
 
 <HEAD>
-<title>
-colors.ColorGameBean Bean Properties
-</title>
+    <title>
+        colors.ColorGameBean Bean Properties
+    </title>
 <BODY BGCOLOR="white">
 <H2>
-colors.ColorGameBean Bean Properties
+    colors.ColorGameBean Bean Properties
 </H2>
 <HR>
 <DL>
-<DT>public class <B>ColorGameBean</B><DT>extends Object</DL>
+    <DT>public class <B>ColorGameBean</B>
+    <DT>extends Object
+</DL>
 
 <P>
 <HR>
@@ -34,82 +36,82 @@
 <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>ColorGameBean:color2</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</FONT></TD>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-String
-</FONT></TD>
-<TD><B>ColorGameBean:color1</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</FONT></TD>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-int
-</FONT></TD>
-<TD><B>ColorGameBean:attempts</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</FONT></TD>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-boolean
-</FONT></TD>
-<TD><B>ColorGameBean:hint</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</FONT></TD>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-boolean
-</FONT></TD>
-<TD><B>ColorGameBean:success</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</FONT></TD>
-<TR BGCOLOR="white">
-<td align="right" valign="top" width="1%">
-<FONT SIZE="-1">
-boolean
-</FONT></TD>
-<TD><B>ColorGameBean:hintTaken</B>
-<BR>
-       </TD>
-<td width="1%">
-<FONT SIZE="-1">
-Single
-</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>ColorGameBean:color2</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                String
+            </FONT></TD>
+        <TD><B>ColorGameBean:color1</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                int
+            </FONT></TD>
+        <TD><B>ColorGameBean:attempts</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                boolean
+            </FONT></TD>
+        <TD><B>ColorGameBean:hint</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                boolean
+            </FONT></TD>
+        <TD><B>ColorGameBean:success</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
+    <TR BGCOLOR="white">
+        <td align="right" valign="top" width="1%">
+            <FONT SIZE="-1">
+                boolean
+            </FONT></TD>
+        <TD><B>ColorGameBean:hintTaken</B>
+            <BR>
+        </TD>
+        <td width="1%">
+            <FONT SIZE="-1">
+                Single
+            </FONT></TD>
 </TABLE>
 <HR>
 </BODY>



Mime
View raw message