svn commit: r897762 [2/3] - in /geronimo/samples/trunk/samples: DataCDInfo/ DataCDInfo/DataCDInfo-JTA-ear/ DataCDInfo/DataCDInfo-JTA-ear/src/ DataCDInfo/DataCDInfo-JTA-ear/src/main/ DataCDInfo/DataCDInfo-JTA-ear/src/main/resources/ DataCDInfo/DataCDInf...

[de...@apache.org]

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDForm.java Mon Jan 11 06:16:40 2010
@@ -0,0 +1,86 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.validator.ValidatorActionForm;
+import java.sql.Date;
+
+import javax.servlet.http.HttpServletRequest;
+
+public class DataCDForm extends ValidatorActionForm {
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = -2878208025571945031L;
+	
+	private Integer cdID = null;	
+	private String cdLabel = null;
+	private String cdDescription = null;
+	private Integer cdSize = null;
+	private Date cdArchiveDate = null;
+	private OwnerForm owner = new OwnerForm();
+	
+	public Integer getCdID() {
+		return cdID;
+	}
+	public void setCdID(Integer cdID) {
+		this.cdID = cdID;
+	}
+	public String getCdLabel() {
+		return cdLabel;
+	}
+	public void setCdLabel(String cdLabel) {
+		this.cdLabel = cdLabel;
+	}
+	public String getCdDescription() {
+		return cdDescription;
+	}
+	public void setCdDescription(String cdDescription) {
+		this.cdDescription = cdDescription;
+	}
+	public Integer getCdSize() {
+		return cdSize;
+	}
+	public void setCdSize(Integer cdSize) {
+		this.cdSize = cdSize;
+	}
+	public Date getCdArchiveDate() {
+		return cdArchiveDate;
+	}
+	public void setCdArchiveDate(Date cdArchiveDate) {
+		this.cdArchiveDate = cdArchiveDate;
+	}
+	public OwnerForm getOwner() {
+		return owner;
+	}
+	public void setOwner(OwnerForm owner) {
+		this.owner = owner;
+	}
+	
+	public void reset(ActionMapping mapping, HttpServletRequest request) {
+	       cdID = null;
+	       cdLabel = null;
+	       cdDescription = null;
+	       cdSize = null;
+	       cdArchiveDate = null;
+	       owner = new OwnerForm();	       
+	    }
+
+}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/DataCDInfoContextListener.java Mon Jan 11 06:16:40 2010
@@ -0,0 +1,53 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+
+import javax.servlet.ServletContext;
+import javax.servlet.ServletContextEvent;
+import javax.servlet.ServletContextListener;
+
+import javax.ejb.EJB;
+
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+
+public class DataCDInfoContextListener implements ServletContextListener {
+	private ServletContext ctx = null;
+	@EJB
+	private DataCDInfoRemote logic = null;	
+
+	
+	public void contextDestroyed(ServletContextEvent event) {
+		ctx = event.getServletContext();		
+		ctx.removeAttribute("logic");		
+	}
+
+	
+	public void contextInitialized(ServletContextEvent event) {
+		ctx = event.getServletContext();
+		
+		if (logic instanceof DataCDInfoRemote) {
+			ctx.setAttribute("logic", logic);
+			System.out.println(">>>>>>>>>>>>>>>>>>>>> Injected ejb DataCDInfoJTAImpl!");
+		} else {
+			System.out.println(">>>>>>>>>>>>>>>>>>>>> Cannot inject ejb DataCDInfoJTAImpl!");
+		}
+	}
+
+}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerActions.java Mon Jan 11 06:16:40 2010
@@ -0,0 +1,114 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import javax.servlet.ServletContext;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+import javax.servlet.http.HttpSession;
+
+import org.apache.commons.beanutils.PropertyUtils;
+import org.apache.geronimo.samples.datacdinfo.beans.OwnerBean;
+import org.apache.geronimo.samples.datacdinfo.core.DataCDInfoRemote;
+import org.apache.geronimo.samples.datacdinfo.exceptions.IncorrectPasswordException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidOwnerException;
+import org.apache.geronimo.samples.datacdinfo.exceptions.InvalidPasswordException;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.ActionMessage;
+import org.apache.struts.action.ActionMessages;
+import org.apache.struts.actions.MappingDispatchAction;
+
+public class OwnerActions extends MappingDispatchAction {
+	public static final String OWNER = "owner";
+
+	public ActionForward logon(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+		OwnerForm ownerform = (OwnerForm) session.getAttribute(OWNER);
+		if (ownerform == null) {
+			ServletContext ctx = session.getServletContext();
+			DataCDInfoRemote logic = (DataCDInfoRemote) ctx
+					.getAttribute("logic");
+			OwnerBean owner = new OwnerBean();
+			PropertyUtils.copyProperties(owner, form);
+
+			try {
+				OwnerBean loginuser = logic.login(owner.getUsername(), owner
+						.getPassword());
+				PropertyUtils.copyProperties(form, loginuser);
+			} catch (Exception e) {
+				e.printStackTrace();
+				ActionMessages errors = new ActionMessages();
+				if (e instanceof InvalidOwnerException) {
+					errors.add(ActionMessages.GLOBAL_MESSAGE,
+							new ActionMessage("errors.invalid.owner"));
+
+				}
+				if (e instanceof IncorrectPasswordException) {
+					errors.add(ActionMessages.GLOBAL_MESSAGE,
+							new ActionMessage("errors.incorrect.password"));
+				}
+				this.saveErrors(request, errors);
+				return mapping.getInputForward();
+			}
+			session.setAttribute(OWNER, form);
+
+		}
+
+		return mapping.findForward("success");
+	}
+
+	public ActionForward register(ActionMapping mapping, ActionForm form,
+			HttpServletRequest request, HttpServletResponse response)
+			throws Exception {
+		HttpSession session = request.getSession();
+
+		ServletContext ctx = session.getServletContext();
+		DataCDInfoRemote logic = (DataCDInfoRemote) ctx.getAttribute("logic");
+		OwnerBean owner = new OwnerBean();
+		PropertyUtils.copyProperties(owner, form);
+
+		try {
+			OwnerBean loginuser = logic.register(owner.getUsername(), owner
+					.getPassword());
+			PropertyUtils.copyProperties(form, loginuser);
+		} catch (Exception e) {
+			System.out.println(e.getMessage());
+			ActionMessages errors = new ActionMessages();
+			if (e instanceof InvalidOwnerException) {
+				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+						"errors.existing.owner"));
+
+			}
+			if (e instanceof InvalidPasswordException) {
+				errors.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage(
+						"errors.invalid.password"));
+			}
+			this.saveErrors(request, errors);
+			return mapping.getInputForward();
+		}
+		session.setAttribute(OWNER, form);
+
+		return mapping.findForward("success");
+	}
+
+}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/java/org/apache/geronimo/samples/datacdinfo/web/struts1/OwnerForm.java Mon Jan 11 06:16:40 2010
@@ -0,0 +1,70 @@
+/**
+ * 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.
+ */
+package org.apache.geronimo.samples.datacdinfo.web.struts1;
+
+import java.util.Collection;
+
+import org.apache.struts.validator.ValidatorForm;
+
+public class OwnerForm extends ValidatorForm {
+	
+	/**
+	 * 
+	 */
+	private static final long serialVersionUID = 8367551067568662573L;
+	private String username;
+	private String password;
+	private String password2;
+	
+
+	private Collection<DataCDForm> DataCDs;
+	
+	public Collection<DataCDForm> getDataCDs() {
+		return DataCDs;
+	}
+
+	public void setDataCDs(Collection<DataCDForm> dataCDs) {
+		DataCDs = dataCDs;
+	}
+
+	public void setUsername(String username) {
+		this.username = username;
+	}
+
+	public String getUsername() {
+		return username;
+	}
+
+	public void setPassword(String password) {
+		this.password = password;
+	}
+
+	public String getPassword() {
+		return password;
+	}
+	
+	public String getPassword2() {
+		return password2;
+	}
+
+	public void setPassword2(String password2) {
+		this.password2 = password2;
+	}
+
+}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_en_US.properties Mon Jan 11 06:16:40 2010
@@ -0,0 +1,60 @@
+#   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.
+
+logon.title=DataCDInfo Logon
+register.title=Register A New User
+prompt.username=Username
+prompt.password=Password
+prompt.password2=Retype Password
+errors.invalid.owner=Invalid owner!
+errors.incorrect.password=Incorrect password!
+errors.existing.owner=Owner existed!
+errors.invalid.password=Invalid password!
+datacd.cdlabel=CD Label
+datacd.cddescription=Content Description
+datacd.cdsize=Size(Mbytes)
+datacd.cdarchivedate=Archive Date
+datacd.operations=Operations
+datacd.operation.add=Add
+datacd.operation.edit=Update
+datacd.operation.remove=Remove
+datacd.operation.logout=Log Out
+datacd.operation.back=Return to list
+general.welcome=Welcome
+general.register=Register?
+general.administration=Administration
+button.submit=Submit
+button.reset=Reset
+button.update=Update
+button.remove=Confirm to remove
+button.add=Add
+errors.duplicated.cdlabel=Duplicated CD Label!
+
+# Standard error messages for validator framework checks
+errors.required={0} is required.
+errors.minlength={0} cannot be less than {1} characters.
+errors.maxlength={0} cannot be greater than {1} characters.
+errors.invalid={0} is invalid.
+errors.byte={0} must be an byte.
+errors.short={0} must be an short.
+errors.integer={0} must be an integer.
+errors.long={0} must be an long.
+errors.float={0} must be an float.
+errors.double={0} must be an double.
+errors.date={0} is not a date.
+errors.range={0} is not in the range {1} through {2}.
+errors.creditcard={0} is not a valid credit card number.
+errors.email={0} is an invalid e-mail address.
+errors.literal={0}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh.properties.template
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh.properties.template?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh.properties.template (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh.properties.template Mon Jan 11 06:16:40 2010
@@ -0,0 +1,60 @@
+#   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.
+
+logon.title=Êý¾ÝÅÌÐÅÏ¢µÇ¼ÇϵͳµÇ¼
+register.title=×¢²áÒ»¸öеÄÓû§
+prompt.username=̞
+prompt.password=ÃÜÂë
+prompt.password2=ÔÙ´ÎÊäÈëÃÜÂë
+errors.invalid.owner=ÎÞЧÓû§£¡
+errors.incorrect.password=ÃÜÂë´íÎó£¡
+errors.existing.owner=Óû§ÒÑ´æÔÚ£¡
+errors.invalid.password=ÎÞЧÃÜÂ룡
+datacd.cdlabel=Êý¾ÝÅ̱êÇ©
+datacd.cddescription=ÄÚÈÝÃèÊö
+datacd.cdsize=´óС(Õ××Ö½Ú)
+datacd.cdarchivedate=´æµµÈÕÆÚ
+datacd.operations=²Ù×÷
+datacd.operation.add=Ìí¼Ó
+datacd.operation.edit=¸üÐÂ
+datacd.operation.remove=ɾ³ý
+datacd.operation.logout=µÇ³ö
+datacd.operation.back=·µ»ØÁбí
+general.welcome=»¶Ó­
+general.register=×¢²á£¿
+general.administration=¹ÜÀí
+button.submit=Ìá½»
+button.reset=ÖØÖÃ
+button.update=¸üÐÂ
+button.remove=È·ÈÏɾ³ý
+button.add=Ìí¼Ó
+errors.duplicated.cdlabel=Öظ´µÄÊý¾ÝÅ̱êÇ©!
+
+# Standard error messages for validator framework checks
+errors.required={0} ÊDZØÐëµÄ¡£
+errors.minlength={0} ²»ÄÜÉÙÓÚ {1} ¸öÓ¢ÎÄ×Ö·û¡£
+errors.maxlength={0} ²»ÄÜ´óÓÚ {1} ¸öÓ¢ÎÄ×Ö·û¡£
+errors.invalid={0} ÊÇÎÞЧµÄ¡£
+errors.byte={0} ±ØÐëÊÇÒ»¸ö×Ö½Ú¡£
+errors.short={0} ±ØÐëÊǶÌÕûÊý¡£
+errors.integer={0} ±ØÐëÊÇÕûÊý¡£
+errors.long={0} ±ØÐëÊdz¤ÕûÊý¡£
+errors.float={0} ±ØÐëÊǸ¡µãÊý¡£
+errors.double={0} ±ØÐëÊÇË«¾«¶È¸¡µãÊý¡£
+errors.date={0} ²»ÊÇÒ»¸öÓÐЧµÄÈÕÆÚ¡£
+errors.range={0} ²»ÔÚ {1} ºÍ {2} Ö®¼ä¡£
+errors.creditcard={0} ²»ÊÇÒ»¸öÓÐЧµÄÐÅÓÿ¨Õʺš£
+errors.email={0} ²»ÊÇÒ»¸öÓÐЧµÄµç×ÓÓʼþµØÖ·¡£
+errors.literal={0}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/resources/DataCDInfoResources_zh_CN.properties Mon Jan 11 06:16:40 2010
@@ -0,0 +1,60 @@
+#   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.
+
+logon.title=\u6570\u636e\u76d8\u4fe1\u606f\u767b\u8bb0\u7cfb\u7edf\u767b\u5f55
+register.title=\u6ce8\u518c\u4e00\u4e2a\u65b0\u7684\u7528\u6237
+prompt.username=\u7528\u6237\u540d
+prompt.password=\u5bc6\u7801
+prompt.password2=\u518d\u6b21\u8f93\u5165\u5bc6\u7801
+errors.invalid.owner=\u65e0\u6548\u7528\u6237\uff01
+errors.incorrect.password=\u5bc6\u7801\u9519\u8bef\uff01
+errors.existing.owner=\u7528\u6237\u5df2\u5b58\u5728\uff01
+errors.invalid.password=\u65e0\u6548\u5bc6\u7801\uff01
+datacd.cdlabel=\u6570\u636e\u76d8\u6807\u7b7e
+datacd.cddescription=\u5185\u5bb9\u63cf\u8ff0
+datacd.cdsize=\u5927\u5c0f(\u5146\u5b57\u8282)
+datacd.cdarchivedate=\u5b58\u6863\u65e5\u671f
+datacd.operations=\u64cd\u4f5c
+datacd.operation.add=\u6dfb\u52a0
+datacd.operation.edit=\u66f4\u65b0
+datacd.operation.remove=\u5220\u9664
+datacd.operation.logout=\u767b\u51fa
+datacd.operation.back=\u8fd4\u56de\u5217\u8868
+general.welcome=\u6b22\u8fce
+general.register=\u6ce8\u518c\uff1f
+general.administration=\u7ba1\u7406
+button.submit=\u63d0\u4ea4
+button.reset=\u91cd\u7f6e
+button.update=\u66f4\u65b0
+button.remove=\u786e\u8ba4\u5220\u9664
+button.add=\u6dfb\u52a0
+errors.duplicated.cdlabel=\u91cd\u590d\u7684\u6570\u636e\u76d8\u6807\u7b7e!
+
+# Standard error messages for validator framework checks
+errors.required={0} \u662f\u5fc5\u987b\u7684\u3002
+errors.minlength={0} \u4e0d\u80fd\u5c11\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
+errors.maxlength={0} \u4e0d\u80fd\u5927\u4e8e {1} \u4e2a\u82f1\u6587\u5b57\u7b26\u3002
+errors.invalid={0} \u662f\u65e0\u6548\u7684\u3002
+errors.byte={0} \u5fc5\u987b\u662f\u4e00\u4e2a\u5b57\u8282\u3002
+errors.short={0} \u5fc5\u987b\u662f\u77ed\u6574\u6570\u3002
+errors.integer={0} \u5fc5\u987b\u662f\u6574\u6570\u3002
+errors.long={0} \u5fc5\u987b\u662f\u957f\u6574\u6570\u3002
+errors.float={0} \u5fc5\u987b\u662f\u6d6e\u70b9\u6570\u3002
+errors.double={0} \u5fc5\u987b\u662f\u53cc\u7cbe\u5ea6\u6d6e\u70b9\u6570\u3002
+errors.date={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u65e5\u671f\u3002
+errors.range={0} \u4e0d\u5728 {1} \u548c {2} \u4e4b\u95f4\u3002
+errors.creditcard={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u4fe1\u7528\u5361\u5e10\u53f7\u3002
+errors.email={0} \u4e0d\u662f\u4e00\u4e2a\u6709\u6548\u7684\u7535\u5b50\u90ae\u4ef6\u5730\u5740\u3002
+errors.literal={0}

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/LICENSE Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/META-INF/MANIFEST.MF Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/geronimo-web.xml Mon Jan 11 06:16:40 2010
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<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</dep:artifactId>
+            <dep:version>1.0</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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/validation.xml Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/WEB-INF/web.xml Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showCDs.jsp Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showOwners.jsp Mon Jan 11 06:16:40 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>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/admin/showPasswd.jsp Mon Jan 11 06:16:40 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>&nbsp;&nbsp;&nbsp;&nbsp;</td>
+</tr>
+<tr>
+<td align="center"><a href="<%= contextpath %>/admin/adminhome.html">Admin Home</a></td>
+</tr>
+</table>
+</body>
+</html>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/auth/logonError.html Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/header.html Mon Jan 11 06:16:40 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%">
+                &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>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/index.html Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/AddCD.jsp Mon Jan 11 06:16:40 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"/>&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>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/ListCDs.jsp Mon Jan 11 06:16:40 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> &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>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logon.jsp Mon Jan 11 06:16:40 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> &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>

Added: geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Logout.jsp Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/Register.jsp Mon Jan 11 06:16:40 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/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/DataCDInfo-JTA-war/src/main/webapp/view/jsp/UpdateCD.jsp Mon Jan 11 06:16:40 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")%>'/>&nbsp;(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> &nbsp;<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/trunk/samples/DataCDInfo/pom.xml
URL: http://svn.apache.org/viewvc/geronimo/samples/trunk/samples/DataCDInfo/pom.xml?rev=897762&view=auto
==============================================================================
--- geronimo/samples/trunk/samples/DataCDInfo/pom.xml (added)
+++ geronimo/samples/trunk/samples/DataCDInfo/pom.xml Mon Jan 11 06:16:40 2010
@@ -0,0 +1,61 @@
+<?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>3.0-SNAPSHOT</version>
+    </parent>
+    
+    <artifactId>DataCDInfo</artifactId>
+    <name>Geronimo Samples :: DataCDInfo</name>
+    <packaging>pom</packaging>
+    <version>${geronimoVersion}</version>
+    
+    <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>