[Bedework-commit] webapps r822 - in trunk: .
webcommon/src/org/bedework/webcommon
webcommon/src/org/bedework/webcommon/admingroup
webconfig/src/org/bedework/webconfig
svnadmin at bedework.org
svnadmin at bedework.org
Fri Nov 14 01:38:54 EST 2008
Author: douglm
Date: 2008-11-14 01:38:47 -0500 (Fri, 14 Nov 2008)
New Revision: 822
Modified:
trunk/build.xml
trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
trunk/webcommon/src/org/bedework/webcommon/admingroup/UpdateAGAction.java
trunk/webconfig/src/org/bedework/webconfig/AbstractAction.java
trunk/webconfig/src/org/bedework/webconfig/ConfigCollection.java
trunk/webconfig/src/org/bedework/webconfig/Configuration.java
Log:
1. Move options classes into rpiutil to make them availabkle to other packages.
2. Make changes to the WebDAV classes to facilitate building of extra WebDAV based services (such as CardDAV)
Modified: trunk/build.xml
===================================================================
--- trunk/build.xml 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/build.xml 2008-11-14 06:38:47 UTC (rev 822)
@@ -48,7 +48,6 @@
<getJar name="bw-annotations" version="3.5" project="calendarapi" />
<getJar name="bw-apiutil" version="3.5" project="calendarapi" />
- <getJar name="bw-calenv" version="3.5" project="calendarapi" />
<getJar name="bw-calfacade" version="3.5" project="calendarapi" />
<getJar name="bw-calsvci" version="3.5" project="calendarapi" />
<getJar name="bw-client" version="3.5" project="calendarapi" />
Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-11-14 06:38:47 UTC (rev 822)
@@ -1730,8 +1730,7 @@
}
}
- String appPrefix = "org.bedework.app.";
- return CalOptionsFactory.getOptions(appPrefix, false).getAppProperty(name);
+ return CalOptionsFactory.getOptions(false).getAppProperty(name);
}
/** Get a prefix for the loggers.
@@ -2218,7 +2217,7 @@
/* If we're running as a portlet change the app root to point to a
* portlet specific directory.
*/
- String portalPlatform = CalOptionsFactory.getOptions(null, false).
+ String portalPlatform = CalOptionsFactory.getOptions(false).
getOptStringProperty("portalPlatform");
if (isPortlet && (portalPlatform != null)) {
appRoot += "." + portalPlatform;
Modified: trunk/webcommon/src/org/bedework/webcommon/admingroup/UpdateAGAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/admingroup/UpdateAGAction.java 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/webcommon/src/org/bedework/webcommon/admingroup/UpdateAGAction.java 2008-11-14 06:38:47 UTC (rev 822)
@@ -261,8 +261,7 @@
form.getErr().emit(ValidationError.missingEventOwner);
ok = false;
} else {
- String prefix = CalOptionsFactory.getOptions(null,
- false).getGlobalStringProperty("adminGroupsIdPrefix");
+ String prefix = CalOptionsFactory.getOptions(false).getGlobalStringProperty("adminGroupsIdPrefix");
if (!adminGroupEventOwner.startsWith(prefix)) {
adminGroupEventOwner = prefix + adminGroupEventOwner;
@@ -318,8 +317,7 @@
return ok;
}
- String prefix = CalOptionsFactory.getOptions(null,
- false).getGlobalStringProperty("adminGroupsIdPrefix");
+ String prefix = CalOptionsFactory.getOptions(false).getGlobalStringProperty("adminGroupsIdPrefix");
if (!adminGroupEventOwner.startsWith(prefix)) {
adminGroupEventOwner = prefix + adminGroupEventOwner;
Modified: trunk/webconfig/src/org/bedework/webconfig/AbstractAction.java
===================================================================
--- trunk/webconfig/src/org/bedework/webconfig/AbstractAction.java 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/webconfig/src/org/bedework/webconfig/AbstractAction.java 2008-11-14 06:38:47 UTC (rev 822)
@@ -211,9 +211,7 @@
return config;
}
- String appPrefix = "org.bedework.app.";
- config = (WebConfigCommon)CalOptionsFactory.getOptions(appPrefix,
- false).getAppProperty(name);
+ config = (WebConfigCommon)CalOptionsFactory.getOptions(false).getAppProperty(name);
frm.assignConfig(config);
return config;
Modified: trunk/webconfig/src/org/bedework/webconfig/ConfigCollection.java
===================================================================
--- trunk/webconfig/src/org/bedework/webconfig/ConfigCollection.java 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/webconfig/src/org/bedework/webconfig/ConfigCollection.java 2008-11-14 06:38:47 UTC (rev 822)
@@ -26,12 +26,13 @@
package org.bedework.webconfig;
-import org.bedework.calenv.CalOptions;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.webconfig.props.BooleanProperty;
import org.bedework.webconfig.props.CommentProperty;
import org.bedework.webconfig.props.ConfigProperty;
+import edu.rpi.sss.util.OptionsException;
+import edu.rpi.sss.util.OptionsI;
import edu.rpi.sss.util.log.MessageEmit;
import edu.rpi.sss.util.xml.XmlEmit;
@@ -227,7 +228,7 @@
* @return boolean true for all ok
*/
public boolean initialise(Properties props,
- CalOptions opts, MessageEmit err) {
+ OptionsI opts, MessageEmit err) {
setValid(true);
try {
@@ -243,7 +244,7 @@
if (options == null) {
try {
options = opts.getProperty(getOptionsName());
- } catch (CalFacadeException cfe) {
+ } catch (OptionsException oe) {
err.emit(CalFacadeException.configNoOptions, getOptionsName());
setValid(false);
return false;
@@ -255,34 +256,29 @@
optName = cp.getSuffix();
}
- try {
- String optVal = String.valueOf(opts.getValue(getOptionsName(), optName));
+ String optVal = String.valueOf(opts.getValue(getOptionsName(), optName));
- // Could be in both - compare
- if (cp.getInProperties()) {
- if ((pval == null) ^ (optVal == null)) {
- err.emit("prop.option.different.value", getName(),
- cp.getSuffix());
- setValid(false);
- } else if ((pval != null) && (!pval.equals(optVal))) {
- err.emit("prop.option.different.value", getName(),
- cp.getSuffix());
- setValid(false);
- }
-
- if (!getValid() && debug) {
- debugMsg("prop and options differ: pname=" + pname +
- " pval= " + pval +
- " optName=" + optName +
- " optVal= " + optVal);
- }
+ // Could be in both - compare
+ if (cp.getInProperties()) {
+ if ((pval == null) ^ (optVal == null)) {
+ err.emit("prop.option.different.value", getName(),
+ cp.getSuffix());
+ setValid(false);
+ } else if ((pval != null) && (!pval.equals(optVal))) {
+ err.emit("prop.option.different.value", getName(),
+ cp.getSuffix());
+ setValid(false);
}
- pval = optVal;
- } catch (CalFacadeException cfe) {
- err.emit(cfe.getMessage(), getName(), cfe.getExtra());
- setValid(false);
+ if (!getValid() && debug) {
+ debugMsg("prop and options differ: pname=" + pname +
+ " pval= " + pval +
+ " optName=" + optName +
+ " optVal= " + optVal);
+ }
}
+
+ pval = optVal;
}
if (pval != null) {
Modified: trunk/webconfig/src/org/bedework/webconfig/Configuration.java
===================================================================
--- trunk/webconfig/src/org/bedework/webconfig/Configuration.java 2008-11-07 21:19:01 UTC (rev 821)
+++ trunk/webconfig/src/org/bedework/webconfig/Configuration.java 2008-11-14 06:38:47 UTC (rev 822)
@@ -26,12 +26,13 @@
package org.bedework.webconfig;
-import org.bedework.calenv.CalOptions;
-import org.bedework.calenv.CalOptions.OptionElement;
+import org.bedework.calfacade.env.CalOptionsFactory;
import org.bedework.http.client.dav.DavClient;
import org.bedework.webconfig.props.ConfigProperty;
import org.bedework.webconfig.props.OrderedListProperty;
+import edu.rpi.sss.util.OptionsI;
+import edu.rpi.sss.util.OptionsI.OptionElement;
import edu.rpi.sss.util.log.MessageEmit;
import edu.rpi.sss.util.xml.XmlEmit;
@@ -59,7 +60,7 @@
private boolean loaded;
private Properties propertySet;
- private CalOptions options;
+ private OptionsI options;
/* Configurable modules
*/
@@ -386,7 +387,7 @@
optionsFileName = optionsFileName.replace("${" + antBuildPropertiesLoc + "}",
configLocation);
- options = CalOptions.makeLocal(dav.getFile(optionsFileName));
+ options = CalOptionsFactory.getOptions(dav.getFile(optionsFileName), debug);
/* Get name of applications */
More information about the Bedework-commit
mailing list