[Bedework-commit] webapps r506 - trunk/webadmin/war/WEB-INF
svnadmin at bedework.org
svnadmin at bedework.org
Wed Sep 5 22:42:51 EDT 2007
Author: douglm
Date: 2007-09-05 22:42:50 -0400 (Wed, 05 Sep 2007)
New Revision: 506
Modified:
trunk/webadmin/war/WEB-INF/struts-config.xml
Log:
Change /admin/showMain to /main/showMain
Modified: trunk/webadmin/war/WEB-INF/struts-config.xml
===================================================================
--- trunk/webadmin/war/WEB-INF/struts-config.xml 2007-09-06 01:51:17 UTC (rev 505)
+++ trunk/webadmin/war/WEB-INF/struts-config.xml 2007-09-06 02:42:50 UTC (rev 506)
@@ -54,22 +54,21 @@
<forward name="noGroupAssigned" path="/admin/showNoGroup.rdo" redirect="true"/>
<!-- <forward name="error" path="/admin/showError.rdo" redirect="true"/> -->
<forward name="error" path="/docs/error.jsp"/>
- <forward name="badRequest" path="/admin/showMain.rdo" redirect="true" />
- <forward name="accessError" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="badRequest" path="/main/showMain.rdo" redirect="true" />
+ <forward name="accessError" path="/main/showMain.rdo" redirect="true"/>
<forward name="noAccess" path="/admin/showNoAccess.rdo" redirect="true"/>
- <forward name="noaccess" path="/admin/showNoAccess.rdo" redirect="true"/>
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true"/>
- <forward name="success" path="/admin/showMain.rdo" redirect="true"/>
- <forward name="cancelled" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true"/>
+ <forward name="success" path="/main/showMain.rdo" redirect="true"/>
+ <forward name="cancelled" path="/main/showMain.rdo" redirect="true"/>
<!-- Forward for a new session from some bookmarked link; used by
org.bedework.webcommon.RenderAction when a refresh is needed -->
- <forward name="gotomain" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="gotomain" path="/main/showMain.rdo" redirect="true"/>
</global-forwards>
<!-- ========== Action Mapping Definitions =========================== -->
<action-mappings>
- <action path="/admin/showMain"
+ <action path="/main/showMain"
type="org.bedework.webcommon.RenderAction"
name="calForm"
scope="session"
@@ -116,7 +115,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="loggedOut" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="loggedOut" path="/main/showMain.rdo" redirect="true"/>
</action>
<!-- ===============================================================
@@ -187,7 +186,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/event/showEvent.rdo" redirect="true" />
</action>
@@ -196,9 +195,9 @@
name="calForm"
scope="session"
validate="false">
- <forward name="noAction" path="/admin/showMain.rdo" redirect="true" />
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
- <forward name="error" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="noAction" path="/main/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
+ <forward name="error" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/event/showModForm.rdo" redirect="true" />
<forward name="copy" path="/event/showModForm.rdo" redirect="true" />
</action>
@@ -285,7 +284,7 @@
<forward name="notFound" path="/docs/main.jsp"/>
<forward name="success" path="/calendar/showModForm.rdo" redirect="true"/>
</action>
-
+
<action path="/calendar/openCloseSelect"
type="org.bedework.webcommon.calendars.OpenCloseAction"
name="peForm"
@@ -294,7 +293,7 @@
<forward name="notFound" path="/docs/main.jsp"/>
<forward name="success" path="/event/showCalsForEvent.rdo" redirect="true"/>
</action>
-
+
<action path="/calendar/openCloseDisplay"
type="org.bedework.webcommon.calendars.OpenCloseAction"
name="peForm"
@@ -491,7 +490,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/subs/showModForm.rdo" redirect="true" />
</action>
@@ -612,7 +611,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="success" path="/calsuite/showModPrefsForm.rdo" redirect="true" />
</action>
@@ -621,9 +620,9 @@
name="calForm"
scope="session"
validate="false">
- <forward name="cancelled" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="cancelled" path="/main/showMain.rdo" redirect="true" />
<forward name="retry" path="/calsuite/showModPrefsForm.rdo" />
- <forward name="success" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="success" path="/main/showMain.rdo" redirect="true" />
</action>
<!-- ===============================================================
@@ -755,7 +754,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="failed" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="failed" path="/main/showMain.rdo" redirect="true"/>
<forward name="success" path="/timezones/showUpload.rdo" redirect="true" />
</action>
@@ -764,7 +763,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="failed" path="/admin/showMain.rdo" redirect="true"/>
+ <forward name="failed" path="/main/showMain.rdo" redirect="true"/>
<forward name="success" path="/timezones/showUpload.rdo" redirect="true" />
</action>
@@ -853,7 +852,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/contact/showContact.rdo" redirect="true" />
</action>
@@ -862,7 +861,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/contact/showModForm.rdo" redirect="true" />
</action>
@@ -964,7 +963,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/location/showLocation.rdo" redirect="true" />
</action>
@@ -973,7 +972,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/location/showModForm.rdo" redirect="true" />
</action>
@@ -1060,7 +1059,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/category/showModForm.rdo" redirect="true" />
</action>
@@ -1142,7 +1141,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="success" path="/prefs/showModForm.rdo" redirect="true" />
</action>
@@ -1151,9 +1150,9 @@
name="calForm"
scope="session"
validate="false">
- <forward name="cancelled" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="cancelled" path="/main/showMain.rdo" redirect="true" />
<forward name="retry" path="/prefs/showModForm.rdo" redirect="true"/>
- <forward name="success" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="success" path="/main/showMain.rdo" redirect="true" />
</action>
<!-- ===============================================================
@@ -1247,7 +1246,7 @@
name="calForm"
scope="session"
validate="false">
- <forward name="notFound" path="/admin/showMain.rdo" redirect="true" />
+ <forward name="notFound" path="/main/showMain.rdo" redirect="true" />
<forward name="continue" path="/admingroup/showModMembersForm.rdo" redirect="true" />
</action>
More information about the Bedework-commit
mailing list