webmacro-cvs Mailing List for WebMacro (Page 20)

Brought to you by: alexfiennes, briangoetz, drater, guyboltonking, and 4 others

webmacro-cvs — receive cvs commit messages

You can subscribe to this list here.

2002	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct (11)	Nov (97)	Dec (35)
2003	Jan (12)	Feb (55)	Mar (21)	Apr (3)	May (7)	Jun (25)	Jul (108)	Aug (23)	Sep	Oct	Nov	Dec (4)
2006	Jan	Feb	Mar (6)	Apr (3)	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2008	Jan (13)	Feb	Mar (257)	Apr (1)	May	Jun	Jul	Aug	Sep	Oct	Nov (38)	Dec
2009	Jan	Feb (1)	Mar (1)	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec
2010	Jan	Feb (63)	Mar	Apr	May	Jun (1)	Jul	Aug	Sep (1)	Oct	Nov	Dec (1)
2011	Jan	Feb (1)	Mar	Apr (1)	May (1)	Jun (1)	Jul	Aug	Sep	Oct	Nov	Dec
2012	Jan	Feb (1)	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov	Dec

Flat | Threaded

<< < 1 .. 18 19 20 21 22 .. 32 > >> (Page 20 of 32)

[WebMacro-cvs] webmacro/src/org/webmacro/directive IncludeDirective.java,1.22,1.23

From: <bri...@us...> - 2003-07-16 06:45:02

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/directive
In directory sc8-pr-cvs1:/tmp/cvs-serv32064/src/org/webmacro/directive

Modified Files:
	IncludeDirective.java 
Log Message:
More ripping out -- eliminate reference counting of Brokers, pooling of context and fastwriter; streamline Context; eliminate Clock thread hack; eliminate ascii fastwriter hack

Index: IncludeDirective.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/directive/IncludeDirective.java,v
retrieving revision 1.22
retrieving revision 1.23
diff -C2 -d -r1.22 -r1.23
*** IncludeDirective.java	8 Jul 2003 19:48:44 -0000	1.22
--- IncludeDirective.java	16 Jul 2003 06:44:59 -0000	1.23
***************
*** 387,391 ****
                  // so just fall through
              case TYPE_TEMPLATE:
!                 out.write(((Template) toInclude).getBytes(out.getEncoding(), context));
                  break;
  
--- 387,391 ----
                  // so just fall through
              case TYPE_TEMPLATE:
!                 out.write(((Template) toInclude).evaluateAsBytes(out.getEncoding(), context));
                  break;

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestParseInclude.java,1.11,1.12

From: <wan...@us...> - 2003-07-14 09:39:23

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs1:/tmp/cvs-serv26091

Modified Files:
	TestParseInclude.java 
Log Message:
New test for #include as macro 

Index: TestParseInclude.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestParseInclude.java,v
retrieving revision 1.11
retrieving revision 1.12
diff -C2 -d -r1.11 -r1.12
*** TestParseInclude.java	12 Jun 2003 00:47:50 -0000	1.11
--- TestParseInclude.java	14 Jul 2003 09:39:15 -0000	1.12
***************
*** 70,73 ****
--- 70,76 ----
                  "pass");
  
