Changeset 128

Timestamp:

02/09/06 14:32:07

Author:

douglm

Message:

Changes are essentially to fix failures in duplication of event in the admin client.

Rearranged a lot of code. Added methods to event object and others to facilitate copying.

Fixed up code which had crippled transaction support as well as the configuration.

Note: for this to work update the datasource config in tomcat so it looks something like:

<DefaultContext>

<Resource name="jdbc/calDB" auth="Container"

type="javax.sql.DataSource"/>

<ResourceParams? name="jdbc/calDB">

<parameter>

<name>username</name>
<value>sa</value>

</parameter>
<parameter>

<name>password</name>
<value></value>

</parameter>
<parameter>

<name>driverClassName</name>
<value>org.hsqldb.jdbcDriver</value>

</parameter>
<parameter>

<name>url</name>
<value>jdbc:hsqldb:hsql://localhost:8887</value>

</parameter>
<parameter>

<name>maxActive</name>
<value>8</value>

</parameter>
<parameter>

<name>maxIdle</name>
<value>4</value>

</parameter>
<parameter>

<name>defaultAutoCommit</name>
<value>false</value>

</parameter>

</ResourceParams>

</DefaultContext>

The significant section is

<parameter>

<name>defaultAutoCommit</name>
<value>false</value>

</parameter>

Files:

