You are viewing a plain text version of this content. The canonical link for it is here.
Posted to scm@geronimo.apache.org by de...@apache.org on 2010/02/10 02:52:39 UTC
svn commit: r908308 [3/3] - in /geronimo/samples/branches/2.1: ./ samples/
samples/DataCDInfo/ samples/DataCDInfo/DataCDInfo-JTA-ear/
samples/DataCDInfo/DataCDInfo-JTA-ear/src/
samples/DataCDInfo/DataCDInfo-JTA-ear/src/main/
samples/DataCDInfo/DataCDIn...
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE Wed Feb 10 01:52:33 2010
@@ -0,0 +1,202 @@
+
+ Apache License
+ Version 2.0, January 2004
+ http://www.apache.org/licenses/
+
+ TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
+
+ 1. Definitions.
+
+ "License" shall mean the terms and conditions for use, reproduction,
+ and distribution as defined by Sections 1 through 9 of this document.
+
+ "Licensor" shall mean the copyright owner or entity authorized by
+ the copyright owner that is granting the License.
+
+ "Legal Entity" shall mean the union of the acting entity and all
+ other entities that control, are controlled by, or are under common
+ control with that entity. For the purposes of this definition,
+ "control" means (i) the power, direct or indirect, to cause the
+ direction or management of such entity, whether by contract or
+ otherwise, or (ii) ownership of fifty percent (50%) or more of the
+ outstanding shares, or (iii) beneficial ownership of such entity.
+
+ "You" (or "Your") shall mean an individual or Legal Entity
+ exercising permissions granted by this License.
+
+ "Source" form shall mean the preferred form for making modifications,
+ including but not limited to software source code, documentation
+ source, and configuration files.
+
+ "Object" form shall mean any form resulting from mechanical
+ transformation or translation of a Source form, including but
+ not limited to compiled object code, generated documentation,
+ and conversions to other media types.
+
+ "Work" shall mean the work of authorship, whether in Source or
+ Object form, made available under the License, as indicated by a
+ copyright notice that is included in or attached to the work
+ (an example is provided in the Appendix below).
+
+ "Derivative Works" shall mean any work, whether in Source or Object
+ form, that is based on (or derived from) the Work and for which the
+ editorial revisions, annotations, elaborations, or other modifications
+ represent, as a whole, an original work of authorship. For the purposes
+ of this License, Derivative Works shall not include works that remain
+ separable from, or merely link (or bind by name) to the interfaces of,
+ the Work and Derivative Works thereof.
+
+ "Contribution" shall mean any work of authorship, including
+ the original version of the Work and any modifications or additions
+ to that Work or Derivative Works thereof, that is intentionally
+ submitted to Licensor for inclusion in the Work by the copyright owner
+ or by an individual or Legal Entity authorized to submit on behalf of
+ the copyright owner. For the purposes of this definition, "submitted"
+ means any form of electronic, verbal, or written communication sent
+ to the Licensor or its representatives, including but not limited to
+ communication on electronic mailing lists, source code control systems,
+ and issue tracking systems that are managed by, or on behalf of, the
+ Licensor for the purpose of discussing and improving the Work, but
+ excluding communication that is conspicuously marked or otherwise
+ designated in writing by the copyright owner as "Not a Contribution."
+
+ "Contributor" shall mean Licensor and any individual or Legal Entity
+ on behalf of whom a Contribution has been received by Licensor and
+ subsequently incorporated within the Work.
+
+ 2. Grant of Copyright License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ copyright license to reproduce, prepare Derivative Works of,
+ publicly display, publicly perform, sublicense, and distribute the
+ Work and such Derivative Works in Source or Object form.
+
+ 3. Grant of Patent License. Subject to the terms and conditions of
+ this License, each Contributor hereby grants to You a perpetual,
+ worldwide, non-exclusive, no-charge, royalty-free, irrevocable
+ (except as stated in this section) patent license to make, have made,
+ use, offer to sell, sell, import, and otherwise transfer the Work,
+ where such license applies only to those patent claims licensable
+ by such Contributor that are necessarily infringed by their
+ Contribution(s) alone or by combination of their Contribution(s)
+ with the Work to which such Contribution(s) was submitted. If You
+ institute patent litigation against any entity (including a
+ cross-claim or counterclaim in a lawsuit) alleging that the Work
+ or a Contribution incorporated within the Work constitutes direct
+ or contributory patent infringement, then any patent licenses
+ granted to You under this License for that Work shall terminate
+ as of the date such litigation is filed.
+
+ 4. Redistribution. You may reproduce and distribute copies of the
+ Work or Derivative Works thereof in any medium, with or without
+ modifications, and in Source or Object form, provided that You
+ meet the following conditions:
+
+ (a) You must give any other recipients of the Work or
+ Derivative Works a copy of this License; and
+
+ (b) You must cause any modified files to carry prominent notices
+ stating that You changed the files; and
+
+ (c) You must retain, in the Source form of any Derivative Works
+ that You distribute, all copyright, patent, trademark, and
+ attribution notices from the Source form of the Work,
+ excluding those notices that do not pertain to any part of
+ the Derivative Works; and
+
+ (d) If the Work includes a "NOTICE" text file as part of its
+ distribution, then any Derivative Works that You distribute must
+ include a readable copy of the attribution notices contained
+ within such NOTICE file, excluding those notices that do not
+ pertain to any part of the Derivative Works, in at least one
+ of the following places: within a NOTICE text file distributed
+ as part of the Derivative Works; within the Source form or
+ documentation, if provided along with the Derivative Works; or,
+ within a display generated by the Derivative Works, if and
+ wherever such third-party notices normally appear. The contents
+ of the NOTICE file are for informational purposes only and
+ do not modify the License. You may add Your own attribution
+ notices within Derivative Works that You distribute, alongside
+ or as an addendum to the NOTICE text from the Work, provided
+ that such additional attribution notices cannot be construed
+ as modifying the License.
+
+ You may add Your own copyright statement to Your modifications and
+ may provide additional or different license terms and conditions
+ for use, reproduction, or distribution of Your modifications, or
+ for any such Derivative Works as a whole, provided Your use,
+ reproduction, and distribution of the Work otherwise complies with
+ the conditions stated in this License.
+
+ 5. Submission of Contributions. Unless You explicitly state otherwise,
+ any Contribution intentionally submitted for inclusion in the Work
+ by You to the Licensor shall be under the terms and conditions of
+ this License, without any additional terms or conditions.
+ Notwithstanding the above, nothing herein shall supersede or modify
+ the terms of any separate license agreement you may have executed
+ with Licensor regarding such Contributions.
+
+ 6. Trademarks. This License does not grant permission to use the trade
+ names, trademarks, service marks, or product names of the Licensor,
+ except as required for reasonable and customary use in describing the
+ origin of the Work and reproducing the content of the NOTICE file.
+
+ 7. Disclaimer of Warranty. Unless required by applicable law or
+ agreed to in writing, Licensor provides the Work (and each
+ Contributor provides its Contributions) on an "AS IS" BASIS,
+ WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
+ implied, including, without limitation, any warranties or conditions
+ of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
+ PARTICULAR PURPOSE. You are solely responsible for determining the
+ appropriateness of using or redistributing the Work and assume any
+ risks associated with Your exercise of permissions under this License.
+
+ 8. Limitation of Liability. In no event and under no legal theory,
+ whether in tort (including negligence), contract, or otherwise,
+ unless required by applicable law (such as deliberate and grossly
+ negligent acts) or agreed to in writing, shall any Contributor be
+ liable to You for damages, including any direct, indirect, special,
+ incidental, or consequential damages of any character arising as a
+ result of this License or out of the use or inability to use the
+ Work (including but not limited to damages for loss of goodwill,
+ work stoppage, computer failure or malfunction, or any and all
+ other commercial damages or losses), even if such Contributor
+ has been advised of the possibility of such damages.
+
+ 9. Accepting Warranty or Additional Liability. While redistributing
+ the Work or Derivative Works thereof, You may choose to offer,
+ and charge a fee for, acceptance of support, warranty, indemnity,
+ or other liability obligations and/or rights consistent with this
+ License. However, in accepting such obligations, You may act only
+ on Your own behalf and on Your sole responsibility, not on behalf
+ of any other Contributor, and only if You agree to indemnify,
+ defend, and hold each Contributor harmless for any liability
+ incurred by, or claims asserted against, such Contributor by reason
+ of your accepting any such warranty or additional liability.
+
+ END OF TERMS AND CONDITIONS
+
+ APPENDIX: How to apply the Apache License to your work.
+
+ To apply the Apache License to your work, attach the following
+ boilerplate notice, with the fields enclosed by brackets "[]"
+ replaced with your own identifying information. (Don't include
+ the brackets!) The text should be enclosed in the appropriate
+ comment syntax for the file format. We also recommend that a
+ file or class name and description of purpose be included on the
+ same "printed page" as the copyright notice for easier
+ identification within third-party archives.
+
+ Copyright [yyyy] [name of copyright owner]
+
+ Licensed 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.
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF Wed Feb 10 01:52:33 2010
@@ -0,0 +1,6 @@
+Manifest-Version: 1.0
+Archiver-Version: Plexus Archiver
+Created-By: Apache Maven
+Built-By: forrestxm
+Build-Jdk: 1.6.0
+
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/NOTICE Wed Feb 10 01:52:33 2010
@@ -0,0 +1,8 @@
+
+Geronimo Samples :: DataCDInfo :: WAR via JTA
+Copyright 2003-2010 The Apache Software Foundation
+
+This product includes software developed at
+The Apache Software Foundation (http://www.apache.org/).
+
+
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml Wed Feb 10 01:52:33 2010
@@ -0,0 +1,37 @@
+<?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: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">
+ <dep:environment>
+ <dep:moduleId>
+ <dep:groupId>org.apache.geronimo.samples</dep:groupId>
+ <dep:artifactId>DataCDInfo-JTA-war</dep:artifactId>
+ <dep:version>${version}</dep:version>
+ <dep:type>car</dep:type>
+ </dep:moduleId>
+ </dep:environment>
+ <web:context-root>/DataCDInfo</web:context-root>
+ <web:security-realm-name>geronimo-admin</web:security-realm-name>
+</web:web-app>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/struts-config.xml Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/adminhome.html Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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> </td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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> </td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logon.html Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html Wed Feb 10 01:52:33 2010
@@ -0,0 +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%">
+
+ </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%">
+ <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> -->
+ </td>
+ </tr>
+ </tbody>
+</table>
+
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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"/> (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> <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+ </td>
+ </tr>
+
+ </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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> <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" /> (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%>&
+ cdLabel=<%=cdLabel%>&
+ cdDescription=<%=cdDescription%>&
+ cdSize=<%=cdSize%>&
+ cdArchiveDate=<%=date%>">
+ <bean:message key="datacd.operation.edit" /></a> <a
+ href="RemoveCD.do?cdID=<%=cdID%>&
+ cdLabel=<%=cdLabel%>&
+ cdDescription=<%=cdDescription%>&
+ cdSize=<%=cdSize%>&
+ cdArchiveDate=<%=date%>">
+ <bean:message key="datacd.operation.remove" /></a></td>
+ </tr>
+ </logic:iterate>
+ <% } %>
+</table>
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
+ </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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +1,82 @@
+<%--
+ 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="register.title"/></h2>
+<html:errors/>
+
+<html:form action="/register" focus="username"
+ onsubmit="return validateOwnerForm(this);">
+ <table border="0" width="100%">
+
+ <tr>
+ <th align="right">
+ <bean:message key="prompt.username"/>:
+ </th>
+ <td align="left">
+ <html:text property="username" size="16" maxlength="18"/>
+ </td>
+ </tr>
+
+ <tr>
+ <th align="right">
+ <bean:message key="prompt.password"/>:
+ </th>
+ <td align="left">
+ <html:password property="password" size="16" maxlength="18"
+ redisplay="false"/>
+ </td>
+ </tr>
+
+ <tr>
+ <th align="right">
+ <bean:message key="prompt.password2"/>:
+ </th>
+ <td align="left">
+ <html:password property="password2" size="16" maxlength="16"/>
+ </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>
+ </td>
+ </tr>
+
+ </table>
+
+</html:form>
+
+<html:javascript formName="OwnerForm"/>
+
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/RemoveCD.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +1,93 @@
+<!--
+ 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" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html:xhtml/>
+<html>
+<head>
+<title>Remove CD</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/removeCD">
+ <table border="0" width="80%" align="center">
+
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cdlabel"/>:
+ </th>
+ <td align="left">
+ <html:hidden property="cdLabel" value='<%= request.getParameter("cdLabel")%>'/>
+ <%=request.getParameter("cdLabel") %>
+ </td>
+ </tr>
+
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cddescription"/>:
+ </th>
+ <td align="left">
+ <html:hidden property="cdDescription" value='<%= request.getParameter("cdDescription")%>'/>
+ <%= request.getParameter("cdDescription")%>
+ </td>
+ </tr>
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cdsize"/>:
+ </th>
+ <td align="left">
+ <html:hidden property="cdSize" value='<%= request.getParameter("cdSize")%>'/>
+ <%= request.getParameter("cdSize")%>
+ </td>
+ </tr>
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cdarchivedate"/>:
+ </th>
+ <td align="left">
+ <html:hidden property="cdArchiveDate" value='<%= request.getParameter("cdArchiveDate")%>'/>
+ <%= request.getParameter("cdArchiveDate")%>
+ </td>
+ </tr>
+
+ <tr>
+ <td align="right">
+ <html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+ <html:submit property="DO_SUBMIT">
+ <bean:message key="button.remove"/>
+ </html:submit>
+ </td>
+ <td align="left">
+ <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+ </td>
+ </tr>
+
+ </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp Wed Feb 10 01:52:33 2010
@@ -0,0 +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" %>
+<!DOCTYPE html PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN" "http://www.w3.org/TR/html4/loose.dtd">
+<html:xhtml/>
+<html>
+<head>
+<title>View/Update CD Details</title>
+</head>
+<logic:notPresent name="owner">
+<logic:redirect href="Logon.do"></logic:redirect>
+</logic:notPresent>
+<body>
+
+<html:errors/>
+
+<html:form action="/updateCD" focus="cddesc"
+ 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" readonly="true" value='<%= request.getParameter("cdLabel")%>'/>
+ </td>
+ </tr>
+
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cddescription"/>:
+ </th>
+ <td align="left">
+ <html:textarea property="cdDescription" rows="10" cols="30" value='<%= request.getParameter("cdDescription")%>'/>
+ </td>
+ </tr>
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cdsize"/>:
+ </th>
+ <td align="left">
+ <html:text property="cdSize" size="10" maxlength="10" value='<%= request.getParameter("cdSize")%>'/>
+ </td>
+ </tr>
+ <tr>
+ <th align="right">
+ <bean:message key="datacd.cdarchivedate"/>:
+ </th>
+ <td align="left">
+ <html:text property="cdArchiveDate" size="16" maxlength="20" value='<%= request.getParameter("cdArchiveDate")%>'/> (yyyy-MM-dd)
+ </td>
+ </tr>
+
+ <tr>
+ <td align="right">
+ <html:hidden property="cdID" value='<%= request.getParameter("cdID")%>'/>
+ <html:submit property="DO_SUBMIT">
+ <bean:message key="button.update"/>
+ </html:submit>
+ </td>
+ <td align="left">
+ <html:reset property="DO_RESET">
+ <bean:message key="button.reset"/>
+ </html:reset> <html:link action="ListCDs.do"><bean:message key="datacd.operation.back"/></html:link>
+ </td>
+ </tr>
+
+ </table>
+
+</html:form>
+
+<html:javascript formName="DataCDForm"/>
+
+</body>
+</html>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/pom.xml Wed Feb 10 01:52:33 2010
@@ -0,0 +1,60 @@
+<?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.
+-->
+
+<!-- $Rev$ $Date$ -->
+
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/maven-v4_0_0.xsd">
+
+ <modelVersion>4.0.0</modelVersion>
+
+ <parent>
+ <groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>samples</artifactId>
+ <version>2.1.3-SNAPSHOT</version>
+ </parent>
+
+ <artifactId>DataCDInfo</artifactId>
+ <name>Geronimo Samples :: DataCDInfo</name>
+ <packaging>pom</packaging>
+
+ <description>
+ Geronimo DataCDInfo sample created from an archetype.
+ </description>
+
+ <modules>
+ <module>DataCDInfo-JTA-ejb</module>
+ <module>DataCDInfo-JTA-war</module>
+ <module>DataCDInfo-JTA-ear</module>
+ <module>DataCDInfo-JTA-jetty</module>
+ <module>DataCDInfo-JTA-tomcat</module>
+ </modules>
+
+ <build>
+ <plugins>
+ <plugin>
+ <artifactId>maven-site-plugin</artifactId>
+ <inherited>false</inherited>
+ <configuration>
+ <outputDirectory>${project.basedir}/docs</outputDirectory>
+ </configuration>
+ </plugin>
+ </plugins>
+ </build>
+</project>
Added: geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt?rev=908308&view=auto
==============================================================================
--- geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt (added)
+++ geronimo/samples/branches/2.1/samples/DataCDInfo/readme.txt Wed Feb 10 01:52:33 2010
@@ -0,0 +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.
+
+Apache Geronimo Samples
+----------------------------------------------------------------------
+
+This sample demonstrates Struts1, EJB 3.0 Session Bean, JPA, JTA and Security Annotations technologies.
+
+This README uses the following aliases to describe directories. These aliases should be replaced with your actual directory paths.
+ %SAMPLE_HOME% refers to the root directory where Geronimo samples are extracted.
+ %GERONIMO_HOME% refers to the root directory where the Geronimo server is installed.
+
+
+BUILD
+-----
+1. cd %SAMPLE_HOME%/samples/DataCDInfo
+2. maven clean install
+
+
+INSTALL
+-------
+1. Start the Geronimo server if it is not already running.
+2. %GERONIMO_HOME%/bin/deploy.[bat|sh] deploy %SAMPLE_HOME%/samples/DataCDInfo/DataCDInfo-JTA-ear/DataCDInfo-JTA-ear-<version>.ear
+
+
+RUN
+---
+1. Open the following link in a web browser:
+ http://localhost:8080/DataCDInfo/
+
+
+MEMO
+----
+To demonstrate security annotation usage, some exceptions are expected: if you are not in "superadmin" role to enter administration
+page, you will experience "javax.ejb.EJBAccessException: Unauthorized Access by Principal Denied".
Modified: geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-jetty/pom.xml Wed Feb 10 01:52:33 2010
@@ -75,6 +75,13 @@
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-jetty</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>inventory-jetty</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/all-samples/all-samples-tomcat/pom.xml Wed Feb 10 01:52:33 2010
@@ -82,6 +82,13 @@
<dependency>
<groupId>org.apache.geronimo.samples</groupId>
+ <artifactId>DataCDInfo-JTA-tomcat</artifactId>
+ <version>${version}</version>
+ <type>car</type>
+ </dependency>
+
+ <dependency>
+ <groupId>org.apache.geronimo.samples</groupId>
<artifactId>inventory-tomcat</artifactId>
<version>${version}</version>
<type>car</type>
Modified: geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-client/pom.xml Wed Feb 10 01:52:33 2010
@@ -50,7 +50,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-ejb/pom.xml Wed Feb 10 01:52:33 2010
@@ -45,7 +45,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/bank/bank-war/pom.xml Wed Feb 10 01:52:33 2010
@@ -58,7 +58,7 @@
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/customer/customer-client/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/customer-client/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/customer-client/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/customer-client/pom.xml Wed Feb 10 01:52:33 2010
@@ -48,7 +48,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/customer/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/customer/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/customer/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/customer/pom.xml Wed Feb 10 01:52:33 2010
@@ -55,7 +55,7 @@
</dependency>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
Modified: geronimo/samples/branches/2.1/samples/myphonebook/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/myphonebook/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/myphonebook/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/myphonebook/pom.xml Wed Feb 10 01:52:33 2010
@@ -49,7 +49,7 @@
<dependencies>
<dependency>
<groupId>org.apache.geronimo.specs</groupId>
- <artifactId>geronimo-jpa_3.0_spec</artifactId>
+ <artifactId>geronimo-jpa_1.0_spec</artifactId>
<scope>provided</scope>
</dependency>
Modified: geronimo/samples/branches/2.1/samples/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/branches/2.1/samples/pom.xml?rev=908308&r1=908307&r2=908308&view=diff
==============================================================================
--- geronimo/samples/branches/2.1/samples/pom.xml (original)
+++ geronimo/samples/branches/2.1/samples/pom.xml Wed Feb 10 01:52:33 2010
@@ -56,6 +56,7 @@
<module>bank</module>
<module>calculator</module>
<module>dbtester</module>
+ <module>DataCDInfo</module>
<module>inventory</module>
<module>jaxws-calculator</module>
<module>jms-mdb</module>