xlawrence 2005/03/02 14:38:47 CET
Modified files:
calClient/webapp/uiclient/conf uwCal-ClientApp.psml
calClient/webapp/uiclient/src/webapp/WEB-INF portlet.xml
web.xml
Log:
Updated config files
Revision Changes Path
1.3 +1 -1
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.2&r2=1.3&f=h
1.5 +1 -1
uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml.diff?r1=1.4&r2=1.5&f=h
1.13 +26 -37
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.12&r2=1.13&f=h
Index: uwCal-ClientApp.psml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/conf/uwCal-ClientApp.psml,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- uwCal-ClientApp.psml 1 Mar 2005 15:58:24 -0000 1.2
+++ uwCal-ClientApp.psml 2 Mar 2005 13:38:47 -0000 1.3
@@ -32,6 +32,6 @@
/>
<title>UWCal Client Application</title>
<fragment id="personalcal-1" type="layout"
name="jetspeed::VelocityOneColumn">
- <fragment id="personalcal-2" type="portlet"
name="ucalApp::PersonalEvents"/>
+ <fragment id="personalcal-2" type="portlet"
name="ucalApp::personalEvents"/>
</fragment>
</page>
Index: portlet.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/portlet.xml,v
retrieving revision 1.4
retrieving revision 1.5
diff -u -r1.4 -r1.5
--- portlet.xml 1 Mar 2005 13:56:35 -0000 1.4
+++ portlet.xml 2 Mar 2005 13:38:47 -0000 1.5
@@ -15,7 +15,7 @@
<name>ViewPage</name>
<value>/initialise.rdo</value>
</init-param>
- <portlet-name>PersonalEvents</portlet-name>
+ <portlet-name>personalEvents</portlet-name>
<display-name>Personal Events Calendar</display-name>
<description>
The UWCal personal calendar application allows a user to manage
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/uiclient/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web.xml 1 Mar 2005 13:56:35 -0000 1.12
+++ web.xml 2 Mar 2005 13:38:47 -0000 1.13
@@ -16,6 +16,11 @@
<param-value>DemoUserCal</param-value>
</context-param>
+ <context-param>
+ <param-name>debug</param-name>
+ <param-value>0</param-value>
+ </context-param>
+
<filter>
<filter-name>XSLT Filter</filter-name>
<filter-class>edu.rpi.sss.util.servlets.ConfiguredXSLTFilter</filter-class>
@@ -27,6 +32,10 @@
<param-name>directoryBrowsingDisallowed</param-name>
<param-value>no</param-value>
</init-param>
+ <init-param>
+ <param-name>ignoreContentType</param-name>
+ <param-value>false</param-value>
+ </init-param>
</filter>
<filter>
@@ -47,26 +56,10 @@
</init-param>
<init-param>
<param-name>attributePrefix</param-name>
- <param-value>org.uwcal.portlet.DemoUserCal</param-value>
+ <param-value>org.uwcal.portlet.DemoCal</param-value>
</init-param>
</filter>
- <!-- not yet - need to reconfig jboss - see cocoon install for hints
- <filter>
- <filter-name>FOP Filter</filter-name>
- <filter-class>edu.rpi.sss.util.servlets.FOPFilter</filter-class>
- <init-param>
- <param-name>debug</param-name>
- <param-value>0</param-value>
- </init-param>
- <init-param>
- <param-name>dump</param-name>
- <param-value>false</param-value>
- </init-param>
- </filter> -->
-
- <!-- XSLT should get the response before the FOPFilter -->
-
<filter-mapping>
<filter-name>Session Filter</filter-name>
<url-pattern>/*</url-pattern>
@@ -77,20 +70,25 @@
<filter-mapping>
<filter-name>SvcI Filter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.do</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
-<!--
<filter-mapping>
- <filter-name>FOP Filter</filter-name>
- <url-pattern>/*</url-pattern>
+ <filter-name>SvcI Filter</filter-name>
+ <url-pattern>*.rdo</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
</filter-mapping>
- -->
<filter-mapping>
<filter-name>XSLT Filter</filter-name>
- <url-pattern>/*</url-pattern>
+ <url-pattern>*.rdo</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
<dispatcher>REQUEST</dispatcher>
</filter-mapping>
@@ -109,6 +107,11 @@
<servlet-mapping>
<servlet-name>action</servlet-name>
+ <url-pattern>*.rdo</url-pattern>
+ </servlet-mapping>
+
+ <servlet-mapping>
+ <servlet-name>action</servlet-name>
<url-pattern>*.do</url-pattern>
</servlet-mapping>
@@ -121,10 +124,6 @@
</welcome-file-list>
<jsp-config>
- <!-- Reference a taglib in the jsp like this:
- <%@ taglib uri="struts-bean" prefix="bean" %>
- -->
-
<taglib>
<taglib-uri>struts-bean</taglib-uri>
<taglib-location>/WEB-INF/tlds/struts-bean.tld</taglib-location>
@@ -182,14 +181,4 @@
</form-login-config>
</login-config>
- <!-- The name rpi/misc/creds is built into the source and mapped onto
- the actual object via container specific methods
- (e.g. for jboss in jboss.xml) -->
-
- <ejb-ref>
- <ejb-ref-name>rpi/misc/creds</ejb-ref-name>
- <ejb-ref-type>Session</ejb-ref-type>
- <home>edu.rpi.cct.misc.credentials.shared.CredentialsHome</home>
- <remote>edu.rpi.cct.misc.credentials.shared.Credentials</remote>
- </ejb-ref>
</web-app>
