Skip to main content
summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorpelder2006-11-21 15:35:08 -0500
committerpelder2006-11-21 15:35:08 -0500
commit0ff861880316a067249750eba5530b799194e002 (patch)
treeb4f902403bd17c5d83037679179c2aa248be2d51 /doc/org.eclipse.jet.doc/references/taglibs/controlTags
parent85e924faca7becbb1ce6bc080e8a4c2784d69587 (diff)
downloadorg.eclipse.jet-0ff861880316a067249750eba5530b799194e002.tar.gz
org.eclipse.jet-0ff861880316a067249750eba5530b799194e002.tar.xz
org.eclipse.jet-0ff861880316a067249750eba5530b799194e002.zip
[163849] Merge in 0.7.x maintenance fixes
Diffstat (limited to 'doc/org.eclipse.jet.doc/references/taglibs/controlTags')
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/addElementTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/addTextElementTag.html8
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/caseTag.html12
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/chooseTag.html35
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/copyElementTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/dumpTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/getTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/ifTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/includeTag.html18
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/initialCodeTag.html34
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/invokeTransformTag.html10
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/iterateTag.html7
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadContentTag.html12
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadTag.html14
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/logTag.html18
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/markerTag.html16
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/nodeAttributesTag.html1
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/otherwiseTag.html18
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/overrideTag.html8
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/overview.html197
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/removeElementTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/replaceStringsTag.html8
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/setTag.html8
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/setVariableTag.html6
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/stringTokensTag.html12
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/userRegionTag.html32
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitTag.html16
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitorTag.html11
-rw-r--r--doc/org.eclipse.jet.doc/references/taglibs/controlTags/whenTag.html12
29 files changed, 280 insertions, 269 deletions
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addElementTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addElementTag.html
index 2477367..3191f99 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addElementTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addElementTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -54,7 +53,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -76,8 +74,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin addElement example -->
-
- &lt;c:addElement select=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- Insert an element 'foo' under $myElement. $new refers to 'foo' --%&gt;<br>
+ &lt;c:addElement select=&quot;$myElement&quot; name=&quot;foo&quot; var=&quot;new&quot;/&gt;<br>
<!-- End addElement example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addTextElementTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addTextElementTag.html
index c167c9f..b1e9687 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addTextElementTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/addTextElementTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -84,9 +82,9 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin addTextElement example -->
-
- &lt;c:addTextElement select=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content consumed by tag evaluation</I><BR>
+ &lt;%-- insert a text element 'foo' under $root. $newText refers to it --%&gt;<br>
+ &lt;c:addTextElement select=&quot;$root&quot; name=&quot;foo&quot; var=&quot;newText&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;This is the content of foo<BR>
&lt;/c:addTextElement&gt;
<!-- End addTextElement example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/caseTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/caseTag.html
index c0dcf55..ea67391 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/caseTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/caseTag.html
@@ -44,7 +44,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -56,7 +55,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -66,11 +64,13 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin case example -->
-
- &lt;c:case test=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if tag condition is
+ &lt;c:choose&gt;<br>
+ &lt;c:case test=&quot;$myVar/@kind = 'FIELD'&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if test condition is
satisfied</I><BR>
- &lt;/c:case&gt;
+ &lt;/c:case&gt;<BR>
+ <I>... other &lt;c:when&gt; and &lt;c:otherwise&gt; tags ...</I><BR>
+ &lt;/c:choose&gt;
<!-- End case example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/chooseTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/chooseTag.html
index bec3372..3bb0466 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/chooseTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/chooseTag.html
@@ -42,15 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -72,10 +63,32 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin choose example -->
-
+ &lt;%-- evaluate one of a number alternatives --%&gt;<BR>
&lt;c:choose&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
+ &lt;c:when test="$var/@value = 1"&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle case 1</I><BR>
+ &lt;/c:when&gt;<BR>
+ &lt;c:when test="$var/@value >= 2"&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle case 2</I><BR>
+ &lt;/c:when&gt;<BR>
+ &lt;c:otherwise&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle other cases</I><BR>
+ &lt;/c:otherwise&gt;<BR>
+ &lt;/c:choose&gt;<BR><BR>
+
+ &lt;%-- evaluate an expression against constances --%&gt;<BR>
+ &lt;c:choose select="$var/@num"&gt;<br>
+ &lt;c:when test=" 'one' "&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle case 'one' </I><BR>
+ &lt;/c:when&gt;<BR>
+ &lt;c:when test=" 'two' "&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle case 'two' </I><BR>
+ &lt;/c:when&gt;<BR>
+ &lt;c:otherwise&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>handle other cases</I><BR>
+ &lt;/c:otherwise&gt;<BR>
&lt;/c:choose&gt;
+
<!-- End choose example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/copyElementTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/copyElementTag.html
index e1185f3..af4158a 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/copyElementTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/copyElementTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -84,8 +82,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin copyElement example -->
-
- &lt;c:copyElement select=&quot;<I>value</I>&quot; toSelect=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- copy element $orig to a new element 'copy' under $dest --%&gt;<BR>
+ &lt;c:copyElement select=&quot;$orig&quot; toSelect=&quot;$dest&quot; name=&quot;copy&quot;/&gt;<br>
<!-- End copyElement example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/dumpTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/dumpTag.html
index 58a1ecb..a14eb00 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/dumpTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/dumpTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -76,8 +74,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin dump example -->
-
- &lt;c:dump select=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- dump the input model as an XML document --%&gt;<BR>
+ &lt;c:dump select=&quot;/*&quot;/&gt;<br>
<!-- End dump example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/getTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/getTag.html
index 72c1911..62a6c00 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/getTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/getTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -72,8 +70,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin get example -->
-
- &lt;c:get select=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- Return the string value of 'name' attribute of element refered to by $var --%&gt;<BR>
+ &lt;c:get select=&quot;$var/@name&quot;/&gt;<br>
<!-- End get example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/ifTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/ifTag.html
index 37650bd..a8bdf2a 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/ifTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/ifTag.html
@@ -44,7 +44,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -56,7 +55,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -78,8 +76,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin if example -->
-
- &lt;c:if test=&quot;<I>value</I>&quot;&gt;<br>
+ &lt;%-- process contents if 'name' attribute is equal to JET --%&gt;<BR>
+ &lt;c:if test=&quot;$var/@name = 'JET'&quot;&gt;<br>
&nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if tag condition is
satisfied</I><BR>
&lt;/c:if&gt;
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/includeTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/includeTag.html
index 6231439..620c0f6 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/includeTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/includeTag.html
@@ -33,12 +33,11 @@
<TR>
<TD width="10%">full tag</TD>
<TD><SPAN style="font-family: monospace">
- &lt;c:include template=&quot;<I>value</I>&quot; restoreNames=&quot;<I>value</I>&quot; passVariables=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;c:include template=&quot;<I>value</I>&quot; restoreNames=&quot;<I>value</I>&quot; passVariables=&quot;<I>value</I>&quot; super=&quot;<I>value</I>&quot;/&gt;<br>
</SPAN></TD>
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -65,6 +63,10 @@
<TD width="10%">passVariables</TD>
<TD><BR> A comma separated list of variable names (without the $ sign). Mutually exclusive with 'restoreNames'.<BR> </TD>
</TR>
+ <TR>
+ <TD width="10%">super</TD>
+ <TD><BR> If set to 'true', the template loader attempts to load directly from the overriden transformation (as specified by the 'override' tag or by the 'overrides' attribute of the 'transform' element of the 'org.eclipse.jet.transform' extension in the transforms plugin.xml). If no 'super' template can be found, an error occurs. The default is 'false', indicating normal template loading.<BR> </TD>
+ </TR>
</TBODY>
</TABLE>
<HR>
@@ -76,8 +78,14 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin include example -->
-
- &lt;c:include template=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;c:include template=&quot;templates/myInclude.jet&quot;/&gt;<br><BR>
+
+ &lt;%-- include myInclude.jet from overriden transformation--%&gt;<BR>
+ &lt;c:include template=&quot;templates/myInclude.jet&quot; super=&quot;true&quot;/&gt;<br><BR>
+
+ &lt;%-- pass only the variables $foo and $bar to myInclude.jet--%&gt;<BR>
+ &lt;c:include template=&quot;templates/myInclude.jet&quot; passVariables=&quot;foo,bar&quot;/&gt;<br>
+
<!-- End include example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/initialCodeTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/initialCodeTag.html
index 85fefc2..191b627 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/initialCodeTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/initialCodeTag.html
@@ -35,22 +35,25 @@
<TR>
<TD width="10%">full tag</TD>
<TD><SPAN style="font-family: monospace">
- &lt;c:initialCode&gt;<br>
+ &lt;c:initialCode unmodifiedMarker=&quot;<I>value</I>&quot;&gt;<br>
&nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
&lt;/c:initialCode&gt;
</SPAN></TD>
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
<TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
+ <TH colspan="2" align="left">Optional Attributes</TH></TR>
+ <TR>
+ <TR>
+ <TD width="10%">unmodifiedMarker</TD>
+ <TD><BR> A string that when present in the content of the existing code indicates that the code has not been modified by the user, and should be replace with the contents of this initial code block.<BR> </TD>
+ </TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -60,10 +63,25 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin initialCode example -->
-
- &lt;c:initialCode&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
- &lt;/c:initialCode&gt;
+ &lt;%-- Define user region 101. Code in block will never be updated by subsequent executions --%&gt;<BR>
+ &lt;c:userRegion&gt;<BR>
+ // BEGIN region 101<BR>
+ &nbsp;&nbsp;&lt;c:initialCode&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>default code</I><BR>
+ &nbsp;&nbsp;&lt;/c:initialCode&gt;<BR>
+ // END region 101<BR>
+ &lt;/c:userRegion&gt;<BR><BR>
+
+ &lt;%-- Define user region 102. Code in block will be updated by subsequent
+ executions only if @generated is found in block --%&gt;<BR>
+ &lt;c:userRegion&gt;<BR>
+ // BEGIN region 102<BR>
+ &nbsp;&nbsp;&lt;c:initialCode unmodifiedMarker="@generated"&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;// @generated<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>default code</I><BR>
+ &nbsp;&nbsp;&lt;/c:initialCode&gt;<BR>
+ // END region 102<BR>
+ &lt;/c:userRegion&gt;<BR>
<!-- End initialCode example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/invokeTransformTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/invokeTransformTag.html
index 02a5291..0947f3c 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/invokeTransformTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/invokeTransformTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -76,8 +74,12 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin invokeTransform example -->
-
- &lt;c:invokeTransform transformId=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- invoke transform 'foo.bar' against the current input model --%&gt;<BR>
+ &lt;c:invokeTransform transformId=&quot;foo.bar&quot;/&gt;<br><BR>
+
+ &lt;%-- invoke transform 'foo.bar' against the current input model,
+ and pass only the variables $a, $b and $c --%&gt;<BR>
+ &lt;c:invokeTransform transformId=&quot;foo.bar&quot; passVariables="a,b,c"/&gt;<br>
<!-- End invokeTransform example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/iterateTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/iterateTag.html
index 4949b6d..b1e1f68 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/iterateTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/iterateTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -80,9 +78,10 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin iterate example -->
-
- &lt;c:iterate select=&quot;<I>value</I>&quot; var=&quot;<I>value</I>&quot;&gt;<br>
+ &lt;%-- Iterate over child 'a' elements of $root. $curA refers to each instance --%&gt;<BR>
+ &lt;c:iterate select=&quot;$root/a&quot; var=&quot;curA&quot;&gt;<br>
&nbsp;&nbsp;&nbsp;&nbsp;<I>content to be repeated for each iteration</I><BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;Value of name: &lt;c:get select="$curA/@name"/&gt;<BR>
&lt;/c:iterate&gt;
<!-- End iterate example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadContentTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadContentTag.html
index e161a7e..5808092 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadContentTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadContentTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -54,7 +53,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -80,9 +78,13 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin loadContent example -->
-
- &lt;c:loadContent var=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content consumed by tag evaluation</I><BR>
+ &lt;%-- Load an in memory XML document. $myXML is the document root,
+ $myXML/root is the root element --%&gt;<BR>
+ &lt;c:loadContent var=&quot;myXML&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;&lt;root&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;a name="one"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;&lt;a name="two"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;&lt;/root&gt;<BR>
&lt;/c:loadContent&gt;
<!-- End loadContent example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadTag.html
index 69086ea..8235e4f 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/loadTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -54,7 +53,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -84,8 +82,18 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin load example -->
+ &lt;%-- Load plugin.xml from transformation as an XML model, $pluginDoc refers to the
+ loaded document. $pluginDoc/* (or $pluginDoc/plugin) refers to the root element --%&gt;<BR>
+ &lt;c:load url=&quot;plugin.xml&quot; var=&quot;pluginDoc&quot;/&gt;<br><BR>
+
+ &lt;%-- same action as above, but with defaults specified --%&gt;<BR>
+ &lt;c:load url=&quot;plugin.xml&quot; var=&quot;pluginDoc&quot; urlContext=&quot;transform&quot;
+ loader=&quot;org.eclipse.jet.emfxml&quot; /&gt;<br><BR>
+
+ &lt;%-- Load sample.appdef from project myProject as an XML document --%&gt;<BR>
+ &lt;c:load url=&quot;myProject/sample.appdef&quot; var=&quot;sampleDoc&quot; urlContext=&quot;workspace&quot;
+ loader=&quot;org.eclipse.jet.emfxml&quot; type="xml" /&gt;<br>
- &lt;c:load url=&quot;<I>value</I>&quot; var=&quot;<I>value</I>&quot;/&gt;<br>
<!-- End load example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/logTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/logTag.html
index beadac7..5c407a3 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/logTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/logTag.html
@@ -42,15 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -72,9 +63,14 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin log example -->
-
+ &lt;%-- Write a message to the JET execution console --%&gt;<BR>
&lt;c:log&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content consumed by tag evaluation</I><BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;Hello from my template<BR>
+ &lt;/c:log&gt;<BR><BR>
+
+ &lt;%-- Write an ERROR message to the JET execution console --%&gt;<BR>
+ &lt;c:log severity="error"&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;Error from my template<BR>
&lt;/c:log&gt;
<!-- End log example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/markerTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/markerTag.html
index abc00b6..56b3fd4 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/markerTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/markerTag.html
@@ -42,15 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -72,10 +63,11 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin marker example -->
+ &lt;%-- Create a task marker on the generated text 'This text is marked!'--%&gt;<BR>
+ &lt;c:marker&gt;This text is marked!&lt;/c:marker&gt;<BR><BR>
- &lt;c:marker&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
- &lt;/c:marker&gt;
+ &lt;%-- Create a task marker on the generated text 'This text is marked with a description!'--%&gt;<BR>
+ &lt;c:marker description=&quot;Do something about this&quot;&gt;This text is marked with a description!&lt;/c:marker&gt;<BR><BR>
<!-- End marker example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/nodeAttributesTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/nodeAttributesTag.html
index 02825b5..e971e63 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/nodeAttributesTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/nodeAttributesTag.html
@@ -80,7 +80,6 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin nodeAttributes example -->
-
&lt;c:nodeAttributes node=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;&gt;<br>
&nbsp;&nbsp;&nbsp;&nbsp;<I>content to be repeated for each iteration</I><BR>
&lt;/c:nodeAttributes&gt;
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/otherwiseTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/otherwiseTag.html
index c66d307..2a02cf3 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/otherwiseTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/otherwiseTag.html
@@ -44,15 +44,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -62,11 +53,12 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin otherwise example -->
-
+ &lt;c:choose&gt;<br>
+ <I>... a sequence of &lt;c:when&gt; tags ...</I><BR>
&lt;c:otherwise&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if tag condition is
- satisfied</I><BR>
- &lt;/c:otherwise&gt;
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if no when tags were statisfied</I><BR>
+ &lt;/c:otherwise&gt;<BR>
+ &lt;/c:choose&gt;
<!-- End otherwise example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overrideTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overrideTag.html
index 44501c3..916acba 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overrideTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overrideTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -60,8 +58,10 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin override example -->
-
- &lt;c:override transformId=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- Declare that this transformation over rides 'foo.bar'--%&gt;<BR>
+ &lt;%-- When resolving templates, JET will first look in this transformation,
+ and then in foo.bar. --%&gt;<BR>
+ &lt;c:override transformId=&quot;foo.bar&quot;/&gt;<br>
<!-- End override example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overview.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overview.html
index 813469c..2b15aa8 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overview.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/overview.html
@@ -25,24 +25,24 @@
<TR>
<TH colspan="2" align="left">Tag Summary</TH></TR>
<TR>
- <TD width="10%"><A href="iterateTag.html">&lt;c:iterate&gt;</A></TD>
- <TD><!-- Begin iterate description -->
- <P> Write the tag contents for each in the template input model identified by an XPath expression
- <!-- End iterate description -->
+ <TD width="10%"><A href="addElementTag.html">&lt;c:addElement&gt;</A></TD>
+ <TD><!-- Begin addElement description -->
+ <P> Create a new model element under the selected node
+ <!-- End addElement description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="ifTag.html">&lt;c:if&gt;</A></TD>
- <TD><!-- Begin if description -->
- <P> Process the tag contents if a test condition is satisfied
- <!-- End if description -->
+ <TD width="10%"><A href="addTextElementTag.html">&lt;c:addTextElement&gt;</A></TD>
+ <TD><!-- Begin addTextElement description -->
+ <P> Create a new model element node under the selected element, and whose text content is the content of this tag
+ <!-- End addTextElement description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="getTag.html">&lt;c:get&gt;</A></TD>
- <TD><!-- Begin get description -->
- <P> Write a the result of an XPath expression
- <!-- End get description -->
+ <TD width="10%"><A href="caseTag.html">&lt;c:case&gt;</A></TD>
+ <TD><!-- Begin case description -->
+ <P> *** DEPRECATED - use 'when' tag instead
+ <!-- End case description -->
</TD>
</TR>
<TR>
@@ -53,38 +53,31 @@
</TD>
</TR>
<TR>
- <TD width="10%"><A href="caseTag.html">&lt;c:case&gt;</A></TD>
- <TD><!-- Begin case description -->
- <P> *** DEPRECATED - use 'when' tag instead
- <!-- End case description -->
- </TD>
- </TR>
- <TR>
- <TD width="10%"><A href="otherwiseTag.html">&lt;c:otherwise&gt;</A></TD>
- <TD><!-- Begin otherwise description -->
- <P> Define a default case for a 'choose' tag
- <!-- End otherwise description -->
+ <TD width="10%"><A href="copyElementTag.html">&lt;c:copyElement&gt;</A></TD>
+ <TD><!-- Begin copyElement description -->
+ <P> Copy the selected node to the selected location
+ <!-- End copyElement description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="visitorTag.html">&lt;c:visitor&gt;</A></TD>
- <TD><!-- Begin visitor description -->
- <P> *** PROTOTYPE *** Iterate over an object and all its contained objects, typically be doing a depth-first traversal
- <!-- End visitor description -->
+ <TD width="10%"><A href="dumpTag.html">&lt;c:dump&gt;</A></TD>
+ <TD><!-- Begin dump description -->
+ Writes out the DOM subtree under a specified model node
+ <!-- End dump description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="visitTag.html">&lt;c:visit&gt;</A></TD>
- <TD><!-- Begin visit description -->
- <P> Define content to process for an object found by the parent 'visitor' tag, provided a condition is met
- <!-- End visit description -->
+ <TD width="10%"><A href="getTag.html">&lt;c:get&gt;</A></TD>
+ <TD><!-- Begin get description -->
+ <P> Write a the result of an XPath expression
+ <!-- End get description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="userRegionTag.html">&lt;c:userRegion&gt;</A></TD>
- <TD><!-- Begin userRegion description -->
- <P> Define a region in the generated text where users may write customized code
- <!-- End userRegion description -->
+ <TD width="10%"><A href="ifTag.html">&lt;c:if&gt;</A></TD>
+ <TD><!-- Begin if description -->
+ <P> Process the tag contents if a test condition is satisfied
+ <!-- End if description -->
</TD>
</TR>
<TR>
@@ -95,13 +88,6 @@
</TD>
</TR>
<TR>
- <TD width="10%"><A href="logTag.html">&lt;c:log&gt;</A></TD>
- <TD><!-- Begin log description -->
- <P> Write a message to the transformation log
- <!-- End log description -->
- </TD>
- </TR>
- <TR>
<TD width="10%"><A href="initialCodeTag.html">&lt;c:initialCode&gt;</A></TD>
<TD><!-- Begin initialCode description -->
<P> A child tag of the 'userRegion' tag containing the initial code to write
@@ -109,38 +95,17 @@
</TD>
</TR>
<TR>
- <TD width="10%"><A href="setVariableTag.html">&lt;c:setVariable&gt;</A></TD>
- <TD><!-- Begin setVariable description -->
- <P> Create a variable whose value is set to the result of the provided XPath expression
- <!-- End setVariable description -->
- </TD>
- </TR>
- <TR>
- <TD width="10%"><A href="addElementTag.html">&lt;c:addElement&gt;</A></TD>
- <TD><!-- Begin addElement description -->
- <P> Create a new model element under the selected node
- <!-- End addElement description -->
- </TD>
- </TR>
- <TR>
- <TD width="10%"><A href="addTextElementTag.html">&lt;c:addTextElement&gt;</A></TD>
- <TD><!-- Begin addTextElement description -->
- <P> Create a new model element node under the selected element, and whose text content is the content of this tag
- <!-- End addTextElement description -->
- </TD>
- </TR>
- <TR>
- <TD width="10%"><A href="removeElementTag.html">&lt;c:removeElement&gt;</A></TD>
- <TD><!-- Begin removeElement description -->
- <P> Remove the selected node from the document tree
- <!-- End removeElement description -->
+ <TD width="10%"><A href="invokeTransformTag.html">&lt;c:invokeTransform&gt;</A></TD>
+ <TD><!-- Begin invokeTransform description -->
+ <P> Invoke the another transformation, passing it the current transformation's source model and context variables
+ <!-- End invokeTransform description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="copyElementTag.html">&lt;c:copyElement&gt;</A></TD>
- <TD><!-- Begin copyElement description -->
- <P> Copy the selected node to the selected location
- <!-- End copyElement description -->
+ <TD width="10%"><A href="iterateTag.html">&lt;c:iterate&gt;</A></TD>
+ <TD><!-- Begin iterate description -->
+ <P> Write the tag contents for each in the template input model identified by an XPath expression
+ <!-- End iterate description -->
</TD>
</TR>
<TR>
@@ -151,17 +116,17 @@
</TD>
</TR>
<TR>
- <TD width="10%"><A href="whenTag.html">&lt;c:when&gt;</A></TD>
- <TD><!-- Begin when description -->
- <P> Define a one of the mutually exclusive cases of a 'choose' tag
- <!-- End when description -->
+ <TD width="10%"><A href="loadContentTag.html">&lt;c:loadContent&gt;</A></TD>
+ <TD><!-- Begin loadContent description -->
+ Extends the model by parsing its contents as XML
+ <!-- End loadContent description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="setTag.html">&lt;c:set&gt;</A></TD>
- <TD><!-- Begin set description -->
- <P> Set an attribute on an object selected by an XPath expression
- <!-- End set description -->
+ <TD width="10%"><A href="logTag.html">&lt;c:log&gt;</A></TD>
+ <TD><!-- Begin log description -->
+ <P> Write a message to the transformation log
+ <!-- End log description -->
</TD>
</TR>
<TR>
@@ -172,6 +137,13 @@
</TD>
</TR>
<TR>
+ <TD width="10%"><A href="otherwiseTag.html">&lt;c:otherwise&gt;</A></TD>
+ <TD><!-- Begin otherwise description -->
+ <P> Define a default case for a 'choose' tag
+ <!-- End otherwise description -->
+ </TD>
+ </TR>
+ <TR>
<TD width="10%"><A href="overrideTag.html">&lt;c:override&gt;</A></TD>
<TD><!-- Begin override description -->
<P> *** Deprecated: Use the 'overrides' attribute on 'transform' extension in plugin
@@ -179,38 +151,31 @@
</TD>
</TR>
<TR>
- <TD width="10%"><A href="invokeTransformTag.html">&lt;c:invokeTransform&gt;</A></TD>
- <TD><!-- Begin invokeTransform description -->
- <P> Invoke the another transformation, passing it the current transformation's source model and context variables
- <!-- End invokeTransform description -->
- </TD>
- </TR>
- <TR>
- <TD width="10%"><A href="dumpTag.html">&lt;c:dump&gt;</A></TD>
- <TD><!-- Begin dump description -->
- Writes out the DOM subtree under a specified model node
- <!-- End dump description -->
+ <TD width="10%"><A href="removeElementTag.html">&lt;c:removeElement&gt;</A></TD>
+ <TD><!-- Begin removeElement description -->
+ <P> Remove the selected node from the document tree
+ <!-- End removeElement description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="loadContentTag.html">&lt;c:loadContent&gt;</A></TD>
- <TD><!-- Begin loadContent description -->
- Extends the model by parsing its contents as XML
- <!-- End loadContent description -->
+ <TD width="10%"><A href="replaceStringsTag.html">&lt;c:replaceStrings&gt;</A></TD>
+ <TD><!-- Begin replaceStrings description -->
+ Replaces one set of strings in its content with another set of strings and writes out the result
+ <!-- End replaceStrings description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="nodeAttributesTag.html">&lt;c:nodeAttributes&gt;</A></TD>
- <TD><!-- Begin nodeAttributes description -->
- Iterates over the attributes for a given node
- <!-- End nodeAttributes description -->
+ <TD width="10%"><A href="setTag.html">&lt;c:set&gt;</A></TD>
+ <TD><!-- Begin set description -->
+ <P> Set an attribute on an object selected by an XPath expression
+ <!-- End set description -->
</TD>
</TR>
<TR>
- <TD width="10%"><A href="replaceStringsTag.html">&lt;c:replaceStrings&gt;</A></TD>
- <TD><!-- Begin replaceStrings description -->
- Replaces one set of strings in its content with another set of strings and writes out the result
- <!-- End replaceStrings description -->
+ <TD width="10%"><A href="setVariableTag.html">&lt;c:setVariable&gt;</A></TD>
+ <TD><!-- Begin setVariable description -->
+ <P> Create a variable whose value is set to the result of the provided XPath expression
+ <!-- End setVariable description -->
</TD>
</TR>
<TR>
@@ -220,6 +185,34 @@
<!-- End stringTokens description -->
</TD>
</TR>
+ <TR>
+ <TD width="10%"><A href="userRegionTag.html">&lt;c:userRegion&gt;</A></TD>
+ <TD><!-- Begin userRegion description -->
+ <P> Define a region in the generated text where users may write customized code
+ <!-- End userRegion description -->
+ </TD>
+ </TR>
+ <TR>
+ <TD width="10%"><A href="visitTag.html">&lt;c:visit&gt;</A></TD>
+ <TD><!-- Begin visit description -->
+ <P> Define content to process for an object found by the parent 'visitor' tag, provided a condition is met
+ <!-- End visit description -->
+ </TD>
+ </TR>
+ <TR>
+ <TD width="10%"><A href="visitorTag.html">&lt;c:visitor&gt;</A></TD>
+ <TD><!-- Begin visitor description -->
+ <P> *** PROTOTYPE *** Iterate over an object and all its contained objects, typically be doing a depth-first traversal
+ <!-- End visitor description -->
+ </TD>
+ </TR>
+ <TR>
+ <TD width="10%"><A href="whenTag.html">&lt;c:when&gt;</A></TD>
+ <TD><!-- Begin when description -->
+ <P> Define a one of the mutually exclusive cases of a 'choose' tag
+ <!-- End when description -->
+ </TD>
+ </TR>
</TBODY>
</TABLE>
<HR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/removeElementTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/removeElementTag.html
index e7291aa..735af0d 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/removeElementTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/removeElementTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -50,7 +49,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -60,8 +58,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin removeElement example -->
-
- &lt;c:removeElement select=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- Remove element a as a child of $root--%&gt;<BR>
+ &lt;c:removeElement select=&quot;$root/a&quot;/&gt;<br>
<!-- End removeElement example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/replaceStringsTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/replaceStringsTag.html
index a94a762..ab93aac 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/replaceStringsTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/replaceStringsTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -68,9 +66,9 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin replaceStrings example -->
-
- &lt;c:replaceStrings replace=&quot;<I>value</I>&quot; with=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content consumed by tag evaluation</I><BR>
+ &lt;%-- Replace %name with 'Jim' and %age with '47' --%&gt;<BR>
+ &lt;c:replaceStrings replace=&quot;%name,%age&quot; with=&quot;Jim,47&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;My name is %name. My age is %age.<BR>
&lt;/c:replaceStrings&gt;
<!-- End replaceStrings example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setTag.html
index 83edfe2..75cc55a 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -68,9 +66,9 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin set example -->
-
- &lt;c:set select=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
+ &lt;%-- create or update an attribute name-length on element $var --%&gt;
+ &lt;c:set select=&quot;$var&quot; name=&quot;name-length&quot;&gt;<br>
+ &lt;c:get select="string-length(local-name($var))"/&gt;<BR>
&lt;/c:set&gt;
<!-- End set example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setVariableTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setVariableTag.html
index 86d2692..e49a5be 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setVariableTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/setVariableTag.html
@@ -38,7 +38,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -54,7 +53,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -64,8 +62,8 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin setVariable example -->
-
- &lt;c:setVariable select=&quot;<I>value</I>&quot; var=&quot;<I>value</I>&quot;/&gt;<br>
+ &lt;%-- define $root as pointing to the root element in the mode --%&gt;<BR>
+ &lt;c:setVariable select=&quot;/*&quot; var=&quot;root&quot;/&gt;<br>
<!-- End setVariable example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/stringTokensTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/stringTokensTag.html
index 69d97f8..a71e977 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/stringTokensTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/stringTokensTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -92,9 +90,13 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin stringTokens example -->
-
- &lt;c:stringTokens string=&quot;<I>value</I>&quot; name=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be repeated for each iteration</I><BR>
+ &lt;%-- break a,bc,cde into tokens, and iterate over them --%&gt;<BR>
+ &lt;c:stringTokens string=&quot;a,bc,cde&quot; name=&quot;curStr&quot; delimitedBy=&quot;,&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;value: &lt;c:get select="$curStr/@value"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;index: &lt;c:get select="$curStr/@index"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;delimiter: &lt;c:get select="$curStr/@delimiter"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;first: &lt;c:get select="$curStr/@first"/&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;last: &lt;c:get select="$curStr/@last"/&gt;<BR>
&lt;/c:stringTokens&gt;
<!-- End stringTokens example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/userRegionTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/userRegionTag.html
index 1d302a5..6fc52db 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/userRegionTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/userRegionTag.html
@@ -42,15 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
-<HR>
-<TABLE border="1" width="100%">
- <TBODY>
- <TR>
- <TH colspan="2" align="left">Required Attributes</TH></TR>
- </TBODY>
-</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -60,10 +51,25 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin userRegion example -->
-
- &lt;c:userRegion&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be written</I><BR>
- &lt;/c:userRegion&gt;
+ &lt;%-- Define user region 101. Code in block will never be updated by subsequent executions --%&gt;<BR>
+ &lt;c:userRegion&gt;<BR>
+ // BEGIN region 101<BR>
+ &nbsp;&nbsp;&lt;c:initialCode&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>default code</I><BR>
+ &nbsp;&nbsp;&lt;/c:initialCode&gt;<BR>
+ // END region 101<BR>
+ &lt;/c:userRegion&gt;<BR><BR>
+
+ &lt;%-- Define user region 102. Code in block will be updated by subsequent
+ executions only if @generated is found in block --%&gt;<BR>
+ &lt;c:userRegion&gt;<BR>
+ // BEGIN region 102<BR>
+ &nbsp;&nbsp;&lt;c:initialCode unmodifiedMarker="@generated"&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;// @generated<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>default code</I><BR>
+ &nbsp;&nbsp;&lt;/c:initialCode&gt;<BR>
+ // END region 102<BR>
+ &lt;/c:userRegion&gt;<BR>
<!-- End userRegion example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitTag.html
index 6563e0c..69f5bec 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitTag.html
@@ -44,7 +44,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -52,11 +51,10 @@
<TH colspan="2" align="left">Required Attributes</TH></TR>
<TR>
<TD width="10%">test</TD>
- <TD>TODO Define description of test</TD>
+ <TD><BR> An expression expression, that, if true, causes the tag contents to be evaluated.<BR> </TD>
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -66,11 +64,13 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin visit example -->
-
- &lt;c:visit test=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if tag condition is
- satisfied</I><BR>
- &lt;/c:visit&gt;
+ &lt;%-- traverse a model starting at $root. $cur refers to current node --%>
+ &lt;c:visitor select=&quot;$root&quot; var=&quot;cur&quot;&gt;<br>
+ &lt;c:visit test=&quot;local-name($cur) = 'a'&quot;&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process of test is true</I><BR>
+ &lt;/c:visit&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>... other &lt;c:visit&gt; tags ...</I><BR>
+ &lt;/c:visitor&gt;
<!-- End visit example -->
</SPAN></TD>
</TR>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitorTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitorTag.html
index 22ef3ef..09f90f4 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitorTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/visitorTag.html
@@ -42,7 +42,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -58,7 +57,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -68,9 +66,12 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin visitor example -->
-
- &lt;c:visitor select=&quot;<I>value</I>&quot; var=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to be repeated for each iteration</I><BR>
+ &lt;%-- traverse a model starting at $root. $cur refers to current node --%>
+ &lt;c:visitor select=&quot;$root&quot; var=&quot;cur&quot;&gt;<br>
+ &lt;c:visit test=&quot;local-name($cur) = 'a'&quot;&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process of test is true</I><BR>
+ &lt;/c:visit&gt;<BR>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>... other &lt;c:visit&gt; tags ...</I><BR>
&lt;/c:visitor&gt;
<!-- End visitor example -->
</SPAN></TD>
diff --git a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/whenTag.html b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/whenTag.html
index 0e55532..782e4ab 100644
--- a/doc/org.eclipse.jet.doc/references/taglibs/controlTags/whenTag.html
+++ b/doc/org.eclipse.jet.doc/references/taglibs/controlTags/whenTag.html
@@ -44,7 +44,6 @@
</TR>
</TBODY>
</TABLE>
-<exists node="tag/attribute use='required'">
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -56,7 +55,6 @@
</TR>
</TBODY>
</TABLE>
-</exists>
<HR>
<TABLE border="1" width="100%">
<TBODY>
@@ -66,11 +64,13 @@
<TD width="10%"></TD>
<TD><SPAN style="font-family: monospace">
<!-- Begin when example -->
-
- &lt;c:when test=&quot;<I>value</I>&quot;&gt;<br>
- &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if tag condition is
+ &lt;c:choose&gt;<br>
+ &lt;c:when test=&quot;$myVar/@kind = 'FIELD'&quot;&gt;<br>
+ &nbsp;&nbsp;&nbsp;&nbsp;<I>content to process if test condition is
satisfied</I><BR>
- &lt;/c:when&gt;
+ &lt;/c:when&gt;<BR>
+ <I>... other &lt;c:when&gt; and &lt;c:otherwise&gt; tags ...</I><BR>
+ &lt;/c:choose&gt;
<!-- End when example -->
</SPAN></TD>
</TR>

Back to the top