You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@tapestry.apache.org by hl...@apache.org on 2006/05/06 19:14:33 UTC

svn commit: r400342 - in /tapestry/tapestry5/tapestry-core/trunk/src: main/aspect/org/apache/tapestry/internal/aspects/ main/java/org/apache/tapestry/internal/parser/ main/java/org/apache/tapestry/internal/util/ main/resources/org/apache/tapestry/inter...

Author: hlship
Date: Sat May  6 10:14:31 2006
New Revision: 400342

URL: http://svn.apache.org/viewcvs?rev=400342&view=rev
Log:
Start filling in the details on the template parser

Added:
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ParserMessages.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParser.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParserImpl.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TextToken.java
    tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/parser/ParserStrings.properties
Removed:
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/util/ListenerManager.java
Modified:
    tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj
    tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
    tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java
    tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java
    tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/parser/basic.html

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj?rev=400342&r1=400341&r2=400342&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/CatchNullParameters.aj Sat May  6 10:14:31 2006
@@ -48,7 +48,7 @@
      * 
      * @SuppressNullCheck annotation, and limit to only applicable methods.
      */
-    pointcut methodsToCheck() :
+    pointcut checkForNullParameters() :
         targetClasses() &&
         typeNotMarkedAsSuppressed() &&
         executionNotSuppressed() &&
@@ -67,7 +67,7 @@
      * Here's where the real work gets done. I think there may be a way to do this more efficiently
      * where much more static logic is injected, triggered by arguments.
      */
