jakarta-taglibs-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From ra...@apache.org
Subject svn commit: r332912 - in /jakarta/taglibs/proper/rdc/trunk: examples/web/subdialog-test/ src/META-INF/tags/rdc/ xml/
Date Sun, 13 Nov 2005 06:47:34 GMT
Author: rahul
Date: Sat Nov 12 22:47:14 2005
New Revision: 332912

URL: http://svn.apache.org/viewcvs?rev=332912&view=rev
Log:
Add subdialog support for atomic RDCs.

Nudge from Vance Vagell:

http://marc.theaimsgroup.com/?l=taglibs-user&m=113165446529618&w=2

Added:
    jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp   (with props)
    jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp   (with props)
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag   (with props)
Modified:
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.tag
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.rdc
    jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.tag
    jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml

Added: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp?rev=332912&view=auto
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp (added)
+++ jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp Sat Nov 12 22:47:14 2005
@@ -0,0 +1,32 @@
+<!--Example:Start-->
+<%--
+  Copyright 2004 The Apache Software Foundation.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<!--
+<%@ page language="java" contentType="application/voicexml+xml" %>
+-->
+<vxml version="2.0" xml:lang="en-US" xmlns="http://www.w3.org/2001/vxml">
+  <form>
+    <subdialog name="citySubdialog" src="subdialog1.jsp">
+      <filled>
+        <script src="${pageContext.request.contextPath}/.grammar/return.js"/>
+        <var name="cityData" expr="deserializeReturnValue(citySubdialog.city)"/>
+        <prompt>
+          The city is <value expr="cityData.getValue()"/>
+        </prompt>
+      </filled> 
+    </subdialog>
+  </form>
+</vxml>
+<!--Example:End-->

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/parent1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Added: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp?rev=332912&view=auto
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp (added)
+++ jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp Sat Nov 12 22:47:14 2005
@@ -0,0 +1,28 @@
+<!--Example:Start-->
+<%--
+  Copyright 2004 The Apache Software Foundation.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<!--
+<%@ page language="java" contentType="application/voicexml+xml" %>
+<%@ taglib prefix="rdc" uri="http://jakarta.apache.org/taglibs/rdc-1.0"%>
+-->
+<vxml version="2.0" xml:lang="en-US"  xmlns="http://www.w3.org/2001/vxml" >
+  <jsp:useBean id="dialogMap" class="java.util.LinkedHashMap" scope="session"/>
+  <rdc:task map="${dialogMap}">
+
+     <rdc:usMajorCity id="city" subdialog="true" confirm="true" />
+
+  </rdc:task>
+</vxml>
+<!--Example:End-->

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp
------------------------------------------------------------------------------
    svn:executable = *

Propchange: jakarta/taglibs/proper/rdc/trunk/examples/web/subdialog-test/subdialog1.jsp
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.rdc Sat Nov 12 22:47:14 2005
@@ -79,6 +79,12 @@
         and will be rejected. The regular expression can constitute of a-z, A-Z, ' ' (space) and ' (apostrophe). 
         The default pattern is [a-zA-Z ']*.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alpha.tag Sat Nov 12 22:47:14 2005
@@ -35,6 +35,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -50,8 +51,7 @@
   minLength: minimum allowed length of alpha input
   maxLength: maximum allowed length of alpha input
   pattern: the pattern of the alpha
-
-  </rdc:comment>
+</rdc:comment>
 
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
 <jsp:useBean id="constants" class="org.apache.taglibs.rdc.core.Constants" />
@@ -82,6 +82,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.alpha.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.alpha.defaultconfig.uri" />
@@ -107,4 +108,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.rdc Sat Nov 12 22:47:14 2005
@@ -79,6 +79,12 @@
         and will be rejected. The regular expression can constitute of a-z and 0-9. 
         The default pattern is [a-z0-9]*.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/alphanum.tag Sat Nov 12 22:47:14 2005
@@ -34,6 +34,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -80,6 +81,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.alphanum.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.alphanum.defaultconfig.uri" />
@@ -105,4 +107,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.rdc Sat Nov 12 22:47:14 2005
@@ -63,6 +63,12 @@
         If confirm is true, the component asks the user to confirm the specified color with an appropriate yes/no dialog.
         Value is false by default.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/color.tag Sat Nov 12 22:47:14 2005
@@ -30,6 +30,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
@@ -49,6 +50,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.color.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.color.defaultconfig.uri" />
@@ -74,4 +76,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.rdc Sat Nov 12 22:47:14 2005
@@ -63,6 +63,12 @@
 	 	  This specifies the URL to which the component should submit its results.
           The default is to submit to the originating page that instantiated the component.
 		</param>
+        <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+          If subdialog is true, the RDC value will be returned to the calling dialog using
+          the VoiceXML return statement. Default value is false.
+          The value of the RDC must be serialized according to a standard public contract so 
+          meaningful deserialization can take place in the host dialog (or caller).
+        </param>
       </input-params>
       <output-params>
 		<param name="id of this component" description="Variable that holds  the country specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/country.tag Sat Nov 12 22:47:14 2005
@@ -30,6 +30,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -42,8 +43,7 @@
   initial: initial value
   confirm: boolean value indicating whether the input should be confirmed 
   echo: boolean value indicating whether to echo back the result on completion
-
-  </rdc:comment>
+</rdc:comment>
 
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
 
@@ -68,6 +68,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.country.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.country.defaultconfig.uri" />
@@ -93,4 +94,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.rdc Sat Nov 12 22:47:14 2005
@@ -78,6 +78,12 @@
 		<param name="submit" value="self-URI" required="false" rtexprvalue="true" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 		</param>
+		<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
      </input-params>
 
      <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardAmount.tag Sat Nov 12 22:47:14 2005
@@ -35,6 +35,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -56,6 +57,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
       <c:set target="${model}" property="currencyCode" value="${currencyCode}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.currency.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="fbGrammar" 
        key="rdc.creditcard.fullbalance.voicegrammar.uri" />
@@ -102,4 +104,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.rdc Sat Nov 12 22:47:14 2005
@@ -65,6 +65,12 @@
 		<param name="submit" value="self-URI" required="false" rtexprvalue="true" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 		</param>
+		<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
      </input-params>
 
      <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardExpiry.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -51,6 +52,7 @@
       <c:set target="${model}" property="confirm" value="${confirm}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.creditcard.expiry.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.creditcard.expiry.defaultconfig.uri" />
@@ -78,4 +80,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.rdc Sat Nov 12 22:47:14 2005
@@ -21,14 +21,16 @@
        <param name="id" value="some-name" required="true" rtexprvalue="false" visible="1" description="Component ID">
 	     This specifies the id of the rdc component. 
 	   </param>
-	  <param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="Location where results are submitted">
+	   <param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="Location where results are submitted">
 	     This specifies the URL to which the component should submit its results.
          The default is to submit to the originating page that instantiated the component.
 	   </param>
-	  <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="0" description="Whether this RDC is invoked as a subdialog">
-	     Defines whether this RDC is defined as a subdialog, which affects who the value it collects
-         will be returned. Default value is Boolean.FALSE
-	  </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
 	  <param name="mode" value="FULL" required="false" rtexprvalue="true" visible="0" description="The mode under which this credit card information composite will operate">
 	     Mode decides which child components will execute. FULL gives (type, number, expiry, securityCode) SHORT gives (number, expiry) and
          TYPE, NUMBER, EXPIRY and SECURITY each gives only those.

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardInfo.tag Sat Nov 12 22:47:14 2005
@@ -107,18 +107,9 @@
     <c:set target="${model}" property="value" value="${data}"/>
 	
     <c:if test="${model.isValid == true}">
-   	    <c:set target="${model}" property="state" value ="${constants.FSM_DONE}"/>
-        <c:choose>
-            <c:when test="${not model.subdialog}">
-                <c:set var="retVal" value="${model.value}"/>
-            </c:when>
-            <c:otherwise>
-                <block>
-                    <var name="${model.id}" expr="'${model.serializedValue}'"/>
-                    <return namelist="${model.id}"/>
-                </block>
-            </c:otherwise>
-        </c:choose>
+   	    <c:set target="${model}" property="state" value="${constants.FSM_DONE}"/>
+        <c:set var="retVal" value="${model.value}"/>
+        <rdc:subdialog-return  model="${model}"/>
     </c:if>
 
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.rdc Sat Nov 12 22:47:14 2005
@@ -65,6 +65,12 @@
 		<param name="submit" value="self-URI" required="false" rtexprvalue="true" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 		</param>
+		<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
      </input-params>
 
      <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardNumber.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -51,6 +52,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.creditcard.number.voicegrammar.uri" />
       <rdc:set-grammar model="${model}" key="rdc.creditcard.number.dtmfgrammar.uri" dtmf="true"/>
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
@@ -79,4 +81,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.rdc Sat Nov 12 22:47:14 2005
@@ -53,7 +53,7 @@
 		<param name="initial" value="creditcard-type" required="false" rtexprvalue="true" description="Default value for the credit card type">
 		This specifies the initial default value of the credit card type. If 
 		a user says initial or default, this value is selected.
-	If not specified, the user will not be able to select a default value.
+	    If not specified, the user will not be able to select a default value.
 		</param>
 		<param name="confirm" value="true/false" required="false" rtexprvalue="true" description="Confirmation option">
 		If confirm is true, it asks a user for confirmation of the 
@@ -62,6 +62,12 @@
 		<param name="submit" value="self-URI" required="false" rtexprvalue="true" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 		</param>
+		<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
      </input-params>
 
      <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/creditcardType.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -43,8 +44,7 @@
   initial: initial value
   confirm: boolean value indicating whether the input should be confirmed 
   echo: boolean value indicating whether to echo back the result on completion
-
-  </rdc:comment>
+</rdc:comment>
 
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
 
@@ -68,6 +68,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.creditcard.type.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.creditcard.type.defaultconfig.uri" />
@@ -93,4 +94,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.rdc Sat Nov 12 22:47:14 2005
@@ -73,6 +73,12 @@
 	<param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 	</param>
+	<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+    </param>
    </input-params>
    <output-params>
 	<param name="id of this component" description="The amount specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/currency.tag Sat Nov 12 22:47:14 2005
@@ -33,6 +33,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -76,6 +77,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.currency.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.currency.defaultconfig.uri" />
@@ -100,4 +102,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.rdc Sat Nov 12 22:47:14 2005
@@ -77,6 +77,12 @@
 		This format in which the date collected is returned as a String.
 		The default is MMddyyyy.
 	</param>
+	<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+    </param>
    </input-params>
    <output-params>
 	<param name="id of this component" description="Variable that holds  the date specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/date.tag Sat Nov 12 22:47:14 2005
@@ -34,6 +34,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -78,6 +79,7 @@
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.date.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.date.defaultconfig.uri" />
@@ -104,4 +106,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.rdc Sat Nov 12 22:47:14 2005
@@ -24,11 +24,13 @@
 	  <param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="Location where results are submitted">
 	     This specifies the URL to which the component should submit its results.
          The default is to submit to the originating page that instantiated the component.
-	   </param>
-	  <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="0" description="Whether this RDC is invoked as a subdialog">
-	     Defines whether this RDC is defined as a subdialog, which affects who the value it collects
-           will be returned. Default value is Boolean.FALSE
 	  </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
 	  <param name="initial" value="DateRangeData" required="false" rtexprvalue="true" visible="2" description="Default date range">
 		This specifies the initial default value, which is an instance of DateRangeData. 
 		If a user says initial or default, this value is selected. 
@@ -43,6 +45,12 @@
 	  <param name="locale" value="[language](-[country])?" required="false" rtexprvalue="true" visible="2" description="RDC Locale">
         The Locale to which the grammars and default configurations chosen for this composite's children will belong to.
         Default is en-US.
+      </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
       </param>
     </input-params>
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/dateRange.tag Sat Nov 12 22:47:14 2005
@@ -100,17 +100,8 @@
 	
     <c:if test="${model.isValid == true}">
    	    <c:set target="${model}" property="state" value ="${constants.FSM_DONE}"/>
-        <c:choose>
-            <c:when test="${not model.subdialog}">
-                <c:set var="retVal" value="${model.value}"/>
-            </c:when>
-            <c:otherwise>
-                <block>
-                    <var name="${model.id}" expr="'${model.serializedValue}'"/>
-                    <return namelist="${model.id}"/>
-                </block>
-            </c:otherwise>
-        </c:choose>
+        <c:set var="retVal" value="${model.value}"/>
+        <rdc:subdialog-return  model="${model}"/>
     </c:if>
 
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.rdc Sat Nov 12 22:47:14 2005
@@ -71,6 +71,12 @@
 	       This specifies the URL to which the component should submit its results.
            The default is to submit to the originating page that instantiated the component.
 	     </param>
+	     <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+           If subdialog is true, the RDC value will be returned to the calling dialog using
+           the VoiceXML return statement. Default value is false.
+           The value of the RDC must be serialized according to a standard public contract so 
+           meaningful deserialization can take place in the host dialog (or caller).
+         </param>
         </input-params>
         <output-params>
 	     <param name="id of this component" description="Variable that holds  the digits specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/digits.tag Sat Nov 12 22:47:14 2005
@@ -32,6 +32,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -78,6 +79,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.digits.voicegrammar.uri" />
       <rdc:set-grammar model="${model}" key="rdc.digits.dtmfgrammar.uri" 
        dtmf="true" />
@@ -105,4 +107,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.rdc Sat Nov 12 22:47:14 2005
@@ -71,6 +71,12 @@
 	 	   This specifies the URL to which the component should submit its results.
            The default is to submit to the originating page that instantiated the component.
 		 </param>
+		 <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+           If subdialog is true, the RDC value will be returned to the calling dialog using
+           the VoiceXML return statement. Default value is false.
+           The value of the RDC must be serialized according to a standard public contract so 
+           meaningful deserialization can take place in the host dialog (or caller).
+         </param>
        </input-params>
        <output-params>
 		 <param name="id of this component" description="Variable that holds  the duration specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/duration.tag Sat Nov 12 22:47:14 2005
@@ -33,6 +33,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -74,6 +75,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.duration.voicegrammar.uri" />     
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.duration.defaultconfig.uri" />
@@ -98,4 +100,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.rdc Sat Nov 12 22:47:14 2005
@@ -65,6 +65,12 @@
     <param name="submit" value="submit-uri" required="false" rtexprvalue="true" visible="0" description="URI of the jsp page">
         This specifies the URI where the component should submit the values.
     </param>
+    <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+    </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/isbn.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -44,8 +45,7 @@
   confirm: boolean value indicating whether the input should be confirmed 
   echo: boolean value indicating whether to echo back the result on completion
   pattern: the pattern of the ISBN
-
-  </rdc:comment>
+</rdc:comment>
 
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
 
@@ -71,6 +71,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.isbn.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.isbn.defaultconfig.uri" />
@@ -96,4 +97,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.rdc Sat Nov 12 22:47:14 2005
@@ -24,11 +24,13 @@
 	  <param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="Location where results are submitted">
 	     This specifies the URL to which the component should submit its results.
          The default is to submit to the originating page that instantiated the component.
-	   </param>
-	  <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="0" description="Whether this RDC is invoked as a subdialog">
-	     Defines whether this RDC is defined as a subdialog, which affects who the value it collects
-         will be returned. Default value is Boolean.FALSE
 	  </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+         If subdialog is true, the RDC value will be returned to the calling dialog using
+         the VoiceXML return statement. Default value is false.
+         The value of the RDC must be serialized according to a standard public contract so 
+         meaningful deserialization can take place in the host dialog (or caller).
+      </param>
 	  <param name="initial" value="MortgageData" required="false" rtexprvalue="true" visible="2" description="Default mortgage data">
 		This specifies the initial default value, which is an instance of MortgageData. 
 		If a user says initial or default, this value is selected. 

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgage.tag Sat Nov 12 22:47:14 2005
@@ -94,18 +94,9 @@
     <c:set target="${model}" property="value" value="${data}"/>
 	
     <c:if test="${model.isValid == true}">
-   	    <c:set target="${model}" property="state" value ="${constants.FSM_DONE}"/>
-        <c:choose>
-            <c:when test="${not model.subdialog}">
-                <c:set var="retVal" value="${model.value}"/>
-            </c:when>
-            <c:otherwise>
-                <block>
-                    <var name="${model.id}" expr="'${model.serializedValue}'"/>
-                    <return namelist="${model.id}"/>
-                </block>
-            </c:otherwise>
-        </c:choose>
+       	<c:set target="${model}" property="state" value="${constants.FSM_DONE}"/>
+        <c:set var="retVal" value="${model.value}"/>
+        <rdc:subdialog-return model="${model}"/>
     </c:if>
 
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.rdc Sat Nov 12 22:47:14 2005
@@ -71,6 +71,12 @@
 	      This specifies the URL to which the component should submit its results.
           The default is to submit to the originating page that instantiated the component.
 	    </param>
+	    <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+          If subdialog is true, the RDC value will be returned to the calling dialog using
+          the VoiceXML return statement. Default value is false.
+          The value of the RDC must be serialized according to a standard public contract so 
+          meaningful deserialization can take place in the host dialog (or caller).
+        </param>
        </input-params>
        <output-params>
 	   <param name="id of this component" description="Variable that holds  the mortgage type specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/mortgageType.tag Sat Nov 12 22:47:14 2005
@@ -32,6 +32,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -73,6 +74,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.mortgagetype.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.mortgagetype.defaultconfig.uri" />
@@ -97,4 +99,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.rdc Sat Nov 12 22:47:14 2005
@@ -74,6 +74,12 @@
         and will be rejected.
         If not specified, there is no maximum length constraint on the alpha value.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/number.tag Sat Nov 12 22:47:14 2005
@@ -33,6 +33,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -75,6 +76,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.number.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.number.defaultconfig.uri" />
@@ -99,4 +101,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.rdc Sat Nov 12 22:47:14 2005
@@ -71,6 +71,12 @@
 	       This specifies the URL to which the component should submit its results.
            The default is to submit to the originating page that instantiated the component.
 	     </param>
+	     <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+           If subdialog is true, the RDC value will be returned to the calling dialog using
+           the VoiceXML return statement. Default value is false.
+           The value of the RDC must be serialized according to a standard public contract so 
+           meaningful deserialization can take place in the host dialog (or caller).
+         </param>
         </input-params>
         <output-params>
 	     <param name="id of this component" description="Variable that holds  the percentage specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/percent.tag Sat Nov 12 22:47:14 2005
@@ -32,6 +32,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -73,6 +74,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.percent.voicegrammar.uri" />
       <rdc:set-grammar model="${model}" key="rdc.percent.dtmfgrammar.uri" 
        dtmf="true" />
@@ -99,4 +101,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.rdc Sat Nov 12 22:47:14 2005
@@ -61,6 +61,12 @@
 	<param name="submit" value="self-URI" required="false" rtexprvalue="true" visible="0" description="isubmit URL">
 		This is the submit - which is mostly the self URI.
 	</param>
+	<param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+    </param>
    </input-params>
    <output-params>
 	<param name="id of this component" description="The option specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/select1.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -87,6 +88,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.select1.defaultconfig.uri" />
       <rdc:configure model="${model}" config="${config}"
@@ -110,4 +112,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.rdc Sat Nov 12 22:47:14 2005
@@ -64,6 +64,12 @@
     <param name="submit" value="submit-uri" required="false" rtexprvalue="true" visible="0" description="URI of the jsp page">
         This specifies the URI where the component should submit the values.
     </param>
+    <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+    </param>
     </input-params>
 
     <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/ssn.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -44,7 +45,7 @@
   confirm: boolean value indicating whether the input should be confirmed 
   echo: boolean value indicating whether to echo back the result on completion
   pattern: the pattern of the social security number
-  </rdc:comment>
+</rdc:comment>
 
 <rdc:peek var="stateMap" stack="${requestScope.rdcStack}"/>
 
@@ -70,6 +71,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.ssn.voicegrammar.uri" />
       <rdc:set-grammar model="${model}" key="rdc.ssn.dtmfgrammar.uri" 
        dtmf="true" />
@@ -97,4 +99,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Added: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag?rev=332912&view=auto
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag (added)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag Sat Nov 12 22:47:14 2005
@@ -0,0 +1,28 @@
+<%--
+  Copyright 2004 The Apache Software Foundation.
+  Licensed under the Apache License, Version 2.0 (the "License");
+  you may not use this file except in compliance with the License.
+  You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+  Unless required by applicable law or agreed to in writing, software
+  distributed under the License is distributed on an "AS IS" BASIS,
+  WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+  See the License for the specific language governing permissions and
+  limitations under the License.
+--%>
+<%--$Id: subdialog-return.tag,v 1.1 2004/07/09 17:06:42 rahul Exp
+$--%>
+<!--
+<%@ taglib prefix="c" uri="http://java.sun.com/jsp/jstl/core" %>
+<%@ tag body-content="empty" %>
+
+<%@ attribute name="model" required="true" type="java.lang.Object" %>
+-->
+<c:if test="${model.subdialog}">
+    <block>
+        <var name="${model.id}" expr="'${model.serializedValue}'"/>
+        <return namelist="${model.id}"/>
+    </block>
+</c:if>

Propchange: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag
------------------------------------------------------------------------------
    svn:eol-style = native

Propchange: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag
------------------------------------------------------------------------------
    svn:executable = *

Propchange: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/subdialog-return.tag
------------------------------------------------------------------------------
    svn:keywords = Date Author Id Revision HeadURL

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.rdc Sat Nov 12 22:47:14 2005
@@ -74,6 +74,12 @@
         This specifies the URL to which the component should submit its results.
         The default is to submit to the originating page that instantiated the component.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
     <output-params>
       <param name="id of this component" description="Variable that holds the instance specific return value">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/template.tag Sat Nov 12 22:47:14 2005
@@ -36,6 +36,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -60,6 +61,7 @@
       <c:set target="${model}" property="confirm" value="${confirm}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="dynamicAttributes" value="${dynamicAttrs}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <c:import varReader="xmlSource" url="${config}">
         <x:parse var="configuration" doc="${xmlSource}"/> 
         <c:set target ="${model}" property="configuration"
@@ -96,4 +98,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.rdc Sat Nov 12 22:47:14 2005
@@ -73,6 +73,12 @@
         This specifies the URL to which the component should submit its results.
         The default is to submit to the originating page that instantiated the component.
       </param>
+      <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+      </param>
     </input-params>
     <output-params>
       <param name="id of this component" description="Variable that holds the time specified by the user">

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/time.tag Sat Nov 12 22:47:14 2005
@@ -33,6 +33,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -78,6 +79,7 @@
       <c:set target="${model}" property="submit" value="${submit}"/>
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.time.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.time.defaultconfig.uri" />
@@ -126,4 +128,5 @@
               
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.rdc Sat Nov 12 22:47:14 2005
@@ -61,6 +61,12 @@
         <param name="submit" value="submit-uri" required="false" rtexprvalue="true" visible="0" description="URI of the jsp page">
         This specifies the URI where the component should submit the values.
         </param>
+        <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
         </input-params>
 
         <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usMajorCity.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -68,6 +69,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.usmajorcity.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.usmajorcity.defaultconfig.uri" />
@@ -94,4 +96,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.rdc Sat Nov 12 22:47:14 2005
@@ -61,6 +61,12 @@
         <param name="submit" value="submit-uri" required="false" rtexprvalue="true" visible="0" description="URI of the jsp page">
         This specifies the URI where the component should submit the values.
         </param>
+        <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
         </input-params>
 
         <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/usState.tag Sat Nov 12 22:47:14 2005
@@ -31,6 +31,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -69,6 +70,7 @@
       <c:set target="${model}" property="locale" value="${locale}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.usstate.voicegrammar.uri" />
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.usstate.defaultconfig.uri" />
@@ -94,4 +96,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.rdc
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.rdc?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.rdc (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.rdc Sat Nov 12 22:47:14 2005
@@ -67,6 +67,12 @@
         <param name="submit" value="submit-uri" required="false" rtexprvalue="true" visible="0" description="URI of the jsp page">
         This specifies the URI where the component should submit the values.
         </param>
+        <param name="subdialog" value="true/false" required="false" rtexprvalue="true" visible="1" description="Subdialog option">
+        If subdialog is true, the RDC value will be returned to the calling dialog using
+        the VoiceXML return statement. Default value is false.
+        The value of the RDC must be serialized according to a standard public contract so 
+        meaningful deserialization can take place in the host dialog (or caller).
+        </param>
         </input-params>
 
         <output-params>

Modified: jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.tag
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.tag?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.tag (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/META-INF/tags/rdc/zipCode.tag Sat Nov 12 22:47:14 2005
@@ -33,6 +33,7 @@
 <%@ attribute name="numNBest" required="false" %>
 <%@ attribute name="maxNoInput" required="false" %>
 <%@ attribute name="maxNoMatch" required="false" %>
+<%@ attribute name="subdialog" required="false" %>
 <%@ variable name-from-attribute="id" alias="retVal" scope="AT_END"%>
 -->
 
@@ -74,6 +75,7 @@
       <c:set target="${model}" property="echo" value="${echo}"/>
       <c:set target="${model}" property="initial" value="${initial}"/>
       <c:set target="${model}" property="locale" value="${locale}"/>
+      <c:set target="${model}" property="subdialog" value="${subdialog}"/>
       <rdc:set-grammar model="${model}" key="rdc.zipcode.voicegrammar.uri" />     
       <rdc:get-resource bundle="${model.rdcResourceBundle}" var="defaultConfig"
        key="rdc.zipcode.defaultconfig.uri" />
@@ -100,4 +102,5 @@
 
 <c:if test="${model.state == constants.FSM_DONE}">
   <c:set var="retVal" value="${model.value}"/>
+  <rdc:subdialog-return  model="${model}"/>
 </c:if>

Modified: jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml?rev=332912&r1=332911&r2=332912&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml (original)
+++ jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml Sat Nov 12 22:47:14 2005
@@ -1191,6 +1191,20 @@
         </example>
       </tag>
       <tag-file>
+        <name>subdialog-return</name>
+        <path>/META-INF/tags/rdc/subdialog-return.tag</path>
+        <description>Generate the appropriate VoiceXML return statement,
+        if called as a subdialog. The value of the RDC must be serialized
+        according to a standard public contract so meaningful deserialization
+        can take place in the host dialog (or caller).</description>
+        <display-name>generate return statement if called as a subdialog</display-name>
+        <example>
+           <![CDATA[
+                <rdc:subdialog-return model="${model}" />
+          ]]>          
+        </example>
+      </tag-file>
+      <tag-file>
         <description>A template for rapid development of atomic RDCs</description>
         <display-name>RDC template</display-name>
         <name>template</name>



---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org


Mime
View raw message