maven-commits mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ltheu...@apache.org
Subject svn commit: r366021 [3/4] - in /maven/maven-1/plugins/trunk/genapp/src/plugin-resources: complex/template-resources/components/ears/ear/ complex/template-resources/components/ears/ear/src/application/ complex/template-resources/components/ears/ear/src/...
Date Wed, 04 Jan 2006 23:15:02 GMT
Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp Wed Jan  4 15:14:07 2006
@@ -0,0 +1,30 @@
+<%@ page contentType="text/html; charset=utf-8" %>
+
+<%@ taglib prefix="c" uri="http://java.sun.com/jstl/core" %>
+<%@ taglib prefix="fmt" uri="http://java.sun.com/jstl/fmt" %>
+<%@ taglib prefix="x" uri="http://java.sun.com/jstl/xml" %>
+<%@ taglib prefix="sql" uri="http://java.sun.com/jstl/sql" %>
+
+<%@ taglib uri="/WEB-INF/tld/struts-bean-1.1.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tld/struts-html-1.1.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tld/struts-logic-1.1.tld" prefix="logic" %>
+
+<html:html xhtml="true">
+<head>
+	<html:base/>
+	<title><bean:message key="title.page"/></title>
+	<script type="text/javascript">
+	<html:javascript formName="TestForm" />
+	</script>
+</head>
+
+<body>
+	<p>The name is <bean:write name="TestForm" property="familyName"/>, <bean:write name="TestForm"  property="givenName"/> on <bean:write name="TestForm"  property="theDate"/></p>
+	<html:errors />
+	<html:form action="/TestInput" onsubmit="return validateTestForm(this);">
+	<html:text property="givenName" size="16"/>
+	<html:text property="familyName" size="16"/>
+	<html:submit/>
+	</html:form>
+</body>
+</html:html>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,1044 @@
+<!DOCTYPE form-validation PUBLIC
+          "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.0//EN"
+          "http://jakarta.apache.org/commons/dtds/validator_1_0.dtd">
+<!--
+
+   This file contains the default Struts Validator pluggable validator
+   definitions.  It should be placed somewhere under /WEB-INF and
+   referenced in the struts-config.xml under the plug-in element
+   for the ValidatorPlugIn.
+
+      <plug-in className="org.apache.struts.validator.ValidatorPlugIn">
+        <set-property property="pathnames" value="/WEB-INF/validator-rules.xml,
+                                                  /WEB-INF/validation.xml"/>
+      </plug-in>
+
+   These are the default error messages associated with
+   each validator defined in this file.  They should be
+   added to your projects ApplicationResources.properties
+   file or you can associate new ones by modifying the
+   pluggable validators msg attributes in this file.
+
+   # Struts Validator Error Messages
+   errors.required={0} is required.
+   errors.minlength={0} can not be less than {1} characters.
+   errors.maxlength={0} can not be greater than {1} characters.
+   errors.invalid={0} is invalid.
+
+   errors.byte={0} must be a byte.
+   errors.short={0} must be a short.
+   errors.integer={0} must be an integer.
+   errors.long={0} must be a long.
+   errors.float={0} must be a float.
+   errors.double={0} must be a double.
+
+   errors.date={0} is not a date.
+   errors.range={0} is not in the range {1} through {2}.
+   errors.creditcard={0} is an invalid credit card number.
+   errors.email={0} is an invalid e-mail address.
+
+-->
+
+<form-validation>
+
+   <global>
+
+      <validator name="required"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateRequired"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+                  msg="errors.required">
+
+         <javascript><![CDATA[
+            function validateRequired(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oRequired = new required();
+                for (x in oRequired) {
+                	var field = form[oRequired[x][0]];
+                	
+                    if (field.type == 'text' ||
+                        field.type == 'textarea' ||
+                        field.type == 'file' ||
+                        field.type == 'select-one' ||
+                        field.type == 'radio' ||
+                        field.type == 'password') {
+                        
+                        var value = '';
+						// get field's value
+						if (field.type == "select-one") {
+							var si = field.selectedIndex;
+							if (si >= 0) {
+								value = field.options[si].value;
+							}
+						} else {
+							value = field.value;
+						}
+                        
+                        if (trim(value).length == 0) {
+                        
+	                        if (i == 0) {
+	                            focusField = field;
+	                        }
+	                        fields[i++] = oRequired[x][1];
+	                        isValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return isValid;
+            }
+            
+            // Trim whitespace from left and right sides of s.
+            function trim(s) {
+                return s.replace( /^\s*/, "" ).replace( /\s*$/, "" );
+            }
+            
+            ]]>
+         </javascript>
+
+      </validator>
+
+      <validator name="requiredif"
+                 classname="org.apache.struts.validator.FieldChecks"
+                 method="validateRequiredIf"
+                 methodParams="java.lang.Object,
+                               org.apache.commons.validator.ValidatorAction,
+                               org.apache.commons.validator.Field,
+                               org.apache.struts.action.ActionErrors,
+                               org.apache.commons.validator.Validator,
+                               javax.servlet.http.HttpServletRequest"
+                 msg="errors.required">
+      </validator>
+
+      <validator name="minlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMinLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.minlength">
+
+         <javascript><![CDATA[
+            function validateMinLength(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMinLength = new minlength();
+                for (x in oMinLength) {
+                    var field = form[oMinLength[x][0]];
+                    
+                    if (field.type == 'text' ||
+                        field.type == 'textarea') {
+                        
+                        var iMin = parseInt(oMinLength[x][2]("minlength"));
+                        if ((trim(field.value).length > 0) && (field.value.length < iMin)) {
+                            if (i == 0) {
+                                focusField = field;
+                            }
+                            fields[i++] = oMinLength[x][1];
+                            isValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return isValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="maxlength"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMaxLength"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.maxlength">
+
+         <javascript><![CDATA[
+            function validateMaxLength(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMaxLength = new maxlength();
+                for (x in oMaxLength) {
+                    var field = form[oMaxLength[x][0]];
+                    
+                    if (field.type == 'text' ||
+                        field.type == 'textarea') {
+                        
+                        var iMax = parseInt(oMaxLength[x][2]("maxlength"));
+                        if (field.value.length > iMax) {
+                            if (i == 0) {
+                                focusField = field;
+                            }
+                            fields[i++] = oMaxLength[x][1];
+                            isValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return isValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="mask"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateMask"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.invalid">
+
+         <javascript><![CDATA[
+            function validateMask(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oMasked = new mask();
+                for (x in oMasked) {
+                    var field = form[oMasked[x][0]];
+                    
+                    if ((field.type == 'text' || 
+                         field.type == 'textarea') && 
+                         (field.value.length > 0)) {
+                        
+                        if (!matchPattern(field.value, oMasked[x][2]("mask"))) {
+                            if (i == 0) {
+                                focusField = field;
+                            }
+                            fields[i++] = oMasked[x][1];
+                            isValid = false;
+                        }
+                    }
+                }
+                
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return isValid;
+            }
+
+            function matchPattern(value, mask) {
+               return mask.exec(value);
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="byte"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateByte"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.byte"
+       jsFunctionName="ByteValidations">
+
+         <javascript><![CDATA[
+            function validateByte(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oByte = new ByteValidations();
+                for (x in oByte) {
+                	var field = form[oByte[x][0]];
+                	
+                    if (field.type == 'text' ||
+                        field.type == 'textarea' ||
+                        field.type == 'select-one' ||
+						field.type == 'radio') {
+
+						var value = '';
+						// get field's value
+						if (field.type == "select-one") {
+							var si = field.selectedIndex;
+							if (si >= 0) {
+								value = field.options[si].value;
+							}
+						} else {
+							value = field.value;
+						}
+                        
+                        if (value.length > 0) {
+                            if (!isAllDigits(value)) {
+                                bValid = false;
+                                if (i == 0) {
+                                    focusField = field;
+                                }
+                                fields[i++] = oByte[x][1];
+
+                            } else {
+
+	                            var iValue = parseInt(value);
+	                            if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) {
+	                                if (i == 0) {
+	                                    focusField = field;
+	                                }
+	                                fields[i++] = oByte[x][1];
+	                                bValid = false;
+	                            }
+                            }
+						}
+						
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="short"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateShort"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.short"
+       jsFunctionName="ShortValidations">
+
+         <javascript><![CDATA[
+            function validateShort(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oShort = new ShortValidations();
+                for (x in oShort) {
+                	var field = form[oShort[x][0]];
+                	
+                    if (field.type == 'text' ||
+                        field.type == 'textarea' ||
+                        field.type == 'select-one' ||
+                        field.type == 'radio') {
+                        
+                        var value = '';
+						// get field's value
+						if (field.type == "select-one") {
+							var si = field.selectedIndex;
+							if (si >= 0) {
+								value = field.options[si].value;
+							}
+						} else {
+							value = field.value;
+						}
+                        
+                        if (value.length > 0) {
+                            if (!isAllDigits(value)) {
+                                bValid = false;
+                                if (i == 0) {
+                                    focusField = field;
+                                }
+                                fields[i++] = oShort[x][1];
+
+                            } else {
+                        
+	                            var iValue = parseInt(value);
+	                            if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) {
+	                                if (i == 0) {
+	                                    focusField = field;
+	                                }
+	                                fields[i++] = oShort[x][1];
+	                                bValid = false;
+	                            }
+	                       }
+                       }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="integer"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateInteger"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.integer"
+       jsFunctionName="IntegerValidations">
+
+         <javascript><![CDATA[
+            function validateInteger(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oInteger = new IntegerValidations();
+                for (x in oInteger) {
+                	var field = form[oInteger[x][0]];
+
+                    if (field.type == 'text' ||
+                        field.type == 'textarea' ||
+                        field.type == 'select-one' ||
+                        field.type == 'radio') {
+                        
+                        var value = '';
+						// get field's value
+						if (field.type == "select-one") {
+							var si = field.selectedIndex;
+						    if (si >= 0) {
+							    value = field.options[si].value;
+						    }
+						} else {
+							value = field.value;
+						}
+                        
+                        if (value.length > 0) {
+                        
+                            if (!isAllDigits(value)) {
+                                bValid = false;
+                                if (i == 0) {
+	                                focusField = field;
+	                            }
+						        fields[i++] = oInteger[x][1];
+						        
+                            } else {
+	                            var iValue = parseInt(value);
+	                            if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) {
+	                                if (i == 0) {
+	                                    focusField = field;
+	                                }
+	                                fields[i++] = oInteger[x][1];
+	                                bValid = false;
+	                           }
+                           }
+                       }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            function isAllDigits(argvalue) {
+                argvalue = argvalue.toString();
+                var validChars = "0123456789";
+                var startFrom = 0;
+                if (argvalue.substring(0, 2) == "0x") {
+                   validChars = "0123456789abcdefABCDEF";
+                   startFrom = 2;
+                } else if (argvalue.charAt(0) == "0") {
+                   validChars = "01234567";
+                   startFrom = 1;
+                } else if (argvalue.charAt(0) == "-") {
+                    startFrom = 1;
+                }
+                
+                for (var n = startFrom; n < argvalue.length; n++) {
+                    if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false;
+                }
+                return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="long"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateLong"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.long"/>
+
+
+      <validator name="float"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloat"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.float"
+       jsFunctionName="FloatValidations">
+
+         <javascript><![CDATA[
+            function validateFloat(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oFloat = new FloatValidations();
+                for (x in oFloat) {
+                	var field = form[oFloat[x][0]];
+                	
+                    if (field.type == 'text' ||
+                        field.type == 'textarea' ||
+                        field.type == 'select-one' ||
+                        field.type == 'radio') {
+                        
+                    	var value = '';
+						// get field's value
+						if (field.type == "select-one") {
+							var si = field.selectedIndex;
+							if (si >= 0) {
+							    value = field.options[si].value;
+							}
+						} else {
+							value = field.value;
+						}
+                        
+                        if (value.length > 0) {
+                            // remove '.' before checking digits
+                            var tempArray = value.split('.');
+                            var joinedString= tempArray.join('');
+
+                            if (!isAllDigits(joinedString)) {
+                                bValid = false;
+                                if (i == 0) {
+                                    focusField = field;
+                                }
+                                fields[i++] = oFloat[x][1];
+
+                            } else {
+	                            var iValue = parseFloat(value);
+	                            if (isNaN(iValue)) {
+	                                if (i == 0) {
+	                                    focusField = field;
+	                                }
+	                                fields[i++] = oFloat[x][1];
+	                                bValid = false;
+	                            }
+                            }
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                   focusField.focus();
+                   alert(fields.join('\n'));
+                }
+                return bValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="double"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDouble"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.double"/>
+
+
+      <validator name="date"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateDate"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.date"
+       jsFunctionName="DateValidations">
+
+         <javascript><![CDATA[
+            function validateDate(form) {
+               var bValid = true;
+               var focusField = null;
+               var i = 0;
+               var fields = new Array();
+               oDate = new DateValidations();
+               for (x in oDate) {
+                   var value = form[oDate[x][0]].value;
+                   var datePattern = oDate[x][2]("datePatternStrict");
+                   if ((form[oDate[x][0]].type == 'text' ||
+                        form[oDate[x][0]].type == 'textarea') &&
+                       (value.length > 0) &&
+                       (datePattern.length > 0)) {
+                     var MONTH = "MM";
+                     var DAY = "dd";
+                     var YEAR = "yyyy";
+                     var orderMonth = datePattern.indexOf(MONTH);
+                     var orderDay = datePattern.indexOf(DAY);
+                     var orderYear = datePattern.indexOf(YEAR);
+                     if ((orderDay < orderYear && orderDay > orderMonth)) {
+                         var iDelim1 = orderMonth + MONTH.length;
+                         var iDelim2 = orderDay + DAY.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderDay && iDelim2 == orderYear) {
+                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
+                         } else if (iDelim1 == orderDay) {
+                            dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
+                         } else if (iDelim2 == orderYear) {
+                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
+                         } else {
+                            dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                            if (!isValidDate(matched[2], matched[1], matched[3])) {
+                               if (i == 0) {
+                                   focusField = form[oDate[x][0]];
+                               }
+                               fields[i++] = oDate[x][1];
+                               bValid =  false;
+                            }
+                         } else {
+                            if (i == 0) {
+                                focusField = form[oDate[x][0]];
+                            }
+                            fields[i++] = oDate[x][1];
+                            bValid =  false;
+                         }
+                     } else if ((orderMonth < orderYear && orderMonth > orderDay)) {
+                         var iDelim1 = orderDay + DAY.length;
+                         var iDelim2 = orderMonth + MONTH.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderMonth && iDelim2 == orderYear) {
+                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$");
+                         } else if (iDelim1 == orderMonth) {
+                             dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$");
+                         } else if (iDelim2 == orderYear) {
+                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$");
+                         } else {
+                             dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                             if (!isValidDate(matched[1], matched[2], matched[3])) {
+                                 if (i == 0) {
+                                     focusField = form[oDate[x][0]];
+                                 }
+                                 fields[i++] = oDate[x][1];
+                                 bValid =  false;
+                              }
+                         } else {
+                             if (i == 0) {
+                                 focusField = form[oDate[x][0]];
+                             }
+                             fields[i++] = oDate[x][1];
+                             bValid =  false;
+                         }
+                     } else if ((orderMonth > orderYear && orderMonth < orderDay)) {
+                         var iDelim1 = orderYear + YEAR.length;
+                         var iDelim2 = orderMonth + MONTH.length;
+                         var delim1 = datePattern.substring(iDelim1, iDelim1 + 1);
+                         var delim2 = datePattern.substring(iDelim2, iDelim2 + 1);
+                         if (iDelim1 == orderMonth && iDelim2 == orderDay) {
+                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$");
+                         } else if (iDelim1 == orderMonth) {
+                             dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$");
+                         } else if (iDelim2 == orderDay) {
+                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$");
+                         } else {
+                             dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$");
+                         }
+                         var matched = dateRegexp.exec(value);
+                         if(matched != null) {
+                             if (!isValidDate(matched[3], matched[2], matched[1])) {
+                                 if (i == 0) {
+                                     focusField = form[oDate[x][0]];
+                                  }
+                                  fields[i++] = oDate[x][1];
+                                  bValid =  false;
+                              }
+                          } else {
+                              if (i == 0) {
+                                  focusField = form[oDate[x][0]];
+                              }
+                              fields[i++] = oDate[x][1];
+                              bValid =  false;
+                          }
+                     } else {
+                         if (i == 0) {
+                             focusField = form[oDate[x][0]];
+                         }
+                         fields[i++] = oDate[x][1];
+                         bValid =  false;
+                     }
+                  }
+               }
+               if (fields.length > 0) {
+                  focusField.focus();
+                  alert(fields.join('\n'));
+               }
+               return bValid;
+            }
+
+	    function isValidDate(day, month, year) {
+	        if (month < 1 || month > 12) {
+                    return false;
+                }
+                if (day < 1 || day > 31) {
+                    return false;
+                }
+                if ((month == 4 || month == 6 || month == 9 || month == 11) &&
+                    (day == 31)) {
+                    return false;
+                }
+                if (month == 2) {
+                    var leap = (year % 4 == 0 &&
+                               (year % 100 != 0 || year % 400 == 0));
+                    if (day>29 || (day == 29 && !leap)) {
+                        return false;
+                    }
+                }
+                return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+<!-- range is deprecated use intRange instead -->
+      <validator name="range"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateIntRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="integer"
+                  msg="errors.range">
+
+         <javascript><![CDATA[
+            function validateRange(form) {
+                return validateIntRange(form);
+            }]]>
+         </javascript>
+
+      </validator>
+
+      <validator name="intRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateIntRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="integer"
+                  msg="errors.range">
+
+         <javascript><![CDATA[
+            function validateIntRange(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oRange = new intRange();
+                for (x in oRange) {
+                    var field = form[oRange[x][0]];
+                    
+                    if ((field.type == 'text' ||
+                         field.type == 'textarea') &&
+                        (field.value.length > 0)) {
+                        
+                        var iMin = parseInt(oRange[x][2]("min"));
+                        var iMax = parseInt(oRange[x][2]("max"));
+                        var iValue = parseInt(field.value);
+                        if (!(iValue >= iMin && iValue <= iMax)) {
+                            if (i == 0) {
+                                focusField = field;
+                            }
+                            fields[i++] = oRange[x][1];
+                            isValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return isValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+      <validator name="floatRange"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateFloatRange"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends="float"
+                  msg="errors.range">
+
+         <javascript><![CDATA[
+            function validateFloatRange(form) {
+                var isValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oRange = new floatRange();
+                for (x in oRange) {
+                    var field = form[oRange[x][0]];
+                    
+                    if ((field.type == 'text' ||
+                         field.type == 'textarea') &&
+                        (field.value.length > 0)) {
+                        
+                        var fMin = parseFloat(oRange[x][2]("min"));
+                        var fMax = parseFloat(oRange[x][2]("max"));
+                        var fValue = parseFloat(field.value);
+                        if (!(fValue >= fMin && fValue <= fMax)) {
+                            if (i == 0) {
+                                focusField = field;
+                            }
+                            fields[i++] = oRange[x][1];
+                            isValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return isValid;
+            }]]>
+         </javascript>
+
+      </validator>
+
+      <validator name="creditCard"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateCreditCard"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.creditcard">
+
+         <javascript><![CDATA[
+            function validateCreditCard(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oCreditCard = new creditCard();
+                for (x in oCreditCard) {
+                    if ((form[oCreditCard[x][0]].type == 'text' ||
+                         form[oCreditCard[x][0]].type == 'textarea') &&
+                        (form[oCreditCard[x][0]].value.length > 0)) {
+                        if (!luhnCheck(form[oCreditCard[x][0]].value)) {
+                            if (i == 0) {
+                                focusField = form[oCreditCard[x][0]];
+                            }
+                            fields[i++] = oCreditCard[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            /**
+             * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl
+             */
+            function luhnCheck(cardNumber) {
+                if (isLuhnNum(cardNumber)) {
+                    var no_digit = cardNumber.length;
+                    var oddoeven = no_digit & 1;
+                    var sum = 0;
+                    for (var count = 0; count < no_digit; count++) {
+                        var digit = parseInt(cardNumber.charAt(count));
+                        if (!((count & 1) ^ oddoeven)) {
+                            digit *= 2;
+                            if (digit > 9) digit -= 9;
+                        };
+                        sum += digit;
+                    };
+                    if (sum == 0) return false;
+                    if (sum % 10 == 0) return true;
+                };
+                return false;
+            }
+
+            function isLuhnNum(argvalue) {
+                argvalue = argvalue.toString();
+                if (argvalue.length == 0) {
+                    return false;
+                }
+                for (var n = 0; n < argvalue.length; n++) {
+                    if ((argvalue.substring(n, n+1) < "0") ||
+                        (argvalue.substring(n,n+1) > "9")) {
+                        return false;
+                    }
+                }
+                return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+
+      <validator name="email"
+            classname="org.apache.struts.validator.FieldChecks"
+               method="validateEmail"
+         methodParams="java.lang.Object,
+                       org.apache.commons.validator.ValidatorAction,
+                       org.apache.commons.validator.Field,
+                       org.apache.struts.action.ActionErrors,
+                       javax.servlet.http.HttpServletRequest"
+              depends=""
+                  msg="errors.email">
+
+         <javascript><![CDATA[
+            function validateEmail(form) {
+                var bValid = true;
+                var focusField = null;
+                var i = 0;
+                var fields = new Array();
+                oEmail = new email();
+                for (x in oEmail) {
+                    if ((form[oEmail[x][0]].type == 'text' ||
+                         form[oEmail[x][0]].type == 'textarea') &&
+                        (form[oEmail[x][0]].value.length > 0)) {
+                        if (!checkEmail(form[oEmail[x][0]].value)) {
+                            if (i == 0) {
+                                focusField = form[oEmail[x][0]];
+                            }
+                            fields[i++] = oEmail[x][1];
+                            bValid = false;
+                        }
+                    }
+                }
+                if (fields.length > 0) {
+                    focusField.focus();
+                    alert(fields.join('\n'));
+                }
+                return bValid;
+            }
+
+            /**
+             * Reference: Sandeep V. Tamhankar (stamhankar@hotmail.com),
+             * http://javascript.internet.com
+             */
+            function checkEmail(emailStr) {
+               if (emailStr.length == 0) {
+                   return true;
+               }
+               var emailPat=/^(.+)@(.+)$/;
+               var specialChars="\\(\\)<>@,;:\\\\\\\"\\.\\[\\]";
+               var validChars="\[^\\s" + specialChars + "\]";
+               var quotedUser="(\"[^\"]*\")";
+               var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/;
+               var atom=validChars + '+';
+               var word="(" + atom + "|" + quotedUser + ")";
+               var userPat=new RegExp("^" + word + "(\\." + word + ")*$");
+               var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$");
+               var matchArray=emailStr.match(emailPat);
+               if (matchArray == null) {
+                   return false;
+               }
+               var user=matchArray[1];
+               var domain=matchArray[2];
+               if (user.match(userPat) == null) {
+                   return false;
+               }
+               var IPArray = domain.match(ipDomainPat);
+               if (IPArray != null) {
+                   for (var i = 1; i <= 4; i++) {
+                      if (IPArray[i] > 255) {
+                         return false;
+                      }
+                   }
+                   return true;
+               }
+               var domainArray=domain.match(domainPat);
+               if (domainArray == null) {
+                   return false;
+               }
+               var atomPat=new RegExp(atom,"g");
+               var domArr=domain.match(atomPat);
+               var len=domArr.length;
+               if ((domArr[domArr.length-1].length < 2) ||
+                   (domArr[domArr.length-1].length > 3)) {
+                   return false;
+               }
+               if (len < 2) {
+                   return false;
+               }
+               return true;
+            }]]>
+         </javascript>
+
+      </validator>
+
+   </global>
+
+</form-validation>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/main/webapp/WEB-INF/validator-rules.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,51 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+
+/**
+ * This tests the site using HttpUnit
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id$
+ */
+public class HttpUnitTest extends ServletTestCase {
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+
+    /**
+     * This tests if the sample struts form works properly
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testStrutsPages() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/TestInput.do"));
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            form.setParameter("givenName", "Archie");
+            form.setParameter("familyName", "Trajano");
+            form.submit();
+        }
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            assertEquals("Archie", form.getParameterValue("givenName"));
+            assertEquals("Trajano", form.getParameterValue("familyName"));
+        }
+    }
+};
\ No newline at end of file

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/HttpUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,31 @@
+package @PACKAGE@;
+
+import servletunit.struts.CactusStrutsTestCase;
+
+/**
+ * This tests the functionality of the StrutsTestCase
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id$
+ */
+public class StrutsTest extends CactusStrutsTestCase {
+
+    /**
+     * Required constructor for CactusStrutsTestCase
+     * 
+     * @param name
+     *                   name of the test
+     */
+    public StrutsTest(String name) {
+        super(name);
+    }
+
+    public void testInputForm() throws Exception {
+        setRequestPathInfo("/TestInput.do");
+        addRequestParameter("givenName", "Archie");
+        addRequestParameter("familyName", "Trajano");
+        actionPerform();
+        verifyForward("success");
+        verifyNoActionErrors();
+    }
+}

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test-cactus/java/StrutsTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id$
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template-resources/src/test/java/SanityTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template.properties?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template.properties (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts-validation/template.properties Wed Jan  4 15:14:07 2006
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties
+maven.genapp.repackage=main/java,test/java,test-cactus/java
+maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties
 
 maven.genapp.default.package=example.web

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/build.properties.jboss?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
Binary files - no diff available.

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.properties?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.properties (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.properties Wed Jan  4 15:14:07 2006
@@ -15,22 +15,23 @@
 # -------------------------------------------------------------------
 
 maven.xdoc.date=left
-maven.eclipse.classpath.include=src/test-cactus,src/conf
+maven.docs.src=${basedir}/src/site/xdoc
+maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
 maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
 maven.xdoclet.webdoclet.0=true
 maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
 maven.xdoclet.webdoclet.strutsconfigxml.0=true
 maven.xdoclet.webdoclet.strutsconfigxml.0.validateXML=true
 maven.xdoclet.webdoclet.strutsconfigxml.0.Version=1.1
 maven.xdoclet.webdoclet.strutsconfigxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.strutsconfigxml.0.mergeDir=src/main/merge
 maven.xdoclet.webdoclet.strutsvalidationxml.0=true
 maven.xdoclet.webdoclet.strutsvalidationxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.jbosswebxml.0=true
 maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
 maven.xdoclet.webdoclet.deploymentdescriptor.0.displayname=@NAME@
 maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-cactus.src.mergewebxml = src/conf/cactus-web.xml
+cactus.src.mergewebxml = src/main/config/cactus-web.xml

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/project.xml Wed Jan  4 15:14:07 2006
@@ -249,8 +249,8 @@
   <build>
     <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
     <unitTest>
       <includes>
         <include>**/*Test.java</include>
@@ -261,7 +261,7 @@
     </unitTest>
     <resources>
       <resource>
-        <directory>src/conf</directory>
+        <directory>src/main/resources</directory>
         <includes>
           <include>*.properties</include>
         </includes>

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+</web-app>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/config/cactus-web.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,55 @@
+package @PACKAGE@;
+
+import java.io.IOException;
+import java.util.Date;
+
+import javax.servlet.ServletException;
+import javax.servlet.http.HttpServletRequest;
+import javax.servlet.http.HttpServletResponse;
+
+import org.apache.struts.action.Action;
+import org.apache.struts.action.ActionForm;
+import org.apache.struts.action.ActionForward;
+import org.apache.struts.action.ActionMapping;
+import org.apache.struts.action.DynaActionForm;
+
+
+/**
+ * This is a simple struts action that simply redirects the input back to itself.  It
+ * also sets a bean value to the current date.
+ * 
+ * @struts.action
+ * 	name="TestForm"
+ * 	 path="/TestInput"
+ * @struts.action-forward 
+ * 	name="success" 
+ * 	path="/WEB-INF/jsp/input.jsp"
+ * 
+ * @author <a href="mailto:trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id$ 
+ */
+public class InputAction extends Action {
+    /**
+     * Performs the simple action
+     * 
+     * @param mapping
+     *                   the action mappings where you find the return value of the
+     *                   forward
+     * @param actionForm
+     *                   the action form used, in this example it will be an instance
+     *                   of the DynaActionForm class
+     * @param request
+     *                   the HTTP servlet request
+     * @param response
+     *                   the HTTP servlet response
+     */
+    public ActionForward execute(ActionMapping mapping, ActionForm actionForm,
+            HttpServletRequest request, HttpServletResponse response)
+            throws IOException, ServletException {
+        if (actionForm != null) {
+            DynaActionForm form = (DynaActionForm) actionForm;
+            form.set("theDate", new Date());
+        }
+        return (mapping.findForward("success"));
+    }
+}

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/java/InputAction.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,21 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+<servlet-mapping>
+  <servlet-name>action</servlet-name>
+  <url-pattern>*.do</url-pattern>
+</servlet-mapping>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlet-mappings.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,26 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+  <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>
\ No newline at end of file

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/servlets.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,30 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+<form-bean 
+    name="TestForm" 
+    type="org.apache.struts.action.DynaActionForm">
+    <form-property 
+        name="givenName" 
+        type="java.lang.String" />
+    <form-property 
+        name="familyName" 
+        type="java.lang.String" />
+    <form-property 
+        name="theDate" 
+        type="java.util.Date" />
+</form-bean>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-forms.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,18 @@
+<!-- 
+/*
+ * Copyright 2001-2004 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+<message-resources parameter="ApplicationResources"/>
\ No newline at end of file

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/merge/struts-message-resources.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties Wed Jan  4 15:14:07 2006
@@ -0,0 +1,17 @@
+# -------------------------------------------------------------------
+# Copyright 2001-2004 The Apache Software Foundation.
+# 
+# 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.
+# -------------------------------------------------------------------
+
+title.page=The title @NAME@
\ No newline at end of file

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/resources/ApplicationResources.properties
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp Wed Jan  4 15:14:07 2006
@@ -0,0 +1,21 @@
+<%@ page contentType="text/html; charset=utf-8" %>
+
+<%@ taglib uri="/WEB-INF/tld/struts-bean-1.1.tld" prefix="bean" %>
+<%@ taglib uri="/WEB-INF/tld/struts-html-1.1.tld" prefix="html" %>
+<%@ taglib uri="/WEB-INF/tld/struts-logic-1.1.tld" prefix="logic" %>
+
+<html:html xhtml="true">
+<head>
+	<html:base/>
+	<title><bean:message key="title.page"/></title>
+</head>
+
+<body>
+	<p>The name is <bean:write name="TestForm"  property="familyName"/>, <bean:write name="TestForm"  property="givenName"/> on <bean:write name="TestForm"  property="theDate"/></p>
+	<html:form action="/TestInput">
+	 <html:text  property="givenName" size="16"/>
+	 <html:text  property="familyName" size="16"/>
+	 <html:submit/>
+	</html:form>
+</body>
+</html:html>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/main/webapp/WEB-INF/jsp/input.jsp
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,51 @@
+package @PACKAGE@;
+
+import org.apache.cactus.ServletTestCase;
+
+import com.meterware.httpunit.WebConversation;
+import com.meterware.httpunit.WebForm;
+
+/**
+ * This tests the site using HttpUnit
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id$
+ */
+public class HttpUnitTest extends ServletTestCase {
+    /**
+     * This is a helper method to create the URL string for the initial web
+     * conversation request
+     * 
+     * @param relativeUrl
+     *                   the relative URL including the leading"/"
+     * @return the context url with the relative URL appended to it
+     */
+    private String requestUrl(String relativeUrl) {
+        StringBuffer url = request.getRequestURL();
+        url.delete(url.lastIndexOf("/"), url.length());
+        url.append(relativeUrl);
+        return url.toString();
+    }
+
+    /**
+     * This tests if the sample struts form works properly
+     * 
+     * @throws Exception
+     *                    thrown when there is a problem with the test
+     */
+    public void testStrutsPages() throws Exception {
+        WebConversation wc = new WebConversation();
+        wc.getResponse(requestUrl("/TestInput.do"));
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            form.setParameter("givenName", "Archie");
+            form.setParameter("familyName", "Trajano");
+            form.submit();
+        }
+        {
+            WebForm form = wc.getCurrentPage().getForms()[0];
+            assertEquals("Archie", form.getParameterValue("givenName"));
+            assertEquals("Trajano", form.getParameterValue("familyName"));
+        }
+    }
+};
\ No newline at end of file

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/HttpUnitTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,31 @@
+package @PACKAGE@;
+
+import servletunit.struts.CactusStrutsTestCase;
+
+/**
+ * This tests the functionality of the StrutsTestCase
+ * 
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano </a>
+ * @version $Id$
+ */
+public class StrutsTest extends CactusStrutsTestCase {
+
+    /**
+     * Required constructor for CactusStrutsTestCase
+     * 
+     * @param name
+     *                   name of the test
+     */
+    public StrutsTest(String name) {
+        super(name);
+    }
+
+    public void testInputForm() throws Exception {
+        setRequestPathInfo("/TestInput.do");
+        addRequestParameter("givenName", "Archie");
+        addRequestParameter("familyName", "Trajano");
+        actionPerform();
+        verifyForward("success");
+        verifyNoActionErrors();
+    }
+}

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test-cactus/java/StrutsTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java Wed Jan  4 15:14:07 2006
@@ -0,0 +1,15 @@
+package @PACKAGE@;
+
+import junit.framework.TestCase;
+
+/**
+ * This is a simple JUnit test case to ensure that the environment is okay.
+ *
+ * @author <a href="trajano@yahoo.com">Archimedes Trajano</a>
+ * @version $Id$
+ */
+public class SanityTest extends TestCase {
+  public void testSanity() {
+    assertEquals( "test", "test" );
+  }
+}

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template-resources/src/test/java/SanityTest.java
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template.properties?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template.properties (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/struts/template.properties Wed Jan  4 15:14:07 2006
@@ -14,7 +14,7 @@
 # limitations under the License.
 # -------------------------------------------------------------------
 
-maven.genapp.repackage=java,test,test-cactus
-maven.genapp.filter=project.xml,src/conf/cactus-web.xml,src/merge/**,src/conf/ApplicationResources.properties,project.properties
+maven.genapp.repackage=main/java,test/java,test-cactus/java
+maven.genapp.filter=project.xml,src/main/config/cactus-web.xml,src/main/merge/**,src/main/resources/ApplicationResources.properties,project.properties
 
 maven.genapp.default.package=example.web

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.jboss Wed Jan  4 15:14:07 2006
@@ -19,7 +19,7 @@
 # Specify the XDoclet properties for the descriptor
 maven.xdoclet.ejbdoclet.jboss.0=true
 maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
-maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
+maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge
 maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
 maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
 maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/build.properties.tomcat Wed Jan  4 15:14:07 2006
@@ -19,7 +19,7 @@
 # Specify the XDoclet properties for the descriptor
 maven.xdoclet.ejbdoclet.jboss.0=true
 maven.xdoclet.ejbdoclet.jboss.0.Version=3.2
-maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/merge
+maven.xdoclet.ejbdoclet.jboss.0.mergeDir=src/main/merge
 maven.xdoclet.ejbdoclet.jboss.0.preferredrelationmapping="relation-table"
 maven.xdoclet.ejbdoclet.jboss.0.unauthenticatedPrincipal="nobody"
 maven.xdoclet.ejbdoclet.jboss.0.destDir=${maven.build.dir}/xdoclet/ejb/META-INF

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.properties
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.properties?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.properties (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.properties Wed Jan  4 15:14:07 2006
@@ -15,14 +15,15 @@
 # -------------------------------------------------------------------
 
 maven.xdoc.date=left
-maven.eclipse.classpath.include=src/test-cactus,src/conf
+maven.docs.src=${basedir}/src/site/xdoc
+maven.eclipse.classpath.include=src/test-cactus/java,src/main/config
 maven.war.webapp.dir=${maven.build.dir}/xdoclet/webdoclet
 maven.xdoclet.webdoclet.0=true
 maven.xdoclet.webdoclet.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-maven.xdoclet.webdoclet.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.0.mergeDir=src/main/merge
 maven.xdoclet.webdoclet.jbosswebxml.0=true
 maven.xdoclet.webdoclet.jbosswebxml.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
 maven.xdoclet.webdoclet.deploymentdescriptor.0.destDir=${maven.build.dir}/xdoclet/webdoclet/WEB-INF
-maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/merge
+maven.xdoclet.webdoclet.deploymentdescriptor.0.mergeDir=src/main/merge
 maven.xdoclet.webdoclet.fileset.0.include=**/*.java
-cactus.src.mergewebxml=src/conf/cactus-web.xml
+cactus.src.mergewebxml=src/main/config/cactus-web.xml

Modified: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.xml?rev=366021&r1=366020&r2=366021&view=diff
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.xml (original)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/project.xml Wed Jan  4 15:14:07 2006
@@ -276,8 +276,8 @@
   <build>
     <defaultGoal>war</defaultGoal>
     <nagEmailAddress>turbine-maven-dev@jakarta.apache.org</nagEmailAddress>
-    <sourceDirectory>src/java</sourceDirectory>
-    <unitTestSourceDirectory>src/test</unitTestSourceDirectory>
+    <sourceDirectory>src/main/java</sourceDirectory>
+    <unitTestSourceDirectory>src/test/java</unitTestSourceDirectory>
     <unitTest>
       <includes>
         <include>**/*Test.java</include>
@@ -288,7 +288,7 @@
     </unitTest>
     <resources>
       <resource>
-        <directory>src/conf</directory>
+        <directory>src/main/resources</directory>
         <includes>
           <include>*.properties</include>
         </includes>

Added: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml
URL: http://svn.apache.org/viewcvs/maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml?rev=366021&view=auto
==============================================================================
--- maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml (added)
+++ maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml Wed Jan  4 15:14:07 2006
@@ -0,0 +1,23 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!-- 
+/*
+ * Copyright 2001-2005 The Apache Software Foundation.
+ * 
+ * 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.
+ */
+ -->
+
+<!DOCTYPE web-app PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" "http://java.sun.com/dtd/web-app_2_3.dtd">
+
+<web-app>
+</web-app>

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml
------------------------------------------------------------------------------
    svn:executable = *

Propchange: maven/maven-1/plugins/trunk/genapp/src/plugin-resources/tapestry/template-resources/src/main/config/cactus-web.xml
------------------------------------------------------------------------------
    svn:keywords = "Author Date Id Revision"



Mime
View raw message