Changeset 302

Timestamp:

03/27/06 13:44:59

Author:

douglm

Message:

Two sets of changes - bwconfig and session stuff

BwConfig?: very out of date.
Started on changes to bring it up to date with all the property changes that took place.
Still broken but does build. More to follow.

Sessions - packaging the suite as one ear file revealed a number of problems with tracking session counts.
Though only intended as a guide to usage they are useful and the single static field became
an accumulation of all applications use. Switched to a table based approach using the
app name as a key.

Files:

• trunk/calendar3/common/src/edu/rpi/sss/util/Util.java (modified) (2 diffs)
• trunk/calendar3/common/src/edu/rpi/sss/util/jsp/SessionListener.java (modified) (8 diffs)
• trunk/calendar3/config/configs/democal.properties (modified) (1 diff)
• trunk/calendar3/config/properties/default-bedework.properties (modified) (10 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/AbstractAction.java (modified) (3 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/Defs.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Caldavpersonal.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Caldavpublic.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/ConfigCollection.java (modified) (3 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Globals.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Modules.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Syspars.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Webadmin.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Webconfig.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Webpersonal.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/collections/Webpublic.java (modified) (2 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/props/CommentProperty.java (added)
• trunk/calendar3/config/src/org/bedework/webconfig/props/MultiProperty.java (modified) (3 diffs)
• trunk/calendar3/config/src/org/bedework/webconfig/props/OrderedListProperty.java (added)
• trunk/calendar3/config/src/org/bedework/webconfig/props/OrderedMultiListProperty.java (added)
• trunk/calendar3/config/war/WEB-INF/classes/servlet.properties (modified) (1 diff)
• trunk/calendar3/config/war/docs/main.jsp (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwAbstractAction.java (modified) (7 diffs)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwSession.java (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/BwSessionImpl.java (modified) (6 diffs)

trunk/calendar3/common/src/edu/rpi/sss/util/Util.java

@@ -60 +60 @@
-import java.text.MessageFormat;
-import java.util.ArrayList;
+import java.util.LinkedList;
+import java.util.List;
-import java.util.Properties;
-import java.util.Random;
+import java.util.StringTokenizer;
-
-/**
@@ -403 +406 @@
-    return checkNull(val) != null;
-  }
+
+  /** Turn a comma separated list into a List.
+   * Throws exception for invalid list.
+   * 
+   * @param val     String comma separated list
+   * @param emptyOk Empty elements are OK
+   * @return List of elements, never null
+   * @throws Throwable for invalid list
+   */
+  public static List getList(String val, boolean emptyOk) throws Throwable {
+    List l = new LinkedList();
+
+    if ((val == null) || (val.length() == 0)) {
+      return l;
+    }
+
+    StringTokenizer st = new StringTokenizer(val, ",", false);
+    while (st.hasMoreTokens()) {
+      String token = st.nextToken().trim();
+
+      if ((token == null) || (token.length() == 0)) {
+        if (!emptyOk) {
+          // No empty strings
+
+          throw new Exception("List has an empty element.");
+        }
+        l.add("");
+      } else {
+        // Got non-empty element
+        l.add(token);
+      }
+    }
+
+    return l;
+  }
-}

trunk/calendar3/common/src/edu/rpi/sss/util/jsp/SessionListener.java

@@ -61 +61 @@
-
-import java.util.Enumeration;
+import java.util.HashMap;
+
-import org.apache.log4j.Logger;
-
@@ -67 +69 @@
- */
-public class SessionListener implements HttpSessionListener {
-
-
+
+
+
+
+
+
-  private static boolean logActive = true;
-  private static String id = "";
-
-  /** Name of the init parameter holding our name */
@@ -83 +88 @@
-   */
-  public void sessionCreated(HttpSessionEvent se) {
-    activeSessions++;
-    totalSessions++;
-    HttpSession session = se.getSession();
-    ServletContext sc = session.getServletContext();
+    String appname = getAppName(session);
+    Counts ct = getCounts(appname);
+    
+    ct.activeSessions++;
+    ct.totalSessions++;
-
-    if (logActive) {
-      logSessionCounts(session, true);
-id
-
-
+appname
+ct.
+ct.
-            Runtime.getRuntime().freeMemory()/(1024 * 1024) + "M, " +
-            Runtime.getRuntime().totalMemory()/(1024 * 1024) + "M)");
@@ -111 +119 @@
-  /* Session Invalidation Event */
-  public void sessionDestroyed(HttpSessionEvent se) {
-    if (activeSessions > 0) {
-      activeSessions--;
-    }
-    HttpSession session = se.getSession();
-    ServletContext sc = session.getServletContext();
+    String appname = getAppName(session);
+    Counts ct = getCounts(appname);
+    
+    if (ct.activeSessions > 0) {
+      ct.activeSessions--;
+    }
+    
-    if (logActive) {
-      logSessionCounts(session, false);
-id
-
+appname
+ct.
-            Runtime.getRuntime().freeMemory()/(1024 * 1024) + "M, " +
-            Runtime.getRuntime().totalMemory()/(1024 * 1024) + "M)");
@@ -130 +142 @@
-  public static void setLogActive(boolean val) {
-    logActive = val;
-  }
-
-  /**
-   * @return int num active sessions
-   */
-  public static int getActiveSessions() {
-    return activeSessions;
-  }
-
-  /**
-   * @return long total sessions
-   */
-  public static long getTotalSessions() {
-    return totalSessions;
-  }
-
-  /**
-   * @param val String id
-   */
-  public static void setId(String val) {
-    if (val != null) {
-      id = val;
-    } else {
-      id = "";
-    }
-  }
-
@@ -166 +153 @@
-    Logger log = Logger.getLogger(this.getClass());
-    StringBuffer sb;
-
-
-
-
-
-
+
+
-
-    if (start) {
@@ -183 +166 @@
-    sb.append(appname);
-    sb.append(":");
-
-
-
+ct.
+
+ct.
-    sb.append(":");
-    sb.append(Runtime.getRuntime().freeMemory()/(1024 * 1024));
@@ -193 +176 @@
-
-    log.info(sb.toString());
+  }
+  
+  private Counts getCounts(String name) {
+    try {
+      synchronized (countsMap) {
+        Counts c = (Counts)countsMap.get(name);
+        
+        if (c == null) {
+          c = new Counts();
+          countsMap.put(name, c);
+        }
+        
+        return c;
+      }
+    } catch (Throwable t) {
+      return new Counts();
+    }
+  }
+  
+  private String getAppName(HttpSession sess) {
+    ServletContext sc = sess.getServletContext();
+
+    String appname = sc.getInitParameter(appNameInitParameter);
+    if (appname == null) {
+      appname = "?";
+    }
+    
+    return appname;
-  }
-

trunk/calendar3/config/configs/democal.properties

@@ -13 +13 @@
-# Global options
-#
-org.bedework.install.admin.web=true
-org.bedework.install.public.web=true
-org.bedework.install.personal.web=true
-org.bedework.install.public.caldav=true
-org.bedework.install.personal.caldav=true
-
-# Define the names of the applications we want to build

trunk/calendar3/config/properties/default-bedework.properties

@@ -1 @@
-org.bedework.webadmin.app.transport.guarantee=NONE
-#
-# --------------------------------------------------------------------
@@ -14 +13 @@
-# Global options
-#
-
-
-personal.web=true
-public.caldav=true
-
+
+
+app.names=bwconfig,CalAdmin,Events,UserCal,Pubcaldav,Usercaldav
+app.types=webconfig,webadmin,webpublic,webuser,publiccaldav,usercaldav
+
-#
-# --------------------------------------------------------------------
@@ -24 +23 @@
-# 'environment' options used globally by the system.
-#
-org.bedework.global.version=3.0
-org.bedework.global.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-
+
+
-org.bedework.global.directory.browsing.disallowed=false
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-#
-# -------------------------------------------------------------------
@@ -47 +65 @@
-# Bedework config web client
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -168 +193 @@
-# Public Caldav Server
-#
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -184 +211 @@
-# Personal Caldav Server
-#
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-#
@@ -205 +233 @@
-#
-
-
-
-
-
+app.
+app.
+app.
+app.
-
-# -------------- dump parameters ------------------
@@ -214 +242 @@
-org.bedework.dump.arg.dumpfile=${user.home}/.bedework/caldata.xml
-org.bedework.dump.arg.debug=-debug
-org.bedework.restore.arg.hib=-nhib
-org.bedework.dump.arg.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-org.bedework.dump.arg.jdbcdriver=org.hsqldb.jdbcDriver
@@ -223 +250 @@
-# -------------- restore parameters ------------------
-
-
-
+
-org.bedework.restore.arg.debug=-debug
-hib=-nhib
+from2p3px=
-org.bedework.restore.arg.fixcals=-nfixcals
-
-
+
-org.bedework.restore.arg.hibernate.dialect=org.hibernate.dialect.HSQLDialect
-org.bedework.restore.arg.jdbcdriver=org.hsqldb.jdbcDriver
@@ -235 +260 @@
-org.bedework.restore.arg.jdbcid=sa
-org.bedework.restore.arg.jdbcpw=
-
+
+

trunk/calendar3/config/src/org/bedework/webconfig/AbstractAction.java

@@ -68 +68 @@
-import org.bedework.webconfig.collections.Webpersonal;
-import org.bedework.webconfig.collections.Webpublic;
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.ConfigProperty;
+import org.bedework.webconfig.props.OrderedListProperty;
+import org.bedework.webconfig.props.OrderedMultiListProperty;
-
-import edu.rpi.sss.util.Util;
-import edu.rpi.sss.util.jsp.JspUtil;
-import edu.rpi.sss.util.jsp.UtilAbstractAction;
-import edu.rpi.sss.util.jsp.UtilActionForm;
@@ -170 +170 @@
-    form.addPropertyCollection(modules);
-    form.addPropertyCollection(new Globals());
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-    if (pr != null) {
@@ -278 +314 @@
-    }
-
-    String envPrefix = JspUtil.getReqProperty(frm.getMres(),
-                                              "org.bedework.envprefix");
-
-    env = new CalEnv(envPrefix, debug);
-    frm.assignEnv(env);

trunk/calendar3/config/src/org/bedework/webconfig/Defs.java

@@ -60 +60 @@
- */
-public interface Defs {
+  /** This prefix never changes */
+  public static final String envPrefix = "org.bedework.app.bwconfig.";
+  
+  public static final String webconfigType = "webconfig";
+  public static final String webadminType = "webadmin";
+  public static final String webpublicType = "webpublic";
+  public static final String webuserType = "webuser";
+  public static final String publiccaldavType = "publiccaldav";
+  public static final String usercaldavType = "usercaldav";
+  
+  /** Valid types of application */
+  public static final String[] appTypes = {
+    webconfigType,
+    webadminType,
+    webpublicType,
+    webuserType,
+    publiccaldavType,
+    usercaldavType
+  };
+  
-  /** Default properties file (built in to application) */
-  public final static String defaultProperties = "/properties/calendar/default-bedework.properties"; 
@@ -79 +99 @@
-  /** Multi-value property - radio or select */
-  public final static int typeMultiple = 4; 
+  
+  /** Comment */
+  public final static int typeComment = 5; 
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Caldavpersonal.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Caldav public events server properties.
- *
@@ -68 +65 @@
-   * @throws Throwable
-   */
-BooleanProperty onlyIf
-"calDAV-personal", "caldav.user", onlyIf
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("war", "war.name"
-
-BooleanProperty j2ee = new BooleanProperty("j2ee.deploy", "deploy.j2ee", true
+requiredText("context.root", "context.root"
-
-addProperty(j2ee
+requiredText("deploy.dir", "deploy.dir"
-
-addProperty(new ConfigProperty("ear", "ear.name", true, j2ee)
+requiredText("security.domain", "app.security.domain"
-
-addProperty(new ConfigProperty("context.root", "context.root", true)
+requiredText("security.prefix", "app.security.prefix"
-
-
-
-
-
-
-
-
-
-
+
-
-    // We really want this to set the value of the above to NONE or CONFIDENTIAL
-    //addProperty(new BooleanProperty("ssl", "use.ssl", true));
-
-addProperty(new ConfigProperty("description", "app.description", true)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("display.name", "app.display.name", true)
+requiredText("display.name", "app.display.name"
-
-addProperty(new ConfigProperty("name", "app.name", true)
+requiredText("name", "app.name"
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Caldavpublic.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Caldav public events server properties.
- *
@@ -68 +65 @@
-   * @throws Throwable
-   */
-BooleanProperty onlyIf
-"calDAV-public", "caldav.public", onlyIf
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("war", "war.name"
-
-BooleanProperty j2ee = new BooleanProperty("j2ee.deploy", "deploy.j2ee", true
+requiredText("context.root", "context.root"
-
-addProperty(j2ee
+requiredText("deploy.dir", "deploy.dir"
-
-addProperty(new ConfigProperty("ear", "ear.name", true, j2ee)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("context.root", "context.root", true)
+requiredText("display.name", "app.display.name"
-
-
-
-
-
-
-
-
-
-
+
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/ConfigCollection.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
+import org.bedework.webconfig.Defs;
-import org.bedework.webconfig.props.BooleanProperty;
+import org.bedework.webconfig.props.CommentProperty;
-import org.bedework.webconfig.props.ConfigProperty;
+import org.bedework.webconfig.props.IntProperty;
+import org.bedework.webconfig.props.OrderedListProperty;
+import org.bedework.webconfig.props.OrderedMultiListProperty;
-
-import edu.rpi.sss.util.log.MessageEmit;
@@ -77 +82 @@
- * @author Mike Douglass
- */
-
+Defs, 
-  private String name;
-  private String prefix;
@@ -160 +165 @@
-    return properties;
-  }
+  
+  /** Add a required boolean property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @return  BooleanProperty
+   * @throws Throwable
+   */
+  public BooleanProperty requiredBoolean(String name, String suffix) throws Throwable {
+    BooleanProperty prop = new BooleanProperty(name, suffix, true);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add an optional boolean property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @return  BooleanProperty
+   * @throws Throwable
+   */
+  public BooleanProperty optBoolean(String name, String suffix) throws Throwable {
+    BooleanProperty prop = new BooleanProperty(name, suffix, false);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add a required int property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @return  IntProperty
+   * @throws Throwable
+   */
+  public IntProperty requiredInt(String name, String suffix) throws Throwable {
+    IntProperty prop = new IntProperty(name, suffix, true);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add a required text property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @return  ConfigProperty
+   * @throws Throwable
+   */
+  public ConfigProperty requiredText(String name, String suffix) throws Throwable {
+    ConfigProperty prop = new ConfigProperty(name, suffix, true);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add a required text property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @param onlyIf     BooleanProperty - if true this field is displayed and used
+   * @return  ConfigProperty
+   * @throws Throwable
+   */
+  public ConfigProperty requiredText(String name, String suffix,
+                                     BooleanProperty onlyIf) throws Throwable {
+    ConfigProperty prop = new ConfigProperty(name, suffix, true, onlyIf);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add a required ordered list property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @return
+   * @throws Throwable
+   */
+  public OrderedListProperty requiredOrderedList(String name, 
+                                                 String suffix) throws Throwable {
+    OrderedListProperty prop = new OrderedListProperty(name, suffix, true);
+    addProperty(prop);
+    
+    return prop;
+  }
+  
+  /** Add a required ordered multi list property to the collection
+   *
+   * @param name
+   * @param suffix
+   * @param possibleValues String[] array of allowable values
+   * @return
+   * @throws Throwable
+   */
+  public OrderedMultiListProperty requiredOrderedMultiList(String name, 
+                                                           String suffix,
+                                                           String[] possibleValues) 
+               throws Throwable {
+    OrderedMultiListProperty prop = new OrderedMultiListProperty(name, suffix, true, 
+                                                                 possibleValues);
+    addProperty(prop);
+    
+    return prop;
+  }
+ 
+  /** Add a comment to the collection
+   *
+   * @param val
+   * @throws Throwable
+   */
+  public void comment(String val) throws Throwable {
+    addProperty(new CommentProperty(val));
+  }
-
-  /** Add a property to the collection

trunk/calendar3/config/src/org/bedework/webconfig/collections/Globals.java

@@ -52 +52 @@
-    to the maximum extent the law permits.
-*/
-
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Global properties.
@@ -70 +68 @@
-    super("globals", "global");
-
-addProperty(new ConfigProperty("system.name", "system.name", true)
+requiredText("system.name", "system.name"
-
-addProperty(new ConfigProperty("hibernate.dialect", "hibernate.dialect", true)
+requiredText("hibernate.dialect", "hibernate.dialect"
-
-addProperty(new ConfigProperty("calintfclass", "calintfclass", true)
+requiredText("calintfclass", "calintfclass"
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Modules.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-
-/** The modules to build.
- *
@@ -69 +67 @@
-    super("modules", "install");
-
-addProperty(new BooleanProperty("adminwebclient", "admin.web", true)
+requiredOrderedList("app.names", "app.names"
-
-
-
-
-
-
-
-
-
-
+
-  }
-}
-

trunk/calendar3/config/src/org/bedework/webconfig/collections/Syspars.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.IntProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Global properties.
- *
@@ -70 +67 @@
-    super("syspar", "syspar");
-
-addProperty(new ConfigProperty("tzid", "tzid", true)
+requiredText("tzid", "tzid"
-
-addProperty(new ConfigProperty("systemid", "systemid", true)
+requiredText("systemid", "systemid"
-
-
-
+
-
-
-
+
-
-addProperty(new ConfigProperty
-, true)
+requiredText
+
-
-addProperty(new ConfigProperty
-, true)
+requiredText
+
-
-addProperty(new ConfigProperty
-, true)
+requiredText
+
-
-addProperty(new ConfigProperty
-, true)
+requiredText
+
-
-addProperty(new ConfigProperty
-, true)
+requiredText
+
-
-addProperty(new ConfigProperty("public.user", "public.user", true, true)
+requiredText("public.user", "public.user"
-
-addProperty(new IntProperty("http.connections.peruser", "http connections per user", true, true)
+requiredInt("http.connections.peruser", "http connections per user"
-
-addProperty(new IntProperty("http.connections.perhost", "http connections per host", true, true)
+requiredInt("http.connections.perhost", "http connections per host"
-
-addProperty(new IntProperty("http.connections", "http connections", true, true)
+requiredInt("http.connections", "http connections"
-
-addProperty(new ConfigProperty("userauthclass", "userauthclass", true)
+requiredText("userauthclass", "userauthclass"
-
-addProperty(new ConfigProperty("mailerclass", "mailerclass", true)
+requiredText("mailerclass", "mailerclass"
-
-addProperty(new ConfigProperty("admingroupsclass", "admingroupsclass", true)
+requiredText("admingroupsclass", "admingroupsclass"
-
-addProperty(new ConfigProperty("usergroupsclass", "usergroupsclass", true)
+requiredText("usergroupsclass", "usergroupsclass"
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Webadmin.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.IntProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Web admin client properties.
- *
@@ -69 +65 @@
-   * @throws Throwable
-   */
-BooleanProperty onlyIf
-"Webadmin", "webadmin", onlyIf
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("defaultContentType", "app.default.contenttype", true)
+requiredText("defaultContentType", "app.default.contenttype"
-
-addProperty(new BooleanProperty("standalone.app", "build.standalone.app", true)
+requiredText("war", "war.name"
-
-
-
+
-
-addProperty(new ConfigProperty("jetspeed2.roles", "app.jetspeed2.roles", true, jetspeedportlet)
+requiredText("app.root", "app.root"
-
-
-
+
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("deploy.dir", "deploy.dir"
-
-BooleanProperty j2ee = new BooleanProperty("j2ee.deploy", "deploy.j2ee", true
+requiredText("security.domain", "app.security.domain"
-
-addProperty(j2ee
+requiredText("security.prefix", "app.security.prefix"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    // We really want this to set the value of the above to NONE or CONFIDENTIAL
-    //addProperty(new BooleanProperty("ssl", "use.ssl", true));
-
-addProperty(new ConfigProperty("description", "app.description", true)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("display.name", "app.display.name", true)
+requiredText("display.name", "app.display.name"
-
-addProperty(new ConfigProperty("name", "app.name", true)
+requiredText("name", "app.name"
-
-addProperty(new BooleanProperty("noGroupAllowed", "app.nogroupallowed", true)
+requiredBoolean("noGroupAllowed", "app.nogroupallowed"
-
-addProperty(new BooleanProperty("autocreatesponsors", "app.autocreatesponsors", true)
+requiredBoolean("autocreatesponsors", "app.autocreatesponsors"
-
-addProperty(new BooleanProperty("autodeletesponsors", "app.autodeletesponsors", true)
+requiredBoolean("autodeletesponsors", "app.autodeletesponsors"
-
-addProperty(new BooleanProperty("autocreatelocations", "app.autocreatelocations", true)
+requiredBoolean("autocreatelocations", "app.autocreatelocations"
-
-addProperty(new BooleanProperty("autodeletelocations", "app.autodeletelocations", true)
+requiredBoolean("autodeletelocations", "app.autodeletelocations"
-
-addProperty(new BooleanProperty("allowEditAllCategories", "app.allowEditAllCategories", true)
+requiredBoolean("allowEditAllCategories", "app.allowEditAllCategories"
-
-addProperty(new BooleanProperty("allowEditAllLocations", "app.allowEditAllLocations", true)
+requiredBoolean("allowEditAllLocations", "app.allowEditAllLocations"
-
-addProperty(new BooleanProperty("allowEditAllSponsors", "app.allowEditAllSponsors", true)
+requiredBoolean("allowEditAllSponsors", "app.allowEditAllSponsors"
-
-addProperty(new BooleanProperty("categoryOptional", "app.categoryOptional", true)
+requiredBoolean("categoryOptional", "app.categoryOptional"
-
-addProperty(new BooleanProperty("hour24", "app.hour24", true)
+requiredBoolean("hour24", "app.hour24"
-
-addProperty(new IntProperty("minincrement", "app.minincrement", true)
+requiredInt("minincrement", "app.minincrement"
-
-addProperty(new ConfigProperty("admingroupsidprefix", "app.admingroupsidprefix", true)
+requiredText("admingroupsidprefix", "app.admingroupsidprefix"
-  }
-}
-

trunk/calendar3/config/src/org/bedework/webconfig/collections/Webconfig.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Web config client properties.
- *
@@ -67 +64 @@
-   * @throws Throwable
-   */
-
-"Webconfig", "webconfig"
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("defaultContentType", "app.default.contenttype", true)
+requiredText("defaultContentType", "app.default.contenttype"
-
-addProperty(new BooleanProperty("standalone.app", "build.standalone.app", true)
+requiredText("war", "war.name"
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("context.root", "context.root"
-
-addProperty(new ConfigProperty("context.root", "context.root", true)
+requiredText("app.root", "app.root"
-
-addProperty(new ConfigProperty("app.root", "app.root", true)
+requiredText("resources.dir", "app.resources.dir"
-
-addProperty(new ConfigProperty("resources.dir", "app.resources.dir", true)
+requiredText("deploy.dir", "deploy.dir"
-
-addProperty(new ConfigProperty("deploy.dir", "deploy.dir", true)
+requiredText("envprefix", "env.prefix"
-
-addProperty(new ConfigProperty("envprefix", "env.prefix", true)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("description", "app.description", true)
+requiredText("display.name", "app.display.name"
-
-
-
-
+
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Webpersonal.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.IntProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Web personal client properties.
- *
@@ -69 +65 @@
-   * @throws Throwable
-   */
-BooleanProperty onlyIf
-"webpersonal", "webpersonal", onlyIf
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("defaultContentType", "app.default.contenttype", true)
+requiredText("defaultContentType", "app.default.contenttype"
-
-addProperty(new BooleanProperty("standalone.app", "build.standalone.app", true)
+requiredText("war", "war.name"
-
-
-
+
-
-
-
+
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("resources.dir", "app.resources.dir"
-
-BooleanProperty j2ee = new BooleanProperty("j2ee.deploy", "deploy.j2ee", true
+requiredText("deploy.dir", "deploy.dir"
-
-addProperty(j2ee
+requiredText("web.xml", "app.web.xml"
-
-addProperty(new ConfigProperty("ear", "ear.name", true, j2ee)
+requiredText("security.domain", "app.security.domain"
-
-addProperty(new ConfigProperty("context.root", "context.root", true)
+requiredText("security.prefix", "app.security.prefix"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-
-    // We really want this to set the value of the above to NONE or CONFIDENTIAL
-, true)
+
-
-addProperty(new ConfigProperty("description", "app.description", true)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("display.name", "app.display.name", true)
+requiredText("display.name", "app.display.name"
-
-addProperty(new ConfigProperty("name", "app.name", true)
+requiredText("name", "app.name"
-
-addProperty(new BooleanProperty("hour24", "app.hour24", true)
+requiredBoolean("hour24", "app.hour24"
-
-addProperty(new IntProperty("minincrement", "app.minincrement", true)
+requiredInt("minincrement", "app.minincrement"
-
-addProperty(new ConfigProperty("skinset.name", "app.skinset.name", true)
+requiredText("skinset.name", "app.skinset.name"
-
-addProperty(new BooleanProperty("showyeardata", "app.showyeardata", true)
+requiredBoolean("showyeardata", "app.showyeardata"
-
-addProperty(new ConfigProperty("default.view", "app.default.view", true)
+requiredText("default.view", "app.default.view"
-
-addProperty(new IntProperty("refresh.interval", "app.refresh.interval", true)
+requiredInt("refresh.interval", "app.refresh.interval"
-
-addProperty(new ConfigProperty("refresh.action", "app.refresh.action", true)
+requiredText("refresh.action", "app.refresh.action"
-  }
-}

trunk/calendar3/config/src/org/bedework/webconfig/collections/Webpublic.java

@@ -55 +55 @@
-package org.bedework.webconfig.collections;
-
-import org.bedework.webconfig.props.BooleanProperty;
-import org.bedework.webconfig.props.IntProperty;
-import org.bedework.webconfig.props.ConfigProperty;
-
-/** Global properties.
- *
@@ -69 +65 @@
-   * @throws Throwable
-   */
-BooleanProperty onlyIf
-"webpublic", "webpubevents", onlyIf
+String name
+name, "app." + name
-
-addProperty(new ConfigProperty("defaultContentType", "app.default.contenttype", true)
+requiredText("defaultContentType", "app.default.contenttype"
-
-addProperty(new BooleanProperty("standalone.app", "build.standalone.app", true)
+requiredText("war", "war.name"
-
-
-
+
-
-
-
+
-
-addProperty(new ConfigProperty("war", "war.name", true)
+requiredText("resources.dir", "app.resources.dir"
-
-BooleanProperty j2ee = new BooleanProperty("j2ee.deploy", "deploy.j2ee", true
+requiredText("deploy.dir", "deploy.dir"
-
-addProperty(j2ee
+requiredText("web.xml", "app.web.xml"
-
-addProperty(new ConfigProperty("ear", "ear.name", true, j2ee)
+requiredText("description", "app.description"
-
-addProperty(new ConfigProperty("context.root", "context.root", true)
+requiredText("display.name", "app.display.name"
-
-addProperty(new ConfigProperty("app.root", "app.root", true)
+requiredText("name", "app.name"
-
-addProperty(new ConfigProperty("resources.dir", "app.resources.dir", true)
+requiredText("run-as", "run.as.user"
-
-addProperty(new ConfigProperty("deploy.dir", "deploy.dir", true)
+requiredBoolean("hour24", "app.hour24"
-
-addProperty(new ConfigProperty("envprefix", "env.prefix", true)
+requiredInt("minincrement", "app.minincrement"
-
-addProperty(new ConfigProperty("web.xml", "app.web.xml", true)
+requiredText("skinset.name", "app.skinset.name"
-
-addProperty(new ConfigProperty("description", "app.description", true)
+requiredBoolean("showyeardata", "app.showyeardata"
-
-addProperty(new ConfigProperty("display.name", "app.display.name", true)
+requiredText("default.view", "app.default.view"
-
-addProperty(new ConfigProperty("name", "app.name", true)
+requiredInt("refresh.interval", "app.refresh.interval"
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
-  }
-}
-

trunk/calendar3/config/src/org/bedework/webconfig/props/MultiProperty.java

@@ -55 +55 @@
-package org.bedework.webconfig.props;
-
+import java.util.Arrays;
+import java.util.Iterator;
+import java.util.List;
+
+import edu.rpi.sss.util.log.MessageEmit;
+
-/** A property has a name - used by the web application for the tag, a value
- * and a suffix which is appended to the prefix defined by the collection of
@@ -67 +73 @@
- */
-public class MultiProperty extends ConfigProperty {
-String[]
+List
-
-  /** Constructor
@@ -79 +85 @@
-                             String[] possibleValues) {
-    super(name, suffix, required, false);
-possibleValues
+Arrays.asList(possibleValues)
-  }
-
-Get the allowable values
+Called at update to set the error flag and emit a message
-   *
-
+
+
-   */
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-  }
-}

trunk/calendar3/config/war/WEB-INF/classes/servlet.properties

@@ -34 +34 @@
-org.bedework.message.cancelled=Cancelled
-
-# This value is defined in CalEnv - don't lose the '.' on the end
-org.bedework.envprefix=@ENV-PREFIX@
-

trunk/calendar3/config/war/docs/main.jsp

@@ -15 +15 @@
-        <propertyGroup name="<%=bwpgname%>">
-          <logic:iterate id="prop" name="pgroup" property="properties" >
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-                  </logic:equal>
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
-          </logic:iterate>
-        </propertyGroup>

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

@@ -79 +79 @@
-import org.bedework.calsvci.CalSvcIPars;
-
-//import edu.rpi.sss.util.jsp.JspUtil;
-import edu.rpi.sss.util.jsp.SessionListener;
-import edu.rpi.sss.util.jsp.UtilAbstractAction;
-import edu.rpi.sss.util.jsp.UtilActionForm;
@@ -104 +102 @@
- */
-public abstract class BwAbstractAction extends UtilAbstractAction {
+  /** Name of the init parameter holding our name */
+  private static final String appNameInitParameter = "rpiappname";
+  
-  public String getId() {
-    return getClass().getName();
@@ -713 +714 @@
-    BwSession s = BwWebUtil.getState(request);
-    HttpSession sess = request.getSession(false);
-
+
+
-    if (s != null) {
-      if (debug) {
@@ -730 +732 @@
-
-      CalEnv env = getEnv(request, form);
-      String appName = env.getAppProperty("name");
-      String appRoot = env.getAppProperty("root");
-
@@ -736 +737 @@
-       */
-      s = new BwSessionImpl(form.getCurrentUser(), appRoot, appName,
-   
-   
+
+
-
-      BwWebUtil.setState(request, s);
@@ -765 +766 @@
-      String raddr = request.getRemoteAddr();
-      String rhost = request.getRemoteHost();
-      SessionListener.setId(appName); // First time will have no name
-      info("===============" + appName + ": New session (" +
-                       s.getSessionNum() + ") from " +
@@ -821 +821 @@
-
-    return s;
+  }
+  
+  private String getAppName(HttpSession sess) {
+    ServletContext sc = sess.getServletContext();
+
+    String appname = sc.getInitParameter(appNameInitParameter);
+    if (appname == null) {
+      appname = "?";
+    }
+    
+    return appname;
-  }
-

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

@@ -72 +72 @@
-
-  /** This may not be entirely correct so should be used with care.
-   *
-   * @param val
-   */
-  public void setSessionNum(int val);
-
-  /** This may not be entirely correct so should be used with care.
-   * Really just provides some measure of use.
-   *
-in
+long
-   */
-int
+long
-
-  /** The current user

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

@@ -59 +59 @@
-import java.net.URI;
-import java.net.URISyntaxException;
+import java.util.HashMap;
-
-import org.apache.log4j.Logger;
@@ -66 +67 @@
- * CalEnv to figure out which implementation to use.
- *
-UWCal
+Bedework
- * Some user state will be retained here.
- * We also provide a number of methods which act as the interface between
- * the web world and the calendar world.
- *
- * <p>The UW web interface has session support that may not be applicable
- * to all potential users of this application. We should try to interface to
- * it through this.
- *
- * @author Mike Douglass   douglm@rpi.edu
- */
-public class BwSessionImpl implements BwSession {
-
-
-
+
+
+
+
+
+
+
+
-
-  /** True if we want debugging output
@@ -102 +104 @@
-  private PresentationState ps;
-
-UWCal
+
-   *
-   * @param user       String user id
@@ -161 +163 @@
-    }
-
-ssionNum++
+tSessionNum(appName)
-  }
-
@@ -169 +171 @@
-
-  /* (non-Javadoc)
-   * @see org.bedework.webcommon.BwSession#setSessionNum(int)
-   */
-  public void setSessionNum(int val) {
-    sessionNum = val;
-  }
-
-  /* (non-Javadoc)
-   * @see org.bedework.webcommon.BwSession#getSessionNum()
-   */
-int
+long
-    return sessionNum;
-  }
@@ -268 +263 @@
-    }
-  }
+  
+  private void setSessionNum(String name) {
+    try {
+      synchronized (countsMap) {
+        Counts c = (Counts)countsMap.get(name);
+        
+        if (c == null) {
+          c = new Counts();
+          countsMap.put(name, c);
+        }
+        
+        sessionNum = c.totalSessions;
+        c.totalSessions++;
+      }
+    } catch (Throwable t) {
+    }
+  }
-}