+         assertStringTemplateMatches("#include as macro \"org/webmacro/template/test_parse.wm\"",
+                 "pass");
+ 
          // include as <something dynamic>
          assertStringTemplateMatches("#include \"org/webmacro/template/test_parse.wm\"",

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestBinaryAccessor.java,1.1,1.2

From: <wan...@us...> - 2003-07-11 16:24:58

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs1:/tmp/cvs-serv11454

Modified Files:
	TestBinaryAccessor.java 
Log Message:
Removed incorrect license

Index: TestBinaryAccessor.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TestBinaryAccessor.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -C2 -d -r1.1 -r1.2
*** TestBinaryAccessor.java	11 Jul 2003 14:53:44 -0000	1.1
--- TestBinaryAccessor.java	11 Jul 2003 16:24:55 -0000	1.2
***************
*** 1,23 ****
! /*
!  * The contents of this file are subject to the Mozilla Public License Version
!  * 1.1 (the "License"); you may not use this file except in compliance with the
!  * License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
!  * Software distributed under the License is distributed on an "AS IS" basis,
!  * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
!  * the specific language governing rights and limitations under the License.
!  *
!  * The Initial Developer of this code is Wangjammers
!  * Copyright (C) 2003 Wangjammers.
!  *
!  * More information about the Ignition Web-Application can be found at:
!  * http://www.wangjammers.org/ignition
!  *
!  * This software consists of voluntary contributions made by many
!  * individuals on behalf of Wangjammers and/or the WebMacro project.
!  * For more information on the Wangjammers and WebMacro, please see
!  * <http://www.wangjammers.org/> and <http://www.webmacro.org/>
!  * respectively.
!  *
!  */
  package org.webmacro.template;
  
--- 1,3 ----
! 
  package org.webmacro.template;

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template TestBinaryAccessor.java,NONE,1.1

From: <wan...@us...> - 2003-07-11 14:53:47

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs1:/tmp/cvs-serv28232

Added Files:
	TestBinaryAccessor.java 
Log Message:
New test for broken Binary Accessor

--- NEW FILE: TestBinaryAccessor.java ---
/*
 * The contents of this file are subject to the Mozilla Public License Version
 * 1.1 (the "License"); you may not use this file except in compliance with the
 * License. You may obtain a copy of the License at http://www.mozilla.org/MPL/
 * Software distributed under the License is distributed on an "AS IS" basis,
 * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for
 * the specific language governing rights and limitations under the License.
 *
 * The Initial Developer of this code is Wangjammers
 * Copyright (C) 2003 Wangjammers.
 *
 * More information about the Ignition Web-Application can be found at:
 * http://www.wangjammers.org/ignition
 *
 * This software consists of voluntary contributions made by many
 * individuals on behalf of Wangjammers and/or the WebMacro project.
 * For more information on the Wangjammers and WebMacro, please see
 * <http://www.wangjammers.org/> and <http://www.webmacro.org/>
 * respectively.
 *
 */
package org.webmacro.template;

import org.webmacro.Context;

import java.util.Hashtable;
import java.util.Map;

/**
 * @author Marc Palmer (<a href="mailto:wj...@wa...">wj...@wa...</a>)
 */
public class TestBinaryAccessor extends TemplateTestCase
{

    public TestBinaryAccessor( String name )
    {
        super( name );
    }

    public static class Wrapper
    {

        private Map params = new Hashtable();

        public String getParameters( String key )
        {
            return (String) params.get( key );
        }

        public void setParameters( String key, Object value )
        {
            params.put( key, value );
        }
    }

    public void testBinaryGet()
    {
        assertStringTemplateEquals("$obj.Parameters.Name", "Marc");
    }

    public void testBinarySet()
    {
        assertStringTemplateEquals("#set $obj.Parameters.Name = 'Eric'", "");
    }

    public void testBinarySetGet()
    {
        assertStringTemplateEquals(
                "#set $obj.Parameters.Name = 'Eric'\n" +
                "$obj.Parameters.Name", "Eric");
    }

    protected void stuffContext( Context context ) throws Exception
    {
        final Wrapper value = new Wrapper();
        value.setParameters( "Name", "Marc");

        context.put( "obj", value );
    }
}

[WebMacro-cvs] webmacro/src/org/webmacro/servlet WMServlet.java,1.56,1.57

From: <wan...@us...> - 2003-07-11 12:25:46

Update of /cvsroot/webmacro/webmacro/src/org/webmacro/servlet
In directory sc8-pr-cvs1:/tmp/cvs-serv5471

Modified Files:
	WMServlet.java 
Log Message:
Removed redundant FastWriter code in execute() method - was causing NPEs under some conditions due to closing null FW.

Index: WMServlet.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/src/org/webmacro/servlet/WMServlet.java,v
retrieving revision 1.56
retrieving revision 1.57
diff -C2 -d -r1.56 -r1.57
*** WMServlet.java	8 Jul 2003 19:48:45 -0000	1.56
--- WMServlet.java	11 Jul 2003 12:25:43 -0000	1.57
***************
*** 550,554 ****
              throws IOException
      {
-         FastWriter fw = null;
          boolean timing = Flags.PROFILE && c.isTiming();
          try
--- 550,553 ----
***************
*** 591,604 ****
                  if (timing) c.stopTiming();
              }
-             if (timing) c.startTiming("FastWriter.close()");
-             try
-             {
-                 fw.close();
-                 fw = null;
-             }
-             finally
-             {
-                 if (timing) c.stopTiming();
-             }
          }
          catch (UnsupportedEncodingException e)
--- 590,593 ----
***************
*** 639,658 ****
              }
          }
-         finally
-         {
-             try
-             {
-                 if (fw != null)
-                 {
-                     fw.flush();
-                     fw.close();
-                     fw = null;
-                 }
-             }
-             catch (Exception e3)
-             {
-                 // ignore disconnect
-             }
-         }
      }
  
--- 628,631 ----
***************
*** 722,726 ****
       * should analyze the data in the request, put whatever values are
       * required into the context, and return the appropriate view.
-      * @see getTemplate
       * @return the template to be rendered by the WebMacro engine
       * @exception HandlerException throw this to produce vanilla error messages
--- 695,698 ----

[WebMacro-cvs] webmacro/test/unit/org/webmacro/template EncodingTestCase.java,1.4,1.5 TemplateTestCase.java,1.15,1.16

From: <bri...@us...> - 2003-07-08 19:48:49

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template
In directory sc8-pr-cvs1:/tmp/cvs-serv7814/test/unit/org/webmacro/template

Modified Files:
	EncodingTestCase.java TemplateTestCase.java 
Log Message:
Eliminate FastWriter from public interface; use Template.write(OutputStream) instead

