[Bedework-commit] webapps r364 - in trunk: appcommon/src/org/bedework/appcommon liferay/src/org/bedework/portal/liferay webcommon/src/org/bedework/webcommon/misc

[svnadmin at bedework.org]

Author: douglm
Date: 2007-05-02 12:48:26 -0400 (Wed, 02 May 2007)
New Revision: 364

Added:
   trunk/liferay/src/org/bedework/portal/liferay/LiferayStrutsPortlet.java
Modified:
   trunk/appcommon/src/org/bedework/appcommon/ValidationError.java
   trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
Log:
Some changes related to scheduling

Add portlet class to allow liferay deployment. This is a copy of com.liferay.portal.apache.bridges.LiferayStrutsPortlet

Modified: trunk/appcommon/src/org/bedework/appcommon/ValidationError.java
===================================================================
--- trunk/appcommon/src/org/bedework/appcommon/ValidationError.java	2007-04-29 22:21:01 UTC (rev 363)
+++ trunk/appcommon/src/org/bedework/appcommon/ValidationError.java	2007-05-02 16:48:26 UTC (rev 364)
@@ -171,9 +171,12 @@
   /** Your information is incomplete: please supply a name. */
   public static final String missingName = prefix + "missingname";
 
-  /** You event is missing the originator */
+  /** Your event is missing the originator */
   public static final String missingOriginator = prefix + "missingoriginator";
 
+  /** Your event is missing the organizor */
+  public static final String missingOrganizor = prefix + "missingorganizor";
+
   /** You must supply a recipient. */
   public static final String missingRecipients = prefix + "missingrecipients";
 

Added: trunk/liferay/src/org/bedework/portal/liferay/LiferayStrutsPortlet.java
===================================================================
--- trunk/liferay/src/org/bedework/portal/liferay/LiferayStrutsPortlet.java	                        (rev 0)
+++ trunk/liferay/src/org/bedework/portal/liferay/LiferayStrutsPortlet.java	2007-05-02 16:48:26 UTC (rev 364)
@@ -0,0 +1,42 @@
+/**
+ *
+ */
+package org.bedework.portal.liferay;
+//package com.liferay.portal.apache.bridges;
+
+import java.io.IOException;
+
+import javax.portlet.PortletException;
+import javax.portlet.PortletRequest;
+import javax.portlet.PortletResponse;
+import javax.servlet.http.HttpServletRequest;
+
+import org.apache.portals.bridges.struts.StrutsPortlet;
+import org.apache.struts.Globals;
+
+/**
+ * Added this to bedework for th etime being. It doesn't appear in any jar files
+ * I could find and it was easier to add it here.
+ *
+ * LiferayStrutsPortlet: this portlet adds the additional functionality (over StrutsPortlet) to restore overwritten resources.
+ * It works such that:
+ * <ul>
+ * <li>message resources that were in in the request BEFORE the call to processRequest are saved restored afterward such
+ *   as to avoid conflicts with resources used for the portal itself (and other struts portlets)</li>
+ * </ul>
+ *
+ * @author James Schopp
+ *
+ */
+public class LiferayStrutsPortlet extends StrutsPortlet {
+  protected void processRequest(PortletRequest request, PortletResponse response,
+                                String defaultPage, String requestType)
+          throws PortletException, IOException {
+    HttpServletRequest req = getHttpServletRequest(this, request, response);
+    Object objMessages = req.getAttribute(Globals.MESSAGES_KEY);
+
+    super.processRequest(request, response, defaultPage, requestType);
+
+    req.setAttribute(Globals.MESSAGES_KEY, objMessages);
+  }
+}
\ No newline at end of file


Property changes on: trunk/liferay/src/org/bedework/portal/liferay/LiferayStrutsPortlet.java
___________________________________________________________________
Name: svn:eol-style
   + LF

Modified: trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java	2007-04-29 22:21:01 UTC (rev 363)
+++ trunk/webcommon/src/org/bedework/webcommon/misc/UploadAction.java	2007-05-02 16:48:26 UTC (rev 364)
@@ -32,6 +32,7 @@
 import org.bedework.appcommon.ValidationError;
 import org.bedework.calfacade.BwCalendar;
 import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwOrganizer;
 import org.bedework.calfacade.exc.CalFacadeException;
 import org.bedework.calfacade.svc.EventInfo;
 import org.bedework.calsvci.CalSvcI;
@@ -150,6 +151,15 @@
           String recip = svci.userToCaladdr(svci.getUser().getAccount());
           ev.addRecipient(recip);
 
+          BwOrganizer org = ev.getOrganizer();
+
+          if (org == null) {
+            form.getErr().emit(ValidationError.missingOrganizor);
+            return forwardRetry;
+          }
+
+          ev.setOriginator(org.getOrganizerUri());
+
           ev.setScheduleMethod(ic.getMethodType());
 
           // Just add it to our inbox