Changeset 394

Timestamp:

04/20/06 08:54:20

Author:

douglm

Message:

Two major components to this update.

New xml options module - the intent is to move run-time options into the xml
and leave build time properties in the current properties file. An xml element
can define a class with the usual setters to hold values defined by it's child
elements. Curently only ldap properties are set.

New ldap groups module. Allow us to move forward on user client development.

Files:

• trunk/calendar3/bldfiles/buildsh.xml (modified) (1 diff)
• trunk/calendar3/bldfiles/buildwar.xml (modified) (1 diff)
• trunk/calendar3/build.xml (modified) (1 diff)
• trunk/calendar3/calCore/build.xml (modified) (1 diff)
• trunk/calendar3/calCore/src/org/bedework/calcore/ldap (added)
• trunk/calendar3/calCore/src/org/bedework/calcore/ldap/LdapConfigProperties.java (added)
• trunk/calendar3/calCore/src/org/bedework/calcore/ldap/UserGroupsLdapImpl.java (added)
• trunk/calendar3/calEnv/build.xml (modified) (1 diff)
• trunk/calendar3/calEnv/src/org/bedework/calenv/CalOptions.java (added)
• trunk/calendar3/calsvc/src/org/bedework/calsvc/CalSvc.java (modified) (1 diff)
• trunk/calendar3/common/src/edu/rpi/sss/util/xml/XmlUtil.java (modified) (7 diffs)
• trunk/calendar3/config/configs/democal.options.xml (added)
• trunk/calendar3/config/configs/democal.properties (modified) (1 diff)
• trunk/calendar3/webcommon/src/org/bedework/webcommon/access/AccessAction.java (modified) (1 diff)

trunk/calendar3/bldfiles/buildsh.xml

@@ -106 +106 @@
-          file="${org.bedework.config.properties}" />
-
+    <copy tofile="${app.dest.properties}/options.xml"
+          file="${org.bedework.config.options}" />
+
-    <!-- ===============================================================
-                       Add any resource files

trunk/calendar3/bldfiles/buildwar.xml

@@ -183 +183 @@
-          file="${org.bedework.config.properties}" />
-
+    <copy tofile="${app.dest.properties}/options.xml"
+          file="${org.bedework.config.options}" />
+
-    <!-- Make a modified copy of the web.xml file -->
-    <copy tofile="${app.dest.web.xml}"

trunk/calendar3/build.xml

@@ -64 +64 @@
-    <property name="org.bedework.config.properties"
-              location="${org.bedework.config.base}/configs/${org.bedework.clone.name}.properties" />
+    <property name="org.bedework.config.options"
+              location="${org.bedework.config.base}/configs/${org.bedework.clone.name}.options.xml" />
-
-    <echo message="==========================================================" />

trunk/calendar3/calCore/build.xml

@@ -31 +31 @@
-    <fileset id="base.java.sources" dir="${source.home}" >
-<!--      <include name="edu/washington/cac/calfacade/impl/*.java"/>-->
-hibernate
+**
-    </fileset>
-
-    <patternset id="base.class.patternset">
-<!--      <include name="edu/washington/cac/calfacade/impl/*.class"/>-->
-hibernate
+**
-    </patternset>
-

trunk/calendar3/calEnv/build.xml

@@ -30 +30 @@
-    <path id="compile.classpath">
-      <pathelement location="${log4j.jar}"/>
+      <pathelement location="${org.bedework.common.jar}"/>
-    </path>
-

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

@@ -2004 +2004 @@
-    }
-
-
+
+
+
+
+
+
-    if (calendar == null) {
-      // Assume deleted

trunk/calendar3/common/src/edu/rpi/sss/util/xml/XmlUtil.java

@@ -60 +60 @@
-import java.io.PrintWriter;
-import java.io.Serializable;
-Vector
+ArrayList
-
-import org.w3c.dom.Attr;
@@ -693 +693 @@
-   *
-   * @param nd
-Vector
-
-
-Vector
-Vector v = new Vector
+ArrayList
+
+
+ArrayList
+ArrayList al = new ArrayList
-
-    NodeList children = nd.getChildNodes();
@@ -718 +718 @@
-        // Ignore
-      } else if (curnode.getNodeType() == Node.ELEMENT_NODE) {
-v
+al
-      } else {
-        throw new SAXException("Unexpected child node " + curnode.getLocalName() +
@@ -725 +725 @@
-    }
-
-v
+al
-  }
-
@@ -760 +760 @@
-  }
-
+  /** See if this node has any children
+   *
+   * @param el
+   * @return boolean   true for any child elements
+   * @throws SAXException
+   */
+  public static boolean hasChildren(Element el) throws SAXException {
+    NodeList children = el.getChildNodes();
+
+    for (int i = 0; i < children.getLength(); i++) {
+      Node curnode = children.item(i);
+
+      short ntype =  curnode.getNodeType();
+      if ((ntype != Node.TEXT_NODE) &&
+          (ntype != Node.CDATA_SECTION_NODE) &&
+          (ntype != Node.COMMENT_NODE)) {
+        return true;
+      }
+    }
+
+    return false;
+  }
+
-  /**
-   * @param nd
@@ -766 +789 @@
-   */
-  public static Element[] getElementsArray(Node nd) throws SAXException {
-Vector v
-
-v.toArray(new Element[v
+ArrayList al
+
+al.toArray(new Element[al
-  }
-
@@ -777 +800 @@
-   */
-  public static Element getOnlyElement(Node nd) throws SAXException {
-Vector v = getElements
-
-v.size()
+Element[] els = getElementsArray
+
+els.length
-      throw new SAXException("Expected exactly one child node for " +
-                              nd.getLocalName());
-    }
-
-(Element)v.elementAt(0)
+els[0]
-  }
-

trunk/calendar3/config/configs/democal.properties

@@ -59 +59 @@
-org.bedework.syspar.mailerclass=org.bedework.mail.DummyMailer
-org.bedework.syspar.admingroupsclass=org.bedework.calcore.hibernate.AdminGroupsDbImpl
-
+
+
-#
-# -------------------------------------------------------------------

trunk/calendar3/webcommon/src/org/bedework/webcommon/access/AccessAction.java

@@ -169 +169 @@
-
-    if (whoTypeStr == null) {
+      whoType = Ace.whoTypeUser;
+    } else if (whoTypeStr.equals("owner")) {
-      whoType = Ace.whoTypeOwner;
-    } else if (whoTypeStr.equals("user")) {