geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From viol...@apache.org
Subject svn commit: r1078686 [3/6] - in /geronimo/samples/trunk: ./ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ear/src/main/resources/META-INF/ geronimo-samples-archetype/src/main/resources/archetype-resources/sample-ejb/src/main/...
Date Mon, 07 Mar 2011 05:17:15 GMT
Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Mar  7 05:17:11 2011
@@ -1,29 +1,29 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		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 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.
+        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.
 -->
 <web:web-app xmlns:app="http://geronimo.apache.org/xml/ns/j2ee/application-2.0" 
-	xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" 
-	xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" 
-	xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 
-	xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2" 
-	xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" 
-	xmlns:pers="http://java.sun.com/xml/ns/persistence" 
-	xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" 
-	xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
-	xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
+    xmlns:client="http://geronimo.apache.org/xml/ns/j2ee/application-client-2.0" 
+    xmlns:conn="http://geronimo.apache.org/xml/ns/j2ee/connector-1.2" 
+    xmlns:dep="http://geronimo.apache.org/xml/ns/deployment-1.2" 
+    xmlns:ejb="http://openejb.apache.org/xml/ns/openejb-jar-2.2" 
+    xmlns:name="http://geronimo.apache.org/xml/ns/naming-1.2" 
+    xmlns:pers="http://java.sun.com/xml/ns/persistence" 
+    xmlns:pkgen="http://openejb.apache.org/xml/ns/pkgen-2.1" 
+    xmlns:sec="http://geronimo.apache.org/xml/ns/security-2.0" 
+    xmlns:web="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
     <dep:environment>
         <dep:moduleId>
             <dep:groupId>org.apache.geronimo.samples</dep:groupId>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml Mon Mar  7 05:17:11 2011
@@ -24,12 +24,12 @@
     <!-- ========== Form Bean Definitions ================================== -->
     <form-beans>        
         <form-bean 
-        	name="OwnerForm" 
-        	type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"/>
+            name="OwnerForm" 
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"/>
         
         <form-bean
-    		name="DataCDForm"
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"/>        
+            name="DataCDForm"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"/>        
 
     </form-beans>
 
@@ -46,9 +46,9 @@
     </action>
 
     <action path="/logon" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
-    		name="OwnerForm"
-    		scope="request"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+            name="OwnerForm"
+            scope="request"
             cancellable="true"
             validate="true"            
             parameter="logon"
@@ -57,9 +57,9 @@
     </action>
     
     <action path="/register" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
-    		name="OwnerForm"
-    		scope="request"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+            name="OwnerForm"
+            scope="request"
             cancellable="true"
             validate="true"            
             parameter="register"
@@ -68,9 +68,9 @@
     </action>
     
     <action path="/updateCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+            name="DataCDForm"
+            scope="request"
             cancellable="true"
             validate="true"            
             parameter="update"
@@ -79,9 +79,9 @@
     </action>
     
     <action path="/addCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+            name="DataCDForm"
+            scope="request"
             cancellable="true"
             validate="true"            
             parameter="add"
@@ -90,9 +90,9 @@
     </action>
     
     <action path="/removeCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
+            type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+            name="DataCDForm"
+            scope="request"
             cancellable="false"
             validate="true"            
             parameter="remove">

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml Mon Mar  7 05:17:11 2011
@@ -68,9 +68,9 @@
 
         </form>
         <form name="DataCDForm">
-        	<field property="cdLabel" depends="required, maxlength" >
-        		<arg  key="datacd.cdlabel"/>
-        		<arg
+            <field property="cdLabel" depends="required, maxlength" >
+                <arg  key="datacd.cdlabel"/>
+                <arg
                         key="${var:maxlength}"
                         name="maxlength"
                         resource="false"/>
@@ -83,10 +83,10 @@
                         18
                     </var-value>
                 </var>
-        	</field>
-        	<field property="cdDescription" depends="required, maxlength" >
-        		<arg  key="datacd.cddescription"/>
-        		<arg
+            </field>
+            <field property="cdDescription" depends="required, maxlength" >
+                <arg  key="datacd.cddescription"/>
+                <arg
                         key="${var:maxlength}"
                         name="maxlength"
                         resource="false"/>
@@ -99,10 +99,10 @@
                         255
                     </var-value>
                 </var>
-        	</field>
-        	<field property="cdSize" depends="required, maxlength" >
-        		<arg  key="datacd.cdsize"/>
-        		<arg
+            </field>
+            <field property="cdSize" depends="required, maxlength" >
+                <arg  key="datacd.cdsize"/>
+                <arg
                         key="${var:maxlength}"
                         name="maxlength"
                         resource="false"/>
@@ -115,16 +115,16 @@
                         3
                     </var-value>
                 </var>
-        	</field>
-        	
-        	<field property="cdArchiveDate" depends="required,date">
-        		<arg key="datacd.cdarchivedate"/>
-        		<var>
-        			<var-name>datePattern</var-name>
-        			<var-value>yyyy-MM-dd</var-value>
-        		</var>
-    		</field>
-        	
+            </field>
+            
+            <field property="cdArchiveDate" depends="required,date">
+                <arg key="datacd.cdarchivedate"/>
+                <var>
+                    <var-name>datePattern</var-name>
+                    <var-value>yyyy-MM-dd</var-value>
+                </var>
+            </field>
+            
         </form>
 
         

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml Mon Mar  7 05:17:11 2011
@@ -1,18 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <!--
-		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 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.
+        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.
 -->
 <web-app xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns="http://java.sun.com/xml/ns/javaee" xmlns:web="http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_2_5.xsd" id="DataCDInfo" version="2.5">
   <display-name>DataCDInfo</display-name>
