geronimo-scm mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From xiam...@apache.org
Subject svn commit: r957816 [8/12] - in /geronimo/samples/branches/3.0-M1: ./ samples/ samples/all-samples/all-samples-jetty/ samples/all-samples/all-samples-tomcat/ samples/daytrader/ samples/daytrader/assemblies/ samples/daytrader/assemblies/javaee/ samples/...
Date Fri, 25 Jun 2010 06:33:49 GMT
Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml Fri Jun 25 06:33:41 2010
@@ -1,117 +1,117 @@
-<?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
-   
-         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.
--->
-<!DOCTYPE struts-config PUBLIC
-          "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
-          "http://struts.apache.org/dtds/struts-config_1_3.dtd">
-
-<struts-config>
-
-    <!-- ========== Form Bean Definitions ================================== -->
-    <form-beans>        
-        <form-bean 
-        	name="OwnerForm" 
-        	type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"/>
-        
-        <form-bean
-    		name="DataCDForm"
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"/>        
-
-    </form-beans>
-
-    <!-- ========== Global Forward Definitions ============================= -->
-
-    <global-forwards>
-        <forward name="home" path="/ListCDs.do"/>
-    </global-forwards>
-
-    <!-- ========== Action Mapping Definitions ============================= -->
-    <action-mappings>
-    
-    <action  path="/*" forward="/view/jsp/{1}.jsp">
-    </action>
-
-    <action path="/logon" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
-    		name="OwnerForm"
-    		scope="request"
-            cancellable="true"
-            validate="true"            
-            parameter="logon"
-            input="/Logon.do">
-        <forward name="success" path="/ListCDs.do" redirect="true"/>        
-    </action>
-    
-    <action path="/register" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
-    		name="OwnerForm"
-    		scope="request"
-            cancellable="true"
-            validate="true"            
-            parameter="register"
-            input="/Register.do">
-        <forward name="success" path="/ListCDs.do" redirect="true"/>        
-    </action>
-    
-    <action path="/updateCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
-            cancellable="true"
-            validate="true"            
-            parameter="update"
-            input="/UpdateCD.do">
-        <forward name="success" path="/ListCDs.do" redirect="true"/>        
-    </action>
-    
-    <action path="/addCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
-            cancellable="true"
-            validate="true"            
-            parameter="add"
-            input="/AddCD.do">
-        <forward name="success" path="/ListCDs.do" redirect="true"/>        
-    </action>
-    
-    <action path="/removeCD" 
-    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
-    		name="DataCDForm"
-    		scope="request"
-            cancellable="false"
-            validate="true"            
-            parameter="remove">
-        <forward name="success" path="/ListCDs.do" redirect="true"/>        
-    </action>
-
-        
-
-    </action-mappings>
-
-    <!-- ========== Message Resources Definitions =========================== -->
-
-    <message-resources parameter="DataCDInfoResources" />
-
-    <!-- ========== Plug Ins Configuration ================================== -->
-    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
-        <set-property property="pathnames"
-                      value="/org/apache/struts/validator/validator-rules.xml,
-                             /WEB-INF/validation.xml" />
-    </plug-in>
-
-</struts-config>
+<?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
+   
+         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.
+-->
+<!DOCTYPE struts-config PUBLIC
+          "-//Apache Software Foundation//DTD Struts Configuration 1.3//EN"
+          "http://struts.apache.org/dtds/struts-config_1_3.dtd">
+
+<struts-config>
+
+    <!-- ========== Form Bean Definitions ================================== -->
+    <form-beans>        
+        <form-bean 
+        	name="OwnerForm" 
+        	type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerForm"/>
+        
+        <form-bean
+    		name="DataCDForm"
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"/>        
+
+    </form-beans>
+
+    <!-- ========== Global Forward Definitions ============================= -->
+
+    <global-forwards>
+        <forward name="home" path="/ListCDs.do"/>
+    </global-forwards>
+
+    <!-- ========== Action Mapping Definitions ============================= -->
+    <action-mappings>
+    
+    <action  path="/*" forward="/view/jsp/{1}.jsp">
+    </action>
+
+    <action path="/logon" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+    		name="OwnerForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="logon"
+            input="/Logon.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/register" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.OwnerActions"
+    		name="OwnerForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="register"
+            input="/Register.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/updateCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="update"
+            input="/UpdateCD.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/addCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="true"
+            validate="true"            
+            parameter="add"
+            input="/AddCD.do">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+    
+    <action path="/removeCD" 
+    		type="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDActions"
+    		name="DataCDForm"
+    		scope="request"
+            cancellable="false"
+            validate="true"            
+            parameter="remove">
+        <forward name="success" path="/ListCDs.do" redirect="true"/>        
+    </action>
+
+        
+
+    </action-mappings>
+
+    <!-- ========== Message Resources Definitions =========================== -->
+
+    <message-resources parameter="DataCDInfoResources" />
+
+    <!-- ========== Plug Ins Configuration ================================== -->
+    <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames"
+                      value="/org/apache/struts/validator/validator-rules.xml,
+                             /WEB-INF/validation.xml" />
+    </plug-in>
+
+</struts-config>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml Fri Jun 25 06:33:41 2010
@@ -1,132 +1,132 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-<!--
-    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.
--->
-<!DOCTYPE form-validation PUBLIC
-        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
-        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
-
-<form-validation>
-
-    <!-- ==== Default Language Form Definitions ==== -->
-    <formset>
-        <form
-                name="OwnerForm">
-
-            <field
-                    property="username"
-                    depends="required">
-                <arg
-                        key="prompt.username"/>
-            </field>
-
-            <field
-                    property="password"
-                    depends="required, minlength,maxlength">
-                <arg
-                        key="prompt.password"/>
-                <arg
-                        key="${var:minlength}"
-                        name="minlength"
-                        resource="false"/>
-                <arg
-                        key="${var:maxlength}"
-                        name="maxlength"
-                        resource="false"/>
-
-                <var>
-                    <var-name>
-                        maxlength
-                    </var-name>
-                    <var-value>
-                        16
-                    </var-value>
-                </var>
-                <var>
-                    <var-name>
-                        minlength
-                    </var-name>
-                    <var-value>
-                        6
-                    </var-value>
-                </var>
-            </field>    
-            
-
-        </form>
-        <form name="DataCDForm">
-        	<field property="cdLabel" depends="required, maxlength" >
-        		<arg  key="datacd.cdlabel"/>
-        		<arg
-                        key="${var:maxlength}"
-                        name="maxlength"
-                        resource="false"/>
-
-                <var>
-                    <var-name>
-                        maxlength
-                    </var-name>
-                    <var-value>
-                        18
-                    </var-value>
-                </var>
-        	</field>
-        	<field property="cdDescription" depends="required, maxlength" >
-        		<arg  key="datacd.cddescription"/>
-        		<arg
-                        key="${var:maxlength}"
-                        name="maxlength"
-                        resource="false"/>
-
-                <var>
-                    <var-name>
-                        maxlength
-                    </var-name>
-                    <var-value>
-                        255
-                    </var-value>
-                </var>
-        	</field>
-        	<field property="cdSize" depends="required, maxlength" >
-        		<arg  key="datacd.cdsize"/>
-        		<arg
-                        key="${var:maxlength}"
-                        name="maxlength"
-                        resource="false"/>
-
-                <var>
-                    <var-name>
-                        maxlength
-                    </var-name>
-                    <var-value>
-                        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>
-        	
-        </form>
-
-        
-    </formset>
-</form-validation>
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+<!--
+    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.
+-->
+<!DOCTYPE form-validation PUBLIC
+        "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.3.0//EN"
+        "http://jakarta.apache.org/commons/dtds/validator_1_3_0.dtd">
+
+<form-validation>
+
+    <!-- ==== Default Language Form Definitions ==== -->
+    <formset>
+        <form
+                name="OwnerForm">
+
+            <field
+                    property="username"
+                    depends="required">
+                <arg
+                        key="prompt.username"/>
+            </field>
+
+            <field
+                    property="password"
+                    depends="required, minlength,maxlength">
+                <arg
+                        key="prompt.password"/>
+                <arg
+                        key="${var:minlength}"
+                        name="minlength"
+                        resource="false"/>
+                <arg
+                        key="${var:maxlength}"
+                        name="maxlength"
+                        resource="false"/>
+
+                <var>
+                    <var-name>
+                        maxlength
+                    </var-name>
+                    <var-value>
+                        16
+                    </var-value>
+                </var>
+                <var>
+                    <var-name>
+                        minlength
+                    </var-name>
+                    <var-value>
+                        6
+                    </var-value>
+                </var>
+            </field>    
+            
+
+        </form>
+        <form name="DataCDForm">
+        	<field property="cdLabel" depends="required, maxlength" >
+        		<arg  key="datacd.cdlabel"/>
+        		<arg
+                        key="${var:maxlength}"
+                        name="maxlength"
+                        resource="false"/>
+
+                <var>
+                    <var-name>
+                        maxlength
+                    </var-name>
+                    <var-value>
+                        18
+                    </var-value>
+                </var>
+        	</field>
+        	<field property="cdDescription" depends="required, maxlength" >
+        		<arg  key="datacd.cddescription"/>
+        		<arg
+                        key="${var:maxlength}"
+                        name="maxlength"
+                        resource="false"/>
+
+                <var>
+                    <var-name>
+                        maxlength
+                    </var-name>
+                    <var-value>
+                        255
+                    </var-value>
+                </var>
+        	</field>
+        	<field property="cdSize" depends="required, maxlength" >
+        		<arg  key="datacd.cdsize"/>
+        		<arg
+                        key="${var:maxlength}"
+                        name="maxlength"
+                        resource="false"/>
+
+                <var>
+                    <var-name>
+                        maxlength
+                    </var-name>
+                    <var-value>
+                        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>
+        	
+        </form>
+
+        
+    </formset>
+</form-validation>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml Fri Jun 25 06:33:41 2010
@@ -1,96 +1,96 @@
-<?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
-
-		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>
-  <welcome-file-list>
-    <welcome-file>index.html</welcome-file>
-    <welcome-file>index.jsp</welcome-file>
-  </welcome-file-list>
-  <listener>
-    <listener-class>org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDInfoContextListener</listener-class>
-  </listener>
-  <servlet>
-    <servlet-name>action</servlet-name>
-    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
-    <init-param>
-      <param-name>config</param-name>
-      <param-value>
-          /WEB-INF/struts-config.xml          
-       </param-value>
-    </init-param>
-    <load-on-startup>1</load-on-startup>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>action</servlet-name>
-    <url-pattern>*.do</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>ListOwnerServlet</display-name>
-    <servlet-name>ListOwnerServlet</servlet-name>
-    <servlet-class>org.apache.geronimo.samples.datacdinfo.web.ListOwnerServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>ListOwnerServlet</servlet-name>
-    <url-pattern>/admin/ListOwners</url-pattern>
-  </servlet-mapping>
-  <servlet>
-    <description></description>
-    <display-name>DataCDInfoAdminServlet</display-name>
-    <servlet-name>DataCDInfoAdminServlet</servlet-name>
-    <servlet-class>org.apache.geronimo.samples.datacdinfo.web.DataCDInfoAdminServlet</servlet-class>
-  </servlet>
-  <servlet-mapping>
-    <servlet-name>DataCDInfoAdminServlet</servlet-name>
-    <url-pattern>/admin/adminServlet</url-pattern>
-  </servlet-mapping>
-  
-  <security-constraint>
-      <web-resource-collection>
-        <web-resource-name>DataCDInfo Administration Resources</web-resource-name>
-        <url-pattern>/admin/*</url-pattern>
-        <http-method>GET</http-method>
-        <http-method>POST</http-method>
-        <http-method>PUT</http-method>        
-      </web-resource-collection>
-      <auth-constraint>
-        <role-name>admin</role-name>
-        <role-name>superadmin</role-name>
-      </auth-constraint>
-    </security-constraint>    
-
-<!--    <login-config>-->
-<!--      <auth-method>FORM</auth-method>-->
-<!--      <realm-name>geronimo-admin</realm-name>-->
-<!--      <form-login-config>-->
-<!--         <form-login-page>/auth/logon.html</form-login-page>-->
-<!--         <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>
-
-  <security-role>
-      <role-name>admin</role-name>      
-  </security-role>
-  
-  <security-role>      
-      <role-name>superadmin</role-name>
-  </security-role>
-</web-app>
+<?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
+
+		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>
+  <welcome-file-list>
+    <welcome-file>index.html</welcome-file>
+    <welcome-file>index.jsp</welcome-file>
+  </welcome-file-list>
+  <listener>
+    <listener-class>org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDInfoContextListener</listener-class>
+  </listener>
+  <servlet>
+    <servlet-name>action</servlet-name>
+    <servlet-class>org.apache.struts.action.ActionServlet</servlet-class>
+    <init-param>
+      <param-name>config</param-name>
+      <param-value>
+          /WEB-INF/struts-config.xml          
+       </param-value>
+    </init-param>
+    <load-on-startup>1</load-on-startup>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>action</servlet-name>
+    <url-pattern>*.do</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <description></description>
+    <display-name>ListOwnerServlet</display-name>
+    <servlet-name>ListOwnerServlet</servlet-name>
+    <servlet-class>org.apache.geronimo.samples.datacdinfo.web.ListOwnerServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>ListOwnerServlet</servlet-name>
+    <url-pattern>/admin/ListOwners</url-pattern>
+  </servlet-mapping>
+  <servlet>
+    <description></description>
+    <display-name>DataCDInfoAdminServlet</display-name>
+    <servlet-name>DataCDInfoAdminServlet</servlet-name>
+    <servlet-class>org.apache.geronimo.samples.datacdinfo.web.DataCDInfoAdminServlet</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DataCDInfoAdminServlet</servlet-name>
+    <url-pattern>/admin/adminServlet</url-pattern>
+  </servlet-mapping>
+  
+  <security-constraint>
+      <web-resource-collection>
+        <web-resource-name>DataCDInfo Administration Resources</web-resource-name>
+        <url-pattern>/admin/*</url-pattern>
+        <http-method>GET</http-method>
+        <http-method>POST</http-method>
+        <http-method>PUT</http-method>        
+      </web-resource-collection>
+      <auth-constraint>
+        <role-name>admin</role-name>
+        <role-name>superadmin</role-name>
+      </auth-constraint>
+    </security-constraint>    
+
+<!--    <login-config>-->
+<!--      <auth-method>FORM</auth-method>-->
+<!--      <realm-name>geronimo-admin</realm-name>-->
+<!--      <form-login-config>-->
+<!--         <form-login-page>/auth/logon.html</form-login-page>-->
+<!--         <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>
+
+  <security-role>
+      <role-name>admin</role-name>      
+  </security-role>
+  
+  <security-role>      
+      <role-name>superadmin</role-name>
+  </security-role>
+</web-app>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html Fri Jun 25 06:33:41 2010
@@ -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
-
-      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.
--->
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>DataCDInfo Administration Home Page</title>
-</head>
-<body>
-<table border="0" width="80%" align="center">
-<tr><td align="right"><a href="../view/jsp/Logon.jsp">DataCDInfo Home Page</a></td></tr>
-<tr><td></td></tr>
-<tr><td></td></tr>
-<tr>
-<td align="center"><a href="adminServlet?action=listOwners">List Owners</a></td>
-</tr>
-<tr>
-<td align="center"><a href="adminServlet?action=listCDs">List CDs</a></td>
-</tr>
-</table>
-</body>
-</html>
+<!--
+   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.
+-->
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>DataCDInfo Administration Home Page</title>
+</head>
+<body>
+<table border="0" width="80%" align="center">
+<tr><td align="right"><a href="../view/jsp/Logon.jsp">DataCDInfo Home Page</a></td></tr>
+<tr><td></td></tr>
+<tr><td></td></tr>
+<tr>
+<td align="center"><a href="adminServlet?action=listOwners">List Owners</a></td>
+</tr>
+<tr>
+<td align="center"><a href="adminServlet?action=listCDs">List CDs</a></td>
+</tr>
+</table>
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp Fri Jun 25 06:33:41 2010
@@ -1,45 +1,45 @@
-<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-    pageEncoding="UTF-8"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Show CDs Page</title>
-</head>
-<body>
-<% String contextpath = request.getContextPath(); %>
-<table border="0" width="80%" align="center">
-<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
-<tr><td></td></tr>
-<tr><td></td></tr>
-<tr>
-<td align="left">
-<%
-	String[] cds = (String[])request.getAttribute("cds");
-	for (int i = 0 ; i < cds.length ; i ++) {	
-%>
-<%= cds[i] %><br>
-<% } %>
-</td>
-</tr>
-<tr>
-<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
-</tr>
-</table>
-</body>
-</html>
+<!--
+		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"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Show CDs Page</title>
+</head>
+<body>
+<% String contextpath = request.getContextPath(); %>
+<table border="0" width="80%" align="center">
+<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
+<tr><td></td></tr>
+<tr><td></td></tr>
+<tr>
+<td align="left">
+<%
+	String[] cds = (String[])request.getAttribute("cds");
+	for (int i = 0 ; i < cds.length ; i ++) {	
+%>
+<%= cds[i] %><br>
+<% } %>
+</td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp Fri Jun 25 06:33:41 2010
@@ -1,49 +1,49 @@
-<!--
-		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"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Show Owners Page</title>
-</head>
-<body>
-<% String contextpath = request.getContextPath(); %>
-<table border="0" width="80%" align="center">
-<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
-<tr><td></td></tr>
-<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 ++) {	
-%>
-<a href = "<%= servletpath %>?action=findpasswd&ownername=<%= owners[i] %>"><%= owners[i] %></a><br>
-<% } %>
-</td>
-</tr>
-<tr>
-<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-</tr>
-<tr>
-<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
-</tr>
-</table>
-</body>
-</html>
+<!--
+		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"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Show Owners Page</title>
+</head>
+<body>
+<% String contextpath = request.getContextPath(); %>
+<table border="0" width="80%" align="center">
+<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
+<tr><td></td></tr>
+<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 ++) {	
+%>
+<a href = "<%= servletpath %>?action=findpasswd&ownername=<%= owners[i] %>"><%= owners[i] %></a><br>
+<% } %>
+</td>
+</tr>
+<tr>
+<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp Fri Jun 25 06:33:41 2010
@@ -1,48 +1,48 @@
-<!--
-		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"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Show Password Page</title>
-</head>
-<body>
-<% String contextpath = request.getContextPath(); %>
-<table border="0" width="80%" align="center">
-<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
-<tr><td></td></tr>
-<tr><td></td></tr>
-<tr>
-<td align="center">
-<%
-	String ownername = (String)request.getAttribute("ownername");
-	String passwd = (String)request.getAttribute("passwd");
-		
-%>
-<%= ownername %>=<%= passwd %><br>
-</td>
-</tr>
-<tr>
-<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
-</tr>
-<tr>
-<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
-</tr>
-</table>
-</body>
-</html>
+<!--
+		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"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Show Password Page</title>
+</head>
+<body>
+<% String contextpath = request.getContextPath(); %>
+<table border="0" width="80%" align="center">
+<tr><td align="right"><a href="<%= contextpath %>/view/jsp/Logon.jsp">DataCDInfo Home</a><br></br></td></tr>
+<tr><td></td></tr>
+<tr><td></td></tr>
+<tr>
+<td align="center">
+<%
+	String ownername = (String)request.getAttribute("ownername");
+	String passwd = (String)request.getAttribute("passwd");
+		
+%>
+<%= ownername %>=<%= passwd %><br>
+</td>
+</tr>
+<tr>
+<td>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html Fri Jun 25 06:33:41 2010
@@ -1,35 +1,35 @@
-<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
--->
-<HTML>
-<H1>FORM Authentication</H1>
-<form method="POST" action="j_security_check">
-<table border="0" cellspacing="2" cellpadding="1">
-<tr>
-  <td>Username:</td>
-  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
-</tr>
-<tr>
-  <td>Password:</td>
-  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
-</tr>
-<tr>
-  <td colspan="2" align="center">
-    <input name="submit" type="submit" value="Login">
-  </td>
-</tr>
-</table>
-</form>
-</HTML>
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<HTML>
+<H1>FORM Authentication</H1>
+<form method="POST" action="j_security_check">
+<table border="0" cellspacing="2" cellpadding="1">
+<tr>
+  <td>Username:</td>
+  <td><input size="12" value="" name="j_username" maxlength="25" type="text"></td>
+</tr>
+<tr>
+  <td>Password:</td>
+  <td><input size="12" value="" name="j_password" maxlength="25" type="password"></td>
+</tr>
+<tr>
+  <td colspan="2" align="center">
+    <input name="submit" type="submit" value="Login">
+  </td>
+</tr>
+</table>
+</form>
+</HTML>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html Fri Jun 25 06:33:41 2010
@@ -1,23 +1,23 @@
-<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
--->
-<HTML>
-<head><title>Authentication Error Page</title>
-</head>
-<body>
-<H1>Authentication ERROR</H1>
-<h3>Username, password or role incorrect.</h3>
-</body>
-</HTML>
+<!--
+		Licensed to the Apache Software Foundation (ASF) under one or more
+		contributor license agreements. See the NOTICE file distributed with
+		this work for additional information regarding copyright ownership.
+		The ASF licenses this file to you under the Apache License, Version
+		2.0 (the "License"); you may not use this file except in compliance
+		with the License. You may obtain a copy of the License at
+
+		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
+		applicable law or agreed to in writing, software distributed under the
+		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
+		CONDITIONS OF ANY KIND, either express or implied. See the License for
+		the specific language governing permissions and limitations under the
+		License.
+-->
+<HTML>
+<head><title>Authentication Error Page</title>
+</head>
+<body>
+<H1>Authentication ERROR</H1>
+<h3>Username, password or role incorrect.</h3>
+</body>
+</HTML>

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

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html Fri Jun 25 06:33:41 2010
@@ -1,30 +1,30 @@
-<!--
-   Licensed to the Apache Software Foundation (ASF) under one or more
-   contributor license agreements.  See the NOTICE file distributed with
-   this work for additional information regarding copyright ownership.
-   The ASF licenses this file to You under the Apache License, Version 2.0
-   (the "License"); you may not use this file except in compliance with
-   the License.  You may obtain a copy of the License at
-
-      http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
--->
-<!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">
-</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="view/jsp/Logon.jsp" name="MainPageFrame" title="MainPage" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
-</FRAMESET>
-
-
-</html>
+<!--
+   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.
+-->
+<!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">
+</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="view/jsp/Logon.jsp" name="MainPageFrame" title="MainPage" frameborder="0" marginheight="0" marginwidth="0" noresize scrolling="no">
+</FRAMESET>
+
+
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp Fri Jun 25 06:33:41 2010
@@ -1,92 +1,92 @@
-<!--
-		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" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
-<%@ taglib uri="http://struts.apache.org/tags-nested" prefix="nested" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>Add CD</title>
-</head>
-<logic:notPresent name="owner">
-<logic:redirect href="Logon.do"></logic:redirect>
-</logic:notPresent>
-<body>
-
-<html:errors/>
-
-<html:form action="/addCD" focus="cdLabel"
-           onsubmit="return validateDataCDForm(this);">
-    <table border="0" width="80%" align="center">
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdlabel"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdLabel" size="16" maxlength="20"/>
-            </td>
-        </tr>
-
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cddescription"/>:
-            </th>
-            <td align="left">
-                <html:textarea property="cdDescription" rows="10" cols="30"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdsize"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdSize" size="10" maxlength="10"/>
-            </td>
-        </tr>
-        <tr>
-            <th align="right">
-                <bean:message key="datacd.cdarchivedate"/>:
-            </th>
-            <td align="left">
-                <html:text property="cdArchiveDate" size="16" maxlength="20"/>&nbsp;(yyyy-MM-dd)
-            </td>
-        </tr>
-
-        <tr>
-            <td align="right">
-            	<nested:hidden property="owner.username" value='<%= request.getParameter("ownername")%>'/>
-                <html:submit property="DO_SUBMIT">
-                    <bean:message key="button.add"/>
-                </html:submit>
-            </td>
-            <td align="left">
-                <html:reset property="DO_RESET">
-                    <bean:message key="button.reset"/>
-                </html:reset> &nbsp; <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
-            </td>
-        </tr>
-
-    </table>
-
-</html:form>
-
-<html:javascript formName="DataCDForm"/>
-</html>
+<!--
+		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" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic" %>
+<%@ taglib uri="http://struts.apache.org/tags-nested" prefix="nested" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>Add CD</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/addCD" focus="cdLabel"
+           onsubmit="return validateDataCDForm(this);">
+    <table border="0" width="80%" align="center">
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdlabel"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdLabel" size="16" maxlength="20"/>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cddescription"/>:
+            </th>
+            <td align="left">
+                <html:textarea property="cdDescription" rows="10" cols="30"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdsize"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdSize" size="10" maxlength="10"/>
+            </td>
+        </tr>
+        <tr>
+            <th align="right">
+                <bean:message key="datacd.cdarchivedate"/>:
+            </th>
+            <td align="left">
+                <html:text property="cdArchiveDate" size="16" maxlength="20"/>&nbsp;(yyyy-MM-dd)
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+            	<nested:hidden property="owner.username" value='<%= request.getParameter("ownername")%>'/>
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.add"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:reset property="DO_RESET">
+                    <bean:message key="button.reset"/>
+                </html:reset> &nbsp; <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+            </td>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp Fri Jun 25 06:33:41 2010
@@ -1,102 +1,102 @@
-<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		http://www.apache.org/licenses/LICENSE-2.0 Unless required by
-		applicable law or agreed to in writing, software distributed under the
-		License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
-		CONDITIONS OF ANY KIND, either express or implied. See the License for
-		the specific language governing permissions and limitations under the
-		License.
--->
-<%@ page language="java" contentType="text/html; charset=UTF-8"
-	pageEncoding="UTF-8"%>
-<%@ page
-	import="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"%>
-<%@ page
-	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"%>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
-<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic"%>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>ListCDs Page</title>
-</head>
-<logic:notPresent name="owner">
-	<logic:redirect href="Logon.do"></logic:redirect>
-</logic:notPresent>
-<body>
-<bean:message key="general.welcome" />
-<bean:write name="owner" property="username" />!
-<br />
-<bean:define id="ownername" name="owner" property="username" />
-<table border="0" width="80%" align="center">
-<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 />
-</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>
-<%
-	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>
-	<% } %>
-</table>
-</body>
-</html>
+<!--
+		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"%>
+<%@ page
+	import="org.apache.geronimo.samples.datacdinfo.web.struts1.DataCDForm"%>
+<%@ page
+	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"%>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html"%>
+<%@ taglib uri="http://struts.apache.org/tags-logic" prefix="logic"%>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>ListCDs Page</title>
+</head>
+<logic:notPresent name="owner">
+	<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+<bean:message key="general.welcome" />
+<bean:write name="owner" property="username" />!
+<br />
+<bean:define id="ownername" name="owner" property="username" />
+<table border="0" width="80%" align="center">
+<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 />
+</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>
+<%
+	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>
+	<% } %>
+</table>
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp Fri Jun 25 06:33:41 2010
@@ -1,81 +1,81 @@
-<%--
-    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" %>
-<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
-
-
-<html:xhtml/>
-<html>
-<head></head>
-<body>
-<h2 align="center"><bean:message key="logon.title"/></h2>
-<html:errors/>
-
-<html:form action="/logon" focus="username"
-           onsubmit="return validateOwnerForm(this);">
-    <table border="0" width="60%" align="center">
-
-        <tr>
-            <th align="right">
-                <bean:message key="prompt.username"/>:
-            </th>
-            <td align="left">
-                <html:text property="username" size="16" maxlength="16"/>
-            </td>
-        </tr>
-
-        <tr>
-            <th align="right">
-                <bean:message key="prompt.password"/>:
-            </th>
-            <td align="left">
-                <html:password property="password" size="16" maxlength="16"
-                               redisplay="false"/>
-            </td>
-        </tr>
-
-        <tr>
-            <td align="right">
-                <html:submit property="DO_SUBMIT">
-                    <bean:message key="button.submit"/>
-                </html:submit>
-            </td>
-            <td align="left">
-                <html:reset property="DO_RESET">
-                    <bean:message key="button.reset"/>
-                </html:reset> &nbsp;
-            </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>
-        </tr>
-
-    </table>
-
-</html:form>
-
-<html:javascript formName="OwnerForm"/>
-
-</body>
-</html>
+<%--
+    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" %>
+<%@ taglib uri="http://struts.apache.org/tags-html" prefix="html" %>
+
+
+<html:xhtml/>
+<html>
+<head></head>
+<body>
+<h2 align="center"><bean:message key="logon.title"/></h2>
+<html:errors/>
+
+<html:form action="/logon" focus="username"
+           onsubmit="return validateOwnerForm(this);">
+    <table border="0" width="60%" align="center">
+
+        <tr>
+            <th align="right">
+                <bean:message key="prompt.username"/>:
+            </th>
+            <td align="left">
+                <html:text property="username" size="16" maxlength="16"/>
+            </td>
+        </tr>
+
+        <tr>
+            <th align="right">
+                <bean:message key="prompt.password"/>:
+            </th>
+            <td align="left">
+                <html:password property="password" size="16" maxlength="16"
+                               redisplay="false"/>
+            </td>
+        </tr>
+
+        <tr>
+            <td align="right">
+                <html:submit property="DO_SUBMIT">
+                    <bean:message key="button.submit"/>
+                </html:submit>
+            </td>
+            <td align="left">
+                <html:reset property="DO_RESET">
+                    <bean:message key="button.reset"/>
+                </html:reset> &nbsp;
+            </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>
+        </tr>
+
+    </table>
+
+</html:form>
+
+<html:javascript formName="OwnerForm"/>
+
+</body>
+</html>

Modified: geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp?rev=957816&r1=957815&r2=957816&view=diff
==============================================================================
--- geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp (original)
+++ geronimo/samples/branches/3.0-M1/samples/javaee5/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp Fri Jun 25 06:33:41 2010
@@ -1,29 +1,29 @@
-<!--
-		Licensed to the Apache Software Foundation (ASF) under one or more
-		contributor license agreements. See the NOTICE file distributed with
-		this work for additional information regarding copyright ownership.
-		The ASF licenses this file to you under the Apache License, Version
-		2.0 (the "License"); you may not use this file except in compliance
-		with the License. You may obtain a copy of the License at
-
-		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-logic" prefix="logic" %>
-<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
-<html>
-<head>
-<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
-<title>logout</title>
-</head>
-<body>
-<% session.removeAttribute("owner"); %>
-<logic:redirect href="Logon.do"/>
-</body>
-</html>
+<!--
+		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-logic" prefix="logic" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html>
+<head>
+<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
+<title>logout</title>
+</head>
+<body>
+<% session.removeAttribute("owner"); %>
+<logic:redirect href="Logon.do"/>
+</body>
+</html>



Mime
View raw message