• trunk/calendar3/appcommon/src/org/bedework/appcommon/FormattedEvents.java (modified) (2 diffs)
• trunk/calendar3/calCore/resources/properties/hibernate.properties (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (2 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java (modified) (6 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java (modified) (7 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwAlarm.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java (modified) (3 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwRecurrence.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwOwnedDbentity.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwShareableContainedDbentity.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwShareableDbentity.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Attendees.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/AttendeesI.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/EventInfo.java (modified) (3 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (2 diffs)
• trunk/calendar3/quickstartFiles/tomcat.conf/server.xml (modified) (5 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/PEAbstractAction.java (modified) (3 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java (modified) (12 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEInitUpdateAGAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEInitAddCategoryAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEInitUpdateCategoryAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEFetchEventAction.java (modified) (2 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEGetFormattedEventsAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEInitAddAlertAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEInitAddEventAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java (modified) (7 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEInitAddLocationAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEInitUpdateLocationAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEInitAddSponsorAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEInitUpdateSponsorAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/timezones/PEInitUploadTimezonesAction.java (modified) (1 diff)
• trunk/calendar3/webadmin/war/docs/event/emitEvent.jsp (modified) (2 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (3 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java (modified) (5 diffs)

trunk/calendar3/appcommon/src/org/bedework/appcommon/FormattedEvents.java

@@ -61 +61 @@
-import java.util.Collection;
-import java.util.Iterator;
+import java.util.Vector;
-
-/** Object to provide a Collection of formatted BwEvent.
@@ -79 +80 @@
-  public FormattedEvents(Collection events,
-                         CalendarInfo calInfo, CalTimezones ctz) {
-
+
+
+
+
+
-    this.calInfo = calInfo;
-    this.ctz = ctz;

trunk/calendar3/calCore/resources/properties/hibernate.properties

@@ -282 +282 @@
-## the Transaction API abstracts application code from the underlying JTA or JDBC transactions
-
-net.sf
-#hibernate.transaction.factory_class net.sf
+org
+hibernate.transaction.factory_class org
-
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java

@@ -503 +503 @@
-
-    /* Just commit */
-    sess.flush();
-    sess.commit();
+//    sess.flush();
-  }
-
@@ -528 +528 @@
-  public void refreshEvents() throws CalFacadeException {
-    checkOpen();
-
+//
-  }
-

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/Events.java

@@ -96 +96 @@
- */
-public class Events extends CalintfHelper {
-
+transient 
-
-  /** Constructor
@@ -107 +107 @@
-  public Events(Calintf cal, AccessUtil access, BwUser user, boolean debug) {
-    super(cal, access, user, debug);
-
-    Properties uidprops = new Properties();
-    uidprops.setProperty("separator", "-");
-    uuidGen = new UUIDHexGenerator();
-    ((Configurable)uuidGen).configure(Hibernate.STRING, uidprops, null);
-  }
-
@@ -727 +722 @@
-    }
-
-uuidGen
+getUuidGen()
-
-    if (val.getName() == null) {
@@ -805 +800 @@
-    StringBuffer sb = new StringBuffer();
-
-
-
-
-
+
+
+
-
-    /* Name of the event in the query */
@@ -872 +866 @@
-    flt.parPass(sess);
-
+    if (debug) {
+      trace(sess.getQueryString());
+    }
+
-    Collection es = sess.getList();
+
+    if (debug) {
+      trace("Found " + es.size() + " events");
+    }
-
-    es = postGetEvents(es, privRead, noAccessReturnsNull);
@@ -1446 +1448 @@
-    }
-  }
+
+  private UUIDHexGenerator getUuidGen() {
+    if (uuidGen != null) {
+      return uuidGen;
+    }
+
+    Properties uidprops = new Properties();
+    uidprops.setProperty("separator", "-");
+    uuidGen = new UUIDHexGenerator();
+    ((Configurable)uuidGen).configure(Hibernate.STRING, uidprops, null);
+    return uuidGen;
+  }
-}

trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/HibSession.java

@@ -238 +238 @@
-
-      tx = sess.beginTransaction();
+      if (tx == null) {
+        throw new CalFacadeException("Transaction not started");
+      }
-    } catch (Throwable t) {
-      exc = t;
@@ -254 +257 @@
-    }
-
+    try {
+//      if (tx != null &&
+//          !tx.wasCommitted() &&
+//          !tx.wasRolledBack()) {
+        if (getLogger().isDebugEnabled()) {
+          getLogger().debug("About to comnmit");
+        }
+        tx.commit();
+//      }
+
+      tx = null;
+    } catch (Throwable t) {
+      exc = t;
+      throw new CalFacadeException(t);
+    }
+  }
+
+  /** Rollback a transaction
+   *
+   * @throws CalFacadeException
+   */
+  public void rollback() throws CalFacadeException {
+/*    if (exc != null) {
+      // Didn't hear me last time?
+      throw new CalFacadeException(exc);
+    }
+*/
+    if (getLogger().isDebugEnabled()) {
+      getLogger().debug("Enter rollback");
+    }
-    try {
-      if (tx != null &&
-          !tx.wasCommitted() &&
-          !tx.wasRolledBack()) {
-
+
+
+
+
-      }
-
@@ -268 +304 @@
-  }
-
-  /** Rollback a transaction
-   *
-   * @throws CalFacadeException
-   */
-  public void rollback() throws CalFacadeException {
-/*    if (exc != null) {
-      // Didn't hear me last time?
-      throw new CalFacadeException(exc);
-    }
-*/
-    Logger log = getLogger();
-
-    if (log.isDebugEnabled()) {
-      log.debug("Enter rollback");
-    }
-    try {
-      if (tx != null &&
-          !tx.wasCommitted() &&
-          !tx.wasRolledBack()) {
-        if (log.isDebugEnabled()) {
-          log.debug("About to rollback");
-        }
-        tx.rollback();
-      }
-
-      tx = null;
-    } catch (Throwable t) {
-      exc = t;
-      throw new CalFacadeException(t);
-    }
-  }
-
-  /** Create a Criteria ready for the additon of Criterion.
-   *
@@ -357 +361 @@
-    } catch (Throwable t) {
-      handleException(t);
+    }
+  }
+
+  /**
+   * @return query string
+   * @throws CalFacadeException
+   */
+  public String getQueryString() throws CalFacadeException {
+    if (q == null) {
+      return "*** no query ***";
+    }
+
+    try {
+      return q.getQueryString();
+    } catch (Throwable t) {
+      handleException(t);
+      return null;
-    }
-  }
@@ -867 +888 @@
-    }
-
+    if (getLogger().isDebugEnabled()) {
+      getLogger().debug("About to flush");
+    }
-    try {
-      sess.flush();
@@ -912 +936 @@
-  private void handleException(Throwable t) throws CalFacadeException {
-    try {
-
-
-
-
-
+
+
+
-      }
-    } catch (Throwable dummy) {}
@@ -946 +968 @@
-   */
-  private void rollbackException(Throwable t) {
-
-
-
-
-
-
+
+
+
+
-  }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwAlarm.java

@@ -591 +591 @@
-
-  /* (non-Javadoc)
+   * @see org.bedework.calfacade.ifs.AttendeesI#copyAttendees()
+   */
+  public Collection copyAttendees() {
+    if (attendees == null) {
+      return null;
+    }
+
+    return attendeesHelper.copyAttendees();
+  }
+
+  /* (non-Javadoc)
-   * @see org.bedework.calfacade.AttendeesI#cloneAttendees()
-   */

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwEvent.java

@@ -864 +864 @@
-
-  /* (non-Javadoc)
+   * @see org.bedework.calfacade.ifs.AttendeesI#copyAttendees()
+   */
+  public Collection copyAttendees() {
+    if (attendees == null) {
+      return null;
+    }
+
+    return attendeesHelper.copyAttendees();
+  }
+
+  /* (non-Javadoc)
-   * @see org.bedework.calfacade.AttendeesI#cloneAttendees()
-   */
@@ -981 +992 @@
-  }
-
+   /** Copy this objects fields into the parameter. Don't clone many of the
+    * referenced objects
+    *
+    * @param ev
+    */
+   public void shallowCopyTo(BwEvent ev) {
+     super.shallowCopyTo(ev);
+     ev.setName(getName());
+     ev.setSummary(getSummary());
+     ev.setDescription(getDescription());
+     ev.setDtstart(getDtstart());
+     ev.setDtend(getDtend());
+     ev.setEndType(getEndType());
+     ev.setDuration(getDuration());
+     ev.setLink(getLink());
+     ev.setDeleted(getDeleted());
+     ev.setStatus(getStatus());
+     ev.setCost(getCost());
+
+     ev.setOrganizer(getOrganizer());
+
+     ev.setDtstamp(getDtstamp());
+     ev.setLastmod(getLastmod());
+     ev.setCreated(getCreated());
+     ev.setPriority(getPriority());
+     ev.setSequence(getSequence());
+
+     ev.setSponsor(getSponsor());
+
+     ev.setLocation(getLocation());
+
+     ev.setGuid(getGuid());
+     ev.setTransparency(getTransparency());
+
+     /* XXX shallow copy categories */
+     Iterator it = iterateCategories();
+     TreeSet cs = new TreeSet();
+
+     while (it.hasNext()) {
+       BwCategory c = (BwCategory)it.next();
+
+       cs.add(c);
+     }
+
+     ev.setCategories(cs);
+
+     ev.setAttendees(copyAttendees());
+     ev.setRecurring(getRecurring());
+
+     ev.setRecurrence((BwRecurrence)getRecurrence().clone());
+   }
+
-  /** Copy this objects fields into the parameter
-   *
@@ -1041 +1104 @@
-    ev.setRecurring(getRecurring());
-
-
-
-
+
-  }
-

trunk/calendar3/calFacade/src/org/bedework/calfacade/BwRecurrence.java

@@ -350 +350 @@
-
-  public Object clone() {
-(Collection)((TreeSet)getRrules()).clone(
-(Collection)((TreeSet)getExrules()).clone(
-(Collection)((TreeSet)getRdates()).clone(
-(Collection)((TreeSet)getExdates()).clone(
+clone(getRrules()
+clone(getExrules()
+clone(getRdates()
+clone(getExdates()
-                            getRecurrenceId(),
-                            getLatestDate(),
-                            getExpanded());
-  }
+
+  /* ====================================================================
+   *                   Private methods
+   *  =================================================================== */
+
+  private Collection clone(Collection c) {
+    if (c == null) {
+      return null;
+    }
+
+    Iterator cit = c.iterator();
+    TreeSet ts = new TreeSet();
+
+    while (cit.hasNext()) {
+      ts.add(cit.next());
+    }
+
+    return ts;
+  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwOwnedDbentity.java

@@ -132 +132 @@
-  }
-
+   /** Copy this objects fields into the parameter. Don't clone many of the
+    * referenced objects
+    *
+    * @param val
+    */
+   public void shallowCopyTo(BwOwnedDbentity val) {
+     val.setOwner((BwUser)getOwner());
+     val.setPublick(getPublick());
+   }
+
-   /** Copy this objects fields into the parameter
-    *

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwShareableContainedDbentity.java

@@ -123 +123 @@
-  }
-
+   /** Copy this objects fields into the parameter. Don't clone many of the
+    * referenced objects
+    *
+    * @param val
+    */
+   public void shallowCopyTo(BwShareableContainedDbentity val) {
+     super.shallowCopyTo(val);
+     val.setCalendar((BwCalendar)getCalendar());
+   }
+
-   /** Copy this objects fields into the parameter
-    *
@@ -129 +139 @@
-  public void copyTo(BwShareableContainedDbentity val) {
-    super.copyTo(val);
-
+.clone()
-  }
-}

trunk/calendar3/calFacade/src/org/bedework/calfacade/base/BwShareableDbentity.java

@@ -140 +140 @@
-  }
-
+   /** Copy this objects fields into the parameter. Don't clone many of the
+    * referenced objects
+    *
+    * @param val
+    */
+   public void shallowCopyTo(BwShareableDbentity val) {
+     super.shallowCopyTo(val);
+     val.setCreator((BwUser)getCreator());
+     val.setAccess(getAccess());
+   }
+
-   /** Copy this objects fields into the parameter
-    *

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/Attendees.java

@@ -169 +169 @@
-  }
-
-lone
+opy
-   *
-   * @return Collection of BwAttendee
-   */
-lone
+opy
-    TreeSet ts = new TreeSet();
-
@@ -180 +180 @@
-      BwAttendee att = (BwAttendee)it.next();
-
+      ts.add(att);
+    }
+
+    return ts;
+  }
+
+  /** Return a clone of the collection
+   *
+   * @return Collection of BwAttendee
+   */
+  public Collection cloneAttendees() {
+    TreeSet ts = new TreeSet();
+
+    Iterator it = iterateAttendees();
+    while (it.hasNext()) {
+      BwAttendee att = (BwAttendee)it.next();
+
-      ts.add(att.clone());
-    }

trunk/calendar3/calFacade/src/org/bedework/calfacade/ifs/AttendeesI.java

@@ -69 +69 @@
-  public String[] getAttendeeEmailList();
-
+  /** Return a copy of the collection
+   *
+   * @return Collection of BwAttendee
+   */
+  public Collection copyAttendees();
+
-  /** Return a clone of the collection
-   *

trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/EventInfo.java

@@ -67 +67 @@
- * session.
- *
- * <p>This is designed to avoid problems wih persistace engines. In particular
- * objects may be shared among many threads for different users in different
- * contexts. All information in an entity must be the same for any user.
- *
- * <p>This class allows us to handle thread, or user, specific information.
- *
@@ -80 +76 @@
-  /** editable is set at retrieval to indicate an event owned by the current
-   * user. This only has significance for the personal calendar.
-   *
-   * XXX - not applicable in a shared world?
-   */
-  protected boolean editable;
@@ -87 +81 @@
-  protected boolean fromRef;
-
-XXX these need changing
-
+ENUM
+ XXX these need changing
-   */
-

trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java

@@ -1440 +1440 @@
-
-    if (currentView != null) {
+      if (debug) {
+        trace("Use current view \"" + currentView.getName() + "\"");
+      }
+
-      it = currentView.iterateSubscriptions();
-    } else {
@@ -1445 +1449 @@
-      if (subs == null) {
-        // Try set of users subscriptions.
+        if (debug) {
+          trace("Use user subscriptions");
+        }
+
-        subs = getSubscriptions();
+      } else if (debug) {
+        trace("Use current subscriptions");
-      }
-
-      if (subs == null) {
+        if (debug) {
+          trace("Make up ALL events");
+        }
+
-        sub = new BwSubscription();
-        sub.setName("All events"); // XXX property?

trunk/calendar3/quickstartFiles/tomcat.conf/server.xml

@@ -98 +98 @@
-     to -1 -->
-
-       
-
-                       
-                       
-                       
-                       
-       
+  
+
+      
+      
+      
+      
+  
-
-    <!-- Define a SSL Coyote HTTP/1.1 Connector on port 8443 -->
@@ -359 +359 @@
-
-       <!-- make the cal DataSource available in all contexts -->
+
+       <!-- Uncomment to use p6spy - change settings in
+              common/classes/spy.properties, in particular the location
+              of the log file
-       <DefaultContext>
-          <Resource name="jdbc/calDB" auth="Container"
@@ -373 +377 @@
-            <parameter>
-              <name>driverClassName</name>
-org.hsqldb.jdbc
+com.p6spy.engine.spy.P6Spy
-            </parameter>
-            <parameter>
@@ -389 +393 @@
-          </ResourceParams>
-        </DefaultContext>
+        -->
+
+        <!-- without p6spy-->
+       <DefaultContext>
+          <Resource name="jdbc/calDB" auth="Container"
+                    type="javax.sql.DataSource"/>
+          <ResourceParams name="jdbc/calDB">
+            <parameter>
+              <name>username</name>
+              <value>sa</value>
+            </parameter>
+            <parameter>
+              <name>password</name>
+              <value></value>
+            </parameter>
+            <parameter>
+              <name>driverClassName</name>
+              <value>org.hsqldb.jdbcDriver</value>
+            </parameter>
+            <parameter>
+              <name>url</name>
+              <value>jdbc:hsqldb:hsql://localhost:8887</value>
+            </parameter>
+            <parameter>
+              <name>maxActive</name>
+              <value>8</value>
+            </parameter>
+            <parameter>
+              <name>maxIdle</name>
+              <value>4</value>
+            </parameter>
+           <parameter>
+            <name>defaultAutoCommit</name>
+              <value>false</value>
+            </parameter>
+          </ResourceParams>
+        </DefaultContext>
-
-        <!-- turn off session persistence by supplying an empty pathname for
-       
+  
-        <Context path="/caladmin" docBase="caladmin" debug="0">
-          <Manager
@@ -406 +447 @@
-        <Context path="/ucal" docBase="ucal" debug="0">
-          <Manager
-       
-       
-       
+  
+  
+  
-
-      </Host>

trunk/calendar3/webadmin/src/org/bedework/webadmin/PEAbstractAction.java

@@ -56 +56 @@
-
-
+import org.bedework.appcommon.IntSelectId;
+import org.bedework.calfacade.BwCalendar;
+import org.bedework.calfacade.BwCategory;
+import org.bedework.calfacade.BwEvent;
+import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwSponsor;
-import org.bedework.webcommon.BwAbstractAction;
-import org.bedework.webcommon.BwActionFormBase;
@@ -85 +91 @@
-    PEActionForm form = (PEActionForm)frm;
-
-    /*
-    CalEnv env = getEnv(frm);
-
-    / * Set some options from the environment * /
-    form.setAutoCreateSponsors(env.getAppBoolProperty("app.autocreatesponsors"));
-    form.setAutoCreateLocations(env.getAppBoolProperty("app.autocreatelocations"));
-    form.setAutoDeleteSponsors(env.getAppBoolProperty("app.autodeletesponsors"));
-    form.setAutoDeleteLocations(env.getAppBoolProperty("app.autodeletelocations"));
-
-    if (debug) {
-      logIt("form.getGroupSet()=" + form.getGroupSet());
-    }
-
-    / ** Show the owner we are administering * /
-    form.setAdminUserId(form.getCalSvcI().getUser().getAccount());
-
-    if (debug) {
-      logIt("-------- isSuperUser: " + form.getUserAuth().isSuperUser());
-    }
-
-    if (!form.getAuthorisedUser()) {
-      return "noAccess";
-    }
-
-    String temp = checkGroup(request, form, true);
-    if (temp != null) {
-      if (debug) {
-        logIt("form.getGroupSet()=" + form.getGroupSet());
-      }
-      return temp;
-    }
-
-    / ** Ensure we have prefs and other values for the AuthUser
-     * /
-    setAuthUser(form);
-
-    String reqpar = request.getParameter("cancelled");
-
-    if (reqpar != null) {
-      / ** Set the objects to null so we get new ones.
-       * /
-      form.initFields();
-      form.setEvent(null);
-
-      form.getMsg().emit("org.bedework.client.message.cancelled");
-      return "cancelled";
-    }
-    */
-
-    return doAction(request, sess, form);
-  }
@@ -149 +106 @@
-                                  PEActionForm form) throws Throwable;
-
-  /* ********************************************************************
-                             package methods
-     ******************************************************************** */
-
-  /* * Return null if group is chosen else return a forward name.
-   *
-   * @param request   Needed to locate session
-   * @param form      Action form
-   * @param initCheck true if this is a check to see if we're initialised,
-   *                  otherwise this is an explicit request to change group.
-   * @return String   forward name
-   * /
-  protected String checkGroup(HttpServletRequest request,
-                    PEActionForm form,
-                    boolean initCheck) throws Throwable {
-    if (form.getGroupSet()) {
-      return null;
-    }
-
-    CalSvcI svci = form.getCalSvcI();
-
-    try {
-      Groups adgrps = svci.getGroups();
-
-      if (form.retrieveChoosingGroup()) {
-        /* * This should be the response to presenting a list of groups.
-            We handle it here rather than in a separate action to ensure our
-            client is not trying to bypass the group setting.
-         * /
-
-        String reqpar = request.getParameter("adminGroupName");
-        if (reqpar == null) {
-          // Make them do it again.
-
-          return "chooseGroup";
-        }
-
-        return setGroup(request, form, adgrps, reqpar);
-      }
-
-      /* * If the user is in no group or in one group we just go with that,
-          otherwise we ask them to select the group
-       * /
-
-      Collection adgs;
-
-      BwUser user = svci.findUser(form.getCurrentUser());
-      if (user == null) {
-        return "noAccess";
-      }
-
-      if (initCheck || !form.getUserAuth().isSuperUser()) {
-        // Always restrict to groups we're a member of
-        adgs = adgrps.getGroups(user);
-      } else {
-        adgs = adgrps.getAll();
-      }
-
-      if (adgs.isEmpty()) {
-        /* * If we require that all users be in a group we return to an error
-            page. The only exception will be superUser.
-         * /
-
-        boolean noGroupAllowed =
-            form.getEnv().getAppBoolProperty("app.nogroupallowed");
-        if (form.getUserAuth().isSuperUser() || noGroupAllowed) {
-          form.assignAdminGroup(null);
-          return null;
-        }
-
-        return "noGroupAssigned";
-      }
-
-      if (adgs.size() == 1) {
-        Iterator adgsit = adgs.iterator();
-
-        BwAdminGroup adg = (BwAdminGroup)adgsit.next();
-
-        form.assignAdminGroup(adg);
-        String s = setAdminUser(request, form, adg.getOwner().getAccount(), true);
-
-        if (s != null) {
-          return s;
-        }
-
-        form.setAdminUserId(svci.getUser().getAccount());
-        return null;
-      }
-
-      /* * Go ahead and present the possible groups
-       * /
-      form.setUserAdminGroups(adgs);
-      form.assignChoosingGroup(true); // reset
-
-      return "chooseGroup";
-    } catch (Throwable t) {
-      form.getErr().emit(t);
-      return "error";
-    }
-  }*/
-
-  /* ********************************************************************
-                             protected methods
-     ******************************************************************** */
-/*
-  protected String setAdminUser(HttpServletRequest request,
-                                PEActionForm form,
-                                String user,
-                                boolean isMember) throws Throwable {
-    int access = getAccess(request, getMessages());
-
-
-
-
+
+
+
+
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-    }
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
-  protected BwAuthUser getAuthUser(PEActionForm form) throws CalFacadeException {
-    UserAuth ua = form.retrieveUserAuth();
-    return ua.getUser(form.getCurrentUser());
-  }
-*/
-  /* ********************************************************************
-                             private methods
-     ******************************************************************** */
-
-  /*
-  private boolean isMember(BwAdminGroup ag,
-                           PEActionForm form) throws Throwable {
-    return ag.isMember(String.valueOf(form.getCurrentUser()));
-  }
-
-  / * Set information associated witht he current auth user.
-   * Set the prefs on each request to reflect other session changes
-   * /
-  private void setAuthUser(PEActionForm form) throws CalFacadeException {
-    BwAuthUser au = getAuthUser(form);
-    BwAuthUserPrefs prefs = au.getPrefs();
-    if (prefs == null) {
-      prefs = new BwAuthUserPrefs();
-    }
-
-    form.setAuthUserPrefs(prefs);
-
-    int rights = au.getUsertype();
-
-    form.assignAuthUserAlerts((rights & UserAuth.alertUser) != 0);
-    form.assignAuthUserPublicEvents((rights & UserAuth.publicEventUser) != 0);
-    form.assignAuthUserSuperUser((rights & UserAuth.superUser) != 0);
-  }
-
-  private String setGroup(HttpServletRequest request,
-                          PEActionForm form,
-                          Groups adgrps,
-                          String groupName) throws Throwable {
-    if (groupName == null) {
-      // We require a name
-      return "chooseGroup";
-    }
-
-    BwAdminGroup ag = (BwAdminGroup)adgrps.findGroup(groupName);
-
-    if (debug) {
-      if (ag == null) {
-        logIt("No user admin group with name " + groupName);
-      } else {
-        logIt("Retrieved user admin group " + ag.getAccount());
-      }
-    }
-
-    form.assignAdminGroup(ag);
-
-    String s = setAdminUser(request, form, ag.getOwner().getAccount(),
-                            isMember(ag, form));
-
-    if (s != null) {
-      return s;
-    }
-
-    form.setAdminUserId(form.getCalSvcI().getUser().getAccount());
-
-    return null;
-  }
-  */
-}
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/PEActionForm.java

@@ -56 +56 @@
-
-import org.bedework.appcommon.IntSelectId;
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwEventObj;
-import org.bedework.calfacade.BwLocation;
-import org.bedework.calfacade.BwSponsor;
@@ -66 +64 @@
-import org.bedework.calfacade.svc.BwAdminGroup;
-import org.bedework.calfacade.svc.BwAuthUser;
-import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.calfacade.svc.UserAuth;
-import org.bedework.webcommon.BwActionFormBase;
-import org.bedework.webcommon.BwWebUtil;
-
-import edu.rpi.sss.util.Util;
-
-//import java.sql.Date;
-import java.util.Collection;
-import java.util.HashMap;
@@ -96 +91 @@
-   *  ................................................................... */
-
-  private EventInfo eventInfo;
-  private BwEvent event;
-
-  /** True if we are adding an alert
@@ -293 +286 @@
-   * ==================================================================== */
-
+
+  /** XXX Remove this when the jsp is pointed at the common actions.
+   *
+   * @param val
+   */
+  public void setEvent(BwEvent val) {
+    setEditEvent(val);
+  }
+
+  /**
+   * @return event
+   */
+  public BwEvent getEvent() {
+    return getEditEvent();
+  }
+
-  /** Not set - invisible to jsp
-   */
@@ -340 +349 @@
-
-  /**
-   * @param val
-   */
-  public void setEventInfo(EventInfo val) {
-    eventInfo = val;
-    if (val == null) {
-      setEvent(null);
-    } else {
-      setEvent(val.getEvent());
-    }
-  }
-
-  /**
-   * @return EventInfo
-   */
-  public EventInfo getEventInfo() {
-    return eventInfo;
-  }
-
-  /**
-   * @param val
-   */
-  public void setEvent(BwEvent val) {
-    event = val;
-
-    try {
-      if (val == null) {
-        getEventDates().setNewEvent(getEvent(), fetchSvci().getTimezones());
-      } else {
-        getEventDates().setFromEvent(getEvent(), fetchSvci().getTimezones());
-      }
-    } catch (Throwable t) {
-      err.emit(t);
-    }
-
-    if (debug) {
-      debugMsg("setEvent(), dates=" + getEventDates());
-    }
-
-    resetEvent();
-  }
-
-  /**
-   *
-   */
-  public void resetEvent() {
-    getEvent(); // Make sure we have one
-
-    /* Implant the current id(s) in new entries */
-    int id = 0;
-    BwCategory k = event.getFirstCategory();
-    if (k != null) {
-      id = k.getId();
-      setCategory(k);
-    }
-
-    /* A is the All box, B is the user preferred values. */
-    categoryId = new IntSelectId(id, IntSelectId.AHasPrecedence);
-
-    BwSponsor s = event.getSponsor();
-    id = 0;
-    if (s != null) {
-      id = s.getId();
-      setSponsor(s);
-    }
-
-    spId = new IntSelectId(id, IntSelectId.AHasPrecedence);
-
-    BwLocation l = event.getLocation();
-    id = 0;
-    if (l != null) {
-      id = l.getId();
-      setLocation(l);
-    }
-
-    locId = new IntSelectId(id, IntSelectId.AHasPrecedence);
-
-    BwCalendar c = event.getCalendar();
-    id = 0;
-    if (c != null) {
-      id = c.getId();
-      setCalendar(c);
-    }
-
-    calendarId = new IntSelectId(id, IntSelectId.AHasPrecedence);
-  }
-
-  /** If an event object exists, return that otherwise create an empty one.
-   *
-   * @return BwEvent  populated event value object
-   */
-  public BwEvent getEvent() {
-    if (event == null) {
-      event = new BwEventObj();
-      eventInfo = new EventInfo(event);
-    }
-    return event;
-  }
-
-  /**
-   *
-   * @param val Collection of formatted events
@@ -454 +364 @@
-    return formattedEvents;
-  }
-
-  /* * Get the i'th category id from the event object. Return < 0 for none.
-   *
-   * @param i        int index into events vector of categories
-   * @return int     Category index or -1
-   * /
-  public int getEventCategoryId(int i) {
-    CategoryVO k = getEvent().getCategory(i);
-
-    if (k == null) {
-      return -1;
-    }
-
-    return k.getId();
-  }
-
-  /* * Get the i'th category from the event object. Return null for none.
-   *
-   * @param i           int index into events vector of keywors
-   * @return CategoryVO  Category object or null
-   * /
-  public CategoryVO getEventCategory(int i) {
-    return getEvent().getCategory(i);
-  }
-  */
-
-  /* ====================================================================
@@ -516 +401 @@
-
-    return category;
+  }
+
+  /**
+   * @param val IntSelectId id object
+   */
+  public void assignCategoryId(IntSelectId val) {
+    categoryId = val;
+  }
+
+  /**
+   * @return IntSelectId id object
+   */
+  public IntSelectId retrieveCategoryId() {
+    return categoryId;
-  }
-
@@ -632 +531 @@
-  }
-
+  /**
+   * @param val IntSelectId id object
+   */
+  public void assignSpId(IntSelectId val) {
+    spId = val;
+  }
+
+  /**
+   * @return IntSelectId id object
+   */
+  public IntSelectId retrieveSpId() {
+    return spId;
+  }
+
-  /** We have a preferred and all sponsors form field. One of them may be
-   * unset so we ignore negative values.
@@ -726 +639 @@
-  }
-
+  /**
+   * @param val IntSelectId id object
+   */
+  public void assignLocId(IntSelectId val) {
+    locId = val;
+  }
+
+  /**
+   * @return IntSelectId id object
+   */
+  public IntSelectId retrieveLocId() {
+    return locId;
+  }
+
-  /** We have a preferred and all locations form field. One of them will be
-   * unset so we ignore negative values.
@@ -779 +706 @@
-   *                   Calendars
-   * ==================================================================== */
+
+  /**
+   * @param val IntSelectId id object
+   */
+  public void assignCalendarId(IntSelectId val) {
+    calendarId = val;
+  }
+
+  /**
+   * @return IntSelectId id object
+   */
+  public IntSelectId retrieveCalendarId() {
+    return calendarId;
+  }
-
-  /** We have a preferred and all calendars form field. One of them will be
@@ -1088 +1029 @@
-   * ==================================================================== */
-
-  /**
-   *
-   * @return boolean  false means something wrong, message emitted
-   * @throws Throwable
-   */
-  public boolean validateEventCategory() throws Throwable {
-    int id = categoryId.getVal();
-
-    if (id <= 0) {
-      if (getEnv().getAppBoolProperty("app.categoryOptional")) {
-        return true;
-      }
-
-      err.emit("org.bedework.client.error.missingfield", "Category");
-      return false;
-    }
-
-    try {
-      BwCategory k = fetchSvci().getCategory(id);
-
-      if (k == null) {
-        err.emit("org.bedework.client.error.missingcategory", id);
-        return false;
-      }
-
-      if (!categoryId.getChanged()) {
-        return true;
-      }
-
-//    oldCategory = getEvent().getCategory(0);
-
-
-      /* Currently we replace the only category if it exists
-       */
-      BwEvent ev = getEvent();
-      ev.clearCategories();
-      ev.addCategory(k);
-
-      setCategory(k);
-
-      return true;
-    } catch (Throwable t) {
-      err.emit(t);
-      return false;
-    }
-  }
-
-  /** Validate the sponsor provided for an event and embed it in the event and
-   * the form.
-   *
-   * @return boolean  true OK, false not OK and message(s) emitted.
-   * @throws Throwable
-   */
-  public boolean validateEventSponsor() throws Throwable {
-    boolean ok = true;
-
-    if (!spId.getChanged()) {
-      if (getAutoCreateSponsors()) {
-        BwSponsor s = getSponsor();
-        if (!BwWebUtil.validateSponsor(s, err)) {
-          return false;
-        }
-
-        fetchSvci().ensureSponsorExists(s);
-
-        setSponsor(s);
-        getEvent().setSponsor(s);
-      }
-
-      if (event.getSponsor() == null) {
-        err.emit("org.bedework.client.error.missingfield", "Sponsor");
-        return false;
-      }
-
-      return ok;
-    }
-
-    // The user selected one from the list
-    int id = spId.getVal();
-
-    try {
-      BwSponsor s = fetchSvci().getSponsor(id);
-      if (s == null) {
-        // Somebody's faking
-        setSponsor(null);
-        err.emit("org.bedework.client.error.missingfield", "Sponsor");
-        return false;
-      }
-
-      getEvent().setSponsor(s);
-
-      setSponsor(s);
-      return true;
-    } catch (Throwable t) {
-      err.emit(t);
-      return false;
-    }
-  }
-
-  /** Validate the location provided for an event and embed it in the event and
-   * the form.
-   *
-   * @return boolean  true OK, false not OK and message(s) emitted.
-   * @throws Throwable
-   */
-  public boolean validateEventLocation() throws Throwable {
-    boolean ok = true;
-
-    if (!locId.getChanged()) {
-      if (getAutoCreateLocations()) {
-        BwLocation l = getLocation();
-
-        if (!BwWebUtil.validateLocation(l, err)) {
-          return false;
-        }
-
-
-        fetchSvci().ensureLocationExists(l);
-
-        setLocation(l);
-        getEvent().setLocation(l);
-      }
-
-      if (event.getLocation() == null) {
-        err.emit("org.bedework.client.error.missingfield", "Location");
-        return false;
-      }
-
-      return ok;
-    }
-
-    // The user selected one from the list
-
-    try {
-      int id = locId.getVal();
-      BwLocation l = fetchSvci().getLocation(id);
-
-      if ((l == null) || !l.getPublick()) {
-        // Somebody's faking
-        setLocation(null);
-        err.emit("org.bedework.client.error.missingfield", "Location");
-        return false;
-      }
-
-      getEvent().setLocation(l);
-      setLocation(l);
-
-      return true;
-    } catch (Throwable t) {
-      err.emit(t);
-      return false;
-    }
-  }
-
-  /** Validate the calendar provided for an event and embed it in the event and
-   * the form.
-   *
-   * @return boolean  true OK, false not OK and message(s) emitted.
-   */
-  public boolean validateEventCalendar() {
-    boolean ok = true;
-
-    if (!calendarId.getChanged()) {
-      if (event.getCalendar() == null) {
-        err.emit("org.bedework.client.error.missingfield", "Calendar");
-        return false;
-      }
-
-      return ok;
-    }
-
-    // The user selected one from the list
-
-    try {
-      int id = calendarId.getVal();
-
-      BwCalendar c = fetchSvci().getCalendar(id);
-
-      if ((c == null) || !c.getPublick() || !c.getCalendarCollection()) {
-        // Somebody's faking
-        setCalendar(null);
-        err.emit("org.bedework.client.error.missingfield", "Calendar");
-        return false;
-      }
-
-      getEvent().setCalendar(c);
-      setCalendar(c);
-      return true;
-    } catch (Throwable t) {
-      err.emit(t);
-      return false;
-    }
-  }
-
-  /** Validate a category entry after add/mod
-   *
@@ -1303 +1050 @@
-  }
-
-  /**
-   *
-   */
-  public void initFields() {
-    super.initFields();
-    event = null;
-    category = null;
-//    oldCategory = null;
-    sponsor = null;
-    location = null;
-    updGroupMember = null;
-  }
-
-  /* ====================================================================
-   *                   Private methods

trunk/calendar3/webadmin/src/org/bedework/webadmin/admingroup/PEInitUpdateAGAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingAdmingroup(false);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEInitAddCategoryAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingCategory(true);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/category/PEInitUpdateCategoryAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingCategory(false);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEFetchEventAction.java

@@ -102 +102 @@
-     * the form so we can display the page
-     */
-
+
+
-
-    if (id <= 0) {
@@ -124 +125 @@
-
-    form.setEventInfo(einf);
+    resetEvent(form);
+
-    if (einf == null) {
-      form.getErr().emit("org.bedework.client.error.nosuchevent", id);

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEGetFormattedEventsAction.java

@@ -124 +124 @@
-
-    return form.fetchSvci().getEvents(null, filter, fromDate, null,
- 
+
-  }
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEInitAddAlertAction.java

@@ -87 +87 @@
-    /** Set the objects to null so we get new ones.
-     */
-
-
+
-    form.assignAlertEvent(true);
-    form.assignAddingEvent(true);
-    form.resetEvent();
-
-    return "continue";

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEInitAddEventAction.java

@@ -87 +87 @@
-    /** Set the objects to null so we get new ones.
-     */
-
-
+
-    form.assignAlertEvent(false);
-    form.assignAddingEvent(true);
-    form.resetEvent();
-
-    return "continue";

trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java

@@ -55 +55 @@
-package org.bedework.webadmin.event;
-
+import org.bedework.calfacade.BwCalendar;
+import org.bedework.calfacade.BwCategory;
-import org.bedework.calfacade.BwEvent;
-import org.bedework.calfacade.BwEventObj;
+import org.bedework.calfacade.BwLocation;
+import org.bedework.calfacade.BwSponsor;
-import org.bedework.calfacade.CalFacadeDefs;
+import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.calsvci.CalSvcI;
-import org.bedework.webadmin.PEAbstractAction;
@@ -63 +68 @@
-import org.bedework.webcommon.BwSession;
-import org.bedework.webcommon.BwWebUtil;
+
+import edu.rpi.sss.util.log.MessageEmit;
-
-
@@ -108 +115 @@
-    }
-
+    BwEvent event = form.getEditEvent();
+
-    reqpar = request.getParameter("copy");
-
-    if (reqpar != null) {
+      /* Refetch the event and switch it for a cloned copy.
+       * guid must be set to null to avoid dup guid.
+       */
+      EventInfo ei = form.fetchSvci().getEvent(event.getId());
-      BwEvent evcopy = new BwEventObj();
-form.getEvent().c
+ei.getEvent().shallowC
-
-      evcopy.setId(CalFacadeDefs.unsavedItemKey);
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      form.assignAddingEvent(true);
-
@@ -122 +149 @@
-
-    CalSvcI svci = form.fetchSvci();
-
+, svci, event, form.getErr()
-      return "retry";
-    }
@@ -130 +157 @@
-     */
-
-
-
-
+
-
-    if (form.getAddingEvent()) {
-
+ent
-    } else {
-
+ent
-    }
-
-    if (!alerts) {
-
-
-
-
-
-
-
+
+
+
+
+
+
-
-    if (form.getAddingEvent()) {
@@ -154 +178 @@
-      form.getMsg().emit("org.bedework.client.message.event.updated");
-    }
+
+    form.assignAddingEvent(false);
+
-    return "continue";
-  }
@@ -162 +189 @@
-   * categories and embed them in the form and event.
-   */
-) throws Throwable {
-boolean ok = form.validateEventCategory();
-BwEvent ev = form.getEvent();
-CalSvcI svci = form.fetchSvci(
-
-form.validateEventSponsor(
+, CalSvcI svci,
+                            BwEvent event, MessageEmit err)
+      throws Throwable {
+boolean ok = validateEventCategory(form, svci, event, err
+
+validateEventSponsor(form, svci, event, err
-      ok = false;
-    }
-
-form.validateEventLocation(
+validateEventLocation(form, svci, event, err
-      ok = false;
-    }
-
-form.validateEventCalendar(
+validateEventCalendar(form, svci, event, err
-      ok = false;
-    }
-
-
+ent
-      ok = false;
-    } else {
-, true, //
-form.getErr()
+ent, true, // ENUM
+err
-    }
-
-    return ok;
-  }
+
+  /** Validate the calendar provided for an event and embed it in the event and
+   * the form.
+   *
+   * @return boolean  true OK, false not OK and message(s) emitted.
+   */
+  private boolean validateEventCalendar(PEActionForm form, CalSvcI svci,
+                                        BwEvent event, MessageEmit err)
+          throws Throwable {
+    boolean ok = true;
+
+    if (!form.retrieveCalendarId().getChanged()) {
+      if (event.getCalendar() == null) {
+        err.emit("org.bedework.client.error.missingfield", "Calendar");
+        return false;
+      }
+
+      return ok;
+    }
+
+    // The user selected one from the list
+
+    try {
+      int id = form.retrieveCalendarId().getVal();
+
+      BwCalendar c = svci.getCalendar(id);
+
+      if ((c == null) || !c.getPublick() || !c.getCalendarCollection()) {
+        // Somebody's faking
+        form.setCalendar(null);
+        err.emit("org.bedework.client.error.missingfield", "Calendar");
+        return false;
+      }
+
+      event.setCalendar(c);
+      form.setCalendar(c);
+      return true;
+    } catch (Throwable t) {
+      err.emit(t);
+      return false;
+    }
+  }
+
+  /**
+   *
+   * @return boolean  false means something wrong, message emitted
+   * @throws Throwable
+   */
+  private boolean validateEventCategory(PEActionForm form, CalSvcI svci,
+                                        BwEvent event, MessageEmit err)
+          throws Throwable {
+    int id = form.retrieveCategoryId().getVal();
+
+    if (id <= 0) {
+      if (form.getEnv().getAppBoolProperty("app.categoryOptional")) {
+        return true;
+      }
+
+      err.emit("org.bedework.client.error.missingfield", "Category");
+      return false;
+    }
+
+    try {
+      BwCategory cat = svci.getCategory(id);
+
+      if (cat == null) {
+        err.emit("org.bedework.client.error.missingcategory", id);
+        return false;
+      }
+
+      if (!form.retrieveCategoryId().getChanged()) {
+        return true;
+      }
+
+//    oldCategory = getEvent().getCategory(0);
+
+
+      /* Currently we replace the only category if it exists
+       */
+      event.clearCategories();
+      event.addCategory(cat);
+
+      form.setCategory(cat);
+
+      return true;
+    } catch (Throwable t) {
+      err.emit(t);
+      return false;
+    }
+  }
+
+  /** Validate the sponsor provided for an event and embed it in the event and
+   * the form.
+   *
+   * @return boolean  true OK, false not OK and message(s) emitted.
+   * @throws Throwable
+   */
+  private boolean validateEventSponsor(PEActionForm form, CalSvcI svci,
+                                       BwEvent event, MessageEmit err)
+          throws Throwable {
+    boolean ok = true;
+
+    if (!form.retrieveSpId().getChanged()) {
+      if (form.getAutoCreateSponsors()) {
+        BwSponsor s = form.getSponsor();
+        if (!BwWebUtil.validateSponsor(s, err)) {
+          return false;
+        }
+
+        svci.ensureSponsorExists(s);
+
+        form.setSponsor(s);
+        event.setSponsor(s);
+      }
+
+      if (event.getSponsor() == null) {
+        err.emit("org.bedework.client.error.missingfield", "Sponsor");
+        return false;
+      }
+
+      return ok;
+    }
+
+    // The user selected one from the list
+    int id = form.retrieveSpId().getVal();
+
+    try {
+      BwSponsor s = svci.getSponsor(id);
+      if (s == null) {
+        // Somebody's faking
+        form.setSponsor(null);
+        err.emit("org.bedework.client.error.missingfield", "Sponsor");
+        return false;
+      }
+
+      event.setSponsor(s);
+
+      form.setSponsor(s);
+      return true;
+    } catch (Throwable t) {
+      err.emit(t);
+      return false;
+    }
+  }
+
+  /** Validate the location provided for an event and embed it in the event and
+   * the form.
+   *
+   * @return boolean  true OK, false not OK and message(s) emitted.
+   * @throws Throwable
+   */
+  private boolean validateEventLocation(PEActionForm form, CalSvcI svci,
+                                        BwEvent event, MessageEmit err)
+          throws Throwable {
+    boolean ok = true;
+
+    if (!form.retrieveLocId().getChanged()) {
+      if (form.getAutoCreateLocations()) {
+        BwLocation l = form.getLocation();
+
+        if (!BwWebUtil.validateLocation(l, err)) {
+          return false;
+        }
+
+        svci.ensureLocationExists(l);
+
+        form.setLocation(l);
+        event.setLocation(l);
+      }
+
+      if (event.getLocation() == null) {
+        err.emit("org.bedework.client.error.missingfield", "Location");
+        return false;
+      }
+
+      return ok;
+    }
+
+    // The user selected one from the list
+
+    try {
+      int id = form.retrieveLocId().getVal();
+      BwLocation l = svci.getLocation(id);
+
+      if ((l == null) || !l.getPublick()) {
+        // Somebody's faking
+        form.setLocation(null);
+        err.emit("org.bedework.client.error.missingfield", "Location");
+        return false;
+      }
+
+      event.setLocation(l);
+      form.setLocation(l);
+
+      return true;
+    } catch (Throwable t) {
+      err.emit(t);
+      return false;
+    }
+  }
-}
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEInitAddLocationAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingLocation(true);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/location/PEInitUpdateLocationAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingLocation(false);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEInitAddSponsorAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingSponsor(true);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/sponsor/PEInitUpdateSponsorAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignAddingSponsor(false);
-

trunk/calendar3/webadmin/src/org/bedework/webadmin/timezones/PEInitUploadTimezonesAction.java

@@ -86 +86 @@
-    /** Set the objects to null so we get new ones.
-     */
-form.initFields(
+initFields(form
-    form.assignUploadingTimezones(true);
-

trunk/calendar3/webadmin/war/docs/event/emitEvent.jsp

@@ +1 @@
+<%@ taglib uri='struts-logic' prefix='logic' %>
+
-<bean:define id="eventId" name="formattedEvent" property="event.id"/>
-<% String rpitemp="/event/fetchForUpdate.do?eventId=" + eventId; %>
@@ -20 +22 @@
-  <link><bean:write name="formattedEvent" property="event.link" /></link>
-  <cost><bean:write name="formattedEvent" property="event.cost" /></cost>
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  <creator><bean:write name="formattedEvent" property="event.creator.account" /></creator>
-</event>

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java

@@ -237 +237 @@
-      /** Set the objects to null so we get new ones.
-       */
-form.initFields(
+initFields(form
-
-      form.getMsg().emit("org.bedework.client.message.cancelled");
@@ -260 +260 @@
-
-    return forward;
+  }
+
+  protected void initFields(BwActionFormBase form) {
-  }
-
@@ -1037 +1040 @@
-          }
-          svci.open();
+          svci.beginTransaction();
-        }
-      }

trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java

@@ -78 +78 @@
-import org.bedework.calfacade.svc.BwSubscription;
-import org.bedework.calfacade.svc.BwView;
+import org.bedework.calfacade.svc.EventInfo;
-import org.bedework.calfacade.svc.UserAuth;
-import org.bedework.calsvci.CalSvcI;
@@ -271 +272 @@
-  private BwEvent editEvent;
-
-
+
+
+
-   */
-  private BwEvent currentEvent;
@@ -1777 +1780 @@
-      editEvent = val;
-
-
+
+
+
-        getEventDates().setFromEvent(val, fetchSvci().getTimezones());
-      }
@@ -1791 +1796 @@
-    if (editEvent == null) {
-      editEvent = new BwEventObj();
+      eventInfo = new EventInfo(editEvent);
-    }
-
-    return editEvent;
+  }
+
+  /**
+   * @param val
+   */
+  public void setEventInfo(EventInfo val) {
+    eventInfo = val;
+    if (val == null) {
+      setEditEvent(null);
+    } else {
+      setEditEvent(val.getEvent());
+    }
+  }
+
+  /**
+   * @return EventInfo
+   */
+  public EventInfo getEventInfo() {
+    return eventInfo;
-  }
-
@@ -1961 +1986 @@
-    viewTypeI = -1;
-    //key.reset();
-  }
-
-  /**
-   *
-   */
-  public void initFields() {
-  }
-