@@ -81,10 +81,10 @@
 <!--         <form-error-page>/auth/logonError.html</form-error-page>-->
 <!--      </form-login-config>-->
 <!--    </login-config>-->
-	<login-config>
-		<auth-method>BASIC</auth-method>
-		<realm-name>geronimo-admin</realm-name>
-	</login-config>
+    <login-config>
+        <auth-method>BASIC</auth-method>
+        <realm-name>geronimo-admin</realm-name>
+    </login-config>
 
   <security-role>
       <role-name>admin</role-name>      

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        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 language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
@@ -30,8 +30,8 @@
 <tr>
 <td align="left">
 <%
-	String[] cds = (String[])request.getAttribute("cds");
-	for (int i = 0 ; i < cds.length ; i ++) {	
+    String[] cds = (String[])request.getAttribute("cds");
+    for (int i = 0 ; i < cds.length ; i ++) {    
 %>
 <%= cds[i] %><br>
 <% } %>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        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 language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
@@ -29,10 +29,10 @@
 <tr><td></td></tr>
 <tr>
 <td align="center">
-<%	
-	String servletpath = contextpath + "/" + request.getServletPath();
-	String[] owners = (String[])request.getAttribute("owners");
-	for (int i = 0 ; i < owners.length ; i ++) {	
+<%    
+    String servletpath = contextpath + "/" + request.getServletPath();
+    String[] owners = (String[])request.getAttribute("owners");
+    for (int i = 0 ; i < owners.length ; i ++) {    
 %>
 <a href = "<%= servletpath %>?action=findpasswd&ownername=<%= owners[i] %>"><%= owners[i] %></a><br>
 <% } %>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        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 language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
@@ -30,9 +30,9 @@
 <tr>
 <td align="center">
 <%
-	String ownername = (String)request.getAttribute("ownername");
-	String passwd = (String)request.getAttribute("passwd");
-		
+    String ownername = (String)request.getAttribute("ownername");
+    String passwd = (String)request.getAttribute("passwd");
+        
 %>
 <%= ownername %>=<%= passwd %><br>
 </td>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed under the
+        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+        CONDITIONS OF ANY KIND, either express or implied. See the License for
+        the specific language governing permissions and limitations under the
+        License.
 -->
 <HTML>
 <H1>FORM Authentication</H1>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+        applicable law or agreed to in writing, software distributed under the
+        License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+        CONDITIONS OF ANY KIND, either express or implied. See the License for
+        the specific language governing permissions and limitations under the
+        License.
 -->
 <HTML>
 <head><title>Authentication Error Page</title>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		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 language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>
@@ -72,7 +72,7 @@
 
         <tr>
             <td align="right">
-            	<nested:hidden property="owner.username" value='<%= request.getParameter("ownername")%>'/>
+                <nested:hidden property="owner.username" value='<%= request.getParameter("ownername")%>'/>
                 <html:submit property="DO_SUBMIT">
                     <bean:message key="button.add"/>
                 </html:submit>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp Mon Mar  7 05:17:11 2011
@@ -1,24 +1,24 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        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.
+        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 language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
+    pageEncoding="UTF-8"%>
 <%@ page
-	import="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"%>
+    import="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"%>
 <%@ page
-	import="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"%>
+    import="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"%>
 <%@ page import="java.util.Collection"%>
 <%@ page import="java.text.SimpleDateFormat"%>
 <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean"%>
@@ -31,7 +31,7 @@
 <title>ListCDs Page</title>
 </head>
 <logic:notPresent name="owner">
-	<logic:redirect href="Logon.do"></logic:redirect>
+    <logic:redirect href="Logon.do"></logic:redirect>
 </logic:notPresent>
 <body>
 <bean:message key="general.welcome" />
@@ -42,61 +42,61 @@
 <tr>
 <td align="right">
 <a href="AddCD.do?ownername=<%=ownername%>"><bean:message
-	key="datacd.operation.add" /></a> &nbsp;<a href="Logout.do"><bean:message
-	key="datacd.operation.logout"></bean:message></a> <br />
+    key="datacd.operation.add" /></a> &nbsp;<a href="Logout.do"><bean:message
+    key="datacd.operation.logout"></bean:message></a> <br />
 </td>
 </tr>
 </table>
 <p align="right"><br />
 </p>
 <table border="1" width="80%" align="center">
-	<tr>
-		<th><bean:message key="datacd.cdlabel" /></th>
-		<th><bean:message key="datacd.cddescription" /></th>
-		<th><bean:message key="datacd.cdsize" /></th>
-		<th><bean:message key="datacd.cdarchivedate" />&nbsp;(yyyy-MM-dd)</th>
-		<th><bean:message key="datacd.operations" /></th>
-	</tr>
+    <tr>
+        <th><bean:message key="datacd.cdlabel" /></th>
+        <th><bean:message key="datacd.cddescription" /></th>
+        <th><bean:message key="datacd.cdsize" /></th>
+        <th><bean:message key="datacd.cdarchivedate" />&nbsp;(yyyy-MM-dd)</th>
+        <th><bean:message key="datacd.operations" /></th>
+    </tr>
 <%
-	OwnerForm thisowner = (OwnerForm) session.getAttribute("owner");
-	Collection<DataCDForm> datacds = thisowner.getDataCDs();
-	if (datacds != null && !datacds.isEmpty()) {	
+    OwnerForm thisowner = (OwnerForm) session.getAttribute("owner");
+    Collection<DataCDForm> datacds = thisowner.getDataCDs();
+    if (datacds != null && !datacds.isEmpty()) {    
 %>
 
-	<logic:iterate id="datacd" name="owner" collection="<%= datacds %>"
-		indexId="index">
-		<tr>
-			<bean:define id="cdLabel" name="datacd" property="cdLabel" />
-			<bean:define id="cdID" name="datacd" property="cdID" />
-			<bean:define id="cdDescription" name="datacd"
-				property="cdDescription" />
-			<bean:define id="cdSize" name="datacd" property="cdSize" />
-			<bean:define id="cdArchiveDate" name="datacd"
-				property="cdArchiveDate" />
-			<td><bean:write name="datacd" property="cdLabel" /></td>
-			<td><bean:write name="datacd" property="cdDescription" /></td>
-			<td><bean:write name="datacd" property="cdSize" /></td>
-			<td>
-			<%
-				SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
-					String date = sdf.format(cdArchiveDate);
-			%> <%=date%></td>
-			<td><a
-				href="UpdateCD.do?cdID=<%=cdID%>&amp;
-									cdLabel=<%=cdLabel%>&amp;
-									cdDescription=<%=cdDescription%>&amp;
-									cdSize=<%=cdSize%>&amp;
-									cdArchiveDate=<%=date%>">
-			<bean:message key="datacd.operation.edit" /></a>&nbsp; <a
-				href="RemoveCD.do?cdID=<%=cdID%>&amp;
-									cdLabel=<%=cdLabel%>&amp;
-									cdDescription=<%=cdDescription%>&amp;
-									cdSize=<%=cdSize%>&amp;
-									cdArchiveDate=<%=date%>">
-			<bean:message key="datacd.operation.remove" /></a></td>
-		</tr>
-	</logic:iterate>
-	<% } %>
+    <logic:iterate id="datacd" name="owner" collection="<%= datacds %>"
+        indexId="index">
+        <tr>
+            <bean:define id="cdLabel" name="datacd" property="cdLabel" />
+            <bean:define id="cdID" name="datacd" property="cdID" />
+            <bean:define id="cdDescription" name="datacd"
+                property="cdDescription" />
+            <bean:define id="cdSize" name="datacd" property="cdSize" />
+            <bean:define id="cdArchiveDate" name="datacd"
+                property="cdArchiveDate" />
+            <td><bean:write name="datacd" property="cdLabel" /></td>
+            <td><bean:write name="datacd" property="cdDescription" /></td>
+            <td><bean:write name="datacd" property="cdSize" /></td>
+            <td>
+            <%
+                SimpleDateFormat sdf = new SimpleDateFormat("yyyy-MM-dd");
+                    String date = sdf.format(cdArchiveDate);
+            %> <%=date%></td>
+            <td><a
+                href="UpdateCD.do?cdID=<%=cdID%>&amp;
+                                    cdLabel=<%=cdLabel%>&amp;
+                                    cdDescription=<%=cdDescription%>&amp;
+                                    cdSize=<%=cdSize%>&amp;
+                                    cdArchiveDate=<%=date%>">
+            <bean:message key="datacd.operation.edit" /></a>&nbsp; <a
+                href="RemoveCD.do?cdID=<%=cdID%>&amp;
+                                    cdLabel=<%=cdLabel%>&amp;
+                                    cdDescription=<%=cdDescription%>&amp;
+                                    cdSize=<%=cdSize%>&amp;
+                                    cdArchiveDate=<%=date%>">
+            <bean:message key="datacd.operation.remove" /></a></td>
+        </tr>
+    </logic:iterate>
+    <% } %>
 </table>
 </body>
 </html>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp Mon Mar  7 05:17:11 2011
@@ -63,12 +63,12 @@
             </td>
         </tr>
         <tr>
-        	<td align="right">
-        		<html:link action="Register.do"><bean:message key="general.register"/></html:link>
-        	</td>
-        	<td align="left">
-        		<html:link page="/admin/adminhome.html"><bean:message key="general.administration"/></html:link>
-        	</td>
+            <td align="right">
+                <html:link action="Register.do"><bean:message key="general.register"/></html:link>
+            </td>
+            <td align="left">
+                <html:link page="/admin/adminhome.html"><bean:message key="general.administration"/></html:link>
+            </td>
         </tr>
 
     </table>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
+        Licensed to the Apache Software Foundation (ASF) under one or more
+        contributor license agreements. See the NOTICE file distributed with
+        this work for additional information regarding copyright ownership.
+        The ASF licenses this file to you under the Apache License, Version
+        2.0 (the "License"); you may not use this file except in compliance
+        with the License. You may obtain a copy of the License at
 
-		http://www.apache.org/licenses/LICENSE-2.0 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.
+        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 language="java" contentType="text/html; charset=UTF-8"
     pageEncoding="UTF-8"%>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		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 language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
@@ -73,7 +73,7 @@
 
         <tr>
             <td align="right">
-            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+                <html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
                 <html:submit property="DO_SUBMIT">
                     <bean:message key="button.remove"/>
                 </html:submit>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp Mon Mar  7 05:17:11 2011
@@ -1,17 +1,17 @@
 <!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		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 language="java" contentType="text/html; charset=UTF-8" pageEncoding="UTF-8"%>
 <%@ taglib uri="http://struts.apache.org/tags-bean" prefix="bean" %>
@@ -70,7 +70,7 @@
 
         <tr>
             <td align="right">
-            	<html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+                <html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
                 <html:submit property="DO_SUBMIT">
                     <bean:message key="button.update"/>
                 </html:submit>

Modified: geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/DataCDInfo/pom.xml Mon Mar  7 05:17:11 2011
@@ -61,7 +61,7 @@
             <modules>
                 <module>DataCDInfo-JTA-ejb</module>                
                 <module>DataCDInfo-JTA-war</module>        
-    	        <module>DataCDInfo-JTA-ear</module>
+                <module>DataCDInfo-JTA-ear</module>
                 <module>DataCDInfo-JTA-jetty</module>
                 <module>DataCDInfo-JTA-tomcat</module>
             </modules>
@@ -78,7 +78,7 @@
             <modules>
                 <module>DataCDInfo-JTA-ejb</module>                
                 <module>DataCDInfo-JTA-war</module>        
-    	        <module>DataCDInfo-JTA-ear</module>
+                <module>DataCDInfo-JTA-ear</module>
             </modules>
         </profile>
     </profiles>

Modified: geronimo/samples/trunk/samples/javaee5/bank/bank-ear/src/main/resources/BankDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/bank/bank-ear/src/main/resources/BankDB.sql?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/bank/bank-ear/src/main/resources/BankDB.sql (original)
+++ geronimo/samples/trunk/samples/javaee5/bank/bank-ear/src/main/resources/BankDB.sql Mon Mar  7 05:17:11 2011
@@ -16,22 +16,22 @@
 
 
 CREATE TABLE Customer(
-	customerId VARCHAR(255) PRIMARY KEY,
-	name VARCHAR(255)
+    customerId VARCHAR(255) PRIMARY KEY,
+    name VARCHAR(255)
 );
 
 CREATE TABLE Account(
-	accountNumber VARCHAR(255) PRIMARY KEY,
-	accountType VARCHAR(255),
-	balance DOUBLE,
-	customerId VARCHAR(255),
-	FOREIGN KEY (customerId) REFERENCES customer
+    accountNumber VARCHAR(255) PRIMARY KEY,
+    accountType VARCHAR(255),
+    balance DOUBLE,
+    customerId VARCHAR(255),
+    FOREIGN KEY (customerId) REFERENCES customer
 );
 
 CREATE TABLE ExchangeRate(
-	rateId VARCHAR(255) PRIMARY KEY,
-	currency VARCHAR(255),
-	rate DOUBLE
+    rateId VARCHAR(255) PRIMARY KEY,
+    currency VARCHAR(255),
+    rate DOUBLE
 );
 
 INSERT INTO Customer(customerId, name) VALUES('12345','John Doe');

Modified: geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-jetty/pom.xml Mon Mar  7 05:17:11 2011
@@ -17,8 +17,8 @@
 -->
 
 <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">
+    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>
     
@@ -45,21 +45,21 @@
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-console-jetty</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-webconsole-jetty</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/csa-activemq/csa-activemq-tomcat/pom.xml Mon Mar  7 05:17:11 2011
@@ -17,8 +17,8 @@
 -->
 
 <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">
+    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>
     
@@ -45,21 +45,21 @@
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-console-tomcat</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.configs</groupId>
             <artifactId>activemq-ra</artifactId>
             <version>${geronimoVersion}</version>
             <type>car</type>
         </dependency>
 
-	<dependency>
+    <dependency>
             <groupId>org.apache.geronimo.plugins</groupId>
             <artifactId>activemq-webconsole-tomcat</artifactId>
             <version>${geronimoVersion}</version>

Modified: geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/inventory/inventory-jetty/src/main/plan/plan.xml Mon Mar  7 05:17:11 2011
@@ -20,8 +20,8 @@
 
 <!-- $Rev: 497879 $ $Date: 2007-01-19 12:11:01 -0500 (Fri, 19 Jan 2007) $ -->
 <web-app xmlns="http://geronimo.apache.org/xml/ns/j2ee/web-2.0.1">
-	
-	<context-root>${project.artifactId}</context-root>
+    
+    <context-root>${project.artifactId}</context-root>
 
     <!-- define a reference name to the db pool-->
     <resource-ref>

Modified: geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/resources/InventoryDB.sql
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/resources/InventoryDB.sql?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/resources/InventoryDB.sql (original)
+++ geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/resources/InventoryDB.sql Mon Mar  7 05:17:11 2011
@@ -14,14 +14,14 @@
 --  limitations under the License.
 
 CREATE TABLE item(
-	item_id VARCHAR(10) PRIMARY KEY,
-	item_name VARCHAR(25),
-	description VARCHAR(100)	
+    item_id VARCHAR(10) PRIMARY KEY,
+    item_name VARCHAR(25),
+    description VARCHAR(100)    
 );
 
 CREATE TABLE item_master(
-	item_id VARCHAR(10) PRIMARY KEY,
-	quantity INTEGER
+    item_id VARCHAR(10) PRIMARY KEY,
+    quantity INTEGER
 );
 
 INSERT INTO item VALUES('001', 'Item 1', 'Test Item 1');

Modified: geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/inventory/inventory-war/src/main/webapp/WEB-INF/web.xml Mon Mar  7 05:17:11 2011
@@ -20,7 +20,7 @@
 <web-app xmlns="http://java.sun.com/xml/ns/j2ee"
          xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
          xsi:schemaLocation="http://java.sun.com/xml/ns/j2ee
-	 http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
+     http://java.sun.com/xml/ns/j2ee/web-app_2_4.xsd"
          version="2.4">
 
     <welcome-file-list>

Modified: geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml (original)
+++ geronimo/samples/trunk/samples/javaee5/jms-mdb/jms-mdb-ejb/src/main/resources/META-INF/openejb-jar.xml Mon Mar  7 05:17:11 2011
@@ -21,33 +21,33 @@
 <!-- $Rev: 588772 $ $Date: 2007-10-27 04:47:34 +0800 (Sat, 27 Oct 2007) $ -->
 
 <openejb-jar 
-	xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
-	xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1" 
-	xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" 
-	xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
-	<sys:environment>
-		<sys:moduleId>			
-			<sys:groupId>${pom.groupId}</sys:groupId>
-			<sys:artifactId>${pom.artifactId}</sys:artifactId>
-			<sys:version>${version}</sys:version>
-			<sys:type>jar</sys:type>
-		</sys:moduleId>
-		<sys:dependencies>
-		<sys:dependency>
-			<sys:groupId>org.apache.geronimo.configs</sys:groupId>
-			<sys:artifactId>activemq-broker</sys:artifactId>
-			<sys:type>car</sys:type>
-		</sys:dependency>
-		</sys:dependencies>
-		<sys:hidden-classes/>
-		<sys:non-overridable-classes/>
-	</sys:environment>
-	<enterprise-beans>
-		<message-driven>
-			<ejb-name>OrderRecvMDB</ejb-name>
-			<resource-adapter>
-				<resource-link>jms-resources</resource-link>
-			</resource-adapter>
-		</message-driven>
-	</enterprise-beans>
+    xmlns="http://www.openejb.org/xml/ns/openejb-jar-2.1"
+    xmlns:naming="http://geronimo.apache.org/xml/ns/naming-1.1" 
+    xmlns:security="http://geronimo.apache.org/xml/ns/security-1.1" 
+    xmlns:sys="http://geronimo.apache.org/xml/ns/deployment-1.2">
+    <sys:environment>
+        <sys:moduleId>            
+            <sys:groupId>${pom.groupId}</sys:groupId>
+            <sys:artifactId>${pom.artifactId}</sys:artifactId>
+            <sys:version>${version}</sys:version>
+            <sys:type>jar</sys:type>
+        </sys:moduleId>
+        <sys:dependencies>
+        <sys:dependency>
+            <sys:groupId>org.apache.geronimo.configs</sys:groupId>
+            <sys:artifactId>activemq-broker</sys:artifactId>
+            <sys:type>car</sys:type>
+        </sys:dependency>
+        </sys:dependencies>
+        <sys:hidden-classes/>
+        <sys:non-overridable-classes/>
+    </sys:environment>
+    <enterprise-beans>
+        <message-driven>
+            <ejb-name>OrderRecvMDB</ejb-name>
+            <resource-adapter>
+                <resource-link>jms-resources</resource-link>
+            </resource-adapter>
+        </message-driven>
+    </enterprise-beans>
 </openejb-jar>

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/Entries.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/Entries.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/Entries.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/Entries.java Mon Mar  7 05:17:11 2011
@@ -24,8 +24,8 @@ public class Entries {
 
   private Hashtable entries;
   private static final String[] time = {"8am", "9am", "10am", "11am", "12pm", 
-					"1pm", "2pm", "3pm", "4pm", "5pm", "6pm",
-					"7pm", "8pm" };
+                    "1pm", "2pm", "3pm", "4pm", "5pm", "6pm",
+                    "7pm", "8pm" };
   public static final int rows = 12;
 
   public Entries () {   

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/JspCalendar.java Mon Mar  7 05:17:11 2011
@@ -25,127 +25,127 @@ public class JspCalendar {
     Date currentDate;
 
     public JspCalendar() {
-	calendar = Calendar.getInstance();
-	Date trialTime = new Date();
-	calendar.setTime(trialTime);
+    calendar = Calendar.getInstance();
+    Date trialTime = new Date();
+    calendar.setTime(trialTime);
     }
 
 
     public int getYear() {
-	return calendar.get(Calendar.YEAR);
+    return calendar.get(Calendar.YEAR);
     }
     
     public String getMonth() {
-	int m = getMonthInt();
-	String[] months = new String [] { "January", "February", "March",
-					"April", "May", "June",
-					"July", "August", "September",
-					"October", "November", "December" };
-	if (m > 12)
-	    return "Unknown to Man";
-	
-	return months[m - 1];
+    int m = getMonthInt();
+    String[] months = new String [] { "January", "February", "March",
+                    "April", "May", "June",
+                    "July", "August", "September",
+                    "October", "November", "December" };
+    if (m > 12)
+        return "Unknown to Man";
+    
+    return months[m - 1];
 
     }
 
     public String getDay() {
-	int x = getDayOfWeek();
-	String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday", 
-				      "Thursday", "Friday", "Saturday"};
+    int x = getDayOfWeek();
+    String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday", 
+                      "Thursday", "Friday", "Saturday"};
 
-	if (x > 7)
-	    return "Unknown to Man";
+    if (x > 7)
+        return "Unknown to Man";
 
-	return days[x - 1];
+    return days[x - 1];
 
     }
     
     public int getMonthInt() {
-	return 1 + calendar.get(Calendar.MONTH);
+    return 1 + calendar.get(Calendar.MONTH);
     }
 
     public String getDate() {
-	return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();	
+    return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();    
     }
 
     public String getCurrentDate() {
         Date dt = new Date ();
-	calendar.setTime (dt);
-	return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();
+    calendar.setTime (dt);
+    return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();
 
     }
 
     public String getNextDate() {
         calendar.set (Calendar.DAY_OF_MONTH, getDayOfMonth() + 1);
-	return getDate ();
+    return getDate ();
     }
 
     public String getPrevDate() {
         calendar.set (Calendar.DAY_OF_MONTH, getDayOfMonth() - 1);
-	return getDate ();
+    return getDate ();
     }
 
     public String getTime() {
-	return getHour() + ":" + getMinute() + ":" + getSecond();
+    return getHour() + ":" + getMinute() + ":" + getSecond();
     }
 
     public int getDayOfMonth() {
-	return calendar.get(Calendar.DAY_OF_MONTH);
+    return calendar.get(Calendar.DAY_OF_MONTH);
     }
 
     public int getDayOfYear() {
-	return calendar.get(Calendar.DAY_OF_YEAR);
+    return calendar.get(Calendar.DAY_OF_YEAR);
     }
 
     public int getWeekOfYear() {
-	return calendar.get(Calendar.WEEK_OF_YEAR);
+    return calendar.get(Calendar.WEEK_OF_YEAR);
     }
 
     public int getWeekOfMonth() {
-	return calendar.get(Calendar.WEEK_OF_MONTH);
+    return calendar.get(Calendar.WEEK_OF_MONTH);
     }
 
     public int getDayOfWeek() {
-	return calendar.get(Calendar.DAY_OF_WEEK);
+    return calendar.get(Calendar.DAY_OF_WEEK);
     }
      
     public int getHour() {
-	return calendar.get(Calendar.HOUR_OF_DAY);
+    return calendar.get(Calendar.HOUR_OF_DAY);
     }
     
     public int getMinute() {
-	return calendar.get(Calendar.MINUTE);
+    return calendar.get(Calendar.MINUTE);
     }
 
 
     public int getSecond() {
-	return calendar.get(Calendar.SECOND);
+    return calendar.get(Calendar.SECOND);
     }
 
   
     public int getEra() {
-	return calendar.get(Calendar.ERA);
+    return calendar.get(Calendar.ERA);
     }
 
     public String getUSTimeZone() {
-	String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
-				       "Mountain", "Central", "Eastern"};
-	
-	return zones[10 + getZoneOffset()];
+    String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
+                       "Mountain", "Central", "Eastern"};
+    
+    return zones[10 + getZoneOffset()];
     }
 
     public int getZoneOffset() {
-	return calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000);
+    return calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000);
     }
 
 
     public int getDSTOffset() {
-	return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
+    return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
     }
 
     
     public int getAMPM() {
-	return calendar.get(Calendar.AM_PM);
+    return calendar.get(Calendar.AM_PM);
     }
 }
 

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/TableBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/TableBean.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/TableBean.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/cal/TableBean.java Mon Mar  7 05:17:11 2011
@@ -68,7 +68,7 @@ public class TableBean {
     if (name == null || name.equals("")) setName(request.getParameter ("name"));  
     if (email == null || email.equals("")) setEmail(request.getParameter ("email"));
     if (name == null || email == null ||
-		name.equals("") || email.equals("")) {
+        name.equals("") || email.equals("")) {
       this.processError = true;
       return;
     }
@@ -86,7 +86,7 @@ public class TableBean {
     }
 
     // If time is provided add the event.
-	String time = request.getParameter("time");
+    String time = request.getParameter("time");
     if (time != null) entries.processRequest (request, time);
   }
 

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/checkbox/CheckTest.java Mon Mar  7 05:17:11 2011
@@ -22,10 +22,10 @@ public class CheckTest {
     String b[] = new String[] { "1", "2", "3", "4" };
 
     public String[] getFruit() {
-	return b;
+    return b;
     }
 
     public void setFruit(String [] b) {
-	this.b = b;
+    this.b = b;
     }
 }

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/colors/ColorGameBean.java Mon Mar  7 05:17:11 2011
@@ -26,90 +26,90 @@ public class ColorGameBean {
     private String color2 = background;
     private String hint = "no";
     private int attempts = 0;
-	private int intval = 0;
+    private int intval = 0;
     private boolean tookHints = false;
 
     public void processRequest(HttpServletRequest request) {
 
-	// background = "yellow";
-	// foreground = "red";
+    // background = "yellow";
+    // foreground = "red";
 
-	if (! color1.equals(foreground)) {
-	    if (color1.equalsIgnoreCase("black") ||
-			color1.equalsIgnoreCase("cyan")) {
-			background = color1;
-		}
-	}
-
-	if (! color2.equals(background)) {
-	    if (color2.equalsIgnoreCase("black") ||
-			color2.equalsIgnoreCase("cyan")) {
-			foreground = color2;
-	    }
-	}
+    if (! color1.equals(foreground)) {
+        if (color1.equalsIgnoreCase("black") ||
+            color1.equalsIgnoreCase("cyan")) {
+            background = color1;
+        }
+    }
+
+    if (! color2.equals(background)) {
+        if (color2.equalsIgnoreCase("black") ||
+            color2.equalsIgnoreCase("cyan")) {
+            foreground = color2;
+        }
+    }
 
-	attempts++;
+    attempts++;
     }
 
     public void setColor2(String x) {
-	color2 = x;
+    color2 = x;
     }
 
     public void setColor1(String x) {
-	color1 = x;
+    color1 = x;
     }
 
     public void setAction(String x) {
-	if (!tookHints)
-	    tookHints = x.equalsIgnoreCase("Hint");
-	hint = x;
+    if (!tookHints)
+        tookHints = x.equalsIgnoreCase("Hint");
+    hint = x;
     }
 
     public String getColor2() {
-	 return background;
+     return background;
     }
 
     public String getColor1() {
-	 return foreground;
+     return foreground;
     }
 
     public int getAttempts() {
-	return attempts;
+    return attempts;
     }
 
     public boolean getHint() {
-	return hint.equalsIgnoreCase("Hint");
+    return hint.equalsIgnoreCase("Hint");
     }
 
     public boolean getSuccess() {
-	if (background.equalsIgnoreCase("black") ||
-	    background.equalsIgnoreCase("cyan")) {
-	
-	    if (foreground.equalsIgnoreCase("black") ||
-		foreground.equalsIgnoreCase("cyan"))
-		return true;
-	    else
-		return false;
-	}
+    if (background.equalsIgnoreCase("black") ||
+        background.equalsIgnoreCase("cyan")) {
+    
+        if (foreground.equalsIgnoreCase("black") ||
+        foreground.equalsIgnoreCase("cyan"))
+        return true;
+        else
+        return false;
+    }
 
-	return false;
+    return false;
     }
 
     public boolean getHintTaken() {
-	return tookHints;
+    return tookHints;
     }
 
     public void reset() {
-	foreground = "red";
-	background = "yellow";
+    foreground = "red";
+    background = "yellow";
     }
 
     public void setIntval(int value) {
-	intval = value;
-	}
+    intval = value;
+    }
 
     public int getIntval() {
-	return intval;
-	}
+    return intval;
+    }
 }
 

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/dates/JspCalendar.java Mon Mar  7 05:17:11 2011
@@ -23,131 +23,131 @@ public class JspCalendar {
     Calendar  calendar = null;
 
     public JspCalendar() {
-	calendar = Calendar.getInstance();
-	Date trialTime = new Date();
-	calendar.setTime(trialTime);
+    calendar = Calendar.getInstance();
+    Date trialTime = new Date();
+    calendar.setTime(trialTime);
     }
 
     public int getYear() {
-	return calendar.get(Calendar.YEAR);
+    return calendar.get(Calendar.YEAR);
     }
     
     public String getMonth() {
-	int m = getMonthInt();
-	String[] months = new String [] { "January", "February", "March",
-					"April", "May", "June",
-					"July", "August", "September",
-					"October", "November", "December" };
-	if (m > 12)
-	    return "Unknown to Man";
-	
-	return months[m - 1];
+    int m = getMonthInt();
+    String[] months = new String [] { "January", "February", "March",
+                    "April", "May", "June",
+                    "July", "August", "September",
+                    "October", "November", "December" };
+    if (m > 12)
+        return "Unknown to Man";
+    
+    return months[m - 1];
 
     }
 
     public String getDay() {
-	int x = getDayOfWeek();
-	String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday", 
-				      "Thursday", "Friday", "Saturday"};
+    int x = getDayOfWeek();
+    String[] days = new String[] {"Sunday", "Monday", "Tuesday", "Wednesday", 
+                      "Thursday", "Friday", "Saturday"};
 
-	if (x > 7)
-	    return "Unknown to Man";
+    if (x > 7)
+        return "Unknown to Man";
 
-	return days[x - 1];
+    return days[x - 1];
 
     }
     
     public int getMonthInt() {
-	return 1 + calendar.get(Calendar.MONTH);
+    return 1 + calendar.get(Calendar.MONTH);
     }
 
     public String getDate() {
-	return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();
+    return getMonthInt() + "/" + getDayOfMonth() + "/" +  getYear();
 
     }
 
     public String getTime() {
-	return getHour() + ":" + getMinute() + ":" + getSecond();
+    return getHour() + ":" + getMinute() + ":" + getSecond();
     }
 
     public int getDayOfMonth() {
-	return calendar.get(Calendar.DAY_OF_MONTH);
+    return calendar.get(Calendar.DAY_OF_MONTH);
     }
 
     public int getDayOfYear() {
-	return calendar.get(Calendar.DAY_OF_YEAR);
+    return calendar.get(Calendar.DAY_OF_YEAR);
     }
 
     public int getWeekOfYear() {
-	return calendar.get(Calendar.WEEK_OF_YEAR);
+    return calendar.get(Calendar.WEEK_OF_YEAR);
     }
 
     public int getWeekOfMonth() {
-	return calendar.get(Calendar.WEEK_OF_MONTH);
+    return calendar.get(Calendar.WEEK_OF_MONTH);
     }
 
     public int getDayOfWeek() {
-	return calendar.get(Calendar.DAY_OF_WEEK);
+    return calendar.get(Calendar.DAY_OF_WEEK);
     }
      
     public int getHour() {
-	return calendar.get(Calendar.HOUR_OF_DAY);
+    return calendar.get(Calendar.HOUR_OF_DAY);
     }
     
     public int getMinute() {
-	return calendar.get(Calendar.MINUTE);
+    return calendar.get(Calendar.MINUTE);
     }
 
 
     public int getSecond() {
-	return calendar.get(Calendar.SECOND);
+    return calendar.get(Calendar.SECOND);
     }
 
     public static void main(String args[]) {
-	JspCalendar db = new JspCalendar();
-	p("date: " + db.getDayOfMonth());
-	p("year: " + db.getYear());
-	p("month: " + db.getMonth());
-	p("time: " + db.getTime());
-	p("date: " + db.getDate());
-	p("Day: " + db.getDay());
-	p("DayOfYear: " + db.getDayOfYear());
-	p("WeekOfYear: " + db.getWeekOfYear());
-	p("era: " + db.getEra());
-	p("ampm: " + db.getAMPM());
-	p("DST: " + db.getDSTOffset());
-	p("ZONE Offset: " + db.getZoneOffset());
-	p("TIMEZONE: " + db.getUSTimeZone());
+    JspCalendar db = new JspCalendar();
+    p("date: " + db.getDayOfMonth());
+    p("year: " + db.getYear());
+    p("month: " + db.getMonth());
+    p("time: " + db.getTime());
+    p("date: " + db.getDate());
+    p("Day: " + db.getDay());
+    p("DayOfYear: " + db.getDayOfYear());
+    p("WeekOfYear: " + db.getWeekOfYear());
+    p("era: " + db.getEra());
+    p("ampm: " + db.getAMPM());
+    p("DST: " + db.getDSTOffset());
+    p("ZONE Offset: " + db.getZoneOffset());
+    p("TIMEZONE: " + db.getUSTimeZone());
     }
 
     private static void p(String x) {
-	System.out.println(x);
+    System.out.println(x);
     }
 
 
     public int getEra() {
-	return calendar.get(Calendar.ERA);
+    return calendar.get(Calendar.ERA);
     }
 
     public String getUSTimeZone() {
-	String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
-				       "Mountain", "Central", "Eastern"};
-	
-	return zones[10 + getZoneOffset()];
+    String[] zones = new String[] {"Hawaii", "Alaskan", "Pacific",
+                       "Mountain", "Central", "Eastern"};
+    
+    return zones[10 + getZoneOffset()];
     }
 
     public int getZoneOffset() {
-	return calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000);
+    return calendar.get(Calendar.ZONE_OFFSET)/(60*60*1000);
     }
 
 
     public int getDSTOffset() {
-	return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
+    return calendar.get(Calendar.DST_OFFSET)/(60*60*1000);
     }
 
     
     public int getAMPM() {
-	return calendar.get(Calendar.AM_PM);
+    return calendar.get(Calendar.AM_PM);
     }
 }
 

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/error/Smart.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/error/Smart.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/error/Smart.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/error/Smart.java Mon Mar  7 05:17:11 2011
@@ -26,10 +26,10 @@ public class Smart {
   String name = "JSP";
 
   public String getName () {
-	return name;
-  }	
+    return name;
+  }    
 
   public void setName (String name) {
-	this.name = name;
-  }	
+    this.name = name;
+  }    
 }

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/FooTag.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/FooTag.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/FooTag.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/FooTag.java Mon Mar  7 05:17:11 2011
@@ -58,7 +58,7 @@ public class FooTag 
      */
     public int doStartTag() throws JspException {
         i = 0;
-	return EVAL_BODY_TAG;
+    return EVAL_BODY_TAG;
     }
 
     public void doInitBody() throws JspException {

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/ShowSource.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/ShowSource.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/ShowSource.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/examples/ShowSource.java Mon Mar  7 05:17:11 2011
@@ -36,10 +36,10 @@ public class ShowSource
     }
 
     public int doEndTag() throws JspException {
-	if ((jspFile.indexOf( ".." ) >= 0) ||
+    if ((jspFile.indexOf( ".." ) >= 0) ||
             (jspFile.toUpperCase().indexOf("/WEB-INF/") != 0) ||
             (jspFile.toUpperCase().indexOf("/META-INF/") != 0))
-	    throw new JspTagException("Invalid JSP file " + jspFile);
+        throw new JspTagException("Invalid JSP file " + jspFile);
 
         InputStream in
             = pageContext.getServletContext().getResourceAsStream(jspFile);
@@ -48,7 +48,7 @@ public class ShowSource
             throw new JspTagException("Unable to find JSP file: "+jspFile);
 
         InputStreamReader reader = new InputStreamReader(in);
-	JspWriter out = pageContext.getOut();
+    JspWriter out = pageContext.getOut();
 
 
         try {

Modified: geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java?rev=1078686&r1=1078685&r2=1078686&view=diff
==============================================================================
--- geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java (original)
+++ geronimo/samples/trunk/samples/javaee5/jsp-examples/jsp-examples-war/src/main/webapp/WEB-INF/classes/filters/ExampleFilter.java Mon Mar  7 05:17:11 2011
@@ -92,19 +92,19 @@ public final class ExampleFilter impleme
      */
     public void doFilter(ServletRequest request, ServletResponse response,
                          FilterChain chain)
-	throws IOException, ServletException {
+    throws IOException, ServletException {
 
-	// Store ourselves as a request attribute (if requested)
-	if (attribute != null)
-	    request.setAttribute(attribute, this);
+    // Store ourselves as a request attribute (if requested)
+    if (attribute != null)
+        request.setAttribute(attribute, this);
 
-	// Time and log the subsequent processing
-	long startTime = System.currentTimeMillis();
+    // Time and log the subsequent processing
+    long startTime = System.currentTimeMillis();
         chain.doFilter(request, response);
-	long stopTime = System.currentTimeMillis();
-	filterConfig.getServletContext().log
-	    (this.toString() + ": " + (stopTime - startTime) +
-	     " milliseconds");
+    long stopTime = System.currentTimeMillis();
+    filterConfig.getServletContext().log
+        (this.toString() + ": " + (stopTime - startTime) +
+         " milliseconds");
 
     }
 
@@ -116,7 +116,7 @@ public final class ExampleFilter impleme
      */
     public void init(FilterConfig filterConfig) throws ServletException {
 
-	this.filterConfig = filterConfig;
+    this.filterConfig = filterConfig;
         this.attribute = filterConfig.getInitParameter("attribute");
 
     }
@@ -127,12 +127,12 @@ public final class ExampleFilter impleme
      */
     public String toString() {
 
-	if (filterConfig == null)
-	    return ("InvokerFilter()");
-	StringBuffer sb = new StringBuffer("InvokerFilter(");
-	sb.append(filterConfig);
-	sb.append(")");
-	return (sb.toString());
+    if (filterConfig == null)
+        return ("InvokerFilter()");
+    StringBuffer sb = new StringBuffer("InvokerFilter(");
+    sb.append(filterConfig);
+    sb.append(")");
+    return (sb.toString());
 
     }
 



Mime
View raw message