xlawrence 2005/03/01 16:58:24 CET
Modified files:
calClient/webapp/uiclient/conf/META-INF tomcat-context.xml
calClient/webapp/uiclient/conf uwCal-ClientApp.psml
calClient/webapp/uiclient/src/webapp/WEB-INF struts-config.xml
Log:
Updated config
Revision Changes Path
1.2 +1 -1
uwcal_JSR168/calClient/webapp/uiclient/conf/META-INF/tomcat-context.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/conf/META-INF/tomcat-context.xml.diff?r1=1.1&r2=1.2&f=h
1.2 +3 -3
uwcal_JSR168/calClient/webapp/uiclient/conf/uwCal-ClientApp.psml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/conf/uwCal-ClientApp.psml.diff?r1=1.1&r2=1.2&f=h
1.7 +234 -234
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/struts-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/struts-config.xml.diff?r1=1.6&r2=1.7&f=h
Index: tomcat-context.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/conf/META-INF/tomcat-context.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- tomcat-context.xml 1 Mar 2005 13:56:29 -0000 1.1
+++ tomcat-context.xml 1 Mar 2005 15:58:23 -0000 1.2
@@ -25,7 +25,7 @@
Author: Xavier Lawrence @ jahia . com
-->
-<Context path="/uwCal-AdminApp" docBase="uwCal-AdminApp">
+<Context path="/ucalApp" docBase="uucalApp">
<Resource name="jdbc/uwcalSynch" scope="Shareable"
type="javax.sql.DataSource"/>
<ResourceParams name="jdbc/uwcalSynch">
<parameter>
Index: uwCal-ClientApp.psml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/conf/uwCal-ClientApp.psml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- uwCal-ClientApp.psml 1 Mar 2005 13:56:29 -0000 1.1
+++ uwCal-ClientApp.psml 1 Mar 2005 15:58:24 -0000 1.2
@@ -30,8 +30,8 @@
layout-decorator="tigris"
portlet-decorator="tigris"
/>
- <title>UWCal Admin application</title>
- <fragment id="uwcalAdmin-1" type="layout"
name="jetspeed::VelocityTwoColumns">
- <fragment id="uwcalAdmin-2" type="portlet"
name="caladminApp::uwCal_Admin" />
+ <title>UWCal Client Application</title>
+ <fragment id="personalcal-1" type="layout"
name="jetspeed::VelocityOneColumn">
+ <fragment id="personalcal-2" type="portlet"
name="ucalApp::PersonalEvents"/>
</fragment>
</page>
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/struts-config.xml,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -r1.6 -r1.7
--- struts-config.xml 1 Mar 2005 13:56:35 -0000 1.6
+++ struts-config.xml 1 Mar 2005 15:58:24 -0000 1.7
@@ -1,238 +1,238 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
-
-<!DOCTYPE struts-config PUBLIC
- "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
- "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
-
- <!-- ====================================================================
- This is a the Struts configuration for the uwcal client.
- ======================================================================
-->
-
-<struts-config>
- <!-- ========== Form Bean Definitions ===================================
-->
- <form-beans>
- <form-bean name="calForm"
- type="edu.rpi.cct.uwcal.webclient.UWCalActionForm"/>
- </form-beans>
-
- <!-- ========== Global Forward Definitions ==============================
-->
- <global-forwards>
- <!-- render forwards -->
- <forward name="initialise" path="/initialise.rdo"/>
- <forward name="showCals" path="/showCals.rdo"/>
- <forward name="showManageLocations" path="/showManageLocations.rdo"/>
- <forward name="showEditLocation" path="/showEditLocation.rdo"/>
- <forward name="showEditEvent" path="/showEditEvent.rdo"/>
- <forward name="eventMore" path="/showEventMore.rdo"/>
-
- <forward name="initial" path="/setup.do"/>
-
- <forward name="doNothing" path="/showMain.rdo" redirect="true" />
- <forward name="error" path="/showMain.rdo" redirect="true" />
- <forward name="success" path="/showMain.rdo" redirect="true" />
- <forward name="cancelled" path="/showMain.rdo" redirect="true" />
- </global-forwards>
-
- <!-- ========== Action Mapping Definitions ==============================
-->
- <action-mappings>
-
- <!-- ===============================================================
- Render actions - these should be referenced by the rdo suffix to
- invoke the xslt filter
- =============================================================== -->
-
- <!--
- <action path="/showMain"
- name="calForm"
- scope="session"
- validate="false"
- include="/docs/main.jsp"/>
--->
- <action path="/showMain"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/main.jsp"/>
-
- <action path="/showCals"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/calendars.jsp" />
-
- <action path="/showEventMore"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/eventMore.jsp" />
-
- <action path="/showEditEvent"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/editEvent.jsp" />
-
- <action path="/showEditLocation"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/editLocation.jsp" />
-
- <action path="/showManageLocations"
- type="org.apache.struts.actions.ForwardAction"
- name="calForm"
- scope="session"
- validate="false"
- parameter="/docs/manageLocations.jsp" />
-
- <action path="/initialise"
- type="edu.rpi.cct.uwcal.webclient.UWCalAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/docs/main.jsp" />
- <forward name="loggedOut" path="/docs/login/logout.html" />
- </action>
-
- <!-- ===============================================================
- These actions do not render - these should be referenced by the do
- suffix and should redirect to a render action.
- =============================================================== -->
-
- <action path="/setup"
- type="edu.rpi.cct.uwcal.webclient.UWCalAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="loggedOut" path="/docs/login/logout.html" />
- </action>
-
- <action path="/selectFilter"
- type="edu.rpi.cct.uwcal.webclient.UWCalFilterAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="noCalDef" path="/showMain.rdo" redirect="true" />
- </action>
-
- <action path="/setView"
- type="edu.rpi.cct.uwcal.webclient.UWCalGoToAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
-
- <action path="/eventView"
- type="edu.rpi.cct.uwcal.webclient.UWCalEventAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/showEventMore.rdo" redirect="true" />
- </action>
-
- <action path="/addEvent"
- type="edu.rpi.cct.uwcal.webclient.UWCalAddEventAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
-
- <action path="/editEvent"
- type="edu.rpi.cct.uwcal.webclient.UWCalEditEventAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="edit" path="/showEditEvent.rdo" redirect="true" />
- </action>
-
- <action path="/delEvent"
- type="edu.rpi.cct.uwcal.webclient.UWCalDelEventAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
-
- <action path="/addEventRef"
- type="edu.rpi.cct.uwcal.webclient.UWCalAddEventRefAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
-
- <action path="/delEventRef"
- type="edu.rpi.cct.uwcal.webclient.UWCalDelEventRefAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
-
- <action path="/showPage"
- type="edu.rpi.cct.uwcal.webclient.UWCalAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/docs/showPage.jsp" />
- </action>
-
- <action path="/manageLocations"
- type="edu.rpi.cct.uwcal.webclient.UWCalAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
- </action>
-
- <action path="/addLocation"
- type="edu.rpi.cct.uwcal.webclient.UWCalAddLocationAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
- </action>
-
- <action path="/editLoc"
- type="edu.rpi.cct.uwcal.webclient.UWCalEditLocationAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="edit" path="/showEditLocation.rdo" redirect="true" />
- <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
- </action>
-
- <action path="/delLocation"
- type="edu.rpi.cct.uwcal.webclient.UWCalDelLocationAction"
- name="calForm"
- scope="session"
- validate="false">
- <forward name="referenced" path="/showManageLocations.rdo"
redirect="true" />
- <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
- </action>
-
- <action path="/subscribe"
- type="edu.rpi.cct.uwcal.webclient.UWCalSubscribeAction"
- name="calForm"
- scope="session"
- validate="false">
- </action>
- </action-mappings>
-<!-- unknown="true" -->
-
- <!-- Below will be one or more comments which must not be edited or removed
- for the portlet build process to succeed. The comment will be replaced
- by some extra cofiguration.
- -->
-
+<?xml version="1.0" encoding="ISO-8859-1" ?>
+
+<!DOCTYPE struts-config PUBLIC
+ "-//Apache Software Foundation//DTD Struts Configuration 1.2//EN"
+ "http://jakarta.apache.org/struts/dtds/struts-config_1_2.dtd";>
+
+ <!-- ====================================================================
+ This is a the Struts configuration for the uwcal client.
+ ======================================================================
-->
+
+<struts-config>
+ <!-- ========== Form Bean Definitions ===================================
-->
+ <form-beans>
+ <form-bean name="calForm"
+ type="edu.rpi.cct.uwcal.webclient.UWCalActionForm"/>
+ </form-beans>
+
+ <!-- ========== Global Forward Definitions ==============================
-->
+ <global-forwards>
+ <!-- render forwards -->
+ <forward name="initialise" path="/initialise.rdo"/>
+ <forward name="showCals" path="/showCals.rdo"/>
+ <forward name="showManageLocations" path="/showManageLocations.rdo"/>
+ <forward name="showEditLocation" path="/showEditLocation.rdo"/>
+ <forward name="showEditEvent" path="/showEditEvent.rdo"/>
+ <forward name="eventMore" path="/showEventMore.rdo"/>
+
+ <forward name="initial" path="/setup.do"/>
+
+ <forward name="doNothing" path="/showMain.rdo" redirect="true" />
+ <forward name="error" path="/showMain.rdo" redirect="true" />
+ <forward name="success" path="/showMain.rdo" redirect="true" />
+ <forward name="cancelled" path="/showMain.rdo" redirect="true" />
+ </global-forwards>
+
+ <!-- ========== Action Mapping Definitions ==============================
-->
+ <action-mappings>
+
+ <!-- ===============================================================
+ Render actions - these should be referenced by the rdo suffix to
+ invoke the xslt filter
+ =============================================================== -->
+
+ <!--
+ <action path="/showMain"
+ name="calForm"
+ scope="session"
+ validate="false"
+ include="/docs/main.jsp"/>
+-->
+ <action path="/showMain"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/main.jsp"/>
+
+ <action path="/showCals"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/calendars.jsp" />
+
+ <action path="/showEventMore"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/eventMore.jsp" />
+
+ <action path="/showEditEvent"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/editEvent.jsp" />
+
+ <action path="/showEditLocation"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/editLocation.jsp" />
+
+ <action path="/showManageLocations"
+ type="org.apache.struts.actions.ForwardAction"
+ name="calForm"
+ scope="session"
+ validate="false"
+ parameter="/docs/manageLocations.jsp" />
+
+ <action path="/initialise"
+ type="edu.rpi.cct.uwcal.webclient.UWCalAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/docs/main.jsp" />
+ <forward name="loggedOut" path="/docs/login/logout.html" />
+ </action>
+
+ <!-- ===============================================================
+ These actions do not render - these should be referenced by the do
+ suffix and should redirect to a render action.
+ =============================================================== -->
+
+ <action path="/setup"
+ type="edu.rpi.cct.uwcal.webclient.UWCalAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="loggedOut" path="/docs/login/logout.html" />
+ </action>
+
+ <action path="/selectFilter"
+ type="edu.rpi.cct.uwcal.webclient.UWCalFilterAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="noCalDef" path="/showMain.rdo" redirect="true" />
+ </action>
+
+ <action path="/setView"
+ type="edu.rpi.cct.uwcal.webclient.UWCalGoToAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+
+ <action path="/eventView"
+ type="org.jahia.suite.calendar.webApp.client.EventAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/showEventMore.rdo" redirect="true" />
+ </action>
+
+ <action path="/addEvent"
+ type="org.jahia.suite.calendar.webApp.client.AddEventAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+
+ <action path="/editEvent"
+ type="org.jahia.suite.calendar.webApp.client.EditEventAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="edit" path="/showEditEvent.rdo" redirect="true" />
+ </action>
+
+ <action path="/delEvent"
+ type="org.jahia.suite.calendar.webApp.client.DelEventAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+
+ <action path="/addEventRef"
+
type="org.jahia.suite.calendar.webApp.client.AddEventRefAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+
+ <action path="/delEventRef"
+ type="edu.rpi.cct.uwcal.webclient.UWCalDelEventRefAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+
+ <action path="/showPage"
+ type="edu.rpi.cct.uwcal.webclient.UWCalAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/docs/showPage.jsp" />
+ </action>
+
+ <action path="/manageLocations"
+ type="edu.rpi.cct.uwcal.webclient.UWCalAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
+ </action>
+
+ <action path="/addLocation"
+ type="edu.rpi.cct.uwcal.webclient.UWCalAddLocationAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
+ </action>
+
+ <action path="/editLoc"
+ type="edu.rpi.cct.uwcal.webclient.UWCalEditLocationAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="edit" path="/showEditLocation.rdo" redirect="true" />
+ <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
+ </action>
+
+ <action path="/delLocation"
+ type="edu.rpi.cct.uwcal.webclient.UWCalDelLocationAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ <forward name="referenced" path="/showManageLocations.rdo"
redirect="true" />
+ <forward name="success" path="/showManageLocations.rdo"
redirect="true" />
+ </action>
+
+ <action path="/subscribe"
+ type="edu.rpi.cct.uwcal.webclient.UWCalSubscribeAction"
+ name="calForm"
+ scope="session"
+ validate="false">
+ </action>
+ </action-mappings>
+<!-- unknown="true" -->
+
+ <!-- Below will be one or more comments which must not be edited or removed
+ for the portlet build process to succeed. The comment will be replaced
+ by some extra cofiguration.
+ -->
+
<controller pagePattern="$M$P" inputForward="true"
processorClass="org.apache.portals.bridges.struts.PortletRequestProcessor"/>
-
-
- <message-resources parameter="client" null="true" />
-
-</struts-config>
+
+
+ <message-resources parameter="client" null="true" />
+
+</struts-config>
