xlawrence 2005/02/07 16:44:04 CET
Modified files:
calClient/webapp/admin/src/webapp/WEB-INF struts-config.xml
struts-portlet-config.xml
web.xml
calClient/webapp/admin/src/webapp/jsp addEvent.jsp error.jsp
header.jsp loggedOut.jsp
menuHeader.jsp
calClient/webapp/admin/src/webapp/login error.html
Added files:
calClient/webapp/admin/src/webapp login.html
Log:
Caladmin now works as a JSR-168 Portlet or a a standard WEBAPP (2.4)
Revision Changes Path
1.6 +1 -1
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-config.xml.diff?r1=1.5&r2=1.6&f=h
1.2 +9 -9
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-portlet-config.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-portlet-config.xml.diff?r1=1.1&r2=1.2&f=h
1.13 +16 -6
uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml.diff?r1=1.12&r2=1.13&f=h
1.2 +1 -1
uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/addEvent.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/addEvent.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +0 -2
uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/error.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/error.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -2
uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/header.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/header.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +5 -5
uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/loggedOut.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/loggedOut.jsp.diff?r1=1.1&r2=1.2&f=h
1.2 +1 -2
uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/menuHeader.jsp
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/menuHeader.jsp.diff?r1=1.1&r2=1.2&f=h
1.1 +12 -0
uwcal_JSR168/calClient/webapp/admin/src/webapp/login.html (new)
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/login.html?rev=1.1&content-type=text/plain
1.2 +1 -1
uwcal_JSR168/calClient/webapp/admin/src/webapp/login/error.html
http://jahia.mine.nu:8080/cgi-bin/cvsweb.cgi/uwcal_JSR168/calClient/webapp/admin/src/webapp/login/error.html.diff?r1=1.1&r2=1.2&f=h
Index: struts-config.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-config.xml,v
retrieving revision 1.5
retrieving revision 1.6
diff -u -r1.5 -r1.6
--- struts-config.xml 4 Feb 2005 16:09:11 -0000 1.5
+++ struts-config.xml 7 Feb 2005 15:44:02 -0000 1.6
@@ -78,7 +78,7 @@
name="peForm"
scope="session"
validate="false">
- <forward name="add" path="/jsp/addAlert.jsp" />
+ <forward name="add" path="/jsp/addAlert.jsp" />
<forward name="list" path="/jsp/modEventList.jsp" />
<forward name="done" path="/jsp/modEventList.jsp" />
Index: struts-portlet-config.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/struts-portlet-config.xml,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- struts-portlet-config.xml 4 Feb 2005 16:09:11 -0000 1.1
+++ struts-portlet-config.xml 7 Feb 2005 15:44:02 -0000 1.2
@@ -31,15 +31,15 @@
<attribute name="message"/>
</render-context>
<portlet-url-type>
- <action path="/setup"/>
- <action path="/alerts"/>
- <action path="/events"/>
- <action path="/sponsors"/>
- <action path="/locations"/>
- <action path="/auth"/>
- <action path="/admingroups"/>
- <action path="/keywords"/>
- <action path="/calendars"/>
+ <render path="/setup"/>
+ <render path="/alerts"/>
+ <render path="/events"/>
+ <render path="/sponsors"/>
+ <render path="/locations"/>
+ <render path="/auth"/>
+ <render path="/admingroups"/>
+ <render path="/keywords"/>
+ <render path="/calendars"/>
<resource path="/css/"/>
</portlet-url-type>
</config>
\ No newline at end of file
Index: web.xml
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/WEB-INF/web.xml,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -r1.12 -r1.13
--- web.xml 4 Feb 2005 16:09:11 -0000 1.12
+++ web.xml 7 Feb 2005 15:44:02 -0000 1.13
@@ -35,12 +35,24 @@
<param-name>rpiappname</param-name>
<param-value>CalAdmin</param-value>
</context-param>
- <listener>
+ <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>@RPI-DEBUG@</param-value>
+ </init-param>
+ </filter>
+ <filter-mapping>
+ <filter-name>SvcI Filter</filter-name>
+ <url-pattern>*.do</url-pattern>
+ <dispatcher>INCLUDE</dispatcher>
+ <dispatcher>FORWARD</dispatcher>
+ <dispatcher>REQUEST</dispatcher>
+ </filter-mapping>
+ <listener>
<listener-class>edu.rpi.sss.util.jsp.SessionListener</listener-class>
</listener>
- <listener>
-
<listener-class>edu.rpi.cct.uwcal.webcommon.UWCalRequestListener</listener-class>
- </listener>
<servlet>
<servlet-name>action</servlet-name>
<servlet-class>org.apache.portals.bridges.struts.PortletServlet</servlet-class>
@@ -132,8 +144,6 @@
<description>Public events Administration</description>
<url-pattern>*.jsp</url-pattern>
<url-pattern>*.html</url-pattern>
- <url-pattern>*.css</url-pattern>
- <url-pattern>*.gif</url-pattern>
</web-resource-collection>
<auth-constraint>
<role-name>demo.admin</role-name>
Index: addEvent.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/addEvent.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- addEvent.jsp 4 Feb 2005 16:09:12 -0000 1.1
+++ addEvent.jsp 7 Feb 2005 15:44:03 -0000 1.2
@@ -8,7 +8,7 @@
</jsp:include>
<html:form method="post" action="events.do" >
- <jsp:include page="/docs/modEventCommon.jsp" />
+ <jsp:include page="modEventCommon.jsp" />
<html:submit property="addEvent" value="Add Event"/>
Index: error.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/error.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error.jsp 4 Feb 2005 16:09:12 -0000 1.1
+++ error.jsp 7 Feb 2005 15:44:03 -0000 1.2
@@ -8,7 +8,6 @@
--%>
<link rel="stylesheet" type="text/css"
href="<%=request.getContextPath()%>/css/caladmin.css" />
- <body>
<p id="errors">
<html:errors />
</p>
@@ -45,5 +44,4 @@
<div id="footer">
Based on the <a href="http://www.washington.edu/ucal/";>University of
Washington Calendar</a>
</div>
- </body>
Index: header.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/header.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- header.jsp 4 Feb 2005 16:09:12 -0000 1.1
+++ header.jsp 7 Feb 2005 15:44:03 -0000 1.2
@@ -33,8 +33,7 @@
<tr>
<td class="leftCell">
<html:link page="/setup.do">Main Menu</html:link> |
- <html:link href="/uwCal-UIClientApp" target="calendar">Launch
Calendar</html:link> |
- <html:link page="/setup.do?logout=true">Log Out</html:link>
+ <a href="/uwCal-UIClientApp" target="calendar">Launch Calendar</a>
</td>
<logic:equal name="peForm" property="userAuth.contentAdminUser"
value="true" >
Index: loggedOut.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/loggedOut.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- loggedOut.jsp 4 Feb 2005 16:09:12 -0000 1.1
+++ loggedOut.jsp 7 Feb 2005 15:44:03 -0000 1.2
@@ -33,11 +33,11 @@
</table>
<div id="content">
- <p>You have logged out.</p>
-
- <html:form method="post" action="setup.do" >
- <html:submit property="logint" value="Log in"/>
- </html:form>
+ <h3>You have logged out.</h3>
+
+ <p>
+ <a href="<%=request.getContextPath()%>">Log In</a>
+ </p>
</div>
<div id="footer">
Index: menuHeader.jsp
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/jsp/menuHeader.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- menuHeader.jsp 4 Feb 2005 16:09:12 -0000 1.1
+++ menuHeader.jsp 7 Feb 2005 15:44:03 -0000 1.2
@@ -32,8 +32,7 @@
<tr>
<td class="leftCell">
Main Menu |
- <html:link href="/uwCal-UIClientApp" target="calendar">Launch
Calendar</html:link> |
- <html:link page="/setup.do?logout=true">Log Out</html:link>
+ <a href="/uwCal-UIClientApp" target="calendar">Launch Calendar</a>
</td>
<logic:equal name="peForm" property="userAuth.contentAdminUser"
value="true" >
Index: error.html
===================================================================
RCS file:
/home/cvs/repository/uwcal_JSR168/calClient/webapp/admin/src/webapp/login/error.html,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- error.html 4 Feb 2005 16:09:14 -0000 1.1
+++ error.html 7 Feb 2005 15:44:03 -0000 1.2
@@ -132,7 +132,7 @@
<div id="contentBox" align="center">
<h3 id="title">Login error</h3>
<div id="loginBox">
- <p>Please try <a href="setup.do">again</a>.</p>
+ <p>Please try <a href="login.html">again</a>.</p>
</div>
</div>
</td>
Index: login.html
====================================================================
<html>
<head>
<title>CalAdmin</title>
<meta http-equiv="Refresh" content="1;url=setup.do">
</head>
<body>
<div align="center">
<h2>The application is loading</h2>
<h4>Please wait...</h4>
</div>
</body>
</html>
