xlawrence 2005/01/21 09:51:29 CET
Modified files:
calClient/webapp/uiclient/src/webapp/WEB-INF struts-config.xml
web.xml
Log:
Updated working config files
Revision Changes Path
1.3 +1 -1
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.2&r2=1.3&f=h
1.5 +40 -1
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml.diff?r1=1.4&r2=1.5&f=h
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.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- struts-config.xml 11 Jan 2005 11:05:56 -0000 1.2
+++ struts-config.xml 21 Jan 2005 08:51:29 -0000 1.3
@@ -1 +1 @@
-<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
BEGIN LICENSE BLOCK
Version: JCSL 1.0
The contents of this file are subject to the Jahia Community Source License
1.0 or later (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.jahia.org/license
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the rights, obligations and limitations governing use of the contents
of the file. The Original and Upgraded Code is the Jahia CMS and Portal
Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
Ltd. owns the copyrights in the portions it created. All Rights Reserved.
The Shared Modifications are Jahia View Helper.
The Developer of the Shared Modifications is Jahia Solution Sarl.
Portions created by the Initial Developer are Copyright (C) 2002 by the
Initial D
eveloper. All Rights Reserved.
END LICENSE BLOCK
Author: Xavier Lawrence @ jahia . com
-->
<!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>
<forward name="initial" path="/setup.do"/>
<forward name="doNothing" path="/WEB-INF/jsp/main.jsp" />
<forward name="error" path="/WEB
-INF/jsp/main.jsp"/>
<forward name="success" path="/WEB-INF/jsp/main.jsp" />
<forward name="cancelled" path="/WEB-INF/jsp/main.jsp" />
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
<action path="/setup"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
<forward name="loggedOut" path="/WEB-INF/jsp/login/logout.html" />
</action>
<action path="/selectFilter"
type="org.jahia.suite.calendar.webApp.uiclient.FilterAction"
name="calForm"
scope="session"
validate="false">
<forward name="noCalDef" path="/WEB-INF/jsp/main.jsp" />
</action>
<action path="/showCals"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope
="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/calendars.jsp" />
</action>
<action path="/setView"
type="org.jahia.suite.calendar.webApp.uiclient.GoToAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/eventView"
type="org.jahia.suite.calendar.webApp.uiclient.EventAction"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/eventMore.jsp" />
</action>
<action path="/addEvent"
type="org.jahia.suite.calendar.webApp.uiclient.AddEventAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/editEvent"
type="org.jahia.suite.calendar.webApp.uiclient.EditEventAction"
name="calForm"
scope="session"
validate="false">
<forward name="edit" path="/WEB-INF/jsp/editEvent.jsp" />
</action>
<action path="/delEvent"
type="org.jahia.suite.calendar.webApp.uiclient.DelEventAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/addEventRef"
type="org.jahia.suite.calendar.webApp.uiclient.AddEventRefAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/delEventRef"
type="org.jahia.suite.calendar.webApp.uiclient.DelEventRefAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/showPage"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
val
idate="false">
<forward name="success" path="/WEB-INF/jsp/showPage.jsp" />
</action>
<action path="/manageLocations"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/addLocation"
type="org.jahia.suite.calendar.webApp.uiclient.AddLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/editLocation"
type="org.jahia.suite.calendar.webApp.uiclient.EditLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="edit" path="/WEB-INF/jsp/editLocation.jsp" />
<forward name="succ
ess" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/delLocation"
type="org.jahia.suite.calendar.webApp.uiclient.DelLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="referenced" path="/WEB-INF/jsp/manageLocations.jsp" />
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/subscribe"
type="org.jahia.suite.calendar.webApp.uiclient.SubscribeAction"
name="calForm"
scope="session"
validate="false">
</action>
</action-mappings>
<!-- ========== Controller Configuration ================================ -->
<controller pagePattern="$M$P" inputForward="true"
processorClass="org.apache.portals.bridges.struts.PortletRequestProcessor"/>
<!-- pagePattern: use this pattern when creating URIs to resources.
$M=module, $P=p
ath -->
<!-- inputForward: The "input" parameter on "action" elements is the name
of a
local or global "forward" rather than a module-relative path -->
<!-- unknown="true" -->
</struts-config>
\ No newline at end of file
+<?xml version="1.0" encoding="ISO-8859-1" ?>
<!--
BEGIN LICENSE BLOCK
Version: JCSL 1.0
The contents of this file are subject to the Jahia Community Source License
1.0 or later (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.jahia.org/license
Software distributed under the License is distributed on an "AS IS" basis,
WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
for the rights, obligations and limitations governing use of the contents
of the file. The Original and Upgraded Code is the Jahia CMS and Portal
Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
Ltd. owns the copyrights in the portions it created. All Rights Reserved.
The Shared Modifications are Jahia View Helper.
The Developer of the Shared Modifications is Jahia Solution Sarl.
Portions created by the Initial Developer are Copyright (C) 2002 by the
Initial D
eveloper. All Rights Reserved.
END LICENSE BLOCK
Author: Xavier Lawrence @ jahia . com
-->
<!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>
<forward name="initial" path="/setup.do"/>
<forward name="doNothing" path="/WEB-INF/jsp/main.jsp" />
<forward name="error" path="/WEB
-INF/jsp/main.jsp"/>
<forward name="success" path="/WEB-INF/jsp/main.jsp" />
<forward name="cancelled" path="/WEB-INF/jsp/main.jsp" />
</global-forwards>
<!-- ========== Action Mapping Definitions ============================== -->
<action-mappings>
<action path="/setup"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/selectFilter"
type="org.jahia.suite.calendar.webApp.uiclient.FilterAction"
name="calForm"
scope="session"
validate="false">
<forward name="noCalDef" path="/WEB-INF/jsp/main.jsp" />
</action>
<action path="/showCals"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
<forward name="success"
path="/WEB-INF/jsp/calendars.jsp" />
</action>
<action path="/setView"
type="org.jahia.suite.calendar.webApp.uiclient.GoToAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/eventView"
type="org.jahia.suite.calendar.webApp.uiclient.EventAction"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/eventMore.jsp" />
</action>
<action path="/addEvent"
type="org.jahia.suite.calendar.webApp.uiclient.AddEventAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/editEvent"
type="org.jahia.suite.calendar.webApp.uiclient.EditEventAction"
name="calForm"
scope="session"
validate="false">
<forwar
d name="edit" path="/WEB-INF/jsp/editEvent.jsp" />
</action>
<action path="/delEvent"
type="org.jahia.suite.calendar.webApp.uiclient.DelEventAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/addEventRef"
type="org.jahia.suite.calendar.webApp.uiclient.AddEventRefAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/delEventRef"
type="org.jahia.suite.calendar.webApp.uiclient.DelEventRefAction"
name="calForm"
scope="session"
validate="false">
</action>
<action path="/showPage"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/showPage.
jsp" />
</action>
<action path="/manageLocations"
type="org.jahia.suite.calendar.webApp.uiclient.Action"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/addLocation"
type="org.jahia.suite.calendar.webApp.uiclient.AddLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/editLocation"
type="org.jahia.suite.calendar.webApp.uiclient.EditLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="edit" path="/WEB-INF/jsp/editLocation.jsp" />
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<actio
n path="/delLocation"
type="org.jahia.suite.calendar.webApp.uiclient.DelLocationAction"
name="calForm"
scope="session"
validate="false">
<forward name="referenced" path="/WEB-INF/jsp/manageLocations.jsp" />
<forward name="success" path="/WEB-INF/jsp/manageLocations.jsp" />
</action>
<action path="/subscribe"
type="org.jahia.suite.calendar.webApp.uiclient.SubscribeAction"
name="calForm"
scope="session"
validate="false">
</action>
</action-mappings>
<!-- ========== Controller Configuration ================================ -->
<controller pagePattern="$M$P" inputForward="true"
processorClass="org.apache.portals.bridges.struts.PortletRequestProcessor"/>
<!-- pagePattern: use this pattern when creating URIs to resources.
$M=module, $P=path -->
<!-- inputForward: The "input" parameter on "action" elements
is the name of a
local or global "forward" rather than a module-relative path -->
<!-- ========== Message Resources ====================================== -->
<message-resources parameter="client" null="true" />
</struts-config>
\ No newline at end of file
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- web.xml 20 Jan 2005 11:17:21 -0000 1.4
+++ web.xml 21 Jan 2005 08:51:29 -0000 1.5
@@ -1,5 +1,30 @@
<?xml version="1.0" encoding="ISO-8859-1"?>
+<!--
+ BEGIN LICENSE BLOCK
+ Version: JCSL 1.0
+
+ The contents of this file are subject to the Jahia Community Source License
+ 1.0 or later (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.jahia.org/license
+
+ Software distributed under the License is distributed on an "AS IS" basis,
+ WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
+ for the rights, obligations and limitations governing use of the contents
+ of the file. The Original and Upgraded Code is the Jahia CMS and Portal
+ Server. The developer of the Original and Upgraded Code is JAHIA Ltd. JAHIA
+ Ltd. owns the copyrights in the portions it created. All Rights Reserved.
+
+ The Shared Modifications are Jahia View Helper.
+
+ The Developer of the Shared Modifications is Jahia Solution Sarl.
+ Portions created by the Initial Developer are Copyright (C) 2002 by the
+ Initial Developer. All Rights Reserved.
+ END LICENSE BLOCK
+
+ Author: Xavier Lawrence @ jahia . com
+-->
<!DOCTYPE web-app
PUBLIC "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN"
"http://java.sun.com/dtd/web-app_2_3.dtd";>
@@ -17,15 +42,29 @@
<filter-class>edu.rpi.sss.util.servlets.ConfiguredXSLTFilter</filter-class>
<init-param>
<param-name>debug</param-name>
- <param-value>9</param-value>
+ <param-value>0</param-value>
</init-param>
<init-param>
<param-name>directoryBrowsingDisallowed</param-name>
<param-value>no</param-value>
</init-param>
</filter>
+
+ <filter>
+ <filter-name>SvcI Filter</filter-name>
+ <filter-class>edu.rpi.cct.uwcal.webcommon.UWCalSvciFilter</filter-class>
+ <init-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </init-param>
+ </filter>
<filter-mapping>
+ <filter-name>SvcI Filter</filter-name>
+ <url-pattern>/*</url-pattern>
+ </filter-mapping>
+
+ <filter-mapping>
<filter-name>XSLT Filter</filter-name>
<url-pattern>/*</url-pattern>
</filter-mapping>
