[Bedework-commit] webapps r589 - in trunk:
webcommon/src/org/bedework/webcommon
webcommon/src/org/bedework/webcommon/event
webconfig/war/WEB-INF/classes
svnadmin at bedework.org
svnadmin at bedework.org
Thu Jan 3 11:00:56 EST 2008
Author: douglm
Date: 2008-01-03 11:00:54 -0500 (Thu, 03 Jan 2008)
New Revision: 589
Modified:
trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java
trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
trunk/webconfig/war/WEB-INF/classes/digesterrules.xml
Log:
More changes for config application. Now appears to swallow global settings
Modified: trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-01-03 16:00:33 UTC (rev 588)
+++ trunk/webcommon/src/org/bedework/webcommon/BwAbstractAction.java 2008-01-03 16:00:54 UTC (rev 589)
@@ -85,7 +85,7 @@
import org.bedework.calfacade.ScheduleResult.ScheduleRecipientResult;
import org.bedework.calfacade.base.BwStringBase;
import org.bedework.calfacade.configs.AdminConfig;
-import org.bedework.calfacade.configs.ConfigBase;
+import org.bedework.calfacade.configs.WebConfigCommon;
import org.bedework.calfacade.env.CalEnvFactory;
import org.bedework.calfacade.env.CalEnvI;
import org.bedework.calfacade.env.CalOptionsFactory;
@@ -352,7 +352,7 @@
// Not public admin.
- ConfigBase conf = form.retrieveConfig();
+ WebConfigCommon conf = form.retrieveConfig();
/*
if (form.getNewSession()) {
@@ -414,7 +414,7 @@
public void setConfig(HttpServletRequest request,
BwActionFormBase form) throws Throwable {
if (!form.configSet()) {
- ConfigBase conf = (ConfigBase)getConfigOption(request, null);
+ WebConfigCommon conf = (WebConfigCommon)getConfigOption(request, null);
form.setConfig(conf);
}
Modified: trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2008-01-03 16:00:33 UTC (rev 588)
+++ trunk/webcommon/src/org/bedework/webcommon/BwActionFormBase.java 2008-01-03 16:00:54 UTC (rev 589)
@@ -81,7 +81,7 @@
import org.bedework.calfacade.DirectoryInfo;
import org.bedework.calfacade.BwStats.StatsEntry;
import org.bedework.calfacade.base.UpdateFromTimeZonesInfo;
-import org.bedework.calfacade.configs.ConfigBase;
+import org.bedework.calfacade.configs.WebConfigCommon;
import org.bedework.calfacade.env.CalEnvI;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calfacade.mail.MailerIntf;
@@ -130,7 +130,7 @@
private CalendarInfo calInfo;
- private ConfigBase config;
+ private WebConfigCommon config;
// XXX locale - needs to be changed when locale changes
private transient CollectionCollator<BwCalendar> calendarCollator;
@@ -1224,7 +1224,7 @@
*
* @param val
*/
- public void setConfig(ConfigBase val) {
+ public void setConfig(WebConfigCommon val) {
config = val;
/* Set defaults */
@@ -1236,12 +1236,12 @@
*
* @return Config object
*/
- public ConfigBase getConfig() {
+ public WebConfigCommon getConfig() {
if (config == null) {
return null;
}
- return (ConfigBase)config.clone();
+ return (WebConfigCommon)config.clone();
}
/** True if we have a config object set.
@@ -1256,7 +1256,7 @@
*
* @return Config object
*/
- public ConfigBase retrieveConfig() {
+ public WebConfigCommon retrieveConfig() {
return config;
}
@@ -2286,8 +2286,8 @@
public String getSubmissionsRoot() {
String appType = retrieveConfig().getAppType();
- if (ConfigBase.appTypeWebsubmit.equals(appType) ||
- ConfigBase.appTypeWebadmin.equals(appType)) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(appType) ||
+ WebConfigCommon.appTypeWebadmin.equals(appType)) {
try {
return URLEncoder.encode(retrieveConfig().getSubmissionRoot(), "UTF-8");
} catch (Throwable t) {
@@ -2305,8 +2305,8 @@
public String getUnencodedSubmissionsRoot() {
String appType = retrieveConfig().getAppType();
- if (ConfigBase.appTypeWebsubmit.equals(appType) ||
- ConfigBase.appTypeWebadmin.equals(appType)) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(appType) ||
+ WebConfigCommon.appTypeWebadmin.equals(appType)) {
return retrieveConfig().getSubmissionRoot();
}
@@ -2338,7 +2338,7 @@
BwCalendar calendar;
try {
- if (ConfigBase.appTypeWebsubmit.equals(getConfig().getAppType())) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(getConfig().getAppType())) {
// Use submission root
calendar = fetchSvci().getCalendarsHandler().get(getConfig().getSubmissionRoot());
} else {
@@ -3728,7 +3728,7 @@
Collection<BwCategory> vals = null;
if (kind == ownersEntity) {
- if (ConfigBase.appTypeWebsubmit.equals(getConfig().getAppType())) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(getConfig().getAppType())) {
// Use public
vals = calsvci.getCategoriesHandler().get(getPublicUser(), null);
} else {
@@ -3759,7 +3759,7 @@
Collection<BwLocation> vals = null;
if (kind == ownersEntity) {
- if (ConfigBase.appTypeWebsubmit.equals(getConfig().getAppType())) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(getConfig().getAppType())) {
// Use public
vals = calsvci.getLocationsHandler().get(getPublicUser(), null);
} else {
@@ -3790,7 +3790,7 @@
Collection<BwContact> vals = null;
if (kind == ownersEntity) {
- if (ConfigBase.appTypeWebsubmit.equals(getConfig().getAppType())) {
+ if (WebConfigCommon.appTypeWebsubmit.equals(getConfig().getAppType())) {
// Use public
vals = calsvci.getContactsHandler().get(getPublicUser(), null);
} else {
Modified: trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java 2008-01-03 16:00:33 UTC (rev 588)
+++ trunk/webcommon/src/org/bedework/webcommon/BwWebUtil.java 2008-01-03 16:00:54 UTC (rev 589)
@@ -65,7 +65,7 @@
import org.bedework.calfacade.BwContact;
import org.bedework.calfacade.BwString;
import org.bedework.calfacade.BwSystem;
-import org.bedework.calfacade.configs.ConfigBase;
+import org.bedework.calfacade.configs.WebConfigCommon;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calsvci.CalSvcI;
import org.bedework.icalendar.BwEventUtil;
@@ -192,8 +192,8 @@
String appType = form.retrieveConfig().getAppType();
- boolean submitApp = ConfigBase.appTypeWebsubmit.equals(appType);
- boolean publicAdmin = ConfigBase.appTypeWebadmin.equals(appType);
+ boolean submitApp = WebConfigCommon.appTypeWebsubmit.equals(appType);
+ boolean publicAdmin = WebConfigCommon.appTypeWebadmin.equals(appType);
/* ------------- Set zero length fields to null ------------------ */
Modified: trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java
===================================================================
--- trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java 2008-01-03 16:00:33 UTC (rev 588)
+++ trunk/webcommon/src/org/bedework/webcommon/event/UpdateEventAction.java 2008-01-03 16:00:54 UTC (rev 589)
@@ -46,7 +46,7 @@
import org.bedework.calfacade.RecurringRetrievalMode;
import org.bedework.calfacade.ScheduleResult;
import org.bedework.calfacade.RecurringRetrievalMode.Rmode;
-import org.bedework.calfacade.configs.ConfigBase;
+import org.bedework.calfacade.configs.WebConfigCommon;
import org.bedework.calfacade.exc.CalFacadeException;
import org.bedework.calfacade.svc.EventInfo;
import org.bedework.calfacade.timezones.CalTimezones;
@@ -123,7 +123,7 @@
boolean publicAdmin = getPublicAdmin(form);
String appType = form.retrieveConfig().getAppType();
- boolean submitApp = ConfigBase.appTypeWebsubmit.equals(appType);
+ boolean submitApp = WebConfigCommon.appTypeWebsubmit.equals(appType);
boolean sendInvitations = request.present("submitAndSend");
boolean publishEvent = request.present("publishEvent");
Modified: trunk/webconfig/war/WEB-INF/classes/digesterrules.xml
===================================================================
--- trunk/webconfig/war/WEB-INF/classes/digesterrules.xml 2008-01-03 16:00:33 UTC (rev 588)
+++ trunk/webconfig/war/WEB-INF/classes/digesterrules.xml 2008-01-03 16:00:54 UTC (rev 589)
@@ -10,7 +10,7 @@
<digester-rules>
<pattern value="meta-data">
- <!-- Meta data can consist of a global section, modules and applications
+ <!-- Meta data can consist of a globals section, modules and applications
-->
<pattern value="globals">
@@ -44,14 +44,9 @@
<object-create-rule classname="org.bedework.webconfig.props.BooleanProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
- </set-properties-rule>
- <set-properties-rule>
<alias attr-name="required" prop-name="required" />
</set-properties-rule>
@@ -75,10 +70,9 @@
<object-create-rule classname="org.bedework.webconfig.props.BooleanProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
</set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
<call-method-rule methodname="markHidden"/>
@@ -89,12 +83,10 @@
<object-create-rule classname="org.bedework.webconfig.props.IntProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -117,12 +109,10 @@
<object-create-rule classname="org.bedework.webconfig.props.ConfigProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -144,7 +134,8 @@
<object-create-rule classname="org.bedework.webconfig.props.ConfigProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- <alias attr-name="option" prop-name="suffix" />
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
</set-properties-rule>
<call-method-rule methodname="markHidden"/>
@@ -197,14 +188,9 @@
<object-create-rule classname="org.bedework.webconfig.props.BooleanProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
- </set-properties-rule>
- <set-properties-rule>
<alias attr-name="required" prop-name="required" />
</set-properties-rule>
@@ -228,10 +214,9 @@
<object-create-rule classname="org.bedework.webconfig.props.BooleanProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
</set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
<call-method-rule methodname="markHidden"/>
@@ -242,12 +227,10 @@
<object-create-rule classname="org.bedework.webconfig.props.IntProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -270,12 +253,10 @@
<object-create-rule classname="org.bedework.webconfig.props.ConfigProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- </set-properties-rule>
- <set-properties-rule>
- <alias attr-name="option" prop-name="suffix" />
- </set-properties-rule>
- <set-properties-rule>
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
<alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -297,7 +278,8 @@
<object-create-rule classname="org.bedework.webconfig.props.ConfigProperty"/>
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
- <alias attr-name="option" prop-name="suffix" />
+ <alias attr-name="suffix" prop-name="suffix" />
+ <alias attr-name="option" prop-name="optionName" />
</set-properties-rule>
<call-method-rule methodname="markHidden"/>
@@ -316,7 +298,7 @@
<alias attr-name="type" prop-name="type" />
</set-properties-rule>
- <object-create-rule classname="org.bedework.webconfig.Module"/>
+ <object-create-rule classname="org.bedework.webconfig.Application"/>
<set-properties-rule/>
<set-next-rule methodname="addApplication"/>
@@ -352,8 +334,9 @@
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
<alias attr-name="suffix" prop-name="suffix" />
- <alias attr-name="advanced" prop-name="advanced" />
<alias attr-name="option" prop-name="optionName" />
+ <alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -377,7 +360,7 @@
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
<alias attr-name="suffix" prop-name="suffix" />
- <alias attr-name="option" prop-name="setOption" />
+ <alias attr-name="option" prop-name="optionName" />
</set-properties-rule>
<call-method-rule methodname="markHidden"/>
@@ -395,8 +378,9 @@
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
<alias attr-name="suffix" prop-name="suffix" />
- <alias attr-name="advanced" prop-name="advanced" />
<alias attr-name="option" prop-name="optionName" />
+ <alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
@@ -420,8 +404,9 @@
<set-properties-rule>
<alias attr-name="name" prop-name="name" />
<alias attr-name="suffix" prop-name="suffix" />
- <alias attr-name="advanced" prop-name="advanced" />
<alias attr-name="option" prop-name="optionName" />
+ <alias attr-name="advanced" prop-name="advanced" />
+ <alias attr-name="required" prop-name="required" />
</set-properties-rule>
<pattern value="only-if">
More information about the Bedework-commit
mailing list