Index: trunk/web-app/WEB-INF/sitemesh.xml
===================================================================
--- trunk/web-app/WEB-INF/sitemesh.xml	(revision 134)
+++ trunk/web-app/WEB-INF/sitemesh.xml	(revision 137)
@@ -2,9 +2,9 @@
     <page-parsers>
         <parser content-type="text/html"
-            class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
         <parser content-type="text/html;charset=ISO-8859-1"
-            class="com.opensymphony.module.sitemesh.parser.FastPageParser" />
+            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />
         <parser content-type="text/html;charset=UTF-8"
-            class="com.opensymphony.module.sitemesh.parser.FastPageParser" />            
+            class="com.opensymphony.module.sitemesh.parser.HTMLPageParser" />            
     </page-parsers>
 
Index: trunk/web-app/WEB-INF/tld/grails.tld
===================================================================
--- trunk/web-app/WEB-INF/tld/grails.tld	(revision 134)
+++ trunk/web-app/WEB-INF/tld/grails.tld	(revision 137)
@@ -10,412 +10,4 @@
     <uri>http://grails.codehaus.org/tags</uri>
 
-    <tag>
-        <description>
-        	Includes a javascript src file, library or inline script
-	 	if the tag has no src or library attributes its assumed to be an inline script
-        </description>
-        <name>javascript</name>
-        <tag-class>org.codehaus.groovy.grails.plugins.web.taglib.JavascriptTagLib</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>A predefined JavaScript or AJAX library to load</description>
-            <name>library</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <description>A custom (or unknown to Grails) JavaScript source file</description>
-            <name>src</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <description>Since 0.6 Specifies the full base url to prepend to the library name</description>
-            <name>base</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-    
-    <!--  
-    <tag>
-    	<description>
-    	</description>
-    	<name></name>
-    	<tag-class></tag-class>
-    	<body-content></body-content>
-    	<attribute>
-    		<description></description>
-    		<name></name>
-    		<required></required>
-    		<rtexprvalue></rtexprvalue>
-    	</attribute>
-    </tag>
-    -->
-    <tag>
-    	<description>Escapes a javasacript string replacing single/double quotes and new lines
-    	</description>
-    	<name>escapeJavascript</name>
-    	<tag-class>org.codehaus.groovy.grails.plugins.web.taglib.JavascriptTagLib</tag-class>
-    	<body-content>JSP</body-content>
-    </tag>
-    
-    <tag>
-    	<description>Creates a form submit button that submits the current form to a remote ajax call
-    	</description>
-    	<name>submitToRemote</name>
-    	<tag-class>org.codehaus.groovy.grails.plugins.web.taglib.JavascriptTagLib</tag-class>
-    	<body-content>JSP</body-content>
-    	<attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>class</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    </tag>
-    
-    <tag>
-    	<description>A field that sends its value to a remote link
-    	</description>
-    	<name>remoteField</name>
-    	<tag-class>org.codehaus.groovy.grails.plugins.web.taglib.JavascriptTagLib</tag-class>
-    	<body-content>JSP</body-content>
-    	<attribute>
-            <name>name</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>value</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>paramName</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-    	<attribute>
-            <name>before</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>after</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>action</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>controller</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>id</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>params</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>asynchronous</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>method</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>update</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onSuccess</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onFailure</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onComplete</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onLoading</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onLoaded</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>onUninitialized</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>on_ERROR_CODE</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>true</dynamic-attributes>
-    </tag>
-    <tag>
-        <description>
-        	Enables the storing of a value into the given ${var}
-        </description>
-        <name>set</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovySetTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>The value to store</description>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <description>The name of the variable to store the value in</description>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>
-        	Enables the storing of a value into the given ${var} into the page context
-        </description>
-        <name>def</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyDefTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>The value to store</description>
-            <name>value</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <description>The name of the variable to store the value in</description>
-            <name>var</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>
-        	Logical if tag to test whether the given condition is true
-        </description>
-        <name>if</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyIfTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>The condition to test</description>
-            <name>test</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>
-        	Logical else tag as fallback if the if condition fails
-        </description>
-        <name>else</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseTag</tag-class>
-        <body-content>JSP</body-content>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>
-        	Logical elseif tag to test whether the given condition is true
-        </description>
-        <name>elseif</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyElseIfTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>The condition to test</description>
-            <name>test</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-	<tag>
-        <description>
-        	Tag to loop over a collection while the test expression returns true
-        </description>
-        <name>while</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyWhileTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-            <description>The condition to test</description>
-            <name>test</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>Iterates over the given collection</description>
-        <name>each</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyEachTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-        	<description>The collection to iterate over</description>
-            <name>in</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>An optional var-name to reference onto the elements</description>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>status</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>true</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>Iterates over the given collection</description>
-        <name>findAll</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyFindAllTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-        	<description>The collection to iterate over</description>
-            <name>in</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>An optional var-name to reference onto the elements</description>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>The expression to filter the elements to iterate over</description>
-            <name>expr</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>status</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>true</dynamic-attributes>
-    </tag>
-
-	<tag>
-        <description>Iterates over the given collection and collects the elements
-        	you want to work with</description>
-        <name>collect</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyCollectTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-        	<description>The collection to iterate over</description>
-            <name>in</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>An optional var-name to reference onto the elements</description>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>The expression to use to collect the elements. The
-        	expression must retur true to add the element to the
-        	collection</description>
-            <name>expr</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>status</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
-    <tag>
-        <description>Iterates over the given collection and filters the elements
-        with a regular expression</description>
-        <name>grep</name>
-        <tag-class>org.codehaus.groovy.grails.web.taglib.GroovyGrepTag</tag-class>
-        <body-content>JSP</body-content>
-        <attribute>
-        	<description>The collection to iterate over</description>
-            <name>in</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>An optional var-name to reference onto the elements</description>
-            <name>var</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-        	<description>The regular expression to filter the element with. The
-        	filter is a simple Groovy Regex</description>
-            <name>filter</name>
-            <required>true</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <attribute>
-            <name>status</name>
-            <required>false</required>
-            <rtexprvalue>true</rtexprvalue>
-        </attribute>
-        <dynamic-attributes>false</dynamic-attributes>
-    </tag>
-
 
     <tag>
