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 2007/03/02 19:07:36 UTC
svn commit: r513873 [2/2] - in /tapestry/tapestry5/tapestry-core/trunk/src:
main/java/org/apache/tapestry/internal/parser/
main/java/org/apache/tapestry/internal/services/
main/resources/org/apache/tapestry/
main/resources/org/apache/tapestry/corelib/c...
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/EnvironmentalDemo.html Fri Mar 2 10:07:33 2007
@@ -1,9 +1,9 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp type="RenderableProvider">
+ <t:RenderableProvider>
<p> This page demonstrates how components can use the Environment service, and the @Environmental annotation, to
coordinate behavior. </p>
- <p> RenderableUser:[<t:comp type="RenderableUser"/>]</p>
- </t:comp>
-</t:comp>
+ <p> RenderableUser:[<t:RenderableUser/>]</p>
+ </t:RenderableProvider>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Expansion.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Expansion.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Expansion.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Expansion.html Fri Mar 2 10:07:33 2007
@@ -1,7 +1,7 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
This page contains no components, but does contain a [${expansionValue}].
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Fred.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Fred.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Fred.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Fred.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
You clicked Fred.
@@ -11,4 +11,4 @@
<p>
[<a t:type="PageLink" t:page="InjectDemo">Back</a>]
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectComponentMismatch.html Fri Mar 2 10:07:33 2007
@@ -1,7 +1,7 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
This page should never be rendered because of the InjectComponent mismatch inside it.
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectDemo.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectDemo.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectDemo.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InjectDemo.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p> Demonstrates the use of the @Inject annotation. </p>
<p>WebRequest: ${request}</p>
<p>ComponentResources: ${resources}</p>
@@ -9,7 +9,7 @@
ActionLinks used to demonstrate the use of @InjectPage:
</p>
- <p><t:comp id="fred" type="ActionLink">Fred</t:comp></p>
- <p><t:comp id="barney" type="ActionLink">Barney</t:comp></p>
- <p><t:comp id="wilma" type="ActionLink">Wilma</t:comp></p>
-</t:comp>
+ <p><a t:id="fred" t:type="ActionLink">Fred</a></p>
+ <p><a t:id="barney" t:type="ActionLink">Barney</a></p>
+ <p><a t:id="wilma" t:type="ActionLink">Wilma</a></p>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InstanceMixin.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InstanceMixin.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InstanceMixin.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/InstanceMixin.html Fri Mar 2 10:07:33 2007
@@ -1,26 +1,26 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <p> Date #1: [<t:comp type="Output"
- mixins="Emphasis"
+ <p> Date #1: [<t:output
+ t:mixins="Emphasis"
value="date1"
test="showEmphasis"
format="format"/>]
</p>
<p>
- Date #2: [<t:comp id="output2"/>] (via @Mixins)
+ Date #2: [<span t:id="output2"/>] (via @Mixins)
</p>
<p>
- Date #3: [<t:comp id="output3"/>] (via @MixinClasses)
+ Date #3: [<span t:id="output3"/>] (via @MixinClasses)
</p>
<p>
- <t:comp id="toggle" type="ActionLink">Toggle emphasis</t:comp>
+ <a t:id="toggle" t:type="ActionLink">Toggle emphasis</a>
</p>
<p>
Show emphasis: ${showEmphasis}
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Localization.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Localization.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Localization.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Localization.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<h1>Localization</h1>
@@ -37,4 +37,4 @@
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/MerryChristmas.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/MerryChristmas.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/MerryChristmas.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/MerryChristmas.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <p> Merry Christmas: <t:comp type="Loop" source="1..3"> Ho! </t:comp>
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <p> Merry Christmas: <t:loop source="1..3"> Ho! </t:loop>
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/NumberSelect.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/NumberSelect.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/NumberSelect.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/NumberSelect.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<h1>Number Selection</h1>
<p> Demonstration of passivate/activate page logic.</p>
@@ -6,12 +6,12 @@
<p>
Select a number from this list:
- <t:comp type="Loop" source="1..10" value="index">
- <t:comp type="If" test="notFirst"> - </t:comp>
- <t:comp type="ActionLink" id="select" context="index">${index}</t:comp>
- </t:comp>
+ <t:loop source="1..10" value="index">
+ <t:if test="notFirst"> - </t:if>
+ <a t:type="ActionLink" t:id="select" context="index">${index}</a>
+ </t:loop>
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterConflict.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterConflict.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterConflict.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterConflict.html Fri Mar 2 10:07:33 2007
@@ -1,6 +1,6 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p> This component demonstrates that template values are overriden by
bindings inside the @Component annotation, in the component class.</p>
- Output: <t:comp id="echo" value="literal:TemplateValue"/>
-</t:comp>
+ Output: <span t:id="echo" value="literal:TemplateValue"/>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterDefault.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterDefault.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterDefault.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ParameterDefault.html Fri Mar 2 10:07:33 2007
@@ -1,6 +1,6 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- Echo component default: [<t:comp type="Echo" id="echo"/>]
+ Echo component default: [<t:echo t:id="echo"/>]
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/RenderPhaseOrder.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
This page demonstrates the order of render phase operations. Certains later phases
@@ -7,7 +7,7 @@
</p>
<p>
- [<t:comp type="Tracer" mixins="TracerMixin"> BODY </t:comp>]
+ [<t:Tracer t:mixins="TracerMixin"> BODY </t:Tracer>]
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ShowSelection.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ShowSelection.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ShowSelection.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ShowSelection.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<h1>Number Selection</h1>
<p> You chose ${selected}.</p>
@@ -7,4 +7,4 @@
[<a t:type="PageLink" t:page="NumberSelect">Back</a>]
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/ValidForm.html Fri Mar 2 10:07:33 2007
@@ -1,42 +1,38 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <h1>Valid Form</h1>
-
- <p> Tapestry 5 form support with server-side validation. </p>
-
- <t:comp type="Form" clientValidation="false">
-
- <t:comp type="Errors"/>
-
- <label t:type="Label" for="email">This isn't used</label>: <input
- t:type="TextField" t:id="email" value="incident.email" size="50" t:validate="required"/>
- <br/>
- <label t:type="Label" for="message"/>: <textarea t:type="TextArea" t:id="message" t:label="Incident Message"
- value="incident.message" cols="50" rows="10"> You can put text here, but it isn't used. </textarea>
- <br/>
- <input t:type="Checkbox" t:id="urgent" value="incident.urgent"/>
- <label t:type="Label" for="urgent"/>
- <br/>
-
- <label t:type="Label" for="hours"/>:
- <input t:type="TextField" t:id="hours" value="incident.hours" size="10" t:validate="required"/>
-
- <br/>
-
- <input type="submit"/>
- </t:comp>
-
-
- <hr/>
-
- <p> Entered data: </p>
-
- <ul>
- <li>email: [${incident.email}]</li>
- <li>message: [${incident.message}]</li>
- <li>urgent: [${incident.urgent}]</li>
- <li>hours: [${incident.hours}]</li>
- </ul>
-
-
-
-</t:comp>
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <h1>Valid Form</h1>
+
+ <p> Tapestry 5 form support with server-side validation. </p>
+
+ <t:form clientValidation="false">
+ <t:errors/>
+ <t:label for="email">This isn't used</t:label>: <input t:type="TextField" t:id="email"
+ value="incident.email" size="50" t:validate="required"/>
+ <br/>
+ <t:label for="message"/>: <textarea t:type="TextArea" t:id="message"
+ t:label="Incident Message" value="incident.message" cols="50" rows="10"> You can put text
+ here, but it isn't used. </textarea>
+ <br/>
+ <input t:type="Checkbox" t:id="urgent" value="incident.urgent"/>
+ <t:label for="urgent"/>
+ <br/>
+ <t:label for="hours"/>: <input t:type="TextField" t:id="hours"
+ value="incident.hours" size="10" t:validate="required"/>
+ <br/>
+ <input type="submit"/>
+ </t:form>
+
+
+ <hr/>
+
+ <p> Entered data: </p>
+
+ <ul>
+ <li>email: [${incident.email}]</li>
+ <li>message: [${incident.message}]</li>
+ <li>urgent: [${incident.urgent}]</li>
+ <li>hours: [${incident.hours}]</li>
+ </ul>
+
+
+
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Wilma.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Wilma.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Wilma.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app1/pages/Wilma.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
-<t:comp type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+<html t:type="Border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
You clicked Wilma.
@@ -11,4 +11,4 @@
<p>
[<a t:type="PageLink" t:page="InjectDemo">Back</a>]
</p>
-</t:comp>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForActionLink.html Fri Mar 2 10:07:33 2007
@@ -1,5 +1,5 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
-<t:comp id="link1" type="ActionLink" context="123">abc</t:comp>
+<a t:id="link1" t:type="ActionLink" context="123">abc</a>
</p>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForForm.html Fri Mar 2 10:07:33 2007
@@ -1,7 +1,7 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-<p><t:comp id="form1" type="Form">
- <t:comp type="TextField" id="t1" value="value" size="50"/>
-</t:comp></p>
+<p><t:form t:id="form1">
+ <input t:type="TextField" t:id="t1" value="value" size="50"/>
+</t:form></p>
<p>
You entered: ${value}.
</p>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForIf.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForIf.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForIf.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForIf.html Fri Mar 2 10:07:33 2007
@@ -1,14 +1,14 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
-<t:comp type="If" test="true">
- <p id="1">abc.</p>
-</t:comp>
-<t:comp type="If" test="false">
- <p id="2">def.</p>
-</t:comp>
-<t:comp type="If" test="property1">
- <p id="3">111.</p>
-</t:comp>
-<t:comp type="If" test="property2">
- <p id="4">222.</p>
-</t:comp>
+ <t:if test="true">
+ <p id="1">abc.</p>
+ </t:if>
+ <t:if test="false">
+ <p id="2">def.</p>
+ </t:if>
+ <t:if test="property1">
+ <p id="3">111.</p>
+ </t:if>
+ <t:if test="property2">
+ <p id="4">222.</p>
+ </t:if>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForLoop.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForLoop.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForLoop.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForLoop.html Fri Mar 2 10:07:33 2007
@@ -1,8 +1,8 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
-<t:comp type="Loop" source="1..3">abc</t:comp>
+<t:loop source="1..3">abc</t:loop>
</p>
<p>
-<span id="1"><t:comp type="Loop" source="array" value="value">${value}</t:comp></span>
+<span id="1"><t:loop source="array" value="value">${value}</t:loop></span>
</p>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/integration/app2/pages/TestPageForSubmit.html Fri Mar 2 10:07:33 2007
@@ -1,12 +1,12 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
<p>
<form t:id="form1">
- <t:comp id="t1" type="TextField"/>
- <t:comp id="capitalize1"/>
+ <input t:id="t1" t:type="TextField"/>
+ <span t:id="capitalize1"/>
</form>
<form t:id="form2">
- <t:comp id="capitalize2"/>
- <t:comp id="t2" type="TextField"/>
+ <span t:id="capitalize2"/>
+ <input t:id="t2" t:type="TextField"/>
</form></p>
<input type="submit" id="orphanedSubmit"/>
<p>
Added: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/complex_component_type.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/complex_component_type.html?view=auto&rev=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/complex_component_type.html (added)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/complex_component_type.html Fri Mar 2 10:07:33 2007
@@ -0,0 +1,3 @@
+<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <t:subfolder.nifty t:id="foo"/>
+</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component.html Fri Mar 2 10:07:33 2007
@@ -1,4 +1,4 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="fred" type="Fred"/>
+ <t:somecomponent t:id="fred"/>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithBody.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithBody.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithBody.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithBody.html Fri Mar 2 10:07:33 2007
@@ -1,5 +1,5 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="fred" type="Fred">
+ <t:Fred t:id="fred">
fred's body
- </t:comp>
+ </t:Fred>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithParameters.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithParameters.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithParameters.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/componentWithParameters.html Fri Mar 2 10:07:33 2007
@@ -1,5 +1,5 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="fred" type="Fred" cherry="bomb" align="right">
+ <t:Fred t:id="fred" cherry="bomb" align="right">
fred's body
- </t:comp>
+ </t:Fred>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_ids.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_ids.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_ids.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_ids.html Fri Mar 2 10:07:33 2007
@@ -1,5 +1,5 @@
-<t:comp id="border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="zebra" type="Zebra"/>
- <t:comp type="Nebraska"/>
- <t:comp id="bomb"/>
-</t:comp>
\ No newline at end of file
+<t:border t:id="border" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
+ <t:Zebra t:id="zebra"/>
+ <t:Nebraska/>
+ <t:comp t:id="bomb"/>
+</t:border>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_with_mixins.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_with_mixins.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_with_mixins.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/component_with_mixins.html Fri Mar 2 10:07:33 2007
@@ -1,3 +1,3 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="fred" mixins="Barney"/>
+ <t:comp t:id="fred" t:mixins="Barney"/>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/empty_string_mixins_is_null.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/empty_string_mixins_is_null.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/empty_string_mixins_is_null.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/empty_string_mixins_is_null.html Fri Mar 2 10:07:33 2007
@@ -1,3 +1,3 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="fred" type="" mixins=""/>
+ <span t:id="fred" t:mixins=""/>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/parameter_element.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/parameter_element.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/parameter_element.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/parameter_element.html Fri Mar 2 10:07:33 2007
@@ -1,9 +1,9 @@
<html xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd">
- <t:comp id="foo">
+ <t:mycomp t:id="foo">
<t:parameter name="fred">
<!-- fred content -->
</t:parameter>
- </t:comp>
+ </t:mycomp>
</html>
Modified: tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/root_element_is_component.html
URL: http://svn.apache.org/viewvc/tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/root_element_is_component.html?view=diff&rev=513873&r1=513872&r2=513873
==============================================================================
--- tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/root_element_is_component.html (original)
+++ tapestry/tapestry5/tapestry-core/trunk/src/test/resources/org/apache/tapestry/internal/services/root_element_is_component.html Fri Mar 2 10:07:33 2007
@@ -1 +1 @@
-<t:comp id="fred" type="Fred" param="value" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"/>
+<t:Fred t:id="fred" param="value" xmlns:t="http://tapestry.apache.org/schema/tapestry_5_0_0.xsd"/>