[Bedework-commit] calendarapi r728 - in trunk: calEnv/src/org/bedework/calenv calFacade/src/org/bedework/calfacade/configs

[svnadmin at bedework.org]

Author: douglm
Date: 2008-10-29 17:26:18 -0400 (Wed, 29 Oct 2008)
New Revision: 728

Modified:
   trunk/calEnv/src/org/bedework/calenv/CalOptions.java
   trunk/calFacade/src/org/bedework/calfacade/configs/WebConfigCommon.java
Log:
Major reorganization of the build process mostly affecting handling of portal builds.

Removed portal specific directories from teh deployment directory.

Removed portal sepcific code from buildwar.xml and added new portal specific files to be imported. These are in a section of teh bwbuild config directory.

All portal customization is now part of building the war file.

Modified: trunk/calEnv/src/org/bedework/calenv/CalOptions.java
===================================================================
--- trunk/calEnv/src/org/bedework/calenv/CalOptions.java	2008-10-28 16:21:40 UTC (rev 727)
+++ trunk/calEnv/src/org/bedework/calenv/CalOptions.java	2008-10-29 21:26:18 UTC (rev 728)
@@ -421,12 +421,7 @@
    * @throws CalEnvException
    */
   public String getOptStringProperty(String name) throws CalEnvException {
-    Object val;
-    if (useSystemwideValues) {
-      val = findValue(optionsRoot, makePathElements(name), -1);
-    } else {
-      val = findValue(localOptionsRoot, makePathElements(name), -1);
-    }
+    Object val = getOptProperty(name);
 
     if (val == null) {
       return null;

Modified: trunk/calFacade/src/org/bedework/calfacade/configs/WebConfigCommon.java
===================================================================
--- trunk/calFacade/src/org/bedework/calfacade/configs/WebConfigCommon.java	2008-10-28 16:21:40 UTC (rev 727)
+++ trunk/calFacade/src/org/bedework/calfacade/configs/WebConfigCommon.java	2008-10-29 21:26:18 UTC (rev 728)
@@ -65,8 +65,6 @@
 
   private String appRoot;
 
-  private String portalPlatform;
-
   private String refreshAction;
 
   private int refreshInterval;
@@ -209,22 +207,7 @@
     return appRoot;
   }
 
-  /** Define the name of the portal platform.
-   *
-   * @param val
-   */
-  public void setPortalPlatform(String val) {
-    portalPlatform = val;
-  }
-
   /**
-   * @return String
-   */
-  public String getPortalPlatform() {
-    return portalPlatform;
-  }
-
-  /**
    * @param val
    */
   public void setRefreshAction(String val) {