[Struts-cvs] dialogs/war/WEB-INF struts-config.xml,1.7,1.8 web.xml,1.1,1.2

[<jm...@us...>]

Update of /cvsroot/struts/dialogs/war/WEB-INF
In directory sc8-pr-cvs1.sourceforge.net:/tmp/cvs-serv1987/war/WEB-INF

Modified Files:
	struts-config.xml web.xml 
Log Message:
Moving to new package

Index: struts-config.xml
===================================================================
RCS file: /cvsroot/struts/dialogs/war/WEB-INF/struts-config.xml,v
retrieving revision 1.7
retrieving revision 1.8
diff -C2 -d -r1.7 -r1.8
*** struts-config.xml	28 Jun 2005 01:36:12 -0000	1.7
--- struts-config.xml	11 Jul 2005 06:49:04 -0000	1.8
***************
*** 125,128 ****
--- 125,169 ----
  
        <!-- ****************************************************************
+            CRUD action 2: create, duplucate, edit, view, delete item
+            **************************************************************** -->
+ 
+       <!-- CRUD action -->
+       <action path="/crudactionlite"
+               type      = "net.sf.dialogs.samples.crudaction.CRUDActionSample"
+               name      = "crudform"
+               scope     = "session"
+               validate  = "false"
+               parameter = "DIALOG-EVENT">
+ 
+           <forward name="ON-CREATE-SUCCESS" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-DUPLICATE-SUCCESS" path="/crudactionlite.do" redirect="true"/>
+ 
+           <forward name="ON-PREVIEW" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-EDIT" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-LOAD-FAILURE" path="/crudaction-error.jsp"/>
+ 
+           <forward name="ON-DELETE-SUCCESS" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-DELETE-FAILURE" path="/crudaction-error.jsp"/>
+ 
+           <forward name="ON-CANCEL" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-CLOSE" path="/crudactionlite.do" redirect="true"/>
+ 
+           <forward name="ON-STORE-SUCCESS" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-STORE-FAILURE" path="/crudactionlite.do" redirect="true"/>
+           <forward name="ON-INVALID-DATA" path="/crudactionlite.do" redirect="true"/>
+ 
+           <!-- Which page to load on the output phase or on refresh (GET) -->
+ 
+           <!-- Edit Mode -->
+           <forward name="CRUD-UI-MODE-EDITABLE" path="/crudaction-lite-edit.jsp"/>
+           <!-- Preview Mode -->
+           <forward name="CRUD-UI-MODE-READONLY" path="/crudaction-lite-noedit.jsp"/>
+           <!-- If item is not active, show item list -->
+           <forward name="CRUD-UI-MODE-INACTIVE" path="/crudaction-lite-list.jsp"/>
+ 
+       </action>
+       <action path="/erroraction" forward="/crudaction-error.jsp"/>
+ 
+       <!-- ****************************************************************
             Wizard action: User Signup wizard
             **************************************************************** -->
***************
*** 190,193 ****
--- 231,258 ----
        </action>
  
+ 
+       <action path="/tabcontrol"
+               type = "net.sf.collab.TabControlAction">
+               <!-- Reload phase: base path, appended with sublevels -->
+               <forward name = "MAINPAGE" path="main" redirect="true"/>
+               <!-- Render phase: show tabs -->
+               <forward name = "TABS" path="/tabs.jsp"/>
+       </action>
+ 
+ 
+       <action path="/main"
+               type = "net.sf.collab.MasterPageAction">
+               <forward name = "FORWARD" path="main/" redirect="true"/>
+       </action>
+ 
+ <!--
+       Forward action does not allow to forward or redirect to location without
+       leading slash. Standard action prohibits forwarding without leading slash,
+       but allows redirecting.
+       <action path="/main*" forward="main/" redirect="true"/>
+ -->
+       <action path="/main/**" forward="/mainpage.jsp"/>
+ 
+ 
    </action-mappings>
  

Index: web.xml
===================================================================
RCS file: /cvsroot/struts/dialogs/war/WEB-INF/web.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** web.xml	7 Jun 2005 21:34:38 -0000	1.1
--- web.xml	11 Jul 2005 06:49:04 -0000	1.2
***************
*** 22,29 ****
    </servlet>
  
    <servlet-mapping>
      <servlet-name>action</servlet-name>
!     <url-pattern>*.do</url-pattern>
    </servlet-mapping>
  
    <welcome-file-list>
--- 22,35 ----
    </servlet>
  
+ <!--
    <servlet-mapping>
      <servlet-name>action</servlet-name>
!     <url-pattern>/site/*</url-pattern>
    </servlet-mapping>
+ -->
+     <servlet-mapping>
+       <servlet-name>action</servlet-name>
+       <url-pattern>*.do</url-pattern>
+     </servlet-mapping>
  
    <welcome-file-list>