-    before(Object argumentValue) : methodsToCheck() && parametersToCheck(argumentValue) 
+    before(Object argumentValue) : checkForNullParameters() && parametersToCheck(argumentValue) 
     {
         if (argumentValue == null)
         {

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj?rev=400342&r1=400341&r2=400342&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/aspect/org/apache/tapestry/internal/aspects/Synchronization.aj Sat May  6 10:14:31 2006
@@ -79,13 +79,13 @@
         execution(@Synchronized.Read @Synchronized.Write * *(..)) :
             "A method may be annotated with Synchronized.Read or with Synchronized.Write but not both.";
 
-    pointcut writeMethods() :
+    pointcut synchronizeWrite() :
             execution(@Synchronized.Write * *(..));
 
-    pointcut readMethods() :
+    pointcut synchronizeRead() :
         execution(@Synchronized.Read * *(..));
 
-    Object around() : readMethods()
+    Object around() : synchronizeRead()
     {
         boolean locked = _threadHasReadLock.get();
 
@@ -115,7 +115,7 @@
         }
     }
 
-    Object around() : writeMethods()
+    Object around() : synchronizeWrite()
     {
         boolean locked = _threadHasReadLock.get();
 

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/AttributeToken.java Sat May  6 10:14:31 2006
@@ -0,0 +1,31 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Location;
+
+public class AttributeToken extends TemplateToken
+{
+    private final String _qname;
+
+    private final String _value;
+
+    public AttributeToken(String qname, String value, Location location)
+    {
+        super(location);
+
+        _qname = qname;
+        _value = value;
+    }
+
+    /** Returns the namespace qualified name for the attribute. */
+    public String getQname()
+    {
+        return _qname;
+    }
+
+    /** Returns the value for the attribute. */
+    public String getValue()
+    {
+        return _value;
+    }
+
+}

Modified: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java?rev=400342&r1=400341&r2=400342&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplate.java Sat May  6 10:14:31 2006
@@ -1,5 +1,9 @@
 package org.apache.tapestry.internal.parser;
 
+import java.util.List;
+
+import org.apache.hivemind.Resource;
+
 /**
  * A parsed component template, containing all the tokens parsed from the template.
  * 
@@ -7,5 +11,12 @@
  */
 public interface ComponentTemplate
 {
+    /** Returns the resource that was parsed to form the template. */
+    Resource getResource();
 
+    /**
+     * Returns a list of tokens that were parsed from the template. The caller should not modify
+     * this list.
+     */
+    List<TemplateToken> getTokens();
 }

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ComponentTemplateImpl.java Sat May  6 10:14:31 2006
@@ -0,0 +1,41 @@
+package org.apache.tapestry.internal.parser;
+
+import java.util.List;
+
+import org.apache.hivemind.Resource;
+
+import static org.apache.tapestry.util.CollectionFactory.newList;
+
+/**
+ * @author Howard M. Lewis Ship
+ */
+public class ComponentTemplateImpl implements ComponentTemplate
+{
+    private final Resource _resource;
+
+    private final List<TemplateToken> _tokens;
+
+    /**
+     * @param resource
+     *            the resource from which the template was parsed
+     * @param tokens
+     *            the tokens of the template, a copy of this list will be made
+     */
+    public ComponentTemplateImpl(Resource resource, List<TemplateToken> tokens)
+    {
+        super();
+
+        _resource = resource;
+        _tokens = newList(tokens);
+    }
+
+    public Resource getResource()
+    {
+        return _resource;
+    }
+
+    public List<TemplateToken> getTokens()
+    {
+        return _tokens;
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/EndElementToken.java Sat May  6 10:14:31 2006
@@ -0,0 +1,14 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Location;
+
+/**
+ * @author Howard M. Lewis Ship
+ */
+public class EndElementToken extends TemplateToken
+{
+    public EndElementToken(Location location)
+    {
+        super(location);
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ParserMessages.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ParserMessages.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ParserMessages.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/ParserMessages.java Sat May  6 10:14:31 2006
@@ -0,0 +1,30 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Messages;
+import org.apache.hivemind.Resource;
+import org.apache.hivemind.impl.MessageFormatter;
+import org.apache.tapestry.internal.annotations.Utility;
+
+/**
+ * @author Howard M. Lewis Ship
+ */
+@Utility
+final class ParserMessages
+{
+    private static final Messages MESSAGES = new MessageFormatter(ParserMessages.class);
+
+    static String newParserError(Resource resource, Throwable cause)
+    {
+        return MESSAGES.format("new-parser-error", resource, cause);
+    }
+
+    static String missingTemplateResource(Resource resource)
+    {
+        return MESSAGES.format("missing-template-resource", resource);
+    }
+
+    static String templateParseError(Resource resource, Throwable cause)
+    {
+        return MESSAGES.format("template-parse-error", resource, cause);
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/StartElementToken.java Sat May  6 10:14:31 2006
@@ -0,0 +1,22 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Location;
+
+public class StartElementToken extends TemplateToken
+{
+    private final String _qname;
+
+    public StartElementToken(String qname, Location location)
+    {
+        super(location);
+
+        _qname = qname;
+    }
+
+    /** Returns the prefix qualified name for the element. */
+    public String getQname()
+    {
+        return _qname;
+    }
+
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParser.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParser.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParser.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParser.java Sat May  6 10:14:31 2006
@@ -0,0 +1,13 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Resource;
+
+/**
+ * Parses a resource into a {@link org.apache.tapestry.internal.parser.ComponentTemplate}.
+ * 
+ * @author Howard M. Lewis Ship
+ */
+public interface TemplateParser
+{
+    ComponentTemplate parseTemplate(Resource templateResource);
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParserImpl.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParserImpl.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParserImpl.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateParserImpl.java Sat May  6 10:14:31 2006
@@ -0,0 +1,215 @@
+package org.apache.tapestry.internal.parser;
+
+import java.net.URL;
+import java.util.List;
+import java.util.Map;
+
+import javax.xml.parsers.SAXParser;
+import javax.xml.parsers.SAXParserFactory;
+
+import org.apache.hivemind.ApplicationRuntimeException;
+import org.apache.hivemind.Location;
+import org.apache.hivemind.Resource;
+import org.apache.hivemind.impl.LocationImpl;
+import org.apache.tapestry.util.CollectionFactory;
+import org.xml.sax.Attributes;
+import org.xml.sax.InputSource;
+import org.xml.sax.Locator;
+import org.xml.sax.SAXException;
+import org.xml.sax.helpers.DefaultHandler;
+
+import static org.apache.tapestry.util.CollectionFactory.newList;
+import static org.apache.tapestry.util.CollectionFactory.newMap;
+
+/**
+ * Non-threadsafe implementation.
+ * 
+ * @author Howard M. Lewis Ship
+ */
+public class TemplateParserImpl extends DefaultHandler implements TemplateParser
+{
+    public static final String TAPESTRY_SCHEMA_5_0_0 = "http://tapestry.apache.org/schema/tapestry_5_0_0.xsd";
+
+    private final SAXParserFactory _parserFactory;
+
+    private SAXParser _parser;
+
+    // Resource being parsed
+    private Resource _templateResource;
+
+    private Locator _locator;
+
+    private final List<TemplateToken> _tokens = newList();
+
+    // A stack of maps, each map contains mappings from prefix to namespace URL
+
+    private final List<Map<String, String>> _prefixResolutionStack = newList();
+
+    // Used to accumulate text provided by the characters(). Even contiguous characters may be
+    // broken up across multiple invocations due to parser internals. We accumulate those together
+    // before forming a text token.
+
+    private final StringBuffer _textBuffer = new StringBuffer();
+
+    private Location _textStartLocation;
+
+    public TemplateParserImpl()
+    {
+        _parserFactory = SAXParserFactory.newInstance();
+
+        _parserFactory.setNamespaceAware(true);
+    }
+
+    public ComponentTemplate parseTemplate(Resource templateResource)
+    {
+        if (_parser == null)
+        {
+            try
+            {
+                _parser = _parserFactory.newSAXParser();
+            }
+            catch (Exception ex)
+            {
+                throw new RuntimeException(ParserMessages.newParserError(templateResource, ex), ex);
+            }
+        }
+
+        URL resourceURL = templateResource.getResourceURL();
+
+        if (resourceURL == null)
+            throw new RuntimeException(ParserMessages.missingTemplateResource(templateResource));
+
+        Map<String, String> rootPrefixMap = newMap();
+        _prefixResolutionStack.add(rootPrefixMap);
+
+        try
+        {
+            InputSource source = new InputSource(resourceURL.openStream());
+
+            _parser.parse(source, this);
+
+            return new ComponentTemplateImpl(_templateResource, _tokens);
+        }
+        catch (Exception ex)
+        {
+            // Some parsers get in an unknown state when an error occurs, and are are not
+            // subsequently useable.
+
+            _parser = null;
+
+            throw new ApplicationRuntimeException(ParserMessages.templateParseError(
+                    templateResource,
+                    ex), getCurrentLocation(), ex);
+        }
+        finally
+        {
+
+            _tokens.clear();
+            _prefixResolutionStack.clear();
+            _templateResource = null;
+            _locator = null;
+            _textBuffer.setLength(0);
+            _textStartLocation = null;
+        }
+    }
+
+    @Override
+    public void setDocumentLocator(Locator locator)
+    {
+        _locator = locator;
+    }
+
+    /**
+     * Creates a new prefix to URI mapping map and adds this new prefix/URI mapping into the map.
+     * The new map is pushed onto the stack of such maps.
+     */
+    @Override
+    public void startPrefixMapping(String prefix, String uri) throws SAXException
+    {
+        Map<String, String> topMap = _prefixResolutionStack.get(0);
+        Map<String, String> newMap = newMap(topMap);
+        newMap.put(prefix, uri);
+
+        _prefixResolutionStack.add(0, newMap);
+    }
+
+    /** Pops the top prefix mapping map off the stack. */
+    @Override
+    public void endPrefixMapping(String prefix) throws SAXException
+    {
+        _prefixResolutionStack.remove(0);
+    }
+
+    /** Accumulates the characters into a text buffer. */
+    @Override
+    public void characters(char[] ch, int start, int length) throws SAXException
+    {
+        if (_textBuffer.length() == 0)
+            _textStartLocation = getCurrentLocation();
+
+        _textBuffer.append(ch, start, length);
+    }
+
+    /** Adds a text token, if the text buffer is non-empty. Clears the text buffer. */
+    private void addTextToken()
+    {
+        if (_textBuffer.length() == 0)
+            return;
+
+        String text = _textBuffer.toString();
+
+        // Not ideal for multiple lines of text, and will probably be even worse
+        // when we add embedded interpolations, but there you have it.
+
+        _tokens.add(new TextToken(text, _textStartLocation));
+
+        _textBuffer.setLength(0);
+    }
+
+    @Override
+    public void startElement(String uri, String localName, String qName, Attributes attributes)
+            throws SAXException
+    {
+        addTextToken();
+
+        // TODO: Handle tapestry namespace elements
+        // TODO: Handle tapestry namespace attributes in ordinary namespace elements?
+        // TODO: Handle interpolations inside attributes?
+        
+        Location location = getCurrentLocation();
+
+        _tokens.add(new StartElementToken(qName, location));
+
+        int count = attributes.getLength();
+
+        for (int i = 0; i < count; i++)
+        {
+            String qname = attributes.getQName(i);
+            String value = attributes.getValue(i);
+
+            _tokens.add(new AttributeToken(qname, value, location));
+        }
+    }
+
+    @Override
+    public void endElement(String uri, String localName, String qName) throws SAXException
+    {
+        addTextToken();
+        
+        // TODO: Handle tapestry namespace elements
+        
+        // Because XML tags are always balanced, we don't even need to know what element just closed
+        // when we assemble things later.
+
+        _tokens.add(new EndElementToken(getCurrentLocation()));
+    }
+
+    private Location getCurrentLocation()
+    {
+        if (_locator == null)
+            return null;
+
+        return new LocationImpl(_templateResource, _locator.getLineNumber(), _locator
+                .getColumnNumber());
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TemplateToken.java Sat May  6 10:14:31 2006
@@ -0,0 +1,24 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Locatable;
+import org.apache.hivemind.Location;
+
+/**
+ * Base class for tokens parsed out of a template.
+ * 
+ * @author Howard M. Lewis Ship
+ */
+public abstract class TemplateToken implements Locatable
+{
+    private final Location _location;
+
+    public TemplateToken(Location location)
+    {
+        _location = location;
+    }
+
+    public Location getLocation()
+    {
+        return _location;
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TextToken.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TextToken.java?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TextToken.java (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/java/org/apache/tapestry/internal/parser/TextToken.java Sat May  6 10:14:31 2006
@@ -0,0 +1,21 @@
+package org.apache.tapestry.internal.parser;
+
+import org.apache.hivemind.Location;
+
+public class TextToken extends TemplateToken
+{
+    private final String _text;
+
+    public TextToken(String text, Location location)
+    {
+        super(location);
+
+        _text = text;
+    }
+
+    /** Returns the text extracted from that part of the template. */
+    public String getText()
+    {
+        return _text;
+    }
+}

Added: tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/parser/ParserStrings.properties
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/parser/ParserStrings.properties?rev=400342&view=auto
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/parser/ParserStrings.properties (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/main/resources/org/apache/tapestry/internal/parser/ParserStrings.properties Sat May  6 10:14:31 2006
@@ -0,0 +1,3 @@
+new-parser-error=Failure obtaining a SAX parser for resource {0}: {1}
+missing-template-resource=Template resource {0} does not exist.
+template-parse-error=Failure parsing template {0}: {1}

Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java?rev=400342&r1=400341&r2=400342&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/java/org/apache/tapestry/internal/parser/ParserExperiment.java Sat May  6 10:14:31 2006
@@ -33,11 +33,12 @@
         // Equivalent:
         // factory.setFeature("http://xml.org/sax/features/namespaces", true);
 
-        //  Doesn't seem to do anything:
+        // Doesn't seem to do anything:
         factory.setFeature(
                 "http://apache.org/xml/features/validation/schema/normalized-value",
                 true);
-        
+
+        // Doesn't seem to do anything:
         factory.setFeature("http://xml.org/sax/features/namespace-prefixes", true);
 
         // A non-validation parser is fine!
@@ -53,15 +54,17 @@
     {
         StringBuffer buffer = new StringBuffer();
 
-        buffer.append(String.format("%25s", methodName));
+        buffer.append(String.format("%-25s:", methodName));
 
-        for (int i = 0; i < details.length; i++)
+        if (_locator != null)
         {
-            if (i == 0)
-                buffer.append(": ");
-            else
-                buffer.append("\n                           ");
+            buffer.append(String.format(" [Line %d, column %d]", _locator.getLineNumber(), _locator
+                    .getColumnNumber()));
+        }
 
+        for (int i = 0; i < details.length; i++)
+        {
+            buffer.append("\n     ");
             buffer.append(details[i]);
         }
 
@@ -113,10 +116,15 @@
         log("pi", "target=" + target, "data=" + data);
     }
 
+    private Locator _locator;
+
     @Override
     public void setDocumentLocator(Locator locator)
     {
-        log("setDocumentLocator", locator.toString());
+        _locator = locator;
+
+        log("setDocumentLocator", "publicId=" + locator.getPublicId(), "systemId="
+                + locator.getSystemId());
     }
 
     @Override

Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/parser/basic.html
URL: http://svn.apache.org/viewcvs/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/parser/basic.html?rev=400342&r1=400341&r2=400342&view=diff
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/parser/basic.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/parser/basic.html Sat May  6 10:14:31 2006
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd" xmlns:bar="bar">
     <head>
         <title>Test</title>
     </head>
@@ -7,8 +7,21 @@
         <t:comp id="fred" type="If" value="foo">
             <p>You have been served!</p>
         </t:comp>
-        <p t:id="barney">
-            You are barney!
+        <p t:id="barney" class="error">
+            You are barney!<br/>You are barney!
         </p>
+        pre<!-- A comment! -->post
+        
+        <pre>
+line 1
+line 2            
+line 3: <![CDATA[This text contains <invalid markup>]]>
+        </pre>
+        
+        <bar:baz biff="boo">
+            Zippy!
+        </bar:baz>        
     </body>
-</html>
+</html>  <!-- Spaces and comments at end -->
+
+