Index: EncodingTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/EncodingTestCase.java,v
retrieving revision 1.4
retrieving revision 1.5
diff -C2 -d -r1.4 -r1.5
*** EncodingTestCase.java	12 Jun 2003 00:47:49 -0000	1.4
--- EncodingTestCase.java	8 Jul 2003 19:48:45 -0000	1.5
***************
*** 146,150 ****
                  wm.getConfig("TemplateEncoding"), encoding);
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
!         String evaluated = t.evaluate(getContext(wm)).toString();
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  evaluated, expected);
--- 146,150 ----
                  wm.getConfig("TemplateEncoding"), encoding);
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
!         String evaluated = t.getString(getContext(wm));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  evaluated, expected);
***************
*** 158,165 ****
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
          ByteArrayOutputStream bos = new ByteArrayOutputStream();
!         FastWriter fw = wm.getFastWriter(bos, encoding);
!         t.write(fw, getContext(wm));
!         fw.flush();
!         fw.close();
          assertByteArrayEquals(bos.toByteArray(), expected.getBytes(encoding));
      }
--- 158,162 ----
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
          ByteArrayOutputStream bos = new ByteArrayOutputStream();
!         t.write(bos, encoding, getContext(wm));
          assertByteArrayEquals(bos.toByteArray(), expected.getBytes(encoding));
      }
***************
*** 172,179 ****
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
          ByteArrayOutputStream bos = new ByteArrayOutputStream();
!         FastWriter fw = wm.getFastWriter(bos, "UTF8");
!         t.write(fw, getContext(wm));
!         fw.flush();
!         fw.close();
          assertByteArrayEquals(bos.toByteArray(), expected.getBytes("UTF8"));
      }
--- 169,173 ----
          Template t = wm.getTemplate(TEMPLATE_FILENAME);
          ByteArrayOutputStream bos = new ByteArrayOutputStream();
!         t.write(bos, "UTF8", getContext(wm));
          assertByteArrayEquals(bos.toByteArray(), expected.getBytes("UTF8"));
      }
***************
*** 185,189 ****
                  wmUTF8.getConfig("TemplateEncoding"), "UTF8");
          Template t = wmUTF8.getTemplate(TEMPLATE_FILENAME_UTF8);
!         String evaluated = t.evaluate(getContext(wmUTF8)).toString();
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  expected, evaluated);
--- 179,183 ----
                  wmUTF8.getConfig("TemplateEncoding"), "UTF8");
          Template t = wmUTF8.getTemplate(TEMPLATE_FILENAME_UTF8);
!         String evaluated = t.getString(getContext(wmUTF8));
          assertEquals("Template evaluated to \"" + evaluated + "\" instead of \"" + expected + "\"",
                  expected, evaluated);

Index: TemplateTestCase.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/template/TemplateTestCase.java,v
retrieving revision 1.15
retrieving revision 1.16
diff -C2 -d -r1.15 -r1.16
*** TemplateTestCase.java	12 Jun 2003 00:47:49 -0000	1.15
--- TemplateTestCase.java	8 Jul 2003 19:48:45 -0000	1.16
***************
*** 94,98 ****
      public String executeTemplate (Template template) throws Exception
      {
!         return template.evaluate(_context).toString();
      }
  
--- 94,98 ----
      public String executeTemplate (Template template) throws Exception
      {
!         return template.getString(_context);
      }
  
***************
*** 113,120 ****
          Template template = new StringTemplate(_wm.getBroker(), templateText);
          template.parse();
!         FastWriter fw = FastWriter.getInstance(_wm.getBroker(), null, "UTF8");
!         template.write(fw, _context);
!         String output = fw.toString();
!         fw.close();
          return output;
      }
--- 113,117 ----
          Template template = new StringTemplate(_wm.getBroker(), templateText);
          template.parse();
!         String output = template.getString(_context);
          return output;
      }

[WebMacro-cvs] webmacro/test/unit/org/webmacro TestMultipleInstances.java,1.6,1.7

From: <bri...@us...> - 2003-07-08 19:48:49

Update of /cvsroot/webmacro/webmacro/test/unit/org/webmacro
In directory sc8-pr-cvs1:/tmp/cvs-serv7814/test/unit/org/webmacro

Modified Files:
	TestMultipleInstances.java 
Log Message:
Eliminate FastWriter from public interface; use Template.write(OutputStream) instead

Index: TestMultipleInstances.java
===================================================================
RCS file: /cvsroot/webmacro/webmacro/test/unit/org/webmacro/TestMultipleInstances.java,v
retrieving revision 1.6
retrieving revision 1.7
diff -C2 -d -r1.6 -r1.7
*** TestMultipleInstances.java	12 Jun 2003 00:47:49 -0000	1.6
--- TestMultipleInstances.java	8 Jul 2003 19:48:45 -0000	1.7
***************
*** 116,123 ****
          Broker b = wm.getBroker();
          Template template = new StringTemplate(b, templateText);
!         FastWriter fw = FastWriter.getInstance(b, null, "UTF8");
!         template.write(fw, context);
!         String output = fw.toString();
!         fw.close();
          return output;
      }
--- 116,120 ----
          Broker b = wm.getBroker();
          Template template = new StringTemplate(b, templateText);
!         String output = template.getString(context);
          return output;
      }

[WebMacro-cvs] webmacro/test/perf SpinTest.java,1.3,1.4