You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@commons.apache.org by pr...@apache.org on 2002/03/26 11:15:14 UTC

cvs commit: jakarta-commons-sandbox/periodicity/src/velocity/test Evt_do_jrl.vm

prickett    02/03/26 02:15:14

  Modified:    periodicity build.xml
               periodicity/src/java/org/apache/commons/periodicity/turbine/screens
                        Event_detail.java
               periodicity/src/java/org/apache/commons/periodicity/util
                        TestTemplateLabels.java
               periodicity/src/velocity/test Evt_do_jrl.vm
  Added:       periodicity/src/java/org/apache/commons/periodicity/turbine/screens
                        Evt_do.java Evt_do_jrl.java Evt_do_jrl_fb.java
                        No_alarm.java
  Log:
  Removed dependency on core from the war task. This was causing the core task
  to get called twice during the war task and wasting time.
  
  Fixed war file to depend on our own copy of DefaultTop navigation.
  
  Added the rest of the label constants to the TestTemplateLabels file
  
  Added summary parameters to the evt_do_jrl.vm template.
  
  Revision  Changes    Path
  1.20      +2 -3      jakarta-commons-sandbox/periodicity/build.xml
  
  Index: build.xml
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/build.xml,v
  retrieving revision 1.19
  retrieving revision 1.20
  diff -u -r1.19 -r1.20
  --- build.xml	25 Mar 2002 09:24:17 -0000	1.19
  +++ build.xml	26 Mar 2002 10:15:13 -0000	1.20
  @@ -143,7 +143,7 @@
             todir="${build.war}/WEB-INF/templates/layouts"/>
       <copy file="${tdk.home}/DefaultBottom.vm"
             todir="${build.war}/WEB-INF/templates/navigations"/>
  -    <copy file="${tdk.home}/DefaultTop.vm"
  +    <copy file="./src/velocity/turbine/DefaultTop.vm"
             todir="${build.war}/WEB-INF/templates/navigations"/>
       <copy file="${tdk.home}/Index.vm"
             todir="${build.war}/WEB-INF/templates/screens"/>
  @@ -160,7 +160,7 @@
       <antcall target="war-no-build-fast"/>
     </target>  
   
  -  <target name="war" depends="core">
  +  <target name="war">
       <antcall target="javadoc"/>
       <antcall target="war-build-fast"/>
     </target>  
  @@ -206,7 +206,6 @@
     <target name="update-tdk-templates">
       <mkdir dir="${tdk.home}"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/layouts/Default.vm" dest="${tdk.home}/Default.vm"/>
  -    <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultTop.vm" dest="${tdk.home}/DefaultTop.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/DefaultBottom.vm" dest="${tdk.home}/DefaultBottom.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/navigations/Menu.vm" dest="${tdk.home}/Menu.vm"/>
       <get src="http://cvs.apache.org/viewcvs/~checkout~/jakarta-turbine-tdk/src/tdk/apps/2/templates/app/screens/Index.vm" dest="${tdk.home}/Index.vm"/>
  
  
  
  1.2       +3 -3      jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/Event_detail.java
  
  Index: Event_detail.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/Event_detail.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Event_detail.java	26 Mar 2002 04:07:30 -0000	1.1
  +++ Event_detail.java	26 Mar 2002 10:15:13 -0000	1.2
  @@ -61,7 +61,7 @@
   import org.apache.turbine.util.Log;
   import org.apache.commons.periodicity.util.TestTemplateLabels;
   
  -public class Event_detail extends VelocityScreen 
  +public class Event_detail extends Evt_do 
   {
       public void doBuildTemplate(RunData data, Context context) throws Exception
       {
  @@ -76,7 +76,6 @@
               else
               {
                   Log.debug("context == null");
  -                addLabelsToContext(new VelocityContext());
               }    
           }
           else
  @@ -85,8 +84,9 @@
           }    
       }
   
  -    public void addLabelsToContext(Context context)
  +    protected void addLabelsToContext(Context context)
       {
  +        super.addLabelsToContext(context);
           if(context != null)
           {
               context.put(TestTemplateLabels.END_DATE_LABEL_KEY,
  
  
  
  1.1                  jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/Evt_do.java
  
  Index: Evt_do.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.commons.periodicity.turbine.screens;
  
  import org.apache.turbine.util.RunData;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.VelocityContext;
  import org.apache.turbine.modules.screens.VelocityScreen;
  import org.apache.turbine.util.Log;
  import org.apache.commons.periodicity.util.TestTemplateLabels;
  
  public class Evt_do extends Evt_do_jrl
  {
      public void doBuildTemplate(RunData data, Context context) throws Exception
      {
          if(data != null)
          {
              Log.debug("data != null");
              if(context != null)
              {
                  Log.debug("context != null");
                  addLabelsToContext(context);
              }    
              else
              {
                  Log.debug("context == null");
                  addLabelsToContext(new VelocityContext());
              }    
          }
          else
          {
              Log.debug("data == null");
          }    
      }
  
      protected void addLabelsToContext(Context context)
      {
          super.addLabelsToContext(context);
          if(context != null)
          {
              context.put(TestTemplateLabels.LATITUDE_LABEL_KEY,
                     TestTemplateLabels.LATITDUE_LABEL);
              context.put(TestTemplateLabels.LONGITUDE_LABEL_KEY,
                     TestTemplateLabels.LONGITUDE_LABEL);
              context.put(TestTemplateLabels.LOCATION_LABEL_KEY,
                     TestTemplateLabels.LOCATION_LABEL);
              context.put(TestTemplateLabels.LOCATION_ALTREP_LABEL_KEY,
                     TestTemplateLabels.LOCATION_ALTREP_LABEL);
              context.put(TestTemplateLabels.LOCATION_LANG_LABEL_KEY,
                     TestTemplateLabels.LOCATION_LANG_LABEL);
              context.put(TestTemplateLabels.PRIORITY_LABEL_KEY,
                     TestTemplateLabels.PRIORITY_LABEL);
          }
      }    
  }
  
  
  
  
  1.1                  jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/Evt_do_jrl.java
  
  Index: Evt_do_jrl.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.commons.periodicity.turbine.screens;
  
  import org.apache.turbine.util.RunData;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.VelocityContext;
  import org.apache.turbine.modules.screens.VelocityScreen;
  import org.apache.turbine.util.Log;
  import org.apache.commons.periodicity.util.TestTemplateLabels;
  
  public class Evt_do_jrl extends Evt_do_jrl_fb 
  {
      public void doBuildTemplate(RunData data, Context context) throws Exception
      {
          if(data != null)
          {
              Log.debug("data != null");
              if(context != null)
              {
                  Log.debug("context != null");
                  addLabelsToContext(context);
              }    
              else
              {
                  Log.debug("context == null");
                  addLabelsToContext(new VelocityContext());
              }    
          }
          else
          {
              Log.debug("data == null");
          }    
      }
  
      protected void addLabelsToContext(Context context)
      {
          super.addLabelsToContext(context);
          if(context != null)
          {
              context.put(TestTemplateLabels.CLASSIFICATION_LABEL_KEY,
                     TestTemplateLabels.CLASSIFICATION_LABEL);
              context.put(TestTemplateLabels.DESCRIPTION_LABEL_KEY,
                     TestTemplateLabels.DESCRIPTION_LABEL);
              context.put(TestTemplateLabels.DESC_ALTREP_LABEL_KEY,
                     TestTemplateLabels.DESC_ALTREP_LABEL);
              context.put(TestTemplateLabels.DESC_LANG_LABEL_KEY,
                     TestTemplateLabels.DESC_LANG_LABEL);
              context.put(TestTemplateLabels.RECURID_DATE_LABEL_KEY,
                     TestTemplateLabels.RECURID_DATE_LABEL);
              context.put(TestTemplateLabels.RECURID_TIME_LABEL_KEY,
                     TestTemplateLabels.RECURID_TIME_LABEL);
              context.put(TestTemplateLabels.RECURID_RANGE_LABEL_KEY,
                     TestTemplateLabels.RECURID_RANGE_LABEL);
              context.put(TestTemplateLabels.RECURID_TZID_LABEL_KEY,
                     TestTemplateLabels.RECURID_TZID_LABEL);
              context.put(TestTemplateLabels.SEQUENCE_LABEL_KEY,
                     TestTemplateLabels.SEQUENCE_LABEL);
              context.put(TestTemplateLabels.STATUS_LABEL_KEY,
                     TestTemplateLabels.STATUS_LABEL);
              context.put(TestTemplateLabels.SUMMARY_LABEL_KEY,
                     TestTemplateLabels.SUMMARY_LABEL);
              context.put(TestTemplateLabels.SUMMARY_ALTREP_LABEL_KEY,
                     TestTemplateLabels.SUMMARY_ALTREP_LABEL);
              context.put(TestTemplateLabels.SUMMARY_LANG_LABEL_KEY,
                     TestTemplateLabels.SUMMARY_LANG_LABEL);
          }
      }    
  }
  
  
  
  
  1.1                  jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/Evt_do_jrl_fb.java
  
  Index: Evt_do_jrl_fb.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.commons.periodicity.turbine.screens;
  
  import org.apache.turbine.util.RunData;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.VelocityContext;
  import org.apache.turbine.modules.screens.VelocityScreen;
  import org.apache.turbine.util.Log;
  import org.apache.commons.periodicity.util.TestTemplateLabels;
  
  public class Evt_do_jrl_fb extends No_alarm 
  {
      public void doBuildTemplate(RunData data, Context context) throws Exception
      {
          if(data != null)
          {
              Log.debug("data != null");
              if(context != null)
              {
                  Log.debug("context != null");
                  addLabelsToContext(context);
              }    
              else
              {
                  Log.debug("context == null");
                  addLabelsToContext(new VelocityContext());
              }    
          }
          else
          {
              Log.debug("data == null");
          }    
      }
  
      protected void addLabelsToContext(Context context)
      {
          super.addLabelsToContext(context);
          if(context != null)
          {
              context.put(TestTemplateLabels.ORGANIZER_LABEL_KEY,
                     TestTemplateLabels.ORGANIZER_LABEL);
              context.put(TestTemplateLabels.ORGANIZER_NAME_LABEL_KEY,
                     TestTemplateLabels.ORGANIZER_NAME_LABEL);
              context.put(TestTemplateLabels.ORGANIZER_DIRECTORY_LABEL_KEY,
                     TestTemplateLabels.ORGANIZER_DIRECTORY_LABEL);
              context.put(TestTemplateLabels.ORGANIZER_SENTBY_LABEL_KEY,
                     TestTemplateLabels.ORGANIZER_SENTBY_LABEL);
              context.put(TestTemplateLabels.ORGANIZER_LANG_LABEL_KEY,
                     TestTemplateLabels.ORGANIZER_LANG_LABEL);
              context.put(TestTemplateLabels.UID_LABEL_KEY,
                     TestTemplateLabels.UID_LABEL);
              context.put(TestTemplateLabels.URL_LABEL_KEY,
                     TestTemplateLabels.URL_LABEL);
          }
      }    
  }
  
  
  
  
  1.1                  jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/turbine/screens/No_alarm.java
  
  Index: No_alarm.java
  ===================================================================
  /* ====================================================================
   * The Apache Software License, Version 1.1
   *
   * Copyright (c) 2000-2002 The Apache Software Foundation.  All rights
   * reserved.
   *
   * Redistribution and use in source and binary forms, with or without
   * modification, are permitted provided that the following conditions
   * are met:
   *
   * 1. Redistributions of source code must retain the above copyright
   *    notice, this list of conditions and the following disclaimer.
   *
   * 2. Redistributions in binary form must reproduce the above copyright
   *    notice, this list of conditions and the following disclaimer in
   *    the documentation and/or other materials provided with the
   *    distribution.
   *
   * 3. The end-user documentation included with the redistribution,
   *    if any, must include the following acknowledgment:
   *       "This product includes software developed by the
   *        Apache Software Foundation (http://www.apache.org/)."
   *    Alternately, this acknowledgment may appear in the software itself,
   *    if and wherever such third-party acknowledgments normally appear.
   *
   * 4. The names "Apache" and "Apache Software Foundation" and
   *     "Apache Jetspeed" must not be used to endorse or promote products
   *    derived from this software without prior written permission. For
   *    written permission, please contact apache@apache.org.
   *
   * 5. Products derived from this software may not be called "Apache" or
   *    "Apache Jetspeed", nor may "Apache" appear in their name, without
   *    prior written permission of the Apache Software Foundation.
   *
   * THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESSED OR IMPLIED
   * WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES
   * OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE
   * DISCLAIMED.  IN NO EVENT SHALL THE APACHE SOFTWARE FOUNDATION OR
   * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
   * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
   * LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF
   * USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND
   * ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY,
   * OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT
   * OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
   * SUCH DAMAGE.
   * ====================================================================
   *
   * This software consists of voluntary contributions made by many
   * individuals on behalf of the Apache Software Foundation.  For more
   * information on the Apache Software Foundation, please see
   * <http://www.apache.org/>.
   */
  
  package org.apache.commons.periodicity.turbine.screens;
  
  import org.apache.turbine.util.RunData;
  import org.apache.velocity.context.Context;
  import org.apache.velocity.VelocityContext;
  import org.apache.turbine.modules.screens.VelocityScreen;
  import org.apache.turbine.util.Log;
  import org.apache.commons.periodicity.util.TestTemplateLabels;
  
  public class No_alarm extends VelocityScreen 
  {
      public void doBuildTemplate(RunData data, Context context) throws Exception
      {
          if(data != null)
          {
              Log.debug("data != null");
              if(context != null)
              {
                  Log.debug("context != null");
                  addLabelsToContext(context);
              }    
              else
              {
                  Log.debug("context == null");
                  addLabelsToContext(new VelocityContext());
              }    
          }
          else
          {
              Log.debug("data == null");
          }    
      }
  
      protected void addLabelsToContext(Context context)
      {
          if(context != null)
          {
              context.put(TestTemplateLabels.DTSTART_DATE_LABEL_KEY,
                     TestTemplateLabels.DTSTART_DATE_LABEL);
              context.put(TestTemplateLabels.DTSTART_TIME_LABEL_KEY,
                     TestTemplateLabels.DTSTART_TIME_LABEL);
              context.put(TestTemplateLabels.DTSTART_TZID_LABEL_KEY,
                     TestTemplateLabels.DTSTART_TZID_LABEL);
          }
      }    
  }
  
  
  
  
  1.2       +219 -1    jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/util/TestTemplateLabels.java
  
  Index: TestTemplateLabels.java
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/java/org/apache/commons/periodicity/util/TestTemplateLabels.java,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- TestTemplateLabels.java	26 Mar 2002 04:07:30 -0000	1.1
  +++ TestTemplateLabels.java	26 Mar 2002 10:15:14 -0000	1.2
  @@ -2,12 +2,126 @@
   
   public class TestTemplateLabels
   {
  +
  +    /** The velocity context key for the start date label */
  +    public static final String DTSTART_DATE_LABEL_KEY =
  +           "start_date_label";
  +    
  +    /** The velocity context key for the start time label */
  +    public static final String DTSTART_TIME_LABEL_KEY =
  +           "start_time_label";
  +    
  +    /** The velocity context key for the start time's time zone id */
  +    public static final String DTSTART_TZID_LABEL_KEY =
  +           "start_tzid_label";
  +
       /** The velocity context key for the summary label */
       public static final String END_DATE_LABEL_KEY = "end_date_label";
   
       /** The velocity context key for the transparency label */
       public static final String TRANSPARENCY_LABEL_KEY = "transparency_label";
   
  +    /** The velocity context key for the organizer label */
  +    public static final String ORGANIZER_LABEL_KEY = "organizer_label";
  +
  +    /** The velocity context key for organizer's common name label */
  +    public static final String ORGANIZER_NAME_LABEL_KEY =
  +           "organizer_common_name_label";
  +    
  +    /** The velocity context key for organizer's directory label */
  +    public static final String ORGANIZER_DIRECTORY_LABEL_KEY =
  +           "organizer_directory_label";
  +    
  +    /** The velocity context key for the organizer's sentby label */
  +    public static final String ORGANIZER_SENTBY_LABEL_KEY =
  +           "organizer_sentby_label";
  +    
  +    /** The velocity context key for the organizer's language label */
  +    public static final String ORGANIZER_LANG_LABEL_KEY =
  +           "organizer_language_label";
  +    
  +    /** The velocity context key for the Unique id label */
  +    public static final String UID_LABEL_KEY = "uid_label";
  +
  +    /** The velocity context key for the Url label */
  +    public static final String URL_LABEL_KEY = "url_label";
  +
  +    /** The velocity context key for classification label */
  +    public static final String CLASSIFICATION_LABEL_KEY =
  +           "classification_label";
  +    
  +    /** The velocity context key for the description label */
  +    public static final String DESCRIPTION_LABEL_KEY =
  +           "description_label";
  +    
  +    /** The velocity context key for the description's alternate representation
  +     *  label */
  +    public static final String DESC_ALTREP_LABEL_KEY =
  +           "desc_altrep_label";
  +    
  +    /** The velocity context key for the description's language label */
  +    public static final String DESC_LANG_LABEL_KEY =
  +           "desc_language_label";
  +    
  +    /** The velocity context key for the recurrence id's date label */
  +    public static final String RECURID_DATE_LABEL_KEY =
  +           "recur_id_date_label";
  +    
  +    /** The velocity context key for the recurrence id's time label */
  +    public static final String RECURID_TIME_LABEL_KEY =
  +           "recur_id_time_label";
  +    
  +    /** The velocity context key for the recurrence id's range label */
  +    public static final String RECURID_RANGE_LABEL_KEY =
  +           "recur_id_range_label";
  +    
  +    /** The velocity context key for the recurrence id's time zone id label */
  +    public static final String RECURID_TZID_LABEL_KEY =
  +           "recur_id_tzid_label";
  +    
  +    /** The velocity context key for the sequence label */
  +    public static final String SEQUENCE_LABEL_KEY = "sequence_label";
  +
  +    /** The velocity context key for the status label */
  +    public static final String STATUS_LABEL_KEY = "status_label";
  +
  +    /** The velocity context key for the summary label */
  +    public static final String SUMMARY_LABEL_KEY = "summary_label";
  +
  +    /** The velocity context key for the summary alternate representation
  +     *  label */
  +    public static final String SUMMARY_ALTREP_LABEL_KEY =
  +           "summary_altrep_label";
  +    
  +    /** The velocity context key for the summary language label */
  +    public static final String SUMMARY_LANG_LABEL_KEY =
  +           "summary_language_label";
  +
  +    /** The velocity context key for the latitude label */
  +    public static final String LATITUDE_LABEL_KEY = "latitude_label";
  +
  +    /** The velocity context key for the longitude label */
  +    public static final String LONGITUDE_LABEL_KEY = "longitude_label";
  +
  +    /** The velocity context key for the location label */
  +    public static final String LOCATION_LABEL_KEY = "location_label";
  +
  +    /** The velocity context key for the location's alternate represenation
  +     *  label */
  +    public static final String LOCATION_ALTREP_LABEL_KEY = 
  +           "location_altrep_label";
  +    
  +    /** The velocity context key for the location's langauge label */
  +    public static final String LOCATION_LANG_LABEL_KEY =
  +           "location_language_label";
  +    
  +    /** The velocity context key for the priority label */
  +    public static final String PRIORITY_LABEL_KEY = "priority_label";
  +           
  +    
  +    /** The velocity context key for the 
  +    
  +
   
       /*
        * FIXME - The constants below these lines are the actual values for 
  @@ -16,10 +130,114 @@
        *         the application in future releases
        */
       
  +    /** The start date label for the test template */
  +    public static final String DTSTART_DATE_LABEL = "Start Date";
  +
  +    /** The start time label for the test template */
  +    public static final String DTSTART_TIME_LABEL = "Start Time";
  +
  +    /** The start time time zone id label for the test template */
  +    public static final String DTSTART_TZID_LABEL = "Start Time Time Zone ID";
  +    
       /** The summary label for the test template */
  -    public static final String END_DATE_LABEL = "End Date";
  +    public static final String END_DATE_LABEL = "End Date (MM/DD/YYYY)";
   
       /** The transparency label for the test template */
       public static final String TRANSPARENCY_LABEL = "Transparency";
  +
  +    /** The organizer label for the test template */
  +    public static final String ORGANIZER_LABEL = 
  +           "Organizer (must be a URI)";
  +    
  +    /** The organizer's common name label for the test template */
  +    public static final String ORGANIZER_NAME_LABEL =
  +           "Organizer's name";
  +    
  +    /** The organizer's directory label for the test template */
  +    public static final String ORGANIZER_DIRECTORY_LABEL =
  +           "Organizer's Directory (must be a URI)";
  +    
  +    /** The organizer's sentby label for the test templates */
  +    public static final String ORGANIZER_SENTBY_LABEL =
  +           "Organizer's Sentby (must be a URI)";
  +    
  +    /** The organizer's language label for the test templates */
  +    public static final String ORGANIZER_LANG_LABEL =
  +           "Organizer's Language";
  +
  +    /** The Unique ID label for the test templates */
  +    public static final String UID_LABEL = "Unique ID";
  +
  +    /** The URL label for the test templates */
  +    public static final String URL_LABEL = "URL";
  +
  +    /** The classification label for the test templates */
  +    public static final String CLASSIFICATION_LABEL =
  +           "Classification";
  +
  +    /** The description label for the test template */
  +    public static final String DESCRIPTION_LABEL = "Description";
  +    
  +    /** The description's alternate representation label for the test templates
  +     */
  +    public static final String DESC_ALTREP_LABEL = 
  +           "Description's Alternate Representation (must be a URI)";
  +    
  +    /** The description's language label for the test templates */
  +    public static final String DESC_LANG_LABEL =
  +           "Language of the Description";
  +    
  +    /** The recurrence id's date label for the test templates */
  +    public static final String RECURID_DATE_LABEL =
  +           "Recurrence ID's date";
  +    
  +    /** The recurrence id's time label for the test templates */
  +    public static final String RECURID_TIME_LABEL =
  +           "Recurrence ID's time";
  +    
  +    /** The recurrence id's range label for the test templates */
  +    public static final String RECURID_RANGE_LABEL =
  +           "Recurrence ID's range";
  +    
  +    /** The recurrence id's time zone id for the test templates */
  +    public static final String RECURID_TZID_LABEL =
  +           "Recurrence ID's TZID";
  +    
  +    /** The sequence label for the test templates */
  +    public static final String SEQUENCE_LABEL = "Sequence";
  +
  +    /** The status label for the test templates */
  +    public static final String STATUS_LABEL = "Status";
  +
  +    /** The summary label for the test templates */
  +    public static final String SUMMARY_LABEL = "Summary";
  +
  +    /** The summary's alternate representation label for the test templates */
  +    public static final String SUMMARY_ALTREP_LABEL = 
  +           "Alternate Representation of Summary (Must be a URI)";
  +    
  +    /** The summary's language label for the test templates */
  +    public static final String SUMMARY_LANG_LABEL = "Summary Language";
  +
  +    /** The latitude label for the test templates */
  +    public static final String LATITDUE_LABEL = "Latitude";
  +
  +    /** The longitude label for the test templates */
  +    public static final String LONGITUDE_LABEL = "Longitude";
  +
  +    /** The location label for the test templates */
  +    public static final String LOCATION_LABEL = "Location";
  +
  +    /** The location's alternate represenation label for the test templates */
  +    public static final String LOCATION_ALTREP_LABEL =
  +           "Alternate Representation for the Location (must be a URI).";
  +    
  +    /** The location's language label for the test templates */
  +    public static final String LOCATION_LANG_LABEL =
  +           "Location's Language";
  +    
  +    /** The priority label for the test templates */
  +    public static final String PRIORITY_LABEL = "Priority";
  +
   }    
         
  
  
  
  1.2       +10 -0     jakarta-commons-sandbox/periodicity/src/velocity/test/Evt_do_jrl.vm
  
  Index: Evt_do_jrl.vm
  ===================================================================
  RCS file: /home/cvs/jakarta-commons-sandbox/periodicity/src/velocity/test/Evt_do_jrl.vm,v
  retrieving revision 1.1
  retrieving revision 1.2
  diff -u -r1.1 -r1.2
  --- Evt_do_jrl.vm	26 Mar 2002 03:57:57 -0000	1.1
  +++ Evt_do_jrl.vm	26 Mar 2002 10:15:14 -0000	1.2
  @@ -47,6 +47,16 @@
      <td>${status_label}</td>
      <td><input name="${status_param}" value="$!{icalobj.getStatus()}"/></td>
   </tr>
  +<tr>
  +   <td>${summary_altrep_label}</td>
  +   <td><input name="${summary_altrep_param}" value="${summary_altrep}"/></td>
  +</tr>
  +<tr>
  +   <td>${summary_language_label}</td>
  +   <td><input name="${summary_language_param}" 
  +              value="${summary_language}"/></td>
  +</tr>              
  +   
   
              
      
  
  
  

--
To unsubscribe, e-mail:   <ma...@jakarta.apache.org>
For additional commands, e-mail: <ma...@jakarta.apache.org>