geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664120 [3/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/customer-service/customer-service-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/openejb-jar.xml Fri Jun  6 13:53:24 2008
@@ -21,17 +21,17 @@
              xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1"
              xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1"
              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>jar</dep:type>
-      </dep:moduleId>
+    <dep:environment>
+        <dep:moduleId>
+            <dep:groupId>${pom.groupId}</dep:groupId>
+            <dep:artifactId>${pom.artifactId}</dep:artifactId>
+            <dep:version>${version}</dep:version>
+            <dep:type>jar</dep:type>
+        </dep:moduleId>
 
-      <dep:dependencies>
-      </dep:dependencies>
-      <dep:hidden-classes/>
-      <dep:non-overridable-classes/>
-   </dep:environment>
+        <dep:dependencies>
+        </dep:dependencies>
+        <dep:hidden-classes/>
+        <dep:non-overridable-classes/>
+    </dep:environment>
 </openejb-jar>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/persistence.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/persistence.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/persistence.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-ejb/src/main/resources/META-INF/persistence.xml Fri Jun  6 13:53:24 2008
@@ -17,9 +17,9 @@
    limitations under the License.
 -->
 
-<persistence    xmlns="http://java.sun.com/xml/ns/persistence"
-                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
-                xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
+<persistence xmlns="http://java.sun.com/xml/ns/persistence"
+             xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" version="1.0"
+             xsi:schemaLocation="http://java.sun.com/xml/ns/persistence http://java.sun.com/xml/ns/persistence/persistence_1_0.xsd">
     <persistence-unit name="CustomerPU">
         <description>Entity Beans for Customer</description>
         <provider>org.apache.openjpa.persistence.PersistenceProviderImpl</provider>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-jetty/pom.xml Fri Jun  6 13:53:24 2008
@@ -123,7 +123,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -151,17 +151,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>
@@ -174,7 +174,7 @@
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>jetty</it-server>-->
+            <!--<it-server>jetty</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-jetty/src/main/plan/plan.xml Fri Jun  6 13:53:24 2008
@@ -20,5 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-   
+
 </application>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/pom.xml Fri Jun  6 13:53:24 2008
@@ -91,7 +91,7 @@
             <type>car</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6</artifactId>
@@ -125,7 +125,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -153,17 +153,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>
@@ -171,12 +171,12 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <profiles>
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>tomcat</it-server>-->
+            <!--<it-server>tomcat</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-tomcat/src/main/plan/plan.xml Fri Jun  6 13:53:24 2008
@@ -20,5 +20,5 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <application xmlns="http://geronimo.apache.org/xml/ns/j2ee/application-1.2">
-   
+
 </application>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/pom.xml Fri Jun  6 13:53:24 2008
@@ -44,11 +44,11 @@
             <scope>provided</scope>
         </dependency>
     </dependencies>
-    
+
     <build>
         <plugins>
             <plugin>
-              <groupId>org.apache.maven.plugins</groupId>
+                <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-antrun-plugin</artifactId>
                 <executions>
                     <execution>
@@ -59,7 +59,7 @@
                         </goals>
                         <configuration>
                             <tasks>
-                              <echo>Copying site directory from parent</echo>
+                                <echo>Copying site directory from parent</echo>
                                 <copy todir="${project.build.directory}/${pom.artifactId}-${version}" failonerror="false" overwrite="true">
                                     <fileset dir="${pom.basedir}/../docs"/>
                                 </copy>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/java/com/service/customer/web/CustomerServiceJavaBean.java Fri Jun  6 13:53:24 2008
@@ -17,53 +17,47 @@
 
 package com.service.customer.web;
 
-import com.service.customer.ejb.Customer;
-import com.service.customer.ejb.ProcessCustomerSessionLocal;
-
+import java.util.List;
 import java.util.Locale;
 import java.util.ResourceBundle;
-import java.util.List;
+
 import javax.naming.InitialContext;
 
-public class CustomerServiceJavaBean
-{
-   private ProcessCustomerSessionLocal process = null;
-   private ResourceBundle      bundle = null;
-
-   public CustomerServiceJavaBean()
-   {
-      InitialContext initial = null;
-
-      bundle = ResourceBundle.getBundle("customer", Locale.getDefault(), CustomerServiceJavaBean.class.getClassLoader());
-      String jndiName = bundle.getString("jndi.process.ejb");
-
-      try
-      {
-         initial = new InitialContext();
-		 process = (ProcessCustomerSessionLocal) initial.lookup(jndiName.trim());
-         System.out.println("Successful looking up: '" + jndiName.trim() + "'");
-      } // end try
-
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      } // end catch
-   } // end CustomerServiceJavaBean
-
-
-   public List<Customer> getAllCustomers()
-   {
-      List<Customer> customerList = null;
-
-      try
-      {
-         customerList = process.findAllCustomers();
-      } // end try
-      catch (Exception e)
-      {
-         e.printStackTrace();
-      } // end catch
+import com.service.customer.ejb.Customer;
+import com.service.customer.ejb.ProcessCustomerSessionLocal;
+
+public class CustomerServiceJavaBean {
+    private ProcessCustomerSessionLocal process = null;
+    private ResourceBundle bundle = null;
+
+    public CustomerServiceJavaBean() {
+        InitialContext initial = null;
+
+        bundle = ResourceBundle.getBundle("customer", Locale.getDefault(), CustomerServiceJavaBean.class.getClassLoader());
+        String jndiName = bundle.getString("jndi.process.ejb");
+
+        try {
+            initial = new InitialContext();
+            process = (ProcessCustomerSessionLocal) initial.lookup(jndiName.trim());
+            System.out.println("Successful looking up: '" + jndiName.trim() + "'");
+        } // end try
+
+        catch (Exception e) {
+            e.printStackTrace();
+        } // end catch
+    } // end CustomerServiceJavaBean
+
+
+    public List<Customer> getAllCustomers() {
+        List<Customer> customerList = null;
+
+        try {
+            customerList = process.findAllCustomers();
+        } // end try
+        catch (Exception e) {
+            e.printStackTrace();
+        } // end catch
 
-      return customerList;
-   } // end getAllCustomerss
+        return customerList;
+    } // end getAllCustomerss
 } // end CustomerServiceJavaBean

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 13:53:24 2008
@@ -18,20 +18,20 @@
 -->
 
 <web-app
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
-   <environment>
-      <moduleId>
-         <groupId>${pom.groupId}</groupId>
-         <artifactId>${pom.artifactId}</artifactId>
-         <version>${version}</version>
-         <type>war</type>
-      </moduleId>
+        xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-1.1">
+    <environment>
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </moduleId>
 
-      <dependencies>
-      </dependencies>		
-      <hidden-classes/>
-      <non-overridable-classes/>
-   </environment>
-   
-   <context-root>/service</context-root>
+        <dependencies>
+        </dependencies>
+        <hidden-classes/>
+        <non-overridable-classes/>
+    </environment>
+
+    <context-root>/service</context-root>
 </web-app>

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 13:53:24 2008
@@ -22,14 +22,14 @@
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-  </welcome-file-list>
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
 
-  <ejb-local-ref>
-    <ejb-ref-name>ejb/ProcessCustomerSessionBean</ejb-ref-name>
-    <ejb-ref-type>Session</ejb-ref-type>
-    <local>com.service.customer.ejb.ProcessCustomerSessionLocal</local>
-  </ejb-local-ref>
+    <ejb-local-ref>
+        <ejb-ref-name>ejb/ProcessCustomerSessionBean</ejb-ref-name>
+        <ejb-ref-type>Session</ejb-ref-type>
+        <local>com.service.customer.ejb.ProcessCustomerSessionLocal</local>
+    </ejb-local-ref>
 </web-app>
 

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/customers/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/customers/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/customers/index.jsp (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/customers/index.jsp Fri Jun  6 13:53:24 2008
@@ -1,102 +1,102 @@
 <!--
-    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.
 -->
 <%
-// index.jsp - Edit customer information no this page
+    // index.jsp - Edit customer information no this page
 %>
 
+<%@ page import="java.util.List" %>
 <%@ page import="com.service.customer.ejb.Customer" %>
-<%@ page import="com.service.customer.ejb.ProcessCustomerSessionLocal" %>
-<%@ page import="java.util.List"                     %>
 
 <jsp:useBean id="serviceBean" scope="session" class="com.service.customer.web.CustomerServiceJavaBean"/>
 <jsp:setProperty name="serviceBean" property="*"/>
 
 <HTML>
-   <%! Customer customer            = null; %>
-   <%! String message               = null; %>
-   <%! List<Customer> customerList  = null; %>
-
-   <% message = ""; %>
-   <% customerList = serviceBean.getAllCustomers(); %>
-
-   <HEAD>
-   <TITLE>Customer Service - JNDI Series</TITLE>
-   </HEAD>
-
-   <BODY bgcolor="white">
-    <CENTER>
-        <H1>Customer Processing Page</H1>
-    </CENTER>
-
-    <% if ((customerList == null) || (customerList.size() == 0)) { %>
-      <% message = "No Customers Available"; %>
+<%! Customer customer = null; %>
+<%! String message = null; %>
+<%! List<Customer> customerList = null; %>
+
+<% message = ""; %>
+<% customerList = serviceBean.getAllCustomers(); %>
+
+<HEAD>
+    <TITLE>Customer Service - JNDI Series</TITLE>
+</HEAD>
+
+<BODY bgcolor="white">
+<CENTER>
+    <H1>Customer Processing Page</H1>
+</CENTER>
+
+<% if ((customerList == null) || (customerList.size() == 0)) { %>
+<% message = "No Customers Available"; %>
+<% } // end if %>
+
+<!-- Display status message here -->
+<H2><%= message %>
+</H2>
+
+<TABLE border="0">
+    <TR>
+        <TD align="left">
+            Customer ID
+        </TD>
+
+        <TD align="left">
+            Full Name
+        </TD>
+
+        <TD align="left">
+            Email Address
+        </TD>
+
+        <TD align="left">
+            Interests
+        </TD>
+    </TR>
+
+    <% if (customerList != null) { %>
+    <% for (int x = 0; x < customerList.size(); x++) { %>
+    <TR>
+        <% customer = (Customer) customerList.get(x); %>
+
+        <TD align="left">
+            <INPUT type="radio" name="customerID" value="<%= customer.getCustomerId() %>">
+            <%= customer.getCustomerId() %>
+        </TD>
+
+        <TD align="left">
+            <INPUT type="hidden" name="fullName" value="<%= customer.getFullName() %>">
+            <%= customer.getFullName() %>
+        </TD>
+
+        <TD align="left">
+            <INPUT type="hidden" name="emailAddress" value="<%= customer.getEmailAddress() %>">
+            <%= customer.getEmailAddress() %>
+        </TD>
+
+        <TD align="left">
+            <INPUT type="hidden" name="interests" value="<%= customer.getInterests() %>">
+            <%= customer.getInterests() %>
+        </TD>
+    </TR>
+    <% } // end for %>
     <% } // end if %>
-
-    <!-- Display status message here -->
-    <H2><%= message %></H2>
-
-    <TABLE border="0">
-      <TR>
-         <TD align="left">
-         Customer ID
-         </TD>
-
-         <TD align="left">
-         Full Name
-         </TD>
-
-         <TD align="left">
-         Email Address
-         </TD>
-
-         <TD align="left">
-         Interests
-         </TD>
-      </TR>
-
-      <% if (customerList != null) { %>
-      <% for (int x = 0; x < customerList.size(); x++) { %>
-      <TR>
-         <% customer = (Customer)customerList.get(x); %>
-
-         <TD align="left">
-         <INPUT type="radio" name="customerID" value="<%= customer.getCustomerId() %>">
-         <%= customer.getCustomerId() %>
-         </TD>
-
-         <TD align="left">
-         <INPUT type="hidden" name="fullName" value="<%= customer.getFullName() %>">
-         <%= customer.getFullName() %>
-         </TD>
-
-         <TD align="left">
-         <INPUT type="hidden" name="emailAddress" value="<%= customer.getEmailAddress() %>">
-         <%= customer.getEmailAddress() %>
-         </TD>
-
-         <TD align="left">
-         <INPUT type="hidden" name="interests" value="<%= customer.getInterests() %>">
-         <%= customer.getInterests() %>
-         </TD>
-      </TR>
-      <% } // end for %>
-      <% } // end if %>
-    </TABLE>
-   </BODY>
+</TABLE>
+</BODY>
 </HTML>

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

Modified: geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/index.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/index.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/index.jsp (original)
+++ geronimo/samples/trunk/samples/customer-service/customer-service-war/src/main/webapp/index.jsp Fri Jun  6 13:53:24 2008
@@ -1,37 +1,37 @@
 <!--
-    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>Customer Service - JNDI Series</TITLE>
+    <TITLE>Customer Service - JNDI Series</TITLE>
 </HEAD>
 
 <BODY bgcolor="white">
 <CENTER>
-   <H1>Welcome to Customer Service</H1>
+    <H1>Welcome to Customer Service</H1>
 
-   <TABLE>
-      <TR>
-      <TD align="left">
-      <H2><a href="customers/index.jsp">View Customers</a></H2>
-      </TD>
-      </TR>
-   </TABLE>
+    <TABLE>
+        <TR>
+            <TD align="left">
+                <H2><a href="customers/index.jsp">View Customers</a></H2>
+            </TD>
+        </TR>
+    </TABLE>
 </CENTER>
 </BODY>
 </HTML>

Modified: geronimo/samples/trunk/samples/customer-service/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/customer-service/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/customer-service/pom.xml (original)
+++ geronimo/samples/trunk/samples/customer-service/pom.xml Fri Jun  6 13:53:24 2008
@@ -21,56 +21,56 @@
 <!-- $Rev: 550875 $ $Date: 2007-06-26 13:40:09 -0400 (Tue, 26 Jun 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>customer-service</artifactId>
     <name>Geronimo Samples :: customer-service</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo customer-service sample created from an archetype.
     </description>
-    
-   <modules>
+
+    <modules>
         <module>customer-service-ejb</module>
         <module>customer-service-war</module>
         <module>customer-service-ear</module>
         <module>customer-service-jetty</module>
         <module>customer-service-tomcat</module>
-   </modules>
+    </modules>
 
-   <dependencies>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-annotation_1.0_spec</artifactId>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.activemq</groupId>
-        <artifactId>activemq-core</artifactId>
-        <scope>provided</scope>
-    </dependency>
-    <dependency>
-        <groupId>org.apache.geronimo.specs</groupId>
-        <artifactId>geronimo-jpa_3.0_spec</artifactId>
-        <scope>provided</scope>
-    </dependency>
-   </dependencies>
+    <dependencies>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-annotation_1.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.activemq</groupId>
+            <artifactId>activemq-core</artifactId>
+            <scope>provided</scope>
+        </dependency>
+        <dependency>
+            <groupId>org.apache.geronimo.specs</groupId>
+            <artifactId>geronimo-jpa_3.0_spec</artifactId>
+            <scope>provided</scope>
+        </dependency>
+    </dependencies>
 
-   <build>
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-jetty/pom.xml Fri Jun  6 13:53:24 2008
@@ -83,7 +83,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -115,11 +115,11 @@
                                 </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. 
+                                    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> 
+                                </description>
                             </prerequisite>
                         </plugin-artifact>
                     </instance>
@@ -132,7 +132,7 @@
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>jetty-minimal</it-server>-->
+            <!--<it-server>jetty-minimal</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-tomcat/pom.xml Fri Jun  6 13:53:24 2008
@@ -45,7 +45,7 @@
             <type>war</type>
             <scope>provided</scope>
         </dependency>
-        
+
         <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>tomcat6-deployer</artifactId>
@@ -83,7 +83,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -115,11 +115,11 @@
                                 </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. 
+                                    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> 
+                                </description>
                             </prerequisite>
                         </plugin-artifact>
                     </instance>
@@ -127,12 +127,12 @@
             </plugin>
         </plugins>
     </build>
-    
+
     <profiles>
         <profile>
             <id>it</id>
             <!--<properties>-->
-                <!--<it-server>tomcat-minimal</it-server>-->
+            <!--<it-server>tomcat-minimal</it-server>-->
             <!--</properties>-->
             <build>
                 <plugins>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/beans/DBManagerBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/beans/DBManagerBean.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/beans/DBManagerBean.java (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/beans/DBManagerBean.java Fri Jun  6 13:53:24 2008
@@ -42,130 +42,130 @@
 import org.apache.geronimo.naming.ResourceSource;
 
 public class DBManagerBean {
-	
-	private Map poolMap;
-	private Map tableMap;
-	
-	public DBManagerBean(){
-		poolMap = new HashMap();
-		init();
-	}
-	
-	private void init(){
-		Kernel kernel = KernelRegistry.getSingleKernel();
-		Set cfList = kernel.listGBeans(new AbstractNameQuery(ResourceSource.class.getName()));
-		
-		for(Iterator iterator = cfList.iterator();iterator.hasNext();){
-
-			AbstractName name = (AbstractName)iterator.next();
-			try {
-				Object rs = kernel.invoke(name, "$getResource", new Object[]{}, new String[]{});
-				
-				if(rs instanceof javax.sql.DataSource){
-					DataSource ds = (DataSource)rs;	
-					poolMap.put(name.getArtifact().getArtifactId(), ds);
-				}
-			} catch (GBeanNotFoundException e) {
-				e.printStackTrace();
-			} catch (NoSuchOperationException e) {
-				e.printStackTrace();
-			} catch (InternalKernelException e) {
-				e.printStackTrace();
-			} catch (Exception e) {
-				e.printStackTrace();
-			}
-		}
-	}
-	
-	public Map getDeployedPools(){
-		return poolMap;
-	}
-	
-	public Map getTableList(String poolName) throws SQLException {
-		
-		tableMap = new HashMap();
-		
-		if(poolMap.containsKey(poolName)){
-			DataSource ds = (DataSource)poolMap.get(poolName);
-			Connection con = null;
-			try {
-				
-				con = ds.getConnection();
-				
-				DatabaseMetaData metaData = con.getMetaData();
-				String[] tableTypes = {"TABLE"};
-				ResultSet rs = metaData.getTables(null, null, null, tableTypes);
-				
-				while(rs.next()){
-					String schemaName = rs.getString("TABLE_SCHEM");
-					String tableName = rs.getString("TABLE_NAME"); 
-					ArrayList tableList = null;
-					
-					if(tableMap.containsKey(schemaName)){
-						tableList = (ArrayList)tableMap.get(schemaName);
-						tableList.add(tableName);
-					}else {
-						tableList = new ArrayList();
-						tableList.add(tableName);
-					}
-					tableMap.put(schemaName, tableList);
-				}
-			} catch (SQLException e) {
-				throw e;
-			}finally {
-				if(con != null){
-					try {
-						con.close();
-					} catch (SQLException e) {
-						e.printStackTrace();
-					}
-				}
-			}
-		}
-		
-		return tableMap;
-	}
-	
-	public List getTableContents(String poolName, String schemaName, String tableName) throws SQLException {
-		
-		ArrayList matrix = new ArrayList();
-		
-		DataSource ds = (DataSource)poolMap.get(poolName);
-		Connection con = null;
-			
-		con = ds.getConnection();
-			
-		String SQL = "SELECT * FROM ";
-		
-		if(schemaName == null || schemaName.equals("null")){
-			SQL+= tableName; //Problem comes with MySQL 
-		}else {
-			SQL+= (schemaName+"."+tableName);
-		}
-			
-		PreparedStatement pStmt = con.prepareStatement(SQL);
-		ResultSet rs = pStmt.executeQuery();
-			
-		ResultSetMetaData metaData = rs.getMetaData();
-		int columns = metaData.getColumnCount();
-			
-		ArrayList header = new ArrayList();
-		for(int i=1; i<= columns; i++){
-			String colName = metaData.getColumnLabel(i);
-			header.add(colName);
-		}
-		matrix.add(header);
-			
-		while(rs.next()){				
-			ArrayList row = new ArrayList();
-				
-			for(int i=1; i<= columns;i++){
-				row.add(rs.getString(i));
-			}
-				matrix.add(row);
-		}
-		
-		return matrix;
-	}
-	
+
+    private Map poolMap;
+    private Map tableMap;
+
+    public DBManagerBean() {
+        poolMap = new HashMap();
+        init();
+    }
+
+    private void init() {
+        Kernel kernel = KernelRegistry.getSingleKernel();
+        Set cfList = kernel.listGBeans(new AbstractNameQuery(ResourceSource.class.getName()));
+
+        for (Iterator iterator = cfList.iterator(); iterator.hasNext();) {
+
+            AbstractName name = (AbstractName) iterator.next();
+            try {
+                Object rs = kernel.invoke(name, "$getResource", new Object[]{}, new String[]{});
+
+                if (rs instanceof javax.sql.DataSource) {
+                    DataSource ds = (DataSource) rs;
+                    poolMap.put(name.getArtifact().getArtifactId(), ds);
+                }
+            } catch (GBeanNotFoundException e) {
+                e.printStackTrace();
+            } catch (NoSuchOperationException e) {
+                e.printStackTrace();
+            } catch (InternalKernelException e) {
+                e.printStackTrace();
+            } catch (Exception e) {
+                e.printStackTrace();
+            }
+        }
+    }
+
+    public Map getDeployedPools() {
+        return poolMap;
+    }
+
+    public Map getTableList(String poolName) throws SQLException {
+
+        tableMap = new HashMap();
+
+        if (poolMap.containsKey(poolName)) {
+            DataSource ds = (DataSource) poolMap.get(poolName);
+            Connection con = null;
+            try {
+
+                con = ds.getConnection();
+
+                DatabaseMetaData metaData = con.getMetaData();
+                String[] tableTypes = {"TABLE"};
+                ResultSet rs = metaData.getTables(null, null, null, tableTypes);
+
+                while (rs.next()) {
+                    String schemaName = rs.getString("TABLE_SCHEM");
+                    String tableName = rs.getString("TABLE_NAME");
+                    ArrayList tableList = null;
+
+                    if (tableMap.containsKey(schemaName)) {
+                        tableList = (ArrayList) tableMap.get(schemaName);
+                        tableList.add(tableName);
+                    } else {
+                        tableList = new ArrayList();
+                        tableList.add(tableName);
+                    }
+                    tableMap.put(schemaName, tableList);
+                }
+            } catch (SQLException e) {
+                throw e;
+            } finally {
+                if (con != null) {
+                    try {
+                        con.close();
+                    } catch (SQLException e) {
+                        e.printStackTrace();
+                    }
+                }
+            }
+        }
+
+        return tableMap;
+    }
+
+    public List getTableContents(String poolName, String schemaName, String tableName) throws SQLException {
+
+        ArrayList matrix = new ArrayList();
+
+        DataSource ds = (DataSource) poolMap.get(poolName);
+        Connection con = null;
+
+        con = ds.getConnection();
+
+        String SQL = "SELECT * FROM ";
+
+        if (schemaName == null || schemaName.equals("null")) {
+            SQL += tableName; //Problem comes with MySQL
+        } else {
+            SQL += (schemaName + "." + tableName);
+        }
+
+        PreparedStatement pStmt = con.prepareStatement(SQL);
+        ResultSet rs = pStmt.executeQuery();
+
+        ResultSetMetaData metaData = rs.getMetaData();
+        int columns = metaData.getColumnCount();
+
+        ArrayList header = new ArrayList();
+        for (int i = 1; i <= columns; i++) {
+            String colName = metaData.getColumnLabel(i);
+            header.add(colName);
+        }
+        matrix.add(header);
+
+        while (rs.next()) {
+            ArrayList row = new ArrayList();
+
+            for (int i = 1; i <= columns; i++) {
+                row.add(rs.getString(i));
+            }
+            matrix.add(row);
+        }
+
+        return matrix;
+    }
+
 }

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ContentTableServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ContentTableServlet.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ContentTableServlet.java (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ContentTableServlet.java Fri Jun  6 13:53:24 2008
@@ -30,41 +30,41 @@
 
 
 public class ContentTableServlet extends HttpServlet {
-	
-	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		getContent(request, response);
-	}
-	
-	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		doGet(request,response);
-	}
-	
-	private void getContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
-		String poolName = request.getParameter("poolName");
-		String schemaName = request.getParameter("schemaName");
-		String tableName = request.getParameter("tableName");
-		
-		
-		String path = "/jsp/common_error.jsp";
-		
-		try {
-			DBManagerBean dbManager = (DBManagerBean)request.getSession().getAttribute("dbManager");
-			List tableContent = dbManager.getTableContents(poolName, schemaName, tableName);
-			
-			request.setAttribute("poolName", poolName);
-			request.setAttribute("tableName", tableName);
-			request.setAttribute("tableContent", tableContent);
-			
-			path = "/jsp/table_content.jsp";
-			
-		} catch (SQLException e) {
-			e.printStackTrace();
-			request.setAttribute("error", e);
-		}
-		
-		request.setAttribute("poolName", poolName);
-		getServletContext().getRequestDispatcher(path).forward(request,response);
-	}
-	
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        getContent(request, response);
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    private void getContent(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        String poolName = request.getParameter("poolName");
+        String schemaName = request.getParameter("schemaName");
+        String tableName = request.getParameter("tableName");
+
+
+        String path = "/jsp/common_error.jsp";
+
+        try {
+            DBManagerBean dbManager = (DBManagerBean) request.getSession().getAttribute("dbManager");
+            List tableContent = dbManager.getTableContents(poolName, schemaName, tableName);
+
+            request.setAttribute("poolName", poolName);
+            request.setAttribute("tableName", tableName);
+            request.setAttribute("tableContent", tableContent);
+
+            path = "/jsp/table_content.jsp";
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            request.setAttribute("error", e);
+        }
+
+        request.setAttribute("poolName", poolName);
+        getServletContext().getRequestDispatcher(path).forward(request, response);
+    }
+
 }

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ListTablesServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ListTablesServlet.java?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ListTablesServlet.java (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/java/org/apache/geronimo/samples/dbtester/web/ListTablesServlet.java Fri Jun  6 13:53:24 2008
@@ -28,35 +28,35 @@
 
 import org.apache.geronimo.samples.dbtester.beans.DBManagerBean;
 
-public class ListTablesServlet extends HttpServlet{
-	
-	public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		listTables(request, response);
-	}
-	
-	public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		doGet(request,response);
-	}
-	
-	private void listTables(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
-		
-		String poolName = request.getParameter("poolname");
-		
-		String path = "/jsp/common_error.jsp";
-		
-		try {
-			DBManagerBean dbManager = (DBManagerBean)request.getSession().getAttribute("dbManager");
-			Map tableMap = dbManager.getTableList(poolName);
-			
-			request.setAttribute("tableMap", tableMap);
-			
-			path = "/jsp/table_list.jsp";
-			
-		} catch (SQLException e) {
-			e.printStackTrace();
-			request.setAttribute("error", e);
-		}
-		request.setAttribute("poolName", poolName);
-		getServletContext().getRequestDispatcher(path).forward(request,response);
-	}
+public class ListTablesServlet extends HttpServlet {
+
+    public void doGet(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        listTables(request, response);
+    }
+
+    public void doPost(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+        doGet(request, response);
+    }
+
+    private void listTables(HttpServletRequest request, HttpServletResponse response) throws ServletException, IOException {
+
+        String poolName = request.getParameter("poolname");
+
+        String path = "/jsp/common_error.jsp";
+
+        try {
+            DBManagerBean dbManager = (DBManagerBean) request.getSession().getAttribute("dbManager");
+            Map tableMap = dbManager.getTableList(poolName);
+
+            request.setAttribute("tableMap", tableMap);
+
+            path = "/jsp/table_list.jsp";
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+            request.setAttribute("error", e);
+        }
+        request.setAttribute("poolName", poolName);
+        getServletContext().getRequestDispatcher(path).forward(request, response);
+    }
 }

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 13:53:24 2008
@@ -19,7 +19,7 @@
 -->
 
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-        
+
     <environment>
         <moduleId>
             <groupId>${pom.groupId}</groupId>
@@ -28,7 +28,7 @@
             <type>war</type>
         </moduleId>
     </environment>
-                
+
     <context-root>/dbtester</context-root>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/web.xml?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 13:53:24 2008
@@ -24,29 +24,29 @@
 
     <description>dbtester Servlet Sample</description>
     <servlet>
-            <display-name>ContentTableServlet</display-name>
-            <servlet-name>ContentTableServlet</servlet-name>
-            <servlet-class>org.apache.geronimo.samples.dbtester.web.ContentTableServlet</servlet-class>
+        <display-name>ContentTableServlet</display-name>
+        <servlet-name>ContentTableServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.dbtester.web.ContentTableServlet</servlet-class>
     </servlet>
-        
+
     <servlet>
-            <display-name>ListTablesServlet</display-name>
-            <servlet-name>ListTablesServlet</servlet-name>
-            <servlet-class>org.apache.geronimo.samples.dbtester.web.ListTablesServlet</servlet-class>
+        <display-name>ListTablesServlet</display-name>
+        <servlet-name>ListTablesServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.dbtester.web.ListTablesServlet</servlet-class>
     </servlet>
-        
+
     <servlet-mapping>
-            <servlet-name>ContentTableServlet</servlet-name>
-            <url-pattern>/listContent</url-pattern>
+        <servlet-name>ContentTableServlet</servlet-name>
+        <url-pattern>/listContent</url-pattern>
     </servlet-mapping>
-        
+
     <servlet-mapping>
-            <servlet-name>ListTablesServlet</servlet-name>
-            <url-pattern>/listTables</url-pattern>
+        <servlet-name>ListTablesServlet</servlet-name>
+        <url-pattern>/listTables</url-pattern>
     </servlet-mapping>
 
     <welcome-file-list>
-            <welcome-file>index.html</welcome-file>
+        <welcome-file>index.html</welcome-file>
     </welcome-file-list>
 
 </web-app>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/css/main.css Fri Jun  6 13:53:24 2008
@@ -14,497 +14,434 @@
 *   See the License for the specific language governing permissions and
 *   limitations under the License.
 */
-body 
-{
-	/*background-color: #FFFFFF;*/
+body {
+/*background-color: #FFFFFF;*/
 }
 
-.BrightTitle
-{
-	color: #FFFFFF;
-	background-color: #5FA3D6;
-	font-size: 11px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+.BrightTitle {
+    color: #FFFFFF;
+    background-color: #5FA3D6;
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
-.BrightTitle a:hover
-{
-	color: #5FA3D6;
+.BrightTitle a:hover {
+    color: #5FA3D6;
 }
 
-.BrightBox
-{
-	border: thin solid #5FA3D6;
+.BrightBox {
+    border: thin solid #5FA3D6;
 }
 
-td
-{
-	font-size: 11px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+td {
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
-a:link, a:visited
-{
-	color: #204486;
+a:link, a:visited {
+    color: #204486;
 }
 
-a:hover 
-{
-	/*color: #5FA3D6;*/
-	color: #CF820A;
+a:hover {
+/*color: #5FA3D6;*/
+    color: #CF820A;
 }
 
-.Logo
-{
-	background-image:url("images/head_left_754x86.gif");
-	background-repeat: no-repeat;
-	width: 570px;
-	height: 86px;
-	font-size: 35px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	text-align: right;
-	vertical-align: bottom; 
-	line-height: 30px;
-	font-weight: bold;
+.Logo {
+    background-image: url( "images/head_left_754x86.gif" );
+    background-repeat: no-repeat;
+    width: 570px;
+    height: 86px;
+    font-size: 35px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom;
+    line-height: 30px;
+    font-weight: bold;
 }
 
-.LoginLogo
-{
-	background-image:url("images/head_left_login_586x86.gif");
-	background-repeat: no-repeat;
-	width: 570px;
-	height: 86px;
-	font-size: 35px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	text-align: right;
-	vertical-align: bottom; 
-	line-height: 30px;
-	font-weight: bold;
+.LoginLogo {
+    background-image: url( "images/head_left_login_586x86.gif" );
+    background-repeat: no-repeat;
+    width: 570px;
+    height: 86px;
+    font-size: 35px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom;
+    line-height: 30px;
+    font-weight: bold;
 }
 
-.Top
-{
-	background-image:url("images/head_bgstretch_1x86.gif");
-	background-repeat: repeat-x;
-	height: 86px;
-	font-size: 11px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	text-align: right;
-	vertical-align: bottom;
-	font-weight: bold;
+.Top {
+    background-image: url( "images/head_bgstretch_1x86.gif" );
+    background-repeat: repeat-x;
+    height: 86px;
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-align: right;
+    vertical-align: bottom;
+    font-weight: bold;
 }
 
-.Top a:link, .Top a:visited, .Top a:hover
-{
-        color: #FFFFFF;
-        font-size: 11px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-        text-decoration: underline;
-        text-align: left;
-        vertical-align: bottom;
-        line-height: 30px;
-        font-weight: bold;
+.Top a:link, .Top a:visited, .Top a:hover {
+    color: #FFFFFF;
+    font-size: 11px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-decoration: underline;
+    text-align: left;
+    vertical-align: bottom;
+    line-height: 30px;
+    font-weight: bold;
 }
 
-.TopSpacer
-{
-	height: 20px;
+.TopSpacer {
+    height: 20px;
 }
 
-.Hidden
-{
-	visibility: hidden;
-	height: 0px;
-	line-height: 0px;
-	display: none;
+.Hidden {
+    visibility: hidden;
+    height: 0px;
+    line-height: 0px;
+    display: none;
 }
 
-.Menu .Selection
-{
-        background-color: #F2F2F2;
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+.Menu .Selection {
+    background-color: #F2F2F2;
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
-.Menu .Selection .CollapsedLeft
-{
-	width: 12px;
-	height: 12px;
-	color: #000000;
-        background-color: #F2F2F2;
+.Menu .Selection .CollapsedLeft {
+    width: 12px;
+    height: 12px;
+    color: #000000;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .Indent
-{
-	width: 2px;
-        background-color: #F2F2F2;
+.Menu .Selection .Indent {
+    width: 2px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .CollapsedRight
-{
-	width: 8px;
-	height: 12px;
-        background-color: #F2F2F2;
+.Menu .Selection .CollapsedRight {
+    width: 8px;
+    height: 12px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .TopLeft
-{
-	width: 8px;
-	height: 16px;
-        background-color: #F2F2F2;
+.Menu .Selection .TopLeft {
+    width: 8px;
+    height: 16px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .TopMiddle
-{
-	color: #000000;
-	text-decoration: none;
-        background-color: #F2F2F2;
+.Menu .Selection .TopMiddle {
+    color: #000000;
+    text-decoration: none;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .TopMiddle a:link, 
-.Menu .Selection .TopMiddle a:visited, 
+.Menu .Selection .TopMiddle a:link,
+    .Menu .Selection .TopMiddle a:visited,
 {
-	color: #000000;
-	line-height: 20px;
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-        background-color: #F2F2F2;
+    color: #000000;
+    line-height: 20px;
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .TopMiddle a:hover
-{
-	color: #5FA3D6;
+.Menu .Selection .TopMiddle a:hover {
+    color: #5FA3D6;
 }
 
-.Menu .Selection .TopRight
-{
-	width: 8px;
-	height: 16px;
-        background-color: #F2F2F2;
+.Menu .Selection .TopRight {
+    width: 8px;
+    height: 16px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Selection .Spacer
-{
-	height: 5px;
+.Menu .Selection .Spacer {
+    height: 5px;
 }
 
-.Menu .Hidden
-{
-	visibility: hidden;
-	height: 0px;
-	display: none;
+.Menu .Hidden {
+    visibility: hidden;
+    height: 0px;
+    display: none;
 }
 
-.Menu .Subselection .Left
-{
-	width: 12px;
-        background-color: #F2F2F2;
+.Menu .Subselection .Left {
+    width: 12px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Subselection .Indent
-{
-	width: 2px;
-        background-color: #F2F2F2;
+.Menu .Subselection .Indent {
+    width: 2px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Subselection .Middle
-{
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-        background-color: #F2F2F2;
-	color:#000000;
+.Menu .Subselection .Middle {
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #F2F2F2;
+    color: #000000;
 }
 
-.Menu .Subselection .Middle a:link, 
-.Menu .Subselection .Middle a:visited, 
+.Menu .Subselection .Middle a:link,
+    .Menu .Subselection .Middle a:visited,
 {
-	line-height: 20px;
-	color: #000000;
+    line-height: 20px;
+    color: #000000;
 }
 
-.Menu .Subselection .Middle a:hover
-{
-	color: #5FA3D6;
+.Menu .Subselection .Middle a:hover {
+    color: #5FA3D6;
 }
 
-.Menu .Subselection .Right
-{
-	width: 8px;
-        background-color: #F2F2F2;
+.Menu .Subselection .Right {
+    width: 8px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Subselection .BottomLeft
-{
-	width: 8px;
-	height: 8px;
-        background-color: #F2F2F2;
+.Menu .Subselection .BottomLeft {
+    width: 8px;
+    height: 8px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Subselection .BottomMiddle
-{
-	height: 8px;
-        background-color: #F2F2F2;
+.Menu .Subselection .BottomMiddle {
+    height: 8px;
+    background-color: #F2F2F2;
 }
 
-.Menu .Subselection .BottomRight
-{
-	width: 8px;
-	height: 8px;
-        background-color: #F2F2F2;
+.Menu .Subselection .BottomRight {
+    width: 8px;
+    height: 8px;
+    background-color: #F2F2F2;
 }
 
-.Menu .SelectedSubselection .Middle a{
+.Menu .SelectedSubselection .Middle a {
     color: #000;
     text-decoration: none;
 }
 
-.Menu .SelectedSubselection .Middle a:hover{
+.Menu .SelectedSubselection .Middle a:hover {
     color: #000;
     text-decoration: underline;
 }
 
-.Gutter
-{
-	width: 5px;
+.Gutter {
+    width: 5px;
 }
 
-.Content .TopLeft
-{
-	width: 18px;
-	height: 18px;
-	line-height: 18px;
-        background-color: #000000;
+.Content .TopLeft {
+    width: 18px;
+    height: 18px;
+    line-height: 18px;
+    background-color: #000000;
 }
 
-.Content .Title
-{
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	background-color: #000000;
-	color: #FFFFFF;
-	height: 18px;
-	line-height: 18px;
+.Content .Title {
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #000000;
+    color: #FFFFFF;
+    height: 18px;
+    line-height: 18px;
 }
 
-.Content .Title a:link, .Content .Title a:hover, .Content .Title a:visited
-{
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	background-color: #000000;
-	color: #FFFFFF;
-	height: 18px;
-	line-height: 18px;
+.Content .Title a:link, .Content .Title a:hover, .Content .Title a:visited {
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #000000;
+    color: #FFFFFF;
+    height: 18px;
+    line-height: 18px;
 }
 
-.Content .Title .Indent
-{
-	width: 20px;
+.Content .Title .Indent {
+    width: 20px;
 }
 
-.Content .TopRight
-{
-	width: 18px;
-	height: 18px;
-        background-color:#000000;
+.Content .TopRight {
+    width: 18px;
+    height: 18px;
+    background-color: #000000;
 }
 
-.Content .CollapsedLeft
-{
-	width: 18px;
-	height: 18px;
-        background-color:#000000;
+.Content .CollapsedLeft {
+    width: 18px;
+    height: 18px;
+    background-color: #000000;
 }
 
-.Content .CollapsedRight
-{
-	width: 18px;
-	height: 18px;
-        background-color:#000000;
+.Content .CollapsedRight {
+    width: 18px;
+    height: 18px;
+    background-color: #000000;
 }
 
-.Content .Left
-{
-	width: 18px;
-	background-color: #FFFFFF;
+.Content .Left {
+    width: 18px;
+    background-color: #FFFFFF;
 }
 
-.Content .Body, .Content .Body td
-{
-	font-size: 12px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	background-color: #FFFFFF;
-	color: #1E1E52;
+.Content .Body, .Content .Body td {
+    font-size: 12px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #FFFFFF;
+    color: #1E1E52;
 }
 
-.Content .Body strong
-{
-	font-weight: bold;  
-	font-size: 12px;
+.Content .Body strong {
+    font-weight: bold;
+    font-size: 12px;
 }
 
-.Content .Body th
-{
-	font-weight: bold;  
-	font-size: 12px;
+.Content .Body th {
+    font-weight: bold;
+    font-size: 12px;
 }
 
-.Content .Body .LightBackground
-{
-        background-color: #FFFFFF;
-	color:#000000;
+.Content .Body .LightBackground {
+    background-color: #FFFFFF;
+    color: #000000;
 }
 
-.Content .Body .LightBackground .InputField
-{
-  width: 150px;
+.Content .Body .LightBackground .InputField {
+    width: 150px;
 }
 
-.Content .Body .MediumBackground
-{
-	background-color: #F2F2F2;
-	color:#000000;
+.Content .Body .MediumBackground {
+    background-color: #F2F2F2;
+    color: #000000;
 }
 
-.Content .Body .DarkBackground, 
-.Content .Body .DarkBackground a:link, 
-.Content .Body .DarkBackground a:visited,
-.Content .Body .DarkBackground a:hover
-{
-	background-color: #2581C7;
-	color:#FFFFFF;
-	font-size: 15px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+.Content .Body .DarkBackground,
+    .Content .Body .DarkBackground a:link,
+    .Content .Body .DarkBackground a:visited,
+    .Content .Body .DarkBackground a:hover {
+    background-color: #2581C7;
+    color: #FFFFFF;
+    font-size: 15px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
 .Content .Body .reallyDarkBackground,
-.Content .ReallyDarkBackground,
-.ReallyDarkBackground
-{
-	color: #FFFFFF;
-	background-color: #000000;
-	font-size: 15px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    .Content .ReallyDarkBackground,
+    .ReallyDarkBackground {
+    color: #FFFFFF;
+    background-color: #000000;
+    font-size: 15px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
 }
 
-.Content .Body .IndentedTitle
-{
-	background-color: #919FBC;
-	color:#FFFFFF;
+.Content .Body .IndentedTitle {
+    background-color: #919FBC;
+    color: #FFFFFF;
 }
 
-.Content .Body .LightIndentedBG
-{
-	background-color: #FFFFFF;
-	color:#000000;
+.Content .Body .LightIndentedBG {
+    background-color: #FFFFFF;
+    color: #000000;
 }
 
-.Content .Body .MediumIndentedBG
-{
-	background-color: #DDDDDD;
-	color:#000000;
+.Content .Body .MediumIndentedBG {
+    background-color: #DDDDDD;
+    color: #000000;
 }
 
-
 .Content .Body a:link,
-.Content .Body a:visited,
+    .Content .Body a:visited,
 {
-	font-size: 10px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	text-decoration: underline;
-	color: #546BC7;
-	font-weight: bold;
+    font-size: 10px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    text-decoration: underline;
+    color: #546BC7;
+    font-weight: bold;
 }
 
-.Content .Body a:hover
-{
-	color: #5FA3D6;
+.Content .Body a:hover {
+    color: #5FA3D6;
 }
 
 .Content .Buttons {
-	border-top-width: thin;
-	border-right-width: thin;
-	border-bottom-width: thin;
-	border-left-width: thin;
-	border-top-style: solid;
-	border-right-style: solid;
-	border-bottom-style: solid;
-	border-left-style: solid;
-	border-top-color: #7B7BAE;
-	border-right-color: #7B7BAE;
-	border-bottom-color: #141336;
-	border-left-color: #141336;
-	background-color: #23224C;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	font-size: 12px;
-  text-decoration: underline;
-	color: #5FA3D6;
+    border-top-width: thin;
+    border-right-width: thin;
+    border-bottom-width: thin;
+    border-left-width: thin;
+    border-top-style: solid;
+    border-right-style: solid;
+    border-bottom-style: solid;
+    border-left-style: solid;
+    border-top-color: #7B7BAE;
+    border-right-color: #7B7BAE;
+    border-bottom-color: #141336;
+    border-left-color: #141336;
+    background-color: #23224C;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    font-size: 12px;
+    text-decoration: underline;
+    color: #5FA3D6;
 }
 
-.Content .Right
-{
-	width: 18px;
-	background-color: #FFFFFF;
+.Content .Right {
+    width: 18px;
+    background-color: #FFFFFF;
 }
 
-.Content .BottomLeft
-{
-	width: 18px;
-	height: 12px;
-	line-height: 12px;
-	background-color:#333366;
+.Content .BottomLeft {
+    width: 18px;
+    height: 12px;
+    line-height: 12px;
+    background-color: #333366;
 }
 
-.Content .Footer
-{
-	line-height: 12px;
-	height: 12px;
-	font-size: 9px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	background-color:#333366;
-	color:#000000;
+.Content .Footer {
+    line-height: 12px;
+    height: 12px;
+    font-size: 9px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    background-color: #333366;
+    color: #000000;
 }
 
 .Content .Footer a:link,
-.Content .Footer a:visited,
-.Content .Footer a:hover
-{
-	color: #5FA3D6;
+    .Content .Footer a:visited,
+    .Content .Footer a:hover {
+    color: #5FA3D6;
 }
 
-.Content .BottomRight
-{
-	width: 18px;
-	line-height: 12px;
-	height: 12px;
-	background-color:#333366;
+.Content .BottomRight {
+    width: 18px;
+    line-height: 12px;
+    height: 12px;
+    background-color: #333366;
 }
 
-.Content .Spacer
-{
-	height: 10px;
+.Content .Spacer {
+    height: 10px;
 }
 
-.BottomSpacer
-{
+.BottomSpacer {
 }
 
-.Footer
-{
-	font-size: 9px;
-	font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
-	height: 20px;
-	background-color: #5FA3D6;
+.Footer {
+    font-size: 9px;
+    font-family: Verdana, Tahoma, Arial, Helvetica, sans-serif;
+    height: 20px;
+    background-color: #5FA3D6;
 }
 
-.Footer a:link, 
-.Footer a:visited, 
-.Footer a:hover
-{
-	color: #5FA3D6;
-	text-decoration: underline;	
+.Footer a:link,
+    .Footer a:visited,
+    .Footer a:hover {
+    color: #5FA3D6;
+    text-decoration: underline;
 }
 
-.Box
-{
-	border: thin solid #000000;
+.Box {
+    border: thin solid #000000;
 }

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/dbtester.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/dbtester.jsp?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/dbtester.jsp (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/dbtester.jsp Fri Jun  6 13:53:24 2008
@@ -1,106 +1,110 @@
 <!--
-    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.
 -->
-<%@ page import="java.util.Map" %>
 <%@ page import="java.util.Iterator" %>
-<jsp:useBean id="dbManager" scope="session" class="org.apache.geronimo.samples.dbtester.beans.DBManagerBean" /> 
+<%@ page import="java.util.Map" %>
+<jsp:useBean id="dbManager" scope="session" class="org.apache.geronimo.samples.dbtester.beans.DBManagerBean"/>
 <SCRIPT TYPE="text/javascript">
-<!--
-function popup(mylink, windowname)
-{
-leftVal = (screen.width - 400) / 2;
-topVal = (screen.height - 200) / 2;
-if (! window.focus)return true;
-var href;
-if (typeof(mylink) == 'string')
-   href=mylink;
-else
-   href=mylink.href;
-window.open(href, windowname, 'width=400,height=200,left='+leftVal+',top='+topVal);
-return false;
-}
-//-->
+    <!--
+    function popup(mylink, windowname)
+    {
+        leftVal = (screen.width - 400) / 2;
+        topVal = (screen.height - 200) / 2;
+        if (! window.focus)return true;
+        var href;
+        if (typeof(mylink) == 'string')
+            href = mylink;
+        else
+            href = mylink.href;
+        window.open(href, windowname, 'width=400,height=200,left=' + leftVal + ',top=' + topVal);
+        return false;
+    }
+    //-->
 </SCRIPT>
 <html>
 <head>
-<title>Database Testing Application</title>
-<link rel="stylesheet" href="css/main.css" type="text/css">
+    <title>Database Testing Application</title>
+    <link rel="stylesheet" href="css/main.css" type="text/css">
 </head>
 <body>
 <br>
+
 <div class="Content" align="center">
-<table>
-	<tr>
-		<td class="Title"><strong>Database Testing Application</strong></td>
-	</tr>
-	<tr></tr>
-	<tr>
-		<td class="Body">
-		<p>
-		This sample application lists all the database connection pools defined in Geronimo. 
-		You can select any of these connection pools and test connectivity against the database as 
-		well as listing existing schemas and tables.
-		</p>
-		<p>
-		The list of database pools deployed in your Geronimo application server are given below. 
-		</p>
-		<p>
-		To test one of these pools, click the <strong>test</strong> link corresponding to that pool. 
-		If tested successfully, then a list of the schemas and databases found in that particular pool will be displayed.
-		</p>
-		</td>
-	<tr>
-	<table>
-		<tr>
-			<td class="Body">
-			<table width="100%">				
-				<%
-				Map poolMap = dbManager.getDeployedPools();
-				if(poolMap.keySet().size() > 0){
-				%>
-				<tr>
-					<td class="DarkBackground">Pool Name</td>
-					<td class="DarkBackground">Action</td>
-				</tr>
-				<%
-					int counter = 1;
-					for(Iterator iterator = poolMap.keySet().iterator();iterator.hasNext();counter++){	
-				%>
-				<tr>	
-				<%	
-					String poolName = (String)iterator.next();
-					String rowColor = "LightBackground";					
-					if(counter%2 == 0){
-						rowColor = "MediumBackground";
-					}
-				%>
-				<td class="<%=rowColor%>"><%=poolName%></td>
-				<td class="<%=rowColor%>"><a href="listTables?poolname=<%=poolName%>">test</a></td>
-				</tr>
-				<%	
-					}	
-				} 
-				%>
-			</table>
-			</td>
-		<tr>
-	</table>
-</table>
+    <table>
+        <tr>
+            <td class="Title"><strong>Database Testing Application</strong></td>
+        </tr>
+        <tr></tr>
+        <tr>
+            <td class="Body">
+                <p>
+                    This sample application lists all the database connection pools defined in Geronimo.
+                    You can select any of these connection pools and test connectivity against the database as
+                    well as listing existing schemas and tables.
+                </p>
+
+                <p>
+                    The list of database pools deployed in your Geronimo application server are given below.
+                </p>
+
+                <p>
+                    To test one of these pools, click the <strong>test</strong> link corresponding to that pool.
+                    If tested successfully, then a list of the schemas and databases found in that particular pool will be displayed.
+                </p>
+            </td>
+        <tr>
+        <table>
+            <tr>
+                <td class="Body">
+                    <table width="100%">
+                        <%
+                            Map poolMap = dbManager.getDeployedPools();
+                            if (poolMap.keySet().size() > 0) {
+                        %>
+                        <tr>
+                            <td class="DarkBackground">Pool Name</td>
+                            <td class="DarkBackground">Action</td>
+                        </tr>
+                        <%
+                            int counter = 1;
+                            for (Iterator iterator = poolMap.keySet().iterator(); iterator.hasNext(); counter++) {
+                        %>
+                        <tr>
+                            <%
+                                String poolName = (String) iterator.next();
+                                String rowColor = "LightBackground";
+                                if (counter % 2 == 0) {
+                                    rowColor = "MediumBackground";
+                                }
+                            %>
+                            <td class="<%=rowColor%>"><%=poolName%>
+                            </td>
+                            <td class="<%=rowColor%>"><a href="listTables?poolname=<%=poolName%>">test</a></td>
+                        </tr>
+                        <%
+                                }
+                            }
+                        %>
+                    </table>
+                </td>
+            <tr>
+        </table>
+    </table>
 </div>
 <br>
 <br>

Modified: geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/header.html?rev=664120&r1=664119&r2=664120&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/dbtester/dbtester-war/src/main/webapp/header.html (original)
+++ geronimo/samples/trunk/samples/dbtester/dbtester-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



Mime
View raw message