Changeset 54

Timestamp:

01/31/06 09:50:28

Author:

douglm

Message:

Added a number of fields to the system parameters - some not yet used:

maxPublicDescriptionLength
will be used to limit the size of the description for public events
maxUserDescriptionLength;
will be used to limit the size of the description for user events

maxUserEntitySize, defaultUserQuota
will be used when we have quotas working.
defaultUserViewName
Used to set the name of the default view created when a user is added.
Add the above to dump/restore. Changes to CalSvc? to set default view

Add unremoveable flag to subscriptions. Add to dump/restore

Add quota to BwUser?, Add to dump/restore. Set it in CalintfImpl? from syspars.
Add value to users when converting from 2.3

Files:

• trunk/calendar3/calCore/resources/hbms/Subscription.hbm.xml (modified) (2 diffs)
• trunk/calendar3/calCore/resources/hbms/System.hbm.xml (modified) (2 diffs)
• trunk/calendar3/calCore/resources/hbms/User.hbm.xml (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/hibernate/CalintfImpl.java (modified) (1 diff)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwSystem.java (modified) (5 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/BwUser.java (modified) (2 diffs)
• trunk/calendar3/calFacade/src/org/bedework/calfacade/svc/BwSubscription.java (modified) (3 diffs)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/docs/todo.txt (modified) (1 diff)
• trunk/calendar3/dumprestore/build.xml (modified) (1 diff)
• trunk/calendar3/dumprestore/properties/dumprestore.properties (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpSyspars.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpUserPrefs.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/Restore.java (modified) (3 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/RestoreGlobals.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalendarRule.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/SysparsFieldRule.java (modified) (2 diffs)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserFieldRule.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java (modified) (1 diff)
• trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserRule.java (modified) (1 diff)

trunk/calendar3/calCore/resources/hbms/Subscription.hbm.xml

@@ -5 +5 @@
-
-<!-- ===================================================================
-S
+s
-     =================================================================== -->
-
@@ -38 +38 @@
-    <property name="calendarDeleted" type="true_false"
-              column="calendar_deleted" not-null="true" />
+
+    <property name="unremoveable" type="true_false"
+              column="unremoveable" not-null="true" />
-  </class>
-

trunk/calendar3/calCore/resources/hbms/System.hbm.xml

@@ -27 +27 @@
-    <property name="userInbox" column="userInbox" type="text" />
-    <property name="userOutbox" column="userOutbox" type="text" />
+    <property name="defaultUserViewName" column="defaultUserViewName" type="text" />
-
-    <property name="publicUser" column="public_user" type="text" />
@@ -37 +38 @@
-    <property name="httpConnectionsPerHost" column="http_connections_per_host" type="integer" />
-    <property name="httpConnections" column="http_connections" type="integer" />
+
+    <property name="maxPublicDescriptionLength" column="maxPublicDescriptionLength" type="integer" />
+    <property name="maxUserDescriptionLength" column="maxUserDescriptionLength" type="integer" />
+    <property name="maxUserEntitySize" column="maxUserEntitySize" type="integer" />
+    <property name="defaultUserQuota" column="defaultUserQuota" type="long" />
-
-    <property name="userauthClass" column="userauth_class" type="text" />

trunk/calendar3/calCore/resources/hbms/User.hbm.xml

@@ -44 +44 @@
-    <property name="locationAccess"
-              column="location_access" type="text"/>
+
+    <property name="quota" type="long"/>
-  </class>
-</hibernate-mapping>

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

@@ -617 +617 @@
-    user.setSponsorAccess(access.getDefaultPersonalAccess());
-
+    user.setQuota(getSyspars().getDefaultUserQuota());
+
-    sess.save(user);
-

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

@@ -75 +75 @@
-  private String systemid;
-
-a
+
-  private String publicCalendarRoot;
-  private String userCalendarRoot;
@@ -82 +82 @@
-  private String userInbox;
-  private String userOutbox;
+  private String defaultUserViewName;
-
-  private String publicUser;
@@ -90 +91 @@
-  private int httpConnectionsPerHost;
-  private int httpConnections;
+
+  /* Limits */
+  private int maxPublicDescriptionLength = 500;
+  private int maxUserDescriptionLength = 1000;
+  private int maxUserEntitySize = 100000;
+  private long defaultUserQuota = 1000000 * 10; // 10 Meg OK?
-
-  private String userauthClass;
@@ -240 +247 @@
-  }
-
+  /** Set the user default view name
+   *
+   * @param val    String
+   */
+  public void setDefaultUserViewName(String val) {
+    defaultUserViewName = val;
+  }
+
+  /** Get the userCalendar
+   *
+   * @return String   userTrashCalendar
+   */
+  public String getDefaultUserViewName() {
+    return defaultUserViewName;
+  }
+
-  /** Set the public user
-   *
@@ -318 +341 @@
-  public int getHttpConnections() {
-    return httpConnections;
+  }
+
+  /** Set the max description length for public events
+   *
+   * @param val    int max
+   */
+  public void setMaxPublicDescriptionLength(int val) {
+    maxPublicDescriptionLength = val;
+  }
+
+  /**
+   *
+   * @return int
+   */
+  public int getMaxPublicDescriptionLength() {
+    return maxPublicDescriptionLength;
+  }
+
+  /** Set the max description length for user events
+   *
+   * @param val    int max
+   */
+  public void setMaxUserDescriptionLength(int val) {
+    maxUserDescriptionLength = val;
+  }
+
+  /**
+   *
+   * @return int
+   */
+  public int getMaxUserDescriptionLength() {
+    return maxUserDescriptionLength;
+  }
+
+  /** Set the max entity length for users. Probably an estimate
+   *
+   * @param val    int max
+   */
+  public void setMaxUserEntitySize(int val) {
+    maxUserEntitySize = val;
+  }
+
+  /**
+   *
+   * @return int
+   */
+  public int getMaxUserEntitySize() {
+    return maxUserEntitySize;
+  }
+
+  /** Set the default quota for users. Probably an estimate
+   *
+   * @param val    long default
+   */
+  public void setDefaultUserQuota(long val) {
+    defaultUserQuota = val;
+  }
+
+  /**
+   *
+   * @return long
+   */
+  public long getDefaultUserQuota() {
+    return defaultUserQuota;
-  }
-

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

@@ -60 +60 @@
- */
-public class BwUser extends BwPrincipal {
+  private long quota;
+
-  private boolean instanceOwner;
-
@@ -82 +84 @@
-  public int getKind() {
-    return principalUser;
+  }
+
+  /** Quota for this user. This will have to be an estimate I imagine.
+   *
+   * @param val
+   */
+  public void setQuota(long val) {
+    quota = val;
+  }
+
+  /**
+   * @return long
+   */
+  public long getQuota() {
+    return quota;
-  }
-

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

@@ -79 +79 @@
-  private boolean calendarDeleted;
-
+  /** Mark this subscription as unremovable by the user.
+   */
+  private boolean unremoveable;
+
-  /* Non-db fields */
-
@@ -221 +225 @@
-  public boolean getCalendarDeleted() {
-    return calendarDeleted;
+  }
+
+  /** Is the subscription unremoveable?
+   *
+   * @param val   boolean true if the subscription is unremoveable
+   */
+  public void setUnremoveable(boolean val) {
+    unremoveable = val;
+  }
+
+  /** Is the subscription unremoveable?
+   *
+   * @return boolean  true if the subscription is unremoveable
+   */
+  public boolean getUnremoveable() {
+    return unremoveable;
-  }
-
@@ -364 +384 @@
-    sb.append(", uri=");
-    sb.append(String.valueOf(getUri()));
+    sb.append(", unremoveable=");
+    sb.append(getUnremoveable());
-    sb.append(")");
-

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

@@ -1832 +1832 @@
-
-        // Add default subscription for default calendar.
-
+
+
+
+
+
+
+
+
+
+
+
-        setupOwnedEntity(sub);
-
-        prefs.addSubscription(sub);
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-
-        dbi.updatePreferences(prefs);

trunk/calendar3/docs/todo.txt

@@ -2 +2 @@
-
---------------------------------------------------------------------------------
-Web-client - ensure no unexpeected data modifications.
---------------------------------------------------------------------------------
-maxDescriptionLength out of BwEvent - into syspars?
---------------------------------------------------------------------------------
+Unremovable subscriptions
+--------------------------------------------------------------------------------
+Personal users need default subscriptions and views
+--------------------------------------------------------------------------------
+Web-client - ensure no unexpected data modifications.
+--------------------------------------------------------------------------------
-Check all day events are correct in all clients.
---------------------------------------------------------------------------------
-Unremovable subscriptions
---------------------------------------------------------------------------------
-Personal users need default subscriptions and views
---------------------------------------------------------------------------------
-Finish off moving calendar labelling stuff out of TimeDateComponents

trunk/calendar3/dumprestore/build.xml

@@ -264 +264 @@
-      <arg value="-defoutbox" />
-      <arg value="${org.bedework.env.default.user.outbox}" />
+      <arg value="-defuview" />
+      <arg line="${org.bedework.env.default.user.view}" />
-
-      <arg line="${org.bedework.restore.arg.public.user}" />

trunk/calendar3/dumprestore/properties/dumprestore.properties

@@ -57 +57 @@
-org.bedework.restore.arg.timezones=
-
---- System parameters ---------
+ System parameters for 2.3.2 conversion 
-org.bedework.restore.arg.sysname=bedework
-org.bedework.restore.arg.tzid=America/New_York
@@ -68 +68 @@
-org.bedework.env.default.user.inbox=Inbox
-org.bedework.env.default.user.outbox=Outbox
+org.bedework.env.default.user.view=All
-
-org.bedework.restore.arg.public.user=-pu public-user

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpSyspars.java

@@ -83 +83 @@
-    taggedVal("userInbox", s.getUserInbox());
-    taggedVal("userOutbox", s.getUserOutbox());
+    taggedVal("defaultUserViewName", s.getDefaultUserViewName());
-
-    taggedVal("publicUser", s.getPublicUser());
@@ -91 +92 @@
-    taggedVal("httpConnectionsPerHost", s.getHttpConnectionsPerHost());
-    taggedVal("httpConnections", s.getHttpConnections());
+
+    taggedVal("maxPublicDescriptionLength", s.getMaxPublicDescriptionLength());
+    taggedVal("maxUserDescriptionLength", s.getMaxUserDescriptionLength());
+    taggedVal("maxUserEntitySize", s.getMaxUserEntitySize());
+    taggedVal("defaultUserQuota", s.getDefaultUserQuota());
-
-    taggedVal("userauthClass", s.getUserauthClass());

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpUserPrefs.java

@@ -94 +94 @@
-        taggedVal("sub-emailNotifications", sub.getEmailNotifications());
-        taggedVal("sub-calendarDeleted", sub.getCalendarDeleted());
+        taggedVal("sub-unremoveable=", sub.getUnremoveable());
-
-        tagEnd("subscription");

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/dump/dumpling/DumpUsers.java

@@ -67 +67 @@
-
-    principalTags(u);
+    taggedVal("instanceOwner", u.getInstanceOwner());
+    taggedVal("quota", u.getQuota());
-
-    tagEnd(objectUser);

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

@@ -334 +334 @@
-        i++;
-        globals.syspars.setUserOutbox(args[i]);
+      } else if (argpar("-defuview", args, i)) {
+        i++;
+        globals.syspars.setDefaultUserViewName(args[i]);
-
-      } else if (argpar("-pu", args, i)) {
@@ -352 +355 @@
-        i++;
-        globals.syspars.setHttpConnections(intPar(args[i]));
+
+      } else if (argpar("-defuquota", args, i)) {
+        i++;
+        globals.syspars.setDefaultUserQuota(longPar(args[i]));
-
-      } else if (argpar("-userauthClass", args, i)) {
@@ -377 +384 @@
-  private int intPar(String par) throws Throwable {
-    return Integer.parseInt(par);
+  }
+
+  private long longPar(String par) throws Throwable {
+    return Long.parseLong(par);
-  }
-

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

@@ -116 +116 @@
-  public BwSystem syspars = new BwSystem();
-
-  /** * /
-  public String publicCalendarRoot;
-  /** * /
-  public String userCalendarRoot;
-  /** * /
-  public String userDefaultCalendar;
-  /** * /
-  public String defaultTrashCalendar;
-
-  /** Account name for owner of public entities* /
-  public String publicUserAccount;
-
-  /** * /
-  public String systemId; // required for fixing guids
-
-  */
-
-  /* Used when processing timezones */
-  private CalTimezones tzcache;

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/CalendarRule.java

@@ -80 +80 @@
-        globals.rintf.restoreCalendar(entity);
-      }
+      globals.calendarsTbl.put(new Integer(entity.getId()), entity);
-    } catch (Throwable t) {
-      throw new Exception(t);

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/SysparsFieldRule.java

@@ -91 +91 @@
-    } else if (name.equals("userOutbox")) {
-      ent.setUserOutbox(stringFld());
+    } else if (name.equals("defaultUserViewName")) {
+      ent.setDefaultUserViewName(stringFld());
-
-    } else if (name.equals("publicUser")) {
@@ -105 +107 @@
-      ent.setHttpConnections(intFld());
-
+    } else if (name.equals("maxPublicDescriptionLength")) {
+      ent.setMaxPublicDescriptionLength(intFld());
+    } else if (name.equals("maxUserDescriptionLength")) {
+      ent.setMaxUserDescriptionLength(intFld());
+    } else if (name.equals("maxUserEntitySize")) {
+      ent.setMaxUserEntitySize(intFld());
+    } else if (name.equals("defaultUserQuota")) {
+      ent.setDefaultUserQuota(longFld());
+
-    } else if (name.equals("userauthClass")) {
-      ent.setUserauthClass(stringFld());

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserFieldRule.java

@@ -73 +73 @@
-    }
-
-
+
+
+
+
+
-      // Fix it later
-      globals.subscriptionsTbl.put(u, intFld());

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserPrefsFieldRule.java

@@ -127 +127 @@
-    } else if (name.equals("sub-calendarDeleted")) {
-      globals.curSub.setCalendarDeleted(booleanFld());
+    } else if (name.equals("sub-unremoveable")) {
+      globals.curSub.setUnremoveable(booleanFld());
-
-    // view fields

trunk/calendar3/dumprestore/src/org/bedework/dumprestore/restore/rules/UserRule.java

@@ -78 +78 @@
-      entity.setLocationAccess(globals.getDefaultPersonalAccess());
-      entity.setSponsorAccess(globals.getDefaultPersonalAccess());
+      entity.setQuota(globals.syspars.getDefaultUserQuota());
-    }
-