[Modelj-developer] modelj/layout/web/WEB-INF validator-rules.xml,1.1.1.1,1.2 web.xml,1.1.1.1,1.2

[<tom...@us...>]

Update of /cvsroot/modelj/modelj/layout/web/WEB-INF
In directory sc8-pr-cvs1:/tmp/cvs-serv19272/layout/web/WEB-INF

Modified Files:
	validator-rules.xml web.xml 
Log Message:
Ported to Struts 1.1-RC1

Index: validator-rules.xml
===================================================================
RCS file: /cvsroot/modelj/modelj/layout/web/WEB-INF/validator-rules.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** validator-rules.xml	11 Jan 2003 03:37:02 -0000	1.1.1.1
--- validator-rules.xml	30 Mar 2003 21:35:55 -0000	1.2
***************
*** 1,572 ****
  <form-validation>
     <global>
        <validator name="required"
!                  classname="org.apache.struts.validator.util.StrutsValidator"
!                  method="validateRequired"
!                  msg="errors.required">
           <javascript><![CDATA[
!             function validateRequired(form) {                                                                       
                  var bValid = true;
                  var focusField = null;
[...1630 lines suppressed...]
!                }
                 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>

Index: web.xml
===================================================================
RCS file: /cvsroot/modelj/modelj/layout/web/WEB-INF/web.xml,v
retrieving revision 1.1.1.1
retrieving revision 1.2
diff -C2 -d -r1.1.1.1 -r1.2
*** web.xml	11 Jan 2003 03:37:02 -0000	1.1.1.1
--- web.xml	30 Mar 2003 21:35:55 -0000	1.2
***************
*** 5,35 ****
  <web-app>
  
-   <!-- form validation servlet configuration -->
    <servlet>
!     <servlet-name>validator</servlet-name>
!     <servlet-class>org.apache.struts.validator.action.ValidatorServlet</servlet-class>
      <init-param>
!       <param-name>config-rules</param-name>
!       <param-value>/WEB-INF/validator-rules.xml</param-value>
      </init-param>
      <init-param>
!       <param-name>config</param-name>
!       <param-value>/WEB-INF/validation.xml</param-value>
      </init-param>
      <init-param>
!       <param-name>debug</param-name>
!       <param-value>1</param-value>
      </init-param>
-     <load-on-startup>2</load-on-startup>
-   </servlet>
- 
-   <servlet>
-     <servlet-name>action</servlet-name>
- <!--
-     <servlet-class>
-       org.apache.struts.action.ActionServlet
-     </servlet-class>
- -->
-     <servlet-class>org.apache.struts.tiles.ActionComponentServlet</servlet-class>
      <init-param>
        <param-name>application</param-name>
--- 5,29 ----
  <web-app>
  
    <servlet>
!     <servlet-name>action</servlet-name>
!     <servlet-class>
!       org.apache.struts.action.ActionServlet
!     </servlet-class>
! 	<init-param>
!       <param-name>definitions-config</param-name>
!       <param-value>/WEB-INF/tilesDefinitions.xml</param-value>
!     </init-param>
      <init-param>
!       <param-name>definitions-debug</param-name>
!       <param-value>0</param-value>
      </init-param>
      <init-param>
!       <param-name>definitions-parser-details</param-name>
!       <param-value>0</param-value>
      </init-param>
      <init-param>
!       <param-name>definitions-parser-validate</param-name>
!       <param-value>true</param-value>
      </init-param>
      <init-param>
        <param-name>application</param-name>
***************
*** 112,116 ****
    <taglib>
      <taglib-uri>/WEB-INF/tlds/tiles.tld</taglib-uri>
!     <taglib-location>/WEB-INF/tlds/tiles.tld</taglib-location>
    </taglib> 
  
--- 106,110 ----
    <taglib>
      <taglib-uri>/WEB-INF/tlds/tiles.tld</taglib-uri>
!     <taglib-location>/WEB-INF/tlds/struts-tiles.tld</taglib-location>
    </taglib>