Changeset 519

Timestamp:

05/31/06 22:30:22

Author:

douglm

Message:

Fixes to the xml options. Moved some config classes into appcommon, they need to be available for all applications

Changed the demo properties to move more of the runtime values into the xml options.

Start to use the calendar suite object to configure a public calendar.

Files:

• trunk/calendar3/appcommon/build.xml (modified) (1 diff)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/configs (added)
• trunk/calendar3/appcommon/src/org/bedework/appcommon/configs/DumpRestoreConfig.java (moved) (moved from trunk/calendar3/dumprestore/src/org/bedework/dumprestore/DumpRestoreConfig.java) (2 diffs)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/EventProperties.java (modified) (1 diff)
• trunk/calendar3/calEnv/src/org/bedework/calenv/CalOptions.java (modified) (7 diffs)
• trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java (modified) (1 diff)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (5 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvcDb.java (modified) (1 diff)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java (modified) (1 diff)
• trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java (modified) (7 diffs)
• trunk/calendar3/config/configs/democal.options.xml (modified) (4 diffs)
• trunk/calendar3/config/configs/democal.properties (modified) (6 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/Dump.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java (modified) (2 diffs)
• trunk/calendar3/freebusyServer/src/org/bedework/freebusyServer/FreeBusyAggregator.java (modified) (1 diff)
• trunk/calendar3/synchml/src/edu/rpi/cct/uwcal/synchml/common/Synchml.java (modified) (1 diff)
• trunk/calendar3/test/src/org/bedework/tests/calsvc/CalSvcTestWrapper.java (modified) (1 diff)
• trunk/calendar3/timers/src/org/bedework/timers/service/DbPollerTimerService.java (modified) (1 diff)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/PEAbstractAction.java (modified) (4 diffs)
• trunk/calendar3/webadmin/src/org/bedework/webadmin/event/PEUpdateEventAction.java (modified) (4 diffs)
• trunk/calendar3/webadmin/war/docs/event/modEvent.jsp (modified) (2 diffs)
• trunk/calendar3/webadmin/war/docs/header.jsp (modified) (1 diff)
• trunk/calendar3/webclient/war/docs/header.jsp (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/AdminConfig.java (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (10 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwActionFormBase.java (modified) (6 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwWebUtil.java (modified) (2 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/ClientConfig.java (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/ConfigBase.java (added)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java (modified) (1 diff)

trunk/calendar3/appcommon/build.xml

@@ -21 +21 @@
-
-    <fileset id="base.java.sources" dir="${source.home}" >
-
+*/*
-    </fileset>
-
-    <patternset id="base.class.patternset">
-
+*/*
-    </patternset>
-

trunk/calendar3/appcommon/src/org/bedework/appcommon/configs/DumpRestoreConfig.java

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-
+
+
+
-
-/** Configuration propeties for the restore phase
@@ -59 +61 @@
- * @version 1.0
- */
-
+implements Serializable 
-  private boolean debug;
-

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

@@ -69 +69 @@
- * @author Mike Douglass   douglm@rpi.edu
- */
-/**
- * @author douglm
- *
- */
-public class EventProperties extends CalintfHelper {
-  private String keyFieldName;

trunk/calendar3/calEnv/src/org/bedework/calenv/CalOptions.java

@@ -39 +39 @@
-import java.util.Collection;
-import java.util.Iterator;
+import java.util.Stack;
-import java.util.regex.Pattern;
-
@@ -537 +538 @@
-      oel.name = "root";
-
-ull
+ew Stack()
-
-      return oel;
@@ -554 +555 @@
-
-  private static void doChildren(OptionElement oel, Element subroot,
-Object val
+Stack objStack
-    try {
-      if (!XmlUtil.hasChildren(subroot)) {
@@ -561 +562 @@
-        String name = subroot.getNodeName();
-
-val == null
+objStack.empty()
-          // Add a leaf node and return
-          OptionElement valnode = new OptionElement();
@@ -574 +575 @@
-        // Val is an object which should have a setter for the property
-
+        Object val = objStack.peek();
-        Method meth = findMethod(val, name);
-
@@ -622 +624 @@
-           * object.
-           */
-val != null
+!objStack.empty()
-            error("Nested classes not yet supported for element " + valnode.name +
-                  " and class " + className);
@@ -628 +630 @@
-          }
-
-
+Object 
-          valnode.isValue = true;
-          valnode.val = val;
+
+          objStack.push(val);
-        } else {
-          /* Just a non-leaf node */
-        }
-
-
-
-
+
+
+
+
+
-      }
-    } catch (CalEnvException ce) {

trunk/calendar3/caldav/src/edu/rpi/cct/uwcal/caldav/CaldavBWIntf.java

@@ -1348 +1348 @@
-      CalSvcIPars pars = new CalSvcIPars(account,
-                                         account,
+                                         null,
-                                         envPrefix,
-                                         false,   // publicAdmin

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

@@ -144 +144 @@
-  private BwUser publicUser;
-
+  private BwCalSuiteWrapper currentCalSuite;
+
-  // Set up by call to getCal()
-  private String publicUserAccount;
@@ -289 +291 @@
-    try {
-      env = new CalEnv(pars.getEnvPrefix(), debug);
-
-      if (pars.isGuest() && (pars.getUser() == null)) {
-        pars.setUser(env.getAppProperty("run.as.user"));
-      }
-
-      if (pars.getPublicAdmin()) {
@@ -638 +636 @@
-  }
-
+  public BwCalSuiteWrapper getCalSuite() throws CalFacadeException {
+    return currentCalSuite;
+  }
+
-  public BwCalSuiteWrapper getCalSuite(String name) throws CalFacadeException {
-    return dbi.getCalSuite(name);
@@ -746 +748 @@
-     */
-    if (getCal().checkCalendarRefs(val)) {
+      return 2;
+    }
+
+    BwPreferences prefs = getUserPrefs(val.getOwner());
+    if (val.equals(prefs.getDefaultCalendar())) {
-      return 2;
-    }
@@ -2343 +2350 @@
-      cali.beginTransaction();
-
+      if (pars.getCalSuite() != null) {
+        BwCalSuite cs = CalSvcDb.fetchCalSuite(cali.getDbSession(),
+                                               pars.getCalSuite());
+
+        if (cs == null) {
+          throw new CalFacadeException("org.bedework.svci.unknown.calsuite",
+                                       pars.getCalSuite());
+        }
+
+        currentCalSuite = new BwCalSuiteWrapper(cs);
+        pars.setUser(cs.getGroup().getOwner().getAccount());
+      }
+
-      boolean userCreated = cali.init(null,
-                                      pars.getAuthUser(),

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

@@ -200 +200 @@
-   */
-  public BwCalSuiteWrapper getCalSuite(String name) throws CalFacadeException {
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    sess.namedQuery("getCalSuite");
-Entity
+String
-    sess.cacheableQuery();
-
-
-
-
-
-
+
-  }
-

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcI.java

@@ -506 +506 @@
-  public abstract BwCalSuiteWrapper addCalSuite(BwCalSuite val) throws CalFacadeException;
-
+  /** Get the current calendar suite
+   *
+   * @return BwCalSuiteWrapper null for unknown calendar suite
+   * @throws CalFacadeException
+   */
+  public abstract BwCalSuiteWrapper getCalSuite() throws CalFacadeException;
+
-  /** Get a calendar suite given the name
-   *

trunk/calendar3/calsvci/src/org/bedework/calsvci/CalSvcIPars.java

@@ -66 +66 @@
-  private String authUser;
-
-- null for guest
+we run as. null to use calSuite
-   */
-  private String user;
+
+  /** The calendar suite name. user and calSuite null for guest.
+   */
+  private String calSuite;
-
-  /** Environment properties prefix - e.g. "org.bedework.webpersonal."
@@ -94 +98 @@
-   * @param authUser    String authenticated user of the application
-   * @param user        String user to act as
+   * @param calSuite    String calSuite name
-   * @param envPrefix   String Environment properties prefix
-   * @param publicAdmin true for admin
@@ -103 +108 @@
-  public CalSvcIPars(String authUser,
-                     String user,
+                     String calSuite,
-                     String envPrefix,
-                     boolean publicAdmin,
@@ -110 +116 @@
-    this.authUser = authUser;
-    this.user = user;
+    this.calSuite = calSuite;
-    this.envPrefix = envPrefix;
-    this.publicAdmin = publicAdmin;
@@ -139 +146 @@
-
-  /**
+   * @param val String calSuite
+   */
+  public void setCalSuite(String  val) {
+    calSuite = val;
+  }
+
+  /**
+   * @return String
+   */
+  public String getCalSuite() {
+    return calSuite;
+  }
+
+  /**
-   * @param val String envPrefix
-   */
@@ -194 +215 @@
-    sb.append(", user=");
-    sb.append(getUser());
+    sb.append(", calSuite=");
+    sb.append(getCalSuite());
-    sb.append(", publicAdmin=");
-    sb.append(getPublicAdmin());
@@ -210 +233 @@
-    CalSvcIPars pars = new CalSvcIPars(getAuthUser(),
-                                       getUser(),
+                                       getCalSuite(),
-                                       getEnvPrefix(),
-                                       getPublicAdmin(),

trunk/calendar3/config/configs/democal.options.xml

@@ +1 @@
+<!-- This provides run time options for each of the configured applications.
+  -->
-<bedework-options>
-  <org>
-    <bedework>
-      <global>
-
-        <module>
-          <user-ldap-group classname="org.bedework.calcore.ldap.LdapConfigProperties">
@@ -17 +18 @@
-          </user-ldap-group>
-        </module>
-
-      </global>
-
@@ -64 +64 @@
-
-      <app>
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-          <debug>true</debug>
-          <debugEntity>false</debugEntity>
@@ -71 +146 @@
-        </dumpres>
-
-
-
+
+
+
+
+
-          <debug>true</debug>
-          <debugEntity>false</debugEntity>

trunk/calendar3/config/configs/democal.properties

@@ -62 +62 @@
-# Admin Web Client
-#
-0
+1
-org.bedework.app.CalAdmin.default.contenttype=text/xml
-org.bedework.app.CalAdmin.nogroupallowed=false
@@ -81 +81 @@
-org.bedework.app.CalAdmin.name=DemoCalAdmin
-
-
-
-
-
+
+
+
+
+
+
-org.bedework.app.CalAdmin.allowEditAllCategories=false
-org.bedework.app.CalAdmin.allowEditAllLocations=false
-org.bedework.app.CalAdmin.allowEditAllSponsors=false
-org.bedework.app.CalAdmin.categoryOptional=true
-
-org.bedework.app.CalAdmin.hour24=true
-org.bedework.app.CalAdmin.minincrement=5
-org.bedework.app.CalAdmin.admingroupsidprefix=agrp_
-org.bedework.app.CalAdmin.guestmode=false
-org.bedework.app.CalAdmin.publicadmin=true
-org.bedework.app.CalAdmin.logprefix=PubEventsAdmin
-org.bedework.app.CalAdmin.run.as.user=public-user
-
-#
@@ -103 +96 @@
-# Public Web Client
-#
-0
+1
-org.bedework.app.Events.default.contenttype=text/xml
-org.bedework.app.Events.web.xml=guest/web.xml
@@ -119 +112 @@
-org.bedework.app.Events.run.as.user=public-user
-
-org.bedework.app.Events.hour24=true
-org.bedework.app.Events.minincrement=5
-org.bedework.app.Events.skinset.name=demoskins
-org.bedework.app.Events.showyeardata=false
-org.bedework.app.Events.refresh.interval=300
-org.bedework.app.Events.refresh.action=setup.do
-org.bedework.app.Events.guestmode=true
-org.bedework.app.Events.publicadmin=false
-org.bedework.app.Events.logprefix=PubEvents
-
-#
@@ -134 +121 @@
-# Personal Web Client
-#
-0
+1
-org.bedework.app.UserCal.default.contenttype=text/xml
-org.bedework.app.UserCal.web.xml=user/web.xml
@@ -153 +140 @@
-org.bedework.app.UserCal.name=DemoUserCal
-
-org.bedework.app.UserCal.hour24=true
-org.bedework.app.UserCal.minincrement=5
-org.bedework.app.UserCal.skinset.name=demoskins
-org.bedework.app.UserCal.showyeardata=false
-org.bedework.app.UserCal.refresh.interval=300
-org.bedework.app.UserCal.refresh.action=setup.do
-org.bedework.app.UserCal.guestmode=false
-org.bedework.app.UserCal.publicadmin=false
-org.bedework.app.UserCal.logprefix=PersonalCalendar
-
-#

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/Dump.java

@@ -29 +29 @@
-package org.bedework.dumprestore.dump;
-
+import org.bedework.appcommon.configs.DumpRestoreConfig;
-import org.bedework.calenv.CalOptions;
-import org.bedework.dumprestore.Defs;
-import org.bedework.dumprestore.DumpRestoreConfig;
-import org.bedework.dumprestore.dump.dumpling.DumpAll;
-

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/DumpGlobals.java

@@ -29 +29 @@
-package org.bedework.dumprestore.dump;
-
-dumprestore
+appcommon.configs
-
-import java.io.Writer;

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java

@@ -54 +54 @@
-package org.bedework.dumprestore.restore;
-
+import org.bedework.appcommon.configs.DumpRestoreConfig;
-import org.bedework.calenv.CalOptions;
-import org.bedework.calfacade.BwCalendar;
@@ -63 +64 @@
-import org.bedework.calfacade.svc.BwView;
-import org.bedework.dumprestore.Defs;
-import org.bedework.dumprestore.DumpRestoreConfig;
-import org.bedework.dumprestore.restore.rules.RestoreRuleSet;
-

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java

@@ -55 +55 @@
-
-import org.bedework.appcommon.TimeZonesParser;
+import org.bedework.appcommon.configs.DumpRestoreConfig;
-import org.bedework.calfacade.BwAttendee;
-import org.bedework.calfacade.BwEventAnnotation;
@@ -71 +72 @@
-import org.bedework.calfacade.svc.BwSubscription;
-import org.bedework.calfacade.svc.BwView;
-import org.bedework.dumprestore.DumpRestoreConfig;
-
-import edu.rpi.cct.uwcal.access.Access;

trunk/calendar3/freebusyServer/src/org/bedework/freebusyServer/FreeBusyAggregator.java

@@ -273 +273 @@
-    CalSvcIPars pars = new CalSvcIPars(null, // account,
-                                       null, // account,
+                                       null, // calSuite,
-                                       "org.bedework.app.freebusy.",
-                                       publicMode,

trunk/calendar3/synchml/src/edu/rpi/cct/uwcal/synchml/common/Synchml.java

@@ -125 +125 @@
-    CalSvcIPars pars = new CalSvcIPars(account,
-                                       account,
+                                       null,     // calSuite
-                                       null,     // XXX Requires an env prefix
-                                       false,    // public

trunk/calendar3/test/src/org/bedework/tests/calsvc/CalSvcTestWrapper.java

@@ -130 +130 @@
-    }
-
-
+ null,
-                                       envPrefix,
-                                       publicEvents,

trunk/calendar3/timers/src/org/bedework/timers/service/DbPollerTimerService.java

@@ -140 +140 @@
-    CalSvcIPars pars = new CalSvcIPars(account,
-                                       account,
+                                       null,   // calSuite
-                                       null,   // XXX needs envPrefix
-                                       true,    // public

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

@@ -55 +55 @@
-package org.bedework.webadmin;
-
-
-import org.bedework.appcommon.IntSelectId;
-import org.bedework.calfacade.BwCalendar;
@@ -69 +68 @@
-import javax.servlet.http.HttpServletResponse;
-
-events
+lic events admin
- *
- * <p>Forwards to the name returned by the subclass or to:<ul>
@@ -105 +104 @@
-                                  BwSession sess,
-                                  PEActionForm form) throws Throwable;
-
-
-  /* ********************************************************************
@@ -164 +162 @@
-    form.retrieveCalendarId().reset(id, IntSelectId.AHasPrecedence);
-  }
-
-}
-

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

@@ -66 +66 @@
-import org.bedework.webadmin.PEAbstractAction;
-import org.bedework.webadmin.PEActionForm;
+import org.bedework.webcommon.AdminConfig;
-import org.bedework.webcommon.BwSession;
-import org.bedework.webcommon.BwWebUtil;
-
-import edu.rpi.sss.util.log.MessageEmit;
-
-
-
-import javax.servlet.http.HttpServletRequest;
@@ -276 +275 @@
-
-    if (id <= 0) {
-form.getEnv().getAppBoolProperty("categoryOptional"
+((AdminConfig)form.retrieveConfig()).getCategoryOptional(
-        return true;
-      }
@@ -327 +326 @@
-          throws Throwable {
-    if (!form.retrieveSpId().getChanged()) {
-
+retrieveConfig().
-        BwSponsor s = form.getSponsor();
-        if (!BwWebUtil.validateSponsor(s, err)) {
@@ -383 +382 @@
-          throws Throwable {
-    if (!form.retrieveLocId().getChanged()) {
-
+retrieveConfig().
-        BwLocation l = form.getLocation();
-

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

@@ -172 +172 @@
-          </html:select>
-      </all>
-peForm
-
+bwconfig
+  
-        <address>
-          <html:text size="30" value="" property="location.address" styleId="iLocation" styleClass="edit"/>
@@ -200 +200 @@
-        </html:select>
-      </all>
-peForm
+bwconfig
-                 value="true">
-        <%@include file="/docs/sponsor/modSponsorCommon.jsp"%>

trunk/calendar3/webadmin/war/docs/header.jsp

@@ -11 +11 @@
-
-<bedeworkadmin>
+  <bean:define id="bwconfig" name="peForm" property="config" toScope="session" />
+
-  <!-- messages -->
-  <logic:iterate id="msg" name="peForm" property="msg.msgList">

trunk/calendar3/webclient/war/docs/header.jsp

@@ -8 +8 @@
-
-<bedework>
+  <bean:define id="bwconfig" name="calForm" property="config" toScope="session" />
+
-  <now><%-- The actual date right "now" - this may not be the same as currentdate --%>
-    <date><bean:write name="calForm" property="today.dateDigits"/></date><%--

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

@@ -58 +58 @@
-import org.bedework.appcommon.UserAuthPar;
-import org.bedework.calenv.CalEnv;
+import org.bedework.calenv.CalOptions;
-import org.bedework.calfacade.BwCalendar;
-import org.bedework.calfacade.BwCategory;
@@ -169 +170 @@
-
-    CalEnv env = getEnv(request, form);
+
+    setConfig(request, form);
+
-    setSessionAttr(request, "org.bedework.logprefix",
-env.getAppProperty("logprefix"
+form.retrieveConfig().getLogPrefix(
-
-    boolean guestMode = env.getAppBoolProperty("guestmode");
@@ -194 +198 @@
-    }
-
-    /*
-    UWCalCallback cb = new Callback(form);
-    HttpSession sess = request.getSession();
-    sess.setAttribute(UWCalCallback.cbAttrName, cb);
-    */
-
-    BwSession s = getState(request, form, messages, adminUserId,
-                           getPublicAdmin(form));
@@ -233 +231 @@
-    /* Set up ready for the action */
-
+    String temp = actionSetup(request, response, form);
+    if (temp != null) {
+      return temp;
+    }
+
+    /* see if we got cancelled */
+
+    String reqpar = request.getParameter("cancelled");
+
+    if (reqpar != null) {
+      /** Set the objects to null so we get new ones.
+       */
+      initFields(form);
+
+      form.getMsg().emit("org.bedework.client.message.cancelled");
+      return "cancelled";
+    }
+
+    /* Set up or refresh frequently used information,
+     */
+    CalSvcI svc = form.fetchSvci();
+
+    form.setSubscriptions(svc.getSubscriptions());
+
+    try {
+      forward = doAction(request, response, s, form);
+
+      if (!getPublicAdmin(form)) {
+        /* See if we need to refresh */
+        checkRefresh(form);
+      }
+    } catch (CalFacadeAccessException cfae) {
+      form.getErr().emit("org.bedework.client.error.noaccess", "for that action");
+      forward="noaccess";
+    } catch (Throwable t) {
+      form.getErr().emit("org.bedework.client.error.exc", t.getMessage());
+      form.getErr().emit(t);
+    }
+
+    return forward;
+  }
+
+  /** Called just before action.
+   *
+   * @param request
+   * @param response
+   * @param form
+   * @return String forward for error or null
+   * @throws Throwable
+   */
+  public String actionSetup(HttpServletRequest request,
+                            HttpServletResponse response,
+                            BwActionFormBase form) throws Throwable {
-    if (getPublicAdmin(form)) {
-      /* Set some options from the environment */
-
-      form.setAutoCreateSponsors(env.getAppBoolProperty("autocreatesponsors"));
-      form.setAutoCreateLocations(env.getAppBoolProperty("autocreatelocations"));
-      form.setAutoDeleteSponsors(env.getAppBoolProperty("autodeletesponsors"));
-      form.setAutoDeleteLocations(env.getAppBoolProperty("autodeletelocations"));
-
-      if (debug) {
-        logIt("form.getGroupSet()=" + form.getGroupSet());
@@ -267 +311 @@
-       */
-      setAuthUser(form);
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-
@@ -1001 +1026 @@
-  }
-
-  /* Set information associated witht he current auth user.
-   * Set the prefs on each request to reflect other session changes
-   */
-  private void setAuthUser(BwActionFormBase 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,
-                          BwActionFormBase form,
@@ -1100 +1106 @@
-
-    return env;
+  }
+
+  /** get an options property object. If name is null uses the application
+   * name.
+   *
+   * @param request    HttpServletRequest
+   * @param name
+   * @return Object .
+   * @throws Throwable
+   */
+  protected Object getConfigOption(HttpServletRequest request,
+                                   String name) throws Throwable {
+    if (name == null) {
+      HttpSession session = request.getSession();
+      ServletContext sc = session.getServletContext();
+
+      name = sc.getInitParameter("bwappname");
+
+      if ((name == null) || (name.length() == 0)) {
+        name = "unknown-app-name";
+      }
+    }
+
+    String appPrefix = "org.bedework.app.";
+    return CalOptions.getProperty(appPrefix + name);
-  }
-
@@ -1183 +1214 @@
-
-      BwWebUtil.setState(request, s);
-
-      form.setHour24(env.getAppBoolProperty("hour24"));
-      form.setMinIncrement(env.getAppIntProperty("minincrement"));
-      if (!admin) {
-        form.assignShowYearData(env.getAppBoolProperty("showyeardata"));
-      }
-
-      setSessionAttr(request, "cal.pubevents.client.uri",
@@ -1378 +1403 @@
-
-      String runAsUser = user;
+      String calSuite = form.retrieveConfig().getCalSuite();
-
-      try {
-        svci = new CalSvc();
-        if (publicAdmin || (user == null)) {
-
+
+
+
-        }
-
-        CalSvcIPars pars = new CalSvcIPars(user, //access,
-                                           runAsUser,
+                                           calSuite,
-                                           form.getEnv().getAppPrefix(),
-                                           publicAdmin,
@@ -1700 +1729 @@
-  }
-
+  /* ********************************************************************
+                             private methods
+     ******************************************************************** */
+
+  /* Set information associated with the current auth user.
+   * Set the prefs on each request to reflect other session changes
+   */
+  private void setAuthUser(BwActionFormBase 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 void checkRefresh(BwActionFormBase form) {
-    if (!form.isRefreshNeeded()){

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

@@ -111 +111 @@
-  private CalEnv env;
-
+  private ConfigBase config;
+
-  // XXX locale - needs to be changed when locale changes
-  private transient Collator listCollator;
@@ -120 +122 @@
-
-  private transient MailerIntf mailer;
-
-  /** True if we should auto-create sponsors. Some sites may wish to control
-   * the creation of sponsors to enforce consistency in their use. If this
-   * is true we create a sponsor as we create events. If false the sponsor
-   * must already exist.
-   */
-  private boolean autoCreateSponsors;
-
-  /** True if we should auto-create locations. Some sites may wish to control
-   * the creation of locations to enforce consistency in their use. If this
-   * is true we create a location as we create events. If false the location
-   * must already exist.
-   */
-  private boolean autoCreateLocations;
-
-  /** True if we should auto-delete sponsors. Some sites may wish to control
-   * the deletion of sponsors to enforce consistency in their use. If this
-   * is true we delete a sponsor when it becomes unused.
-   */
-  private boolean autoDeleteSponsors;
-
-  /** True if we should auto-delete locations. Some sites may wish to control
-   * the deletion of locations to enforce consistency in their use. If this
-   * is true we delete a location when it becomes unused.
-   */
-  private boolean autoDeleteLocations;
-
-  /* Kind of entity we are referring to */
@@ -411 +387 @@
-  public BwSystem getSyspars() {
-    return syspars;
+  }
+
+  /** Set a copy of the config parameters
+   *
+   * @param val
+   */
+  public void setConfig(ConfigBase val) {
+    config = val;
+
+    /* Set defaults */
+    setHour24(config.getHour24());
+    setMinIncrement(config.getMinIncrement());
+    assignShowYearData(config.getShowYearData());
+  }
+
+  /** Return a cloned copy of the config parameters
+   *
+   * @return Config object
+   */
+  public ConfigBase getConfig() {
+    if (config == null) {
+      return null;
+    }
+
+    return (ConfigBase)config.clone();
+  }
+
+  /** True if we have a config object set.
+   *
+   * @return boolean
+   */
+  public boolean configSet() {
+    return config != null;
+  }
+
+  /** Return the uncloned config parameters
+   *
+   * @return Config object
+   */
+  public ConfigBase retrieveConfig() {
+    return config;
-  }
-
@@ -639 +656 @@
-  }
-
-  /* ====================================================================
-   *                   Configuration flags
-   * ==================================================================== */
-
-  /** True if we should auto-create sponsors. Some sites may wish to control
-   * the creation of sponsors to enforce consistency in their use. If this
-   * is true we create a sponsor as we create events. If false the sponsor
-   * must already exist.
-   *
-   * @param val
-   */
-  public void setAutoCreateSponsors(boolean val) {
-    autoCreateSponsors = val;
-  }
-
-  /**
-   * @return boolean
-   */
-  public boolean getAutoCreateSponsors() {
-    return autoCreateSponsors;
-  }
-
-  /** True if we should auto-create locations. Some sites may wish to control
-   * the creation of locations to enforce consistency in their use. If this
-   * is true we create a location as we create events. If false the location
-   * must already exist.
-   *
-   * @param val
-   */
-  public void setAutoCreateLocations(boolean val) {
-    autoCreateLocations = val;
-  }
-
-  /**
-   * @return boolean
-   */
-  public boolean getAutoCreateLocations() {
-    return autoCreateLocations;
-  }
-
-  /** True if we should auto-delete sponsors. Some sites may wish to control
-   * the deletion of sponsors to enforce consistency in their use. If this
-   * is true we delete a sponsor when it becomes unused.
-   *
-   * @param val
-   */
-  public void setAutoDeleteSponsors(boolean val) {
-    autoDeleteSponsors = val;
-  }
-
-  /**
-   * @return boolean
-   */
-  public boolean getAutoDeleteSponsors() {
-    return autoDeleteSponsors;
-  }
-
-  /** True if we should auto-delete locations. Some sites may wish to control
-   * the deletion of locations to enforce consistency in their use. If this
-   * is true we delete a location when it becomes unused.
-   *
-   * @param val
-   */
-  public void setAutoDeleteLocations(boolean val) {
-    autoDeleteLocations = val;
-  }
-
-  /**
-   * @return boolean
-   */
-  public boolean getAutoDeleteLocations() {
-    return autoDeleteLocations;
-  }
-
-  /**
-   * @param val
@@ -919 +862 @@
-  public boolean getPublicView() {
-    return publicView;
-  }
-
-  /**
-   * @param val
-   */
-  public void setHour24(boolean val) {
-    hour24 = val;
-    eventDates = null;   // reset it
-  }
-
-  /**
-   * @return bool
-   */
-  public boolean getHour24() {
-    return hour24;
-  }
-
-
-  /**
-   * @param val
-   */
-  public void setMinIncrement(int val) {
-    minIncrement = val;
-    eventDates = null;   // reset it
-  }
-
-  /**
-   * @return int
-   */
-  public int getMinIncrement() {
-    return minIncrement;
-  }
-
@@ -1967 +1879 @@
-    if (eventDates == null) {
-      eventDates = new EventDates(fetchSvci(), getCalInfo(),
-
+
+
-    }
-
-    return eventDates;
+  }
+
+  /**
+   * @param val
+   */
+  public void setHour24(boolean val) {
+    hour24 = val;
+    eventDates = null;   // reset it
+  }
+
+  /**
+   * @return bool
+   */
+  public boolean getHour24() {
+    return hour24;
+  }
+
+
+  /**
+   * @param val
+   */
+  public void setMinIncrement(int val) {
+    minIncrement = val;
+    eventDates = null;   // reset it
+  }
+
+  /**
+   * @return int
+   */
+  public int getMinIncrement() {
+    return minIncrement;
-  }
-

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

@@ -245 +245 @@
-       table then delete this sponsor.
-     */
-
+retrieveConfig().
-        svci.getSponsorRefs(event.getSponsor()).size() == 0) {
-      svci.deleteSponsor(event.getSponsor());
@@ -253 +253 @@
-       table then delete this location.
-     */
-
+retrieveConfig().
-        svci.getLocationRefs(event.getLocation()).size() == 0) {
-      svci.deleteLocation(event.getLocation());

trunk/calendar3/webcommon/src/org/bedework/webcommon/calsuite/AddCalSuiteAction.java

@@ -145 +145 @@
-
-    form.setCalSuite(csw);
-    //form.setSubscriptions(svc.getSubscriptions());
-
-    return "success";