[Bedework-commit] r480 - in trunk/calendar3: deployment webclient/src/org/bedework/webclient

[svnadmin at bedework.org]

Author: douglm
Date: 2006-05-15 15:43:33 -0400 (Mon, 15 May 2006)
New Revision: 480

Modified:
   trunk/calendar3/deployment/build.xml
   trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java
   trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java
Log:
Fix free/busy day bug

Modified: trunk/calendar3/deployment/build.xml
===================================================================
--- trunk/calendar3/deployment/build.xml	2006-05-15 08:06:24 UTC (rev 479)
+++ trunk/calendar3/deployment/build.xml	2006-05-15 19:43:33 UTC (rev 480)
@@ -170,11 +170,6 @@
     <antcall target="deploy.apps" inheritrefs="true" />
   </target>
 
-  <target name="deploy.shellscr.apps" if="org.bedework.global.build.standalone.app" >
-    <property name="org.bedework.deploy.kind" value="shellscr" />
-    <antcall target="deploy.apps" inheritrefs="true" />
-  </target>
-
   <target name="deploy.portal.apps" if="org.bedework.global.portal.platform" >
     <property name="org.bedework.deploy.kind"
               value="${org.bedework.global.portal.platform}" />
@@ -187,6 +182,12 @@
     <antcall target="deploy.apps" inheritrefs="true" />
   </target>
 
+  <!-- Always build the shellscr stuff. -->
+  <target name="deploy.shellscr.apps" >
+    <property name="org.bedework.deploy.kind" value="shellscr" />
+    <antcall target="deploy.apps" inheritrefs="true" />
+  </target>
+
   <!-- The cp.xalan task conditionally copies the xalan.jar file, if
        necessary -->
   <target name="cp.xalan" if="xalan.in.tomcat.common.endorsed">

Modified: trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java
===================================================================
--- trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java	2006-05-15 08:06:24 UTC (rev 479)
+++ trunk/calendar3/webclient/src/org/bedework/webclient/BwFreeBusyAction.java	2006-05-15 19:43:33 UTC (rev 480)
@@ -137,6 +137,12 @@
       TimeView tv = form.getCurTimeView();
 
       scal = tv.getFirstDay();
+      Locale loc = scal.getCalInfo().getLocale();  // XXX Locale
+
+      /* Essentially clone so that thbe calculations below don't mess up
+       * the time view.
+       */
+      scal = new MyCalendarVO(scal.getTime(), loc);
       start = scal.getCalendar();
       end = tv.getLastDay().getTomorrow().getCalendar();
     } else {

Modified: trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java
===================================================================
--- trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java	2006-05-15 08:06:24 UTC (rev 479)
+++ trunk/calendar3/webclient/src/org/bedework/webclient/BwInitEventAction.java	2006-05-15 19:43:33 UTC (rev 480)
@@ -68,8 +68,8 @@
  *      <li>"enddate"                Optional end date for the event
  *                                   as yymmdd or yymmddTHHmmss</li>
  *      <li>"minutes"                Optional duration in minutes</li>
- *      <li>  subname:   Name of a subscription to an external calendar</li>.
- *      <li>  calPath:   Path to a (writeable) calendar collection</li>.
+ *      <li>  subname:               Name of a subscription to an external calendar</li>.
+ *      <li>  newCalPath:            Path to a (writeable) calendar collection</li>.
  * </ul>
  *
  */