geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From djen...@apache.org
Subject svn commit: r664175 [4/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/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_content.jsp Fri Jun  6 15:43:44 2008
@@ -1,96 +1,101 @@
 <!--
-    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.
 -->
 <%@ page import="java.util.ArrayList" %>
-<%@ page import="java.util.HashMap" %>
-<%@ page import="java.util.Iterator" %>
 <html>
 <head>
-<title>Table Content</title>
-<link rel="stylesheet" href="css/main.css" type="text/css">
+    <title>Table Content</title>
+    <link rel="stylesheet" href="css/main.css" type="text/css">
 </head>
 <body>
 <center>
-<br>
-<div class="Content">
-<%
-	String poolName = (String)request.getAttribute("poolName");
-	String tableName = (String)request.getAttribute("tableName");
-	ArrayList content = (ArrayList)request.getAttribute("tableContent");	
-%>
-<table>
-	<tr>
-		<td class="Title"><strong>Contents of <%=tableName%> Table</strong></td>
-	</tr>
-	<tr></tr>
-	<tr>
-		<td class="Body">	
-			<p>
-				The content of <%=tableName%> Table from your <%=poolName%> pool.
-			</p>
-		</td>
-	<tr>
-	<td class="Body">
-		<table align="center">
-		<tr>
-		 <%
-		 	ArrayList header = (ArrayList)content.get(0);
-		 	for(int i=0; i<header.size(); i++){
-		 		String headerName = (String)header.get(i);
-		 	%>
-		 	<td class="DarkBackground"><%=headerName%></td>
-		 	<%	
-		 	}
-		 %>
-		 </tr>
-		  <%
-		  	for(int i=1; i<content.size(); i++){
-		  		ArrayList row = (ArrayList)content.get(i);
-		  		String rowColor = "LightBackground";
-		  		if(i%2 == 0){
-		  			rowColor = "MediumBackground";
-		  		}
-		  	%>
-		  	<tr>
-		  	<%	
-		  		for(int j=0; j<row.size(); j++){
-		  			String element = (String)row.get(j);
-		  			%>
-		  			<td class="<%=rowColor%>"><%=element%></td>
-		  			<%
-		  		}
-		  	}
-		  %>
-		 </table>
-	</td>
-	</tr>
-	<tr></tr>
-	<tr>
-		<td class="Body">
-		<center>
-		<div> 
-		<a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
-		</div>
-		</center>
-		</td>
-	</tr>
-</table>
-</div>			
+    <br>
+
+    <div class="Content">
+        <%
+            String poolName = (String) request.getAttribute("poolName");
+            String tableName = (String) request.getAttribute("tableName");
+            ArrayList content = (ArrayList) request.getAttribute("tableContent");
+        %>
+        <table>
+            <tr>
+                <td class="Title"><strong>Contents of <%=tableName%> Table</strong></td>
+            </tr>
+            <tr></tr>
+            <tr>
+                <td class="Body">
+                    <p>
+                        The content of <%=tableName%> Table from your <%=poolName%> pool.
+                    </p>
+                </td>
+            <tr>
+                <td class="Body">
+                    <table align="center">
+                        <tr>
+                            <%
+                                ArrayList header = (ArrayList) content.get(0);
+                                for (int i = 0; i < header.size(); i++) {
+                                    String headerName = (String) header.get(i);
+                            %>
+                            <td class="DarkBackground"><%=headerName%>
+                            </td>
+                            <%
+                                }
+                            %>
+                        </tr>
+                        <%
+                            for (int i = 1; i < content.size(); i++) {
+                                ArrayList row = (ArrayList) content.get(i);
+                                String rowColor = "LightBackground";
+                                if (i % 2 == 0) {
+                                    rowColor = "MediumBackground";
+                                }
+                        %>
+                        <tr>
+                            <%
+
+                                     for(int j=0; j<row.size(); j++){
+                                             String element = (String)row.get(j);
+
+                            %>
+                            <td class="<%=rowColor%>"><%=element%>
+                            </td>
+                            <%
+
+                                     }
+                             }
+
+                            %>
+                    </table>
+                </td>
+            </tr>
+            <tr></tr>
+            <tr>
+                <td class="Body">
+                    <center>
+                        <div>
+                            <a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
+                        </div>
+                    </center>
+                </td>
+            </tr>
+        </table>
+    </div>
 </center>
 </body>
 </html>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp (original)
+++ geronimo/samples/branches/2.1/samples/dbtester/dbtester-war/src/main/webapp/jsp/table_list.jsp Fri Jun  6 15:43:44 2008
@@ -1,107 +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
-
-     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.
 -->
 <%@ page import="java.util.ArrayList" %>
 <%@ page import="java.util.HashMap" %>
 <%@ page import="java.util.Iterator" %>
 <html>
 <head>
-<title>Schemas and Tables</title>
-<link rel="stylesheet" href="css/main.css" type="text/css">
+    <title>Schemas and Tables</title>
+    <link rel="stylesheet" href="css/main.css" type="text/css">
 </head>
 <body>
 <center>
-<br>
-<div class="Content">
-<table>
-	<tr>
-		<td class="Title"><strong>Schemas and Tables</strong></td>
-	</tr>
-	<tr></tr>
-	<tr>
-		<td class="Body">	
-			<p>
-				Displayed below are the list of Schemas and their Tables, from your database. 
-				To view the content of each table click on <strong>list</strong> link.
-			</p>
-		</td>
-	<tr>
-	<td class="Body">
-		<table align="center">
-		 <%
-		 String poolName = (String)request.getAttribute("poolName");
-		 String userName = (String)request.getAttribute("username");
-		 String password = (String)request.getAttribute("password");
-		 
-		 HashMap tableMap = (HashMap)request.getAttribute("tableMap"); 
-		 for(Iterator iterator1 = tableMap.keySet().iterator(); iterator1.hasNext();){
-		 	String schemaName = (String)iterator1.next();
-		 %>
-		 
-		 <%
-		 	String displayName = "    ";
-		 	if(schemaName != null){
-		 		displayName = schemaName;// since MySQL returns it as null and it's ugly :)
-		 	}
-		 %>
-		 
-			 <tr>
-			 	<td class="DarkBackground">Schema:</td>
-			 	<td class="DarkBackground"><%=displayName%></td>
-			 </tr>
-			 
-			 <%
-			 	ArrayList tableList = (ArrayList)tableMap.get(schemaName);
-			 	int counter = 1;
-			 	for(Iterator iterator2 = tableList.iterator(); iterator2.hasNext();counter++){
-			 		String tableName = (String)iterator2.next();
-			 		String rowColor = "LightBackground";
-			 		if(counter%2 == 0){
-			 			rowColor = "MediumBackground";
-			 		}
-			 		%>
-			 		<tr>
-			 			<td class="<%=rowColor%>"><%=tableName%></td>
-			 			<td class="<%=rowColor%>"><a href="listContent?poolName=<%=poolName%>&schemaName=<%=schemaName%>&tableName=<%=tableName%>&username=<%=userName%>&password=<%=password%>">list</a></td>
-			 		</tr>
-			  		<%
-			 	}
-			 %>
-			 <%	
-			 }
-			  %>
-			 <tr>
-			 </tr>
-		</table>
-	</td>
-	</tr>
-	<tr></tr>
-	<tr>
-		<td class="Body">
-		<center>
-		<div> 
-		<a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
-		</div>
-		</center>
-		</td>
-	</tr>
-</table>
-</div>			
+    <br>
+
+    <div class="Content">
+        <table>
+            <tr>
+                <td class="Title"><strong>Schemas and Tables</strong></td>
+            </tr>
+            <tr></tr>
+            <tr>
+                <td class="Body">
+                    <p>
+                        Displayed below are the list of Schemas and their Tables, from your database.
+                        To view the content of each table click on <strong>list</strong> link.
+                    </p>
+                </td>
+            <tr>
+                <td class="Body">
+                    <table align="center">
+                        <%
+                            String poolName = (String) request.getAttribute("poolName");
+                            String userName = (String) request.getAttribute("username");
+                            String password = (String) request.getAttribute("password");
+
+                            HashMap tableMap = (HashMap) request.getAttribute("tableMap");
+                            for (Iterator iterator1 = tableMap.keySet().iterator(); iterator1.hasNext();) {
+                                String schemaName = (String) iterator1.next();
+                        %>
+
+                        <%
+                            String displayName = "    ";
+                            if (schemaName != null) {
+                                displayName = schemaName;// since MySQL returns it as null and it's ugly :)
+                            }
+                        %>
+
+                        <tr>
+                            <td class="DarkBackground">Schema:</td>
+                            <td class="DarkBackground"><%=displayName%>
+                            </td>
+                        </tr>
+
+                        <%
+                            ArrayList tableList = (ArrayList) tableMap.get(schemaName);
+                            int counter = 1;
+                            for (Iterator iterator2 = tableList.iterator(); iterator2.hasNext(); counter++) {
+                                String tableName = (String) iterator2.next();
+                                String rowColor = "LightBackground";
+                                if (counter % 2 == 0) {
+                                    rowColor = "MediumBackground";
+                                }
+                        %>
+                        <tr>
+                            <td class="<%=rowColor%>"><%=tableName%>
+                            </td>
+                            <td class="<%=rowColor%>"><a href="listContent?poolName=<%=poolName%>&schemaName=<%=schemaName%>&tableName=<%=tableName%>&username=<%=userName%>&password=<%=password%>">list</a></td>
+                        </tr>
+                        <%
+                            }
+                        %>
+                        <%
+                            }
+                        %>
+                        <tr>
+                        </tr>
+                    </table>
+                </td>
+            </tr>
+            <tr></tr>
+            <tr>
+                <td class="Body">
+                    <center>
+                        <div>
+                            <a href="../dbtester/dbtester.jsp" target="sampleDocumentFrame"><strong>Test Another Pool</strong></a>
+                        </div>
+                    </center>
+                </td>
+            </tr>
+        </table>
+    </div>
 </center>
 </body>
 </html>
\ No newline at end of file

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

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

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-tomcat/pom.xml Fri Jun  6 15:43:44 2008
@@ -90,7 +90,7 @@
                 <filtering>true</filtering>
             </resource>
         </resources>
-        
+
         <plugins>
             <plugin>
                 <groupId>org.apache.geronimo.buildsupport</groupId>
@@ -122,11 +122,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>

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

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/Item.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/Item.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/Item.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/Item.java Fri Jun  6 15:43:44 2008
@@ -18,40 +18,45 @@
 package org.apache.geronimo.samples.inventory;
 
 
-
 public class Item {
-	
-	
-	private String itemNo;
-	private String itemName;
-	private String description;
-	private int quantity;
-	
-	public String getDescription() {
-		return description;
-	}
-	public void setDescription(String description) {
-		this.description = description;
-	}
-	public String getItemName() {
-		return itemName;
-	}
-	public void setItemName(String itemName) {
-		this.itemName = itemName;
-	}
-	public String getItemNo() {
-		return itemNo;
-	}
-	public void setItemNo(String itemNo) {
-		this.itemNo = itemNo;
-	}
-	public int getQuantity() {
-		return quantity;
-	}
-	public void setQuantity(int quantity) {
-		this.quantity = quantity;
-	}
-	
-	
-	
+
+
+    private String itemNo;
+    private String itemName;
+    private String description;
+    private int quantity;
+
+    public String getDescription() {
+        return description;
+    }
+
+    public void setDescription(String description) {
+        this.description = description;
+    }
+
+    public String getItemName() {
+        return itemName;
+    }
+
+    public void setItemName(String itemName) {
+        this.itemName = itemName;
+    }
+
+    public String getItemNo() {
+        return itemNo;
+    }
+
+    public void setItemNo(String itemNo) {
+        this.itemNo = itemNo;
+    }
+
+    public int getQuantity() {
+        return quantity;
+    }
+
+    public void setQuantity(int quantity) {
+        this.quantity = quantity;
+    }
+
+
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/dao/ItemDAO.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/dao/ItemDAO.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/dao/ItemDAO.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/dao/ItemDAO.java Fri Jun  6 15:43:44 2008
@@ -29,152 +29,152 @@
 
 
 public class ItemDAO {
-	
-	public List getItems(){
-		ArrayList items = new ArrayList();
-		
-		Connection con = DBManager.getConnection();
-		try {
-			
-			PreparedStatement pStmt = con.prepareStatement("SELECT i.item_id as item_id, i.item_name as item_name, i.description as description, im.quantity as quantity FROM item i, item_master im WHERE im.item_id = i.item_id");
-			ResultSet rs = pStmt.executeQuery();
-			int j = 0;
-			while(rs.next()){
-				ArrayList item = new ArrayList();
-				
-				String itemId = rs.getString("item_id");
-				String itemName = rs.getString("item_name");
-				String description = rs.getString("description");
-				int quantity = rs.getInt("quantity");
-				
-				item.add(0, itemId);
-				item.add(1, itemName);
-				item.add(2, description);
-				item.add(3, quantity+"");
-				
-				items.add(j,item);				
-				j++;
-				
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally{
-			if(con != null){
-				try {
-					con.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		}		
-		
-		return items;
-	}
-	
-	public int getQOH(String itemNo){
-		
-		int qoh = 0;
-		Connection con = DBManager.getConnection();
-		try {
-			
-			PreparedStatement pStmt = con.prepareStatement("SELECT quantity FROM item_master WHERE item_id =? ");
-			pStmt.setString(1, itemNo);
-			
-			ResultSet rs = pStmt.executeQuery();
-			while(rs.next()){
-				qoh = rs.getInt("quantity");
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally{
-			if(con != null){
-				try {
-					con.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		}		
-		return qoh;
-	}
-	
-	public boolean isItemIdExists(String itemNo){
-		boolean isExists = false;
-		Connection con = DBManager.getConnection();
-		try {
-			
-			PreparedStatement pStmt = con.prepareStatement("SELECT item_id FROM item WHERE item_id =? ");
-			pStmt.setString(1, itemNo);
-			
-			ResultSet rs = pStmt.executeQuery();
-			if(rs.next()){
-				isExists = true;
-			}
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally{
-			if(con != null){
-				try {
-					con.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		}		
-		return isExists;
-	}
-	
-	public void updateQOH(String itemNo, int qoh){
-		Connection con = DBManager.getConnection();
-		try {
-			
-			PreparedStatement pStmt = con.prepareStatement("UPDATE item_master SET quantity=? WHERE item_id=?");
-			pStmt.setInt(1, qoh);
-			pStmt.setString(2, itemNo);
-			
-			pStmt.executeUpdate();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally{
-			if(con != null){
-				try {
-					con.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		}		
-		
-	}
-	
-	public void addItem(Item item) {
-		Connection con = DBManager.getConnection();
-		try {
-			
-			PreparedStatement pStmt = con.prepareStatement("INSERT INTO item VALUES(?, ?, ?)");
-			pStmt.setString(1, item.getItemNo());
-			pStmt.setString(2, item.getItemName());
-			pStmt.setString(3, item.getDescription());
-			
-			pStmt.executeUpdate();
-			
-			pStmt = con.prepareStatement("INSERT INTO item_master VALUES(?, ?)");
-			pStmt.setString(1, item.getItemNo());
-			pStmt.setInt(2, 0);
-			
-			pStmt.executeUpdate();
-			
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}finally{
-			if(con != null){
-				try {
-					con.close();
-				} catch (SQLException e) {
-					e.printStackTrace();
-				}
-			}
-		}		
-	}
+
+    public List getItems() {
+        ArrayList items = new ArrayList();
+
+        Connection con = DBManager.getConnection();
+        try {
+
+            PreparedStatement pStmt = con.prepareStatement("SELECT i.item_id as item_id, i.item_name as item_name, i.description as description, im.quantity as quantity FROM item i, item_master im WHERE im.item_id = i.item_id");
+            ResultSet rs = pStmt.executeQuery();
+            int j = 0;
+            while (rs.next()) {
+                ArrayList item = new ArrayList();
+
+                String itemId = rs.getString("item_id");
+                String itemName = rs.getString("item_name");
+                String description = rs.getString("description");
+                int quantity = rs.getInt("quantity");
+
+                item.add(0, itemId);
+                item.add(1, itemName);
+                item.add(2, description);
+                item.add(3, quantity + "");
+
+                items.add(j, item);
+                j++;
+
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+        return items;
+    }
+
+    public int getQOH(String itemNo) {
+
+        int qoh = 0;
+        Connection con = DBManager.getConnection();
+        try {
+
+            PreparedStatement pStmt = con.prepareStatement("SELECT quantity FROM item_master WHERE item_id =? ");
+            pStmt.setString(1, itemNo);
+
+            ResultSet rs = pStmt.executeQuery();
+            while (rs.next()) {
+                qoh = rs.getInt("quantity");
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return qoh;
+    }
+
+    public boolean isItemIdExists(String itemNo) {
+        boolean isExists = false;
+        Connection con = DBManager.getConnection();
+        try {
+
+            PreparedStatement pStmt = con.prepareStatement("SELECT item_id FROM item WHERE item_id =? ");
+            pStmt.setString(1, itemNo);
+
+            ResultSet rs = pStmt.executeQuery();
+            if (rs.next()) {
+                isExists = true;
+            }
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+        return isExists;
+    }
+
+    public void updateQOH(String itemNo, int qoh) {
+        Connection con = DBManager.getConnection();
+        try {
+
+            PreparedStatement pStmt = con.prepareStatement("UPDATE item_master SET quantity=? WHERE item_id=?");
+            pStmt.setInt(1, qoh);
+            pStmt.setString(2, itemNo);
+
+            pStmt.executeUpdate();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+
+    }
+
+    public void addItem(Item item) {
+        Connection con = DBManager.getConnection();
+        try {
+
+            PreparedStatement pStmt = con.prepareStatement("INSERT INTO item VALUES(?, ?, ?)");
+            pStmt.setString(1, item.getItemNo());
+            pStmt.setString(2, item.getItemName());
+            pStmt.setString(3, item.getDescription());
+
+            pStmt.executeUpdate();
+
+            pStmt = con.prepareStatement("INSERT INTO item_master VALUES(?, ?)");
+            pStmt.setString(1, item.getItemNo());
+            pStmt.setInt(2, 0);
+
+            pStmt.executeUpdate();
+
+        } catch (SQLException e) {
+            e.printStackTrace();
+        } finally {
+            if (con != null) {
+                try {
+                    con.close();
+                } catch (SQLException e) {
+                    e.printStackTrace();
+                }
+            }
+        }
+    }
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/DuplicateItemIdException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/DuplicateItemIdException.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/DuplicateItemIdException.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/DuplicateItemIdException.java Fri Jun  6 15:43:44 2008
@@ -19,9 +19,9 @@
 
 
 public class DuplicateItemIdException extends Exception {
-	
-	public DuplicateItemIdException(){
-		super();
-	}
+
+    public DuplicateItemIdException() {
+        super();
+    }
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/NotSufficientQuantityException.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/NotSufficientQuantityException.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/NotSufficientQuantityException.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/exception/NotSufficientQuantityException.java Fri Jun  6 15:43:44 2008
@@ -18,8 +18,8 @@
 package org.apache.geronimo.samples.inventory.exception;
 
 
-public class NotSufficientQuantityException extends Exception{
-	public NotSufficientQuantityException(){
-		super();
-	}
+public class NotSufficientQuantityException extends Exception {
+    public NotSufficientQuantityException() {
+        super();
+    }
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/services/InventoryManager.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/services/InventoryManager.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/services/InventoryManager.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/services/InventoryManager.java Fri Jun  6 15:43:44 2008
@@ -26,42 +26,42 @@
 
 
 public class InventoryManager {
-	
-	public List getItems(){
-		ItemDAO dao = new ItemDAO();
-		return dao.getItems();
-	}
-	
-	public void issueItem(String itemNo, int quantity) throws NotSufficientQuantityException{
-		ItemDAO dao = new ItemDAO();
-		
-		int qoh = dao.getQOH(itemNo);
-		
-		if(qoh < quantity)throw new NotSufficientQuantityException();
-		
-		dao.updateQOH(itemNo,(qoh - quantity));
-	}
-	
-	public void recvItem(String itemNo, int quantity){
-		ItemDAO dao = new ItemDAO();
-		
-		int qoh = dao.getQOH(itemNo);
-		
-		dao.updateQOH(itemNo,(qoh + quantity));		
-	}
-	
-	public void addItem(String itemNo, String itemName, String desc) throws DuplicateItemIdException{
-		ItemDAO dao = new ItemDAO();
-		
-		if(dao.isItemIdExists(itemNo))throw new DuplicateItemIdException();
-		Item item = new Item();
-		
-		item.setItemNo(itemNo);
-		item.setItemName(itemName);
-		item.setDescription(desc);
-		
-		dao.addItem(item);
-		
-	}
+
+    public List getItems() {
+        ItemDAO dao = new ItemDAO();
+        return dao.getItems();
+    }
+
+    public void issueItem(String itemNo, int quantity) throws NotSufficientQuantityException {
+        ItemDAO dao = new ItemDAO();
+
+        int qoh = dao.getQOH(itemNo);
+
+        if (qoh < quantity) throw new NotSufficientQuantityException();
+
+        dao.updateQOH(itemNo, (qoh - quantity));
+    }
+
+    public void recvItem(String itemNo, int quantity) {
+        ItemDAO dao = new ItemDAO();
+
+        int qoh = dao.getQOH(itemNo);
+
+        dao.updateQOH(itemNo, (qoh + quantity));
+    }
+
+    public void addItem(String itemNo, String itemName, String desc) throws DuplicateItemIdException {
+        ItemDAO dao = new ItemDAO();
+
+        if (dao.isItemIdExists(itemNo)) throw new DuplicateItemIdException();
+        Item item = new Item();
+
+        item.setItemNo(itemNo);
+        item.setItemName(itemName);
+        item.setDescription(desc);
+
+        dao.addItem(item);
+
+    }
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/util/DBManager.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/util/DBManager.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/util/DBManager.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/util/DBManager.java Fri Jun  6 15:43:44 2008
@@ -27,20 +27,20 @@
 
 
 public class DBManager {
-	
-	public static Connection getConnection(){
-		Connection con = null;
 
-		try {
-			Context context = new InitialContext();
-			DataSource ds = (DataSource)context.lookup("java:comp/env/jdbc/InventoryDS");
-			con = ds.getConnection();
-		} catch (NamingException e) {
-			e.printStackTrace();
-		} catch (SQLException e) {
-			e.printStackTrace();
-		}
-		return con;
-	}
+    public static Connection getConnection() {
+        Connection con = null;
+
+        try {
+            Context context = new InitialContext();
+            DataSource ds = (DataSource) context.lookup("java:comp/env/jdbc/InventoryDS");
+            con = ds.getConnection();
+        } catch (NamingException e) {
+            e.printStackTrace();
+        } catch (SQLException e) {
+            e.printStackTrace();
+        }
+        return con;
+    }
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/AddItemServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/AddItemServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/AddItemServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/AddItemServlet.java Fri Jun  6 15:43:44 2008
@@ -30,42 +30,41 @@
 
 public class AddItemServlet extends HttpServlet {
 
-	
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		process(req,res);
-	}
-
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		doGet(req,res);
-	}
-	
-	private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException{
-		String itemNo = req.getParameter("item_no");
-		String itemName = req.getParameter("item_name");
-		String description = req.getParameter("item_desc");
-		
-		if(!itemNo.equals("") && !itemName.equals("")){
-			InventoryManager itemManager = new InventoryManager();
-			try {
-				itemManager.addItem(itemNo, itemName, description);
-				getServletContext().getRequestDispatcher("/welcome.jsp").forward(req,res);
-			} catch (DuplicateItemIdException e) {
-				req.setAttribute("error","Duplicate Item Id");
-				getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req,res);
-			}
-		}else{
-			String error = "";
-			if(itemNo.equals("")){
-				error = "Invalid Item Number";
-			}else if(itemName.equals("")){
-				error = "Invalid Item Name";
-			}
-			req.setAttribute("error",error);
-			getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req,res);
-		}
-		
-	}
-	
-	
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        process(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+        String itemNo = req.getParameter("item_no");
+        String itemName = req.getParameter("item_name");
+        String description = req.getParameter("item_desc");
+
+        if (!itemNo.equals("") && !itemName.equals("")) {
+            InventoryManager itemManager = new InventoryManager();
+            try {
+                itemManager.addItem(itemNo, itemName, description);
+                getServletContext().getRequestDispatcher("/welcome.jsp").forward(req, res);
+            } catch (DuplicateItemIdException e) {
+                req.setAttribute("error", "Duplicate Item Id");
+                getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req, res);
+            }
+        } else {
+            String error = "";
+            if (itemNo.equals("")) {
+                error = "Invalid Item Number";
+            } else if (itemName.equals("")) {
+                error = "Invalid Item Name";
+            }
+            req.setAttribute("error", error);
+            getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req, res);
+        }
+
+    }
+
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/IssueingServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/IssueingServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/IssueingServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/IssueingServlet.java Fri Jun  6 15:43:44 2008
@@ -30,34 +30,34 @@
 
 public class IssueingServlet extends HttpServlet {
 
-	
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		process(req,res);
-	}
-
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		doGet(req,res);
-	}
-	
-	private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException{
-		String itemNo = req.getParameter("item_no");
-		
-		int quantity = 0;
-		try {
-			quantity = Integer.parseInt(req.getParameter("quantity"));
-			InventoryManager itemManager = new InventoryManager();
-			itemManager.issueItem(itemNo,quantity);
-
-			getServletContext().getRequestDispatcher("/welcome.jsp").forward(req,res);
-		} catch (NumberFormatException e) {
-			e.printStackTrace();
-			req.setAttribute("error","Invalid Number Format for Quantity");
-			getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req,res);			
-		} catch (NotSufficientQuantityException e) {
-			req.setAttribute("error","Not Sufficient Qunatity to Issue Items");
-			getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req,res);	
-		}
-	}
-	
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        process(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+        String itemNo = req.getParameter("item_no");
+
+        int quantity = 0;
+        try {
+            quantity = Integer.parseInt(req.getParameter("quantity"));
+            InventoryManager itemManager = new InventoryManager();
+            itemManager.issueItem(itemNo, quantity);
+
+            getServletContext().getRequestDispatcher("/welcome.jsp").forward(req, res);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            req.setAttribute("error", "Invalid Number Format for Quantity");
+            getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req, res);
+        } catch (NotSufficientQuantityException e) {
+            req.setAttribute("error", "Not Sufficient Qunatity to Issue Items");
+            getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req, res);
+        }
+    }
+
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/RecievingServlet.java
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/RecievingServlet.java?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/RecievingServlet.java (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/java/org/apache/geronimo/samples/inventory/web/RecievingServlet.java Fri Jun  6 15:43:44 2008
@@ -29,34 +29,32 @@
 
 public class RecievingServlet extends HttpServlet {
 
-	
-	protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		process(req,res);
-	}
-
-	protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
-		doGet(req,res);
-	}
-	
-	private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException{
-		String itemNo = req.getParameter("item_no");
-		
-		int quantity = 0;
-		try {
-			quantity = Integer.parseInt(req.getParameter("quantity"));
-			InventoryManager itemManager = new InventoryManager();
-			itemManager.recvItem(itemNo,quantity);
-			
-			getServletContext().getRequestDispatcher("/welcome.jsp").forward(req,res);
-		} catch (NumberFormatException e) {	
-			e.printStackTrace();
-			req.setAttribute("error","Invalid Number Format for Quantity");
-			getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req,res);	
-		}
-			
-	}
-	
-	
-	
+
+    protected void doGet(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        process(req, res);
+    }
+
+    protected void doPost(HttpServletRequest req, HttpServletResponse res) throws ServletException, IOException {
+        doGet(req, res);
+    }
+
+    private void process(HttpServletRequest req, HttpServletResponse res) throws IOException, ServletException {
+        String itemNo = req.getParameter("item_no");
+
+        int quantity = 0;
+        try {
+            quantity = Integer.parseInt(req.getParameter("quantity"));
+            InventoryManager itemManager = new InventoryManager();
+            itemManager.recvItem(itemNo, quantity);
+
+            getServletContext().getRequestDispatcher("/welcome.jsp").forward(req, res);
+        } catch (NumberFormatException e) {
+            e.printStackTrace();
+            req.setAttribute("error", "Invalid Number Format for Quantity");
+            getServletContext().getRequestDispatcher("/jsp/error.jsp").forward(req, res);
+        }
+
+    }
+
 
 }

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/geronimo-web.xml Fri Jun  6 15:43:44 2008
@@ -18,23 +18,23 @@
     under the License.
 -->
 <web-app
-	xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-	
-	<environment>
-		<moduleId>
-			<groupId>${pom.groupId}</groupId>
-			<artifactId>${pom.artifactId}</artifactId>
-			<version>${version}</version>
-                        <type>war</type>
-		</moduleId>
-		<dependencies></dependencies>		
-	</environment>
-		
-	<context-root>/inventory</context-root>
-	
-	<!-- define a reference name to the db pool-->
-	<resource-ref>
+        xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+
+    <environment>
+        <moduleId>
+            <groupId>${pom.groupId}</groupId>
+            <artifactId>${pom.artifactId}</artifactId>
+            <version>${version}</version>
+            <type>war</type>
+        </moduleId>
+        <dependencies></dependencies>
+    </environment>
+
+    <context-root>/inventory</context-root>
+
+    <!-- define a reference name to the db pool-->
+    <resource-ref>
         <ref-name>jdbc/InventoryDS</ref-name>
         <resource-link>SampleTxDatasource</resource-link>
-    </resource-ref>    
+    </resource-ref>
 </web-app>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml Fri Jun  6 15:43:44 2008
@@ -18,50 +18,50 @@
     under the License.
 -->
 <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
+         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">	
-	 
-	<welcome-file-list>
-		<welcome-file>index.html</welcome-file>
-  	</welcome-file-list>  
-  	
-  	<servlet>
-	    <display-name>AddItemServlet</display-name>
-	    <servlet-name>AddItemServlet</servlet-name>
-	    <servlet-class>org.apache.geronimo.samples.inventory.web.AddItemServlet</servlet-class>
-  	</servlet>
-  	<servlet>
-	    <display-name>IssueingServlet</display-name>
-	    <servlet-name>IssueingServlet</servlet-name>
-	    <servlet-class>org.apache.geronimo.samples.inventory.web.IssueingServlet</servlet-class>
-	</servlet>
-	<servlet>
-	    <display-name>RecievingServlet</display-name>
-	    <servlet-name>RecievingServlet</servlet-name>
-	    <servlet-class>org.apache.geronimo.samples.inventory.web.RecievingServlet</servlet-class>
-	</servlet>
-  	
-  	<servlet-mapping>
-	    <servlet-name>AddItemServlet</servlet-name>
-	    <url-pattern>/add_item</url-pattern>
+         version="2.4">
+
+    <welcome-file-list>
+        <welcome-file>index.html</welcome-file>
+    </welcome-file-list>
+
+    <servlet>
+        <display-name>AddItemServlet</display-name>
+        <servlet-name>AddItemServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.inventory.web.AddItemServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <display-name>IssueingServlet</display-name>
+        <servlet-name>IssueingServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.inventory.web.IssueingServlet</servlet-class>
+    </servlet>
+    <servlet>
+        <display-name>RecievingServlet</display-name>
+        <servlet-name>RecievingServlet</servlet-name>
+        <servlet-class>org.apache.geronimo.samples.inventory.web.RecievingServlet</servlet-class>
+    </servlet>
+
+    <servlet-mapping>
+        <servlet-name>AddItemServlet</servlet-name>
+        <url-pattern>/add_item</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-	    <servlet-name>IssueingServlet</servlet-name>
-	    <url-pattern>/issue</url-pattern>
+        <servlet-name>IssueingServlet</servlet-name>
+        <url-pattern>/issue</url-pattern>
     </servlet-mapping>
     <servlet-mapping>
-	    <servlet-name>RecievingServlet</servlet-name>
-	    <url-pattern>/recv</url-pattern>
+        <servlet-name>RecievingServlet</servlet-name>
+        <url-pattern>/recv</url-pattern>
     </servlet-mapping>
-    
+
     <!-- reference name exposed as a datasource -->
     <resource-ref>
-    	<res-ref-name>jdbc/InventoryDS</res-ref-name>
-    	<res-type>javax.sql.DataSource</res-type>
-    	<res-auth>Container</res-auth>
-    	<res-sharing-scope>Shareable</res-sharing-scope>
-  	</resource-ref>
-    
+        <res-ref-name>jdbc/InventoryDS</res-ref-name>
+        <res-type>javax.sql.DataSource</res-type>
+        <res-auth>Container</res-auth>
+        <res-sharing-scope>Shareable</res-sharing-scope>
+    </resource-ref>
+
 </web-app>
\ No newline at end of file

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

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

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/add.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/add.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/add.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/add.jsp Fri Jun  6 15:43:44 2008
@@ -1,46 +1,48 @@
+<%@ page import="java.util.List" %>
 <!--
-    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>Add Items</TITLE></HEAD>
 <BODY>
 <div align="center">
-<H2>Add Items</H2>
-<FORM method="POST" action="../add_item">
-  <TABLE bgcolor="cyan">
-    <TR>
-	<TD>Item No:</TD>
-	<TD><INPUT type="text" name="item_no"></TD>	
-    </TR>
-    <TR>
-	<TD>Name: </TD>
-	<TD><INPUT type="text" name="item_name"></TD>	
-    </TR>
-    <TR>
-	<TD>Description: </TD>
-	<TD><textarea name="item_desc" rows="5"></textarea></TD>	
-    </TR>	
-  </TABLE>
-  <BR>
-	<INPUT type="submit" value="Add">  <INPUT type="reset" value="Cancel">
-  <BR><BR>
-  <a href="../welcome.jsp">Home</a>
-</FORM>
+    <H2>Add Items</H2>
+
+    <FORM method="POST" action="../add_item">
+        <TABLE bgcolor="cyan">
+            <TR>
+                <TD>Item No:</TD>
+                <TD><INPUT type="text" name="item_no"></TD>
+            </TR>
+            <TR>
+                <TD>Name:</TD>
+                <TD><INPUT type="text" name="item_name"></TD>
+            </TR>
+            <TR>
+                <TD>Description:</TD>
+                <TD><textarea name="item_desc" rows="5"></textarea></TD>
+            </TR>
+        </TABLE>
+        <BR>
+        <INPUT type="submit" value="Add"> <INPUT type="reset" value="Cancel">
+        <BR><BR>
+        <a href="../welcome.jsp">Home</a>
+    </FORM>
 </div>
 </BODY>
 </HTML
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/error.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/error.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/error.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/error.jsp Fri Jun  6 15:43:44 2008
@@ -1,36 +1,36 @@
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
 -->
 <HTML>
 <HEAD><TITLE>Error</TITLE></HEAD>
 <BODY>
 <div>
-<CENTER>
-<H2>Error Occured</H2>
-<br><br>
-<%
-	String error = (String)request.getAttribute("error");
-%>
-<br>
-<%=error%>
-<br><br>
-<a href="welcome.jsp">Home</a>
-</CENTER>
+    <CENTER>
+        <H2>Error Occured</H2>
+        <br><br>
+        <%
+            String error = (String) request.getAttribute("error");
+        %>
+        <br>
+        <%=error%>
+        <br><br>
+        <a href="welcome.jsp">Home</a>
+    </CENTER>
 </div>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/issue.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/issue.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/issue.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/issue.jsp Fri Jun  6 15:43:44 2008
@@ -1,22 +1,21 @@
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-     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.
 -->
-<%@ page import="org.apache.geronimo.samples.inventory.services.InventoryManager" %>
 <%@ page import="java.util.List" %>
 
 <HTML>
@@ -24,38 +23,40 @@
 <HEAD><TITLE>Issueing</TITLE></HEAD>
 <BODY>
 <div align="center">
-<H2>Issueing of Goods</H2><br>
-<FORM method="POST" action="../issue">
-<TABLE bgcolor="cyan">
-  <TR>
-  <TD>Item: </TD>
-  <TD>
-   <SELECT name="item_no">
-   <%
-      List itemList = inventoryManager.getItems();
-      for(int i=0; i<itemList.size();i++){
-      	List item = (List)itemList.get(i);
-      	
-      	String itemNo = (String)item.get(0);
-      	String itemName = (String)item.get(1);
-   %>
-   <OPTION value="<%=itemNo%>"><%=itemName%></OPTION>
-   <%	}%>
-   </SELECT>	
-
-  </TD>
-  </TR>
-  <TR>
-  <TD>Quantity: </TD>
-  <TD><INPUT type="text" name="quantity"></TD>
-  </TR>
-</TABLE>
-<br>
-<INPUT type="submit" value="Issue">
-<INPUT type="reset" value="Cancel">
-</FORM>
-<br><br>
-<a href="../welcome.jsp">Home</a>
+    <H2>Issueing of Goods</H2><br>
+
+    <FORM method="POST" action="../issue">
+        <TABLE bgcolor="cyan">
+            <TR>
+                <TD>Item:</TD>
+                <TD>
+                    <SELECT name="item_no">
+                        <%
+                            List itemList = inventoryManager.getItems();
+                            for (int i = 0; i < itemList.size(); i++) {
+                                List item = (List) itemList.get(i);
+
+                                String itemNo = (String) item.get(0);
+                                String itemName = (String) item.get(1);
+                        %>
+                        <OPTION value="<%=itemNo%>"><%=itemName%>
+                        </OPTION>
+                        <% }%>
+                    </SELECT>
+
+                </TD>
+            </TR>
+            <TR>
+                <TD>Quantity:</TD>
+                <TD><INPUT type="text" name="quantity"></TD>
+            </TR>
+        </TABLE>
+        <br>
+        <INPUT type="submit" value="Issue">
+        <INPUT type="reset" value="Cancel">
+    </FORM>
+    <br><br>
+    <a href="../welcome.jsp">Home</a>
 </div>
 </BODY>
 </HTML>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/recv.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/recv.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/recv.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/jsp/recv.jsp Fri Jun  6 15:43:44 2008
@@ -1,22 +1,21 @@
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
+Licensed to the Apache Software Foundation (ASF) under one
+or more contributor license agreements. See the NOTICE file
+distributed with this work for additional information
+regarding copyright ownership. The ASF licenses this file
+to you under the Apache License, Version 2.0 (the
+"License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
 
-     http://www.apache.org/licenses/LICENSE-2.0
+http://www.apache.org/licenses/LICENSE-2.0
 
-    Unless required by applicable law or agreed to in writing,
-    software distributed under the License is distributed on an
-    "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
-    KIND, either express or implied.  See the License for the
-    specific language governing permissions and limitations
-    under the License.
+Unless required by applicable law or agreed to in writing,
+software distributed under the License is distributed on an
+"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+KIND, either express or implied. See the License for the
+specific language governing permissions and limitations
+under the License.
 -->
-<%@ page import="org.apache.geronimo.samples.inventory.services.InventoryManager" %>
 <%@ page import="java.util.List" %>
 
 <HTML>
@@ -24,38 +23,40 @@
 <HEAD><TITLE>Receiving</TITLE></HEAD>
 <BODY>
 <div align="center">
-<H2>Recieving of Goods</H2>
-<FORM method="POST" action="../recv">
-<TABLE bgcolor="cyan">
- <TR>
-  <TD>Item:</TD>
-  <TD>
-   <SELECT name="item_no">
-   <%
-      List itemList = inventoryManager.getItems();
-      for(int i=0; i<itemList.size();i++){
-      	List item = (List)itemList.get(i);
-      	
-      	String itemNo = (String)item.get(0);
-      	String itemName = (String)item.get(1);
-   %>
-   <OPTION value="<%=itemNo%>"><%=itemName%></OPTION>
-   <%	}%>
-   </SELECT>	
-  </TD>
- </TR>
- <TR>
- <TD>Quantity:</TD>
- <TD>
-  <INPUT type="text" name="quantity">
- </TD>
- </TR>
-</TABLE>
-<BR>
-<INPUT type="submit" value="Add">  <INPUT type="reset" value="Cancel">
-</FORM>
-<br><br>
-<a href="../welcome.jsp">Home</a>
+    <H2>Recieving of Goods</H2>
+
+    <FORM method="POST" action="../recv">
+        <TABLE bgcolor="cyan">
+            <TR>
+                <TD>Item:</TD>
+                <TD>
+                    <SELECT name="item_no">
+                        <%
+                            List itemList = inventoryManager.getItems();
+                            for (int i = 0; i < itemList.size(); i++) {
+                                List item = (List) itemList.get(i);
+
+                                String itemNo = (String) item.get(0);
+                                String itemName = (String) item.get(1);
+                        %>
+                        <OPTION value="<%=itemNo%>"><%=itemName%>
+                        </OPTION>
+                        <% }%>
+                    </SELECT>
+                </TD>
+            </TR>
+            <TR>
+                <TD>Quantity:</TD>
+                <TD>
+                    <INPUT type="text" name="quantity">
+                </TD>
+            </TR>
+        </TABLE>
+        <BR>
+        <INPUT type="submit" value="Add"> <INPUT type="reset" value="Cancel">
+    </FORM>
+    <br><br>
+    <a href="../welcome.jsp">Home</a>
 </div>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/sample-docu.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/sample-docu.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/sample-docu.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/sample-docu.jsp Fri Jun  6 15:43:44 2008
@@ -1,32 +1,32 @@
 <!--
-   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 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd class="cell"">
-<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1"%>
+<%@ page language="java" contentType="text/html; charset=ISO-8859-1" pageEncoding="ISO-8859-1" %>
 <html>
 <head>
-  <title>Sample for inventory</title>
-  <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
+    <title>Sample for inventory</title>
+    <meta content="text/html; CHARSET=iso-8859-1" http-equiv="Content-Type">
 </head>
 
 <BODY>
-  <font face="Verdana, Helvetica, Arial">
+<font face="Verdana, Helvetica, Arial">
 
-     Your sample documentation goes here.
+    Your sample documentation goes here.
 
-  </FONT>
+</FONT>
 </body>
 </html>

Modified: geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/welcome.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/welcome.jsp?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/welcome.jsp (original)
+++ geronimo/samples/branches/2.1/samples/inventory/inventory-war/src/main/webapp/welcome.jsp Fri Jun  6 15:43:44 2008
@@ -1,22 +1,21 @@
 <!--
-    Licensed to the Apache Software Foundation (ASF) under one
-    or more contributor license agreements.  See the NOTICE file
-    distributed with this work for additional information
-    regarding copyright ownership.  The ASF licenses this file
-    to you under the Apache License, Version 2.0 (the
-    "License"); you may not use this file except in compliance
-    with the License.  You may obtain a copy of the License at
-
-     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.
 -->
-<%@ page import="org.apache.geronimo.samples.inventory.services.InventoryManager" %>
 <%@ page import="java.util.List" %>
 
 
@@ -24,49 +23,53 @@
 <jsp:useBean id="inventoryManager" scope="session" class="org.apache.geronimo.samples.inventory.services.InventoryManager"/>
 <HEAD><TITLE>Welcome</TITLE></HEAD>
 <BODY>
-    <div div=true align="center">
-      <strong><H2>Welcome to the Inventory Contorl System</H2><br><br><br></strong>
-    
+<div div=true align="center">
+    <strong><H2>Welcome to the Inventory Contorl System</H2><br><br><br></strong>
+
     <%
-    	List itemList = inventoryManager.getItems();
-    	if(itemList.size() > 0){
-    	
-    %>    
-	<TABLE width="90%" border="0" bgcolor="cyan">
-	<TR>
-	<TD><strong>Item Number</strong></TD>
-	<TD><strong>Item Name</strong></TD>
-	<TD><strong>Description</strong></TD>
-	<TD><strong>Quantity</strong></TD>   
-	</TR>
-	<% 
-		for(int i=0; i<itemList.size(); i++){
-			List item = (List)itemList.get(i);
-			
-			String itemNo = (String)item.get(0);
-			String itemName = (String)item.get(1);
-			String description = (String)item.get(2);
-			String quantity = (String)item.get(3);
-	%>	
-	<TR>
-	<TD><%=itemNo%></TD>
-	<TD><%=itemName%></TD>
-	<TD><%=description%></TD>
-	<TD><%=quantity%></TD>
-	</TR>
-	<%	}%>
-	</TABLE>
-	<%}%>
-	  <br>
-      <br>
+        List itemList = inventoryManager.getItems();
+        if (itemList.size() > 0) {
+
+    %>
+    <TABLE width="90%" border="0" bgcolor="cyan">
+        <TR>
+            <TD><strong>Item Number</strong></TD>
+            <TD><strong>Item Name</strong></TD>
+            <TD><strong>Description</strong></TD>
+            <TD><strong>Quantity</strong></TD>
+        </TR>
+        <%
+            for (int i = 0; i < itemList.size(); i++) {
+                List item = (List) itemList.get(i);
+
+                String itemNo = (String) item.get(0);
+                String itemName = (String) item.get(1);
+                String description = (String) item.get(2);
+                String quantity = (String) item.get(3);
+        %>
+        <TR>
+            <TD><%=itemNo%>
+            </TD>
+            <TD><%=itemName%>
+            </TD>
+            <TD><%=description%>
+            </TD>
+            <TD><%=quantity%>
+            </TD>
+        </TR>
+        <% }%>
+    </TABLE>
+    <%}%>
+    <br>
+    <br>
     <TABLE>
-      <TR>
-       <TD><A href="jsp/add.jsp">Add Items </A></TD>
-       <TD><A href="jsp/recv.jsp">Recieving</A></TD>
-       <TD><A href="jsp/issue.jsp">Issueing</A></TD>       
-      </TR>
-    </TABLE>      
-    </div>
-    <strong><br><br><br></strong>
+        <TR>
+            <TD><A href="jsp/add.jsp">Add Items </A></TD>
+            <TD><A href="jsp/recv.jsp">Recieving</A></TD>
+            <TD><A href="jsp/issue.jsp">Issueing</A></TD>
+        </TR>
+    </TABLE>
+</div>
+<strong><br><br><br></strong>
 </BODY>
 </HTML>
\ No newline at end of file

Modified: geronimo/samples/branches/2.1/samples/inventory/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/inventory/pom.xml?rev=664175&r1=664174&r2=664175&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/inventory/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/inventory/pom.xml Fri Jun  6 15:43:44 2008
@@ -21,36 +21,36 @@
 <!-- $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.1-SNAPSHOT</version>
     </parent>
-    
+
     <artifactId>inventory</artifactId>
     <name>Geronimo Samples :: inventory</name>
     <packaging>pom</packaging>
-    
+
     <description>
         Geronimo inventory sample created from an archetype.
     </description>
-    
-   <modules>
+
+    <modules>
         <module>inventory-war</module>
         <module>inventory-jetty</module>
         <module>inventory-tomcat</module>
     </modules>
 
-   <build>
+    <build>
         <plugins>
             <plugin>
                 <artifactId>maven-site-plugin</artifactId>
                 <inherited>false</inherited>
                 <configuration>
-                  <outputDirectory>${project.basedir}/docs</outputDirectory>
+                    <outputDirectory>${project.basedir}/docs</outputDirectory>
                 </configuration>
             </plugin>
         </plugins>



Mime
View raw message