FreeMarker

Update of /cvsroot/freemarker/freemarker/src/freemarker/template
In directory sc8-pr-cvs1:/tmp/cvs-serv26695/src/freemarker/template

Modified Files:
	SimpleDate.java SimpleSequence.java 
Log Message:
Adding some missing toString()-s to SimpleXxx classes.


Index: SimpleDate.java
===================================================================
RCS file: /cvsroot/freemarker/freemarker/src/freemarker/template/SimpleDate.java,v
retrieving revision 1.9
retrieving revision 1.10
diff -C2 -d -r1.9 -r1.10
*** SimpleDate.java	5 Apr 2003 12:54:15 -0000	1.9
--- SimpleDate.java	16 Dec 2003 22:54:51 -0000	1.10
***************
*** 113,115 ****
--- 113,119 ----
          return type;
      }
+     
+     public String toString() {
+         return date.toString();
+     }
  }

Index: SimpleSequence.java
===================================================================
RCS file: /cvsroot/freemarker/freemarker/src/freemarker/template/SimpleSequence.java,v
retrieving revision 1.42
retrieving revision 1.43
diff -C2 -d -r1.42 -r1.43
*** SimpleSequence.java	20 Aug 2003 04:36:32 -0000	1.42
--- SimpleSequence.java	16 Dec 2003 22:54:51 -0000	1.43
***************
*** 92,96 ****
       */
      public SimpleSequence() {
!         this((ObjectWrapper)null);
      }
  
--- 92,96 ----
       */
      public SimpleSequence() {
!         this((ObjectWrapper) null);
      }
  
***************
*** 215,218 ****
--- 215,222 ----
          return new SynchronizedSequence();
      }
+     
+     public String toString() {
+         return list.toString();
+     }
  
      private class SynchronizedSequence extends SimpleSequence {
***************
*** 230,233 ****
          }
      }
! }
! 
--- 234,236 ----
          }
      }
! }
\ No newline at end of file

Update of /cvsroot/freemarker/freemarker/src/freemarker/template
In directory sc8-pr-cvs1:/tmp/cvs-serv16384/src/freemarker/template

Modified Files:
	TemplateException.java 
Log Message:
Those are no quotes in the error message...


Index: TemplateException.java
===================================================================
RCS file: /cvsroot/freemarker/freemarker/src/freemarker/template/TemplateException.java,v
retrieving revision 1.23
retrieving revision 1.24
diff -C2 -d -r1.23 -r1.24
*** TemplateException.java	24 Sep 2003 22:42:18 -0000	1.23
--- TemplateException.java	16 Dec 2003 22:09:54 -0000	1.24
***************
*** 188,192 ****
          pw.println();
          pw.println(getMessage());
!         pw.println("Quoting problematic instruction:");
          pw.println(instructionStack);
          pw.println("Java backtrace for programmers:");
--- 188,192 ----
          pw.println();
          pw.println(getMessage());
!         pw.println("The problematic instruction:");
          pw.println(instructionStack);
          pw.println("Java backtrace for programmers:");

Update of /cvsroot/freemarker/freemarker/src/freemarker
In directory sc8-pr-cvs1:/tmp/cvs-serv28687/src/freemarker

Modified Files:
	version.properties 
Log Message:
updating version name...


Index: version.properties
===================================================================
RCS file: /cvsroot/freemarker/freemarker/src/freemarker/version.properties,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** version.properties	16 Nov 2003 12:51:02 -0000	1.5
--- version.properties	16 Dec 2003 20:51:25 -0000	1.6
***************
*** 31,35 ****
  ##   Note that backward compatibility restrictions do not apply for
  ##   preview releases.
! version=2.3pre14
  
  ## Version string for Manifest.mf: dot separated numbers.
--- 31,35 ----
  ##   Note that backward compatibility restrictions do not apply for
  ##   preview releases.
! version=2.3pre14mod
  
  ## Version string for Manifest.mf: dot separated numbers.

Update of /cvsroot/freemarker/docgen/src
In directory sc8-pr-cvs1:/tmp/cvs-serv27450/src

Modified Files:
	app_versions.xml ref_directives.xml xgui_imperative.xml 
Log Message:
- Version history update for Pre15.
- Minor fixes


Index: app_versions.xml
===================================================================
RCS file: /cvsroot/freemarker/docgen/src/app_versions.xml,v
retrieving revision 1.164
retrieving revision 1.165
diff -C2 -d -r1.164 -r1.165
*** app_versions.xml	10 Nov 2003 14:17:28 -0000	1.164
--- app_versions.xml	16 Dec 2003 20:48:24 -0000	1.165
***************
*** 159,162 ****
--- 159,171 ----
  
  <sect2>
+ <title>Differences between the Preview 15 and Preview 14 releases</title>
+ <itemizedlist mark="bullet">
+   <listitem><para>Bugfix: The new default template cache storage (<markup>MruCacheStorage</markup>) has started to continually fail with <markup>NullPointerException</markup> from a random point of time, usually when the memory usage was high in the JVM.</para></listitem>
+   
+   <listitem><para>Bugfix: In error messages, when the quoted FTL directive had nested content, that was quoted as well, so the quotation could be very long and expose nested lines needlessly.</para></listitem>
+ </itemizedlist>
+ </sect2>
+ 
+ <sect2>
  <title>Differences between the Preview 14 and Preview 13 releases</title>
  <itemizedlist mark="bullet">

Index: ref_directives.xml
===================================================================
RCS file: /cvsroot/freemarker/docgen/src/ref_directives.xml,v
retrieving revision 1.96
retrieving revision 1.97
diff -C2 -d -r1.96 -r1.97
*** ref_directives.xml	29 Aug 2003 18:08:45 -0000	1.96
--- ref_directives.xml	16 Dec 2003 20:48:24 -0000	1.97
***************
*** 938,942 ****
  
  <programlisting role="template"><![CDATA[
! <#assign x ="Hello ${user}!">
  ]]></programlisting>
  
--- 938,942 ----
  
  <programlisting role="template"><![CDATA[
! <#assign x="Hello ${user}!">
  ]]></programlisting>
  

Index: xgui_imperative.xml
===================================================================
RCS file: /cvsroot/freemarker/docgen/src/xgui_imperative.xml,v
retrieving revision 1.40
retrieving revision 1.41
diff -C2 -d -r1.40 -r1.41
*** xgui_imperative.xml	10 Nov 2003 14:03:54 -0000	1.40
--- xgui_imperative.xml	16 Dec 2003 20:48:24 -0000	1.41
***************
*** 568,572 ****
  <para>When you apply one of the above special keys on a node sequence that contains more than 1 or 0 nodes, then for each node in the sequence (where the special key does make sense, e.g. text nodes will be skipped for key <markup>*</markup> or <markup>@foo</markup>), the special key will be applied as it was explained for single nodes, and the results will be concatenated to form the final result. The results will be concatenated in the order as the corresponding nodes occur in the node sequence. The concatenation means string or sequence concatenation depending on the type of the results. If the special key would result in a string for a single node, then for multiple nodes the result is a single string too (the results for the single nodes concatenated), and if the special key would return a sequence for a single node, then for multiple nodes the result is a single sequence too. If there are 0 nodes in the sequence you apply the special key on, the string result is an empty string or an empty sequence respectively.</para>
  
! <para>XPath expressions can be used with node sequences that contain 0 or more than 1 nodes too. However, for 0 or more than 1 nodes it will work only if you use Jaxen instead of Xalan, because of the limitations of the Xalan XPath implementation.</para>
  
  </sect2>
--- 568,572 ----
  <para>When you apply one of the above special keys on a node sequence that contains more than 1 or 0 nodes, then for each node in the sequence (where the special key does make sense, e.g. text nodes will be skipped for key <markup>*</markup> or <markup>@foo</markup>), the special key will be applied as it was explained for single nodes, and the results will be concatenated to form the final result. The results will be concatenated in the order as the corresponding nodes occur in the node sequence. The concatenation means string or sequence concatenation depending on the type of the results. If the special key would result in a string for a single node, then for multiple nodes the result is a single string too (the results for the single nodes concatenated), and if the special key would return a sequence for a single node, then for multiple nodes the result is a single sequence too. If there are 0 nodes in the sequence you apply the special key on, the string result is an empty string or an empty sequence respectively.</para>
  
! <para>XPath expressions can be used with node sequences. However, for 0 or more than 1 nodes it will work only if you use Jaxen instead of Xalan, because of the limitations of the Xalan XPath implementation.</para>
  
  </sect2>

Update of /cvsroot/freemarker/freemarker/src/freemarker/cache
In directory sc8-pr-cvs1:/tmp/cvs-serv26355/freemarker/cache

Modified Files:
	MruCacheStorage.java 
Log Message:
Fixing NPE in MRU cache storage.


Index: MruCacheStorage.java
===================================================================
RCS file: /cvsroot/freemarker/freemarker/src/freemarker/cache/MruCacheStorage.java,v
retrieving revision 1.5
retrieving revision 1.6
diff -C2 -d -r1.5 -r1.6
*** MruCacheStorage.java	23 Sep 2003 14:29:33 -0000	1.5
--- MruCacheStorage.java	16 Dec 2003 20:42:52 -0000	1.6
***************
*** 257,262 ****
          
          void unlink() {
!             next.prev = prev;
!             prev.next = next;
              prev = null;
              next = null;
--- 257,266 ----
          
          void unlink() {
!             if (next != null) {
!                 next.prev = prev;
!             }
!             if (prev != null) {
!                 prev.next = next;
!             }
              prev = null;
              next = null;