rubys 2005/06/24 04:35:47
Modified: rdc/examples/web alpha-test.jsp alphanum-test.jsp
country-test.jsp creditcardAmount-test.jsp
creditcardInfo-test.jsp currency-test.jsp
date-test.jsp digits-test.jsp duration-test.jsp
dyna-select1-test.jsp equipment-type-test.jsp
getcart.jsp group-test.jsp hello.jsp i18n-test.jsp
isbn-test.jsp mortgage-test.jsp
mortgageType-test.jsp nested-group-test.jsp
number-test.jsp payment-method-test.jsp
percent-test.jsp regression-test.jsp
rulebased-conditions.jsp rulebased-nested.jsp
rulebased-order.jsp select1-test.jsp
simple-template-test.jsp ssn-test.jsp task-test.jsp
time-test.jsp usMajorCity-test.jsp usState-test.jsp
zipCode-test.jsp
rdc/examples/web/config/rule-based-dialog rulebased.dtd
rdc/examples/web/mortgage-app goodbye.jsp login.jsp
mortgage-rate.jsp mortgage.jsp pause.jsp
transaction-confirm.jsp
rdc/examples/web/musicstore-app/voice error.jsp footer.jsp
goodbye.jsp header.jsp listalbums.jsp
mainmenu-fsm.jsp mainmenu.jsp pause.jsp
reviewalbum-fsm.jsp reviewalbum.jsp reviewcart.jsp
rdc/src/.grammar return.js
rdc/src/META-INF/tags/rdc alpha.tag alphanum.tag
configure.tag creditcardAmount.tag
creditcardExpiry.tag creditcardInfo.tag
creditcardNumber.tag creditcardType.tag date.tag
duration.tag fsm-confirm.tag fsm-input.tag
fsm-run.tag number.tag set-config-composite.tag
set-grammar.tag setup-results.tag task.tag
template.tag time.tag usMajorCity.tag usState.tag
zipCode.tag
rdc/src/META-INF/tags/rdc/schemas config10.mod
config10.mod.rnc config10.mod.rng config10.mod.xsd
rdc-config.dtd rdc-config.rnc rdc-config.rng
rdc-config.xsd sample-config.xml
rdc/src/org/apache/taglibs/rdc CreditCardAmount.java
CreditCardInfo.java GrammarServlet.java
RDCUtils.java
rdc/src/org/apache/taglibs/rdc/core Constants.java
DialogManager.java ExpandTag.java GroupTag.java
IncludeFSMFragmentTag.java StrutsErrorsTag.java
StrutsSubmitTag.java
rdc/src/org/apache/taglibs/rdc/dm Conditions.java
DMUtils.java DialogManagerImpl.java
RuleBasedDirectedDialog.java
SimpleDirectedDialog.java
rdc/src/org/apache/taglibs/rdc/resources
RDCBundle.properties RDCBundle_en_US.properties
rdc/src/util taglibs20-doc.xsl tld20.xsl
Log:
minor update to the Beta 1.3
Author: Rahul P Akolkar
Revision Changes Path
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/alpha-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/alphanum-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/country-test.jsp
1.2 +2 -1
jakarta-taglibs-sandbox/rdc/examples/web/creditcardAmount-test.jsp
Index: creditcardAmount-test.jsp
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/examples/web/creditcardAmount-test.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardAmount-test.jsp 12 Jun 2005 11:22:17 -0000 1.1
+++ creditcardAmount-test.jsp 24 Jun 2005 11:35:45 -0000 1.2
@@ -21,7 +21,8 @@
<jsp:useBean id="dialogMap" class="java.util.LinkedHashMap"
scope="session"/>
<rdc:task map="${dialogMap}">
- <rdc:creditcardAmount id="ccAmount" />
+ <rdc:creditcardAmount id="ccAmount" confirm="true" echo="true"
+ minAmount="USD20.00" balance="USD758.32" maxAmount="USD1000.00"/>
</rdc:task>
</vxml>
1.2 +1 -1
jakarta-taglibs-sandbox/rdc/examples/web/creditcardInfo-test.jsp
Index: creditcardInfo-test.jsp
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/examples/web/creditcardInfo-test.jsp,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardInfo-test.jsp 12 Jun 2005 11:22:17 -0000 1.1
+++ creditcardInfo-test.jsp 24 Jun 2005 11:35:45 -0000 1.2
@@ -21,7 +21,7 @@
<jsp:useBean id="dialogMap" class="java.util.LinkedHashMap"
scope="session"/>
<rdc:task map="${dialogMap}">
- <rdc:creditcardInfo id="ccInfo" />
+ <rdc:creditcardInfo id="ccInfoTest" />
</rdc:task>
</vxml>
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/currency-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/date-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/digits-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/duration-test.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/dyna-select1-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/equipment-type-test.jsp
1.7 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/getcart.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/group-test.jsp
1.9 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/hello.jsp
1.3 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/i18n-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/isbn-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgageType-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/nested-group-test.jsp
1.8 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/number-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/payment-method-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/percent-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/regression-test.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/rulebased-conditions.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/rulebased-nested.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/rulebased-order.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/select1-test.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/simple-template-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/ssn-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/task-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/time-test.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/usMajorCity-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/usState-test.jsp
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/examples/web/zipCode-test.jsp
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/config/rule-based-dialog/rulebased.dtd
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/goodbye.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/login.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/mortgage-rate.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/mortgage.jsp
1.5 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/pause.jsp
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/mortgage-app/transaction-confirm.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/error.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/footer.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/goodbye.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/header.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/listalbums.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/mainmenu-fsm.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/mainmenu.jsp
1.5 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/pause.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/reviewalbum-fsm.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/reviewalbum.jsp
1.7 +0 -0
jakarta-taglibs-sandbox/rdc/examples/web/musicstore-app/voice/reviewcart.jsp
1.2 +2 -4 jakarta-taglibs-sandbox/rdc/src/.grammar/return.js
Index: return.js
===================================================================
RCS file: /home/cvs/jakarta-taglibs-sandbox/rdc/src/.grammar/return.js,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- return.js 12 Jun 2005 11:22:18 -0000 1.1
+++ return.js 24 Jun 2005 11:35:46 -0000 1.2
@@ -36,11 +36,9 @@
var val = "";
if (avp.length < 2) {
continue;
- }
- if (avp.length == 2) {
+ } else if (avp.length == 2) {
val = avp[1];
- }
- if (avp.length > 2) {
+ } else {
for (var j = 1; j < avp.length; j++) {
val += avp[j];
}
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/alpha.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/alphanum.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/configure.tag
1.2 +17 -16
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardAmount.tag
Index: creditcardAmount.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardAmount.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardAmount.tag 12 Jun 2005 11:22:18 -0000 1.1
+++ creditcardAmount.tag 24 Jun 2005 11:35:46 -0000 1.2
@@ -47,34 +47,35 @@
value="${stateMap.initOnlyFlag == true ? constants.FSM_INITONLY :
constants.FSM_INPUT}"/>
<rdc:comment> initialize bean from our attributes </rdc:comment>
<c:set target="${model}" property="id" value="${id}"/>
- <c:set target="${model}" property="balance" value="${balance}"/>
- <c:set target="${model}" property="minAmount" value="${minAmount}"/>
- <c:set target="${model}" property="maxAmount" value="${maxAmount}"/>
<c:set target="${model}" property="initial" value="${initial}"/>
<c:set target="${model}" property="submit" value="${submit}"/>
<c:set target="${model}" property="confirm" value="${confirm}"/>
<c:set target="${model}" property="echo" value="${echo}"/>
<c:set target="${model}" property="currencyCode"
value="${currencyCode}"/>
- <jsp:useBean id="builtin_grammar"
+ <rdc:set-grammar model="${model}" key="rdc.currency.voicegrammar.uri"
/>
+ <rdc:get-resource bundle="${model.rdcResourceBundle}" var="fbGrammar"
+ key="rdc.creditcard.fullbalance.voicegrammar.uri" />
+ <jsp:useBean id="full_amt_grammar"
class="org.apache.taglibs.rdc.core.Grammar" >
- <c:set target="${builtin_grammar}" property="grammar"
- value="builtin:grammar/currency"/>
+ <c:set target="${full_amt_grammar}" property="grammar"
+ value="${pageContext.request.contextPath}/${fbGrammar}"/>
</jsp:useBean>
- <c:set target="${model}" property="grammar"
value="${builtin_grammar}"/>
+ <c:set target="${model}" property="fullAmountGrammar"
value="${full_amt_grammar}"/>
+ <rdc:get-resource bundle="${model.rdcResourceBundle}" var="mpGrammar"
+ key="rdc.creditcard.minpayment.voicegrammar.uri" />
<jsp:useBean id="min_due_grammar"
class="org.apache.taglibs.rdc.core.Grammar" >
<c:set target="${min_due_grammar}" property="grammar"
-
value="${pageContext.request.contextPath}/.grammar/cardamountextras.grxml#minimum"/>
+ value="${pageContext.request.contextPath}/${mpGrammar}"/>
</jsp:useBean>
<c:set target="${model}" property="minimumDueGrammar"
value="${min_due_grammar}"/>
- <jsp:useBean id="full_amt_grammar"
- class="org.apache.taglibs.rdc.core.Grammar" >
- <c:set target="${full_amt_grammar}" property="grammar"
-
value="${pageContext.request.contextPath}/.grammar/cardamountextras.grxml#full"/>
- </jsp:useBean>
- <c:set target="${model}" property="fullAmountGrammar"
value="${full_amt_grammar}"/>
- <rdc:configure model="${model}" config="${config}"
- defaultConfig="META-INF/tags/rdc/config/cardamount.xml" />
+ <c:set target="${model}" property="balance" value="${balance}"/>
+ <c:set target="${model}" property="minAmount" value="${minAmount}"/>
+ <c:set target="${model}" property="maxAmount" value="${maxAmount}"/>
+ <rdc:get-resource bundle="${model.rdcResourceBundle}"
var="defaultConfig"
+ key="rdc.creditcard.amount.defaultconfig.uri" />
+ <rdc:configure model="${model}" config="${config}"
+ defaultConfig="${defaultConfig}" />
<rdc:setup-results model="${model}" submit="${submit}"
minConfidence="${minConfidence}" numNBest="${numNBest}" />
<c:if test="${not empty maxDenials}">
1.2 +5 -8
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardExpiry.tag
Index: creditcardExpiry.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardExpiry.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardExpiry.tag 12 Jun 2005 11:22:18 -0000 1.1
+++ creditcardExpiry.tag 24 Jun 2005 11:35:46 -0000 1.2
@@ -47,14 +47,11 @@
<c:set target ="${model}" property="submit" value="${submit}"/>
<c:set target="${model}" property="confirm" value="${confirm}"/>
<c:set target ="${model}" property="echo" value="${echo}"/>
- <jsp:useBean id="voice_grammar"
- class="org.apache.taglibs.rdc.core.Grammar" >
- <c:set target="${voice_grammar}" property="grammar"
-
value="${pageContext.request.contextPath}/.grammar/cardexpiry.grxml"/>
- </jsp:useBean>
- <c:set target="${model}" property="grammar" value="${voice_grammar}"/>
- <rdc:configure model="${model}" config="${config}"
- defaultConfig="META-INF/tags/rdc/config/cardexpiry.xml" />
+ <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" />
+ <rdc:configure model="${model}" config="${config}"
+ defaultConfig="${defaultConfig}" />
<rdc:setup-results model="${model}" submit="${submit}"
minConfidence="${minConfidence}" numNBest="${numNBest}" />
<c:if test="${not empty maxDenials}">
1.2 +1 -1
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardInfo.tag
Index: creditcardInfo.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardInfo.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardInfo.tag 12 Jun 2005 11:22:18 -0000 1.1
+++ creditcardInfo.tag 24 Jun 2005 11:35:46 -0000 1.2
@@ -68,7 +68,7 @@
</c:when>
<c:when test="${model.state == constants.FSM_INPUT}">
- <rdc:group id="ccInfoGrp"
strategy="org.apache.taglibs.rdc.dm.SimpleDirectedDialog"
+ <rdc:group id="ccInfoGrp"
strategy="org.apache.taglibs.rdc.dm.RuleBasedDirectedDialog"
config="META-INF/tags/rdc/config/cardinfo-rules.xml"
submit="${model.submit}">
<rdc:creditcardType id="ccType" confirm="true" echo="true"
1.2 +6 -15
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardNumber.tag
Index: creditcardNumber.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardNumber.tag,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- creditcardNumber.tag 12 Jun 2005 11:22:18 -0000 1.1
+++ creditcardNumber.tag 24 Jun 2005 11:35:46 -0000 1.2
@@ -47,21 +47,12 @@
<c:set target ="${model}" property="initial" value="${initial}"/>
<c:set target ="${model}" property="submit" value="${submit}"/>
<c:set target ="${model}" property="echo" value="${echo}"/>
- <jsp:useBean id="voice_grammar"
- class="org.apache.taglibs.rdc.core.Grammar" >
- <c:set target="${voice_grammar}" property="grammar"
-
value="${pageContext.request.contextPath}/.grammar/cardnumber.grxml"/>
- </jsp:useBean>
- <c:set target="${model}" property="grammar" value="${voice_grammar}"/>
- <jsp:useBean id="dtmf_grammar"
- class="org.apache.taglibs.rdc.core.Grammar" >
- <c:set target="${dtmf_grammar}" property="grammar"
-
value="${pageContext.request.contextPath}/.grammar/cardnumber-dtmf.grxml"/>
- <c:set target="${dtmf_grammar}" property="isDTMF" value="true" />
- </jsp:useBean>
- <c:set target="${model}" property="grammar" value="${dtmf_grammar}"/>
- <rdc:configure model="${model}" config="${config}"
- defaultConfig="META-INF/tags/rdc/config/cardnumber.xml" />
+ <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"
+ key="rdc.creditcard.number.defaultconfig.uri" />
+ <rdc:configure model="${model}" config="${config}"
+ defaultConfig="${defaultConfig}" />
<rdc:setup-results model="${model}" submit="${submit}"
minConfidence="${minConfidence}" numNBest="${numNBest}" />
<c:if test="${not empty maxDenials}">
1.10 +3 -3
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardType.tag
Index: creditcardType.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/creditcardType.tag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- creditcardType.tag 12 Jun 2005 11:22:18 -0000 1.9
+++ creditcardType.tag 24 Jun 2005 11:35:46 -0000 1.10
@@ -68,9 +68,9 @@
<c:set target="${model}" property="echo" value="${echo}"/>
<c:set target="${model}" property="initial" value="${initial}"/>
<c:set target="${model}" property="locale" value="${locale}"/>
- <rdc:set-grammar model="${model}"
key="rdc.creditcardtype.voicegrammar.uri" />
+ <rdc:set-grammar model="${model}"
key="rdc.creditcard.type.voicegrammar.uri" />
<rdc:get-resource bundle="${model.rdcResourceBundle}"
var="defaultConfig"
- key="rdc.creditcardtype.defaultconfig.uri" />
+ key="rdc.creditcard.type.defaultconfig.uri" />
<rdc:configure model="${model}" config="${config}"
defaultConfig="${defaultConfig}" />
<rdc:setup-results model="${model}" submit="${submit}"
1.10 +3 -1
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/date.tag
Index: date.tag
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/date.tag,v
retrieving revision 1.9
retrieving revision 1.10
diff -u -r1.9 -r1.10
--- date.tag 12 Jun 2005 11:22:18 -0000 1.9
+++ date.tag 24 Jun 2005 11:35:46 -0000 1.10
@@ -93,6 +93,8 @@
<c:otherwise>
<rdc:comment> retrieve cached bean for this instance </rdc:comment>
<c:set var="model" value="${stateMap[id]}"/>
+ <c:set target="${model}" property="maxDate" value="${maxDate}"/>
+ <c:set target="${model}" property="minDate" value="${minDate}"/>
</c:otherwise>
</c:choose>
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/duration.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/fsm-confirm.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/fsm-input.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/fsm-run.tag
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/number.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/set-config-composite.tag
1.3 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/set-grammar.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/setup-results.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/task.tag
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/template.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/time.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/usMajorCity.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/usState.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/zipCode.tag
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/config10.mod
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/config10.mod.rnc
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/config10.mod.rng
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/config10.mod.xsd
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/rdc-config.dtd
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/rdc-config.rnc
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/rdc-config.rng
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/rdc-config.xsd
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/META-INF/tags/rdc/schemas/sample-config.xml
1.2 +2 -2
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/CreditCardAmount.java
Index: CreditCardAmount.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/CreditCardAmount.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CreditCardAmount.java 12 Jun 2005 11:22:19 -0000 1.1
+++ CreditCardAmount.java 24 Jun 2005 11:35:46 -0000 1.2
@@ -172,7 +172,7 @@
public void setMinAmount(String minAmount) {
if (minAmount != null) {
this.minAmount =
(String)canonicalize(minAmount.toUpperCase(), true);
- this.grammars.add(minimumDueGrammar);
+ this.grammars.add(this.minimumDueGrammar);
}
} // end setMinAmount
@@ -193,7 +193,7 @@
public void setBalance(String balance) {
if (balance != null) {
this.balance =
(String)canonicalize(balance.toUpperCase(), true);
- this.grammars.add(fullAmountGrammar);
+ this.grammars.add(this.fullAmountGrammar);
}
}
1.2 +6 -6
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/CreditCardInfo.java
Index: CreditCardInfo.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/CreditCardInfo.java,v
retrieving revision 1.1
retrieving revision 1.2
diff -u -r1.1 -r1.2
--- CreditCardInfo.java 12 Jun 2005 11:22:19 -0000 1.1
+++ CreditCardInfo.java 24 Jun 2005 11:35:46 -0000 1.2
@@ -85,37 +85,37 @@
/**
* @return Returns MODE_EXPIRY
*/
- public static String getMODE_EXPIRY() {
+ public String getMODE_EXPIRY() {
return MODE_EXPIRY;
}
/**
* @return Returns MODE_LONG.
*/
- public static String getMODE_LONG() {
+ public String getMODE_LONG() {
return MODE_LONG;
}
/**
* @return Returns MODE_NUMBER.
*/
- public static String getMODE_NUMBER() {
+ public String getMODE_NUMBER() {
return MODE_NUMBER;
}
/**
* @return Returns MODE_SECURITY.
*/
- public static String getMODE_SECURITY() {
+ public String getMODE_SECURITY() {
return MODE_SECURITY;
}
/**
* @return Returns MODE_SHORT.
*/
- public static String getMODE_SHORT() {
+ public String getMODE_SHORT() {
return MODE_SHORT;
}
/**
* @return Returns MODE_TYPE.
*/
- public static String getMODE_TYPE() {
+ public String getMODE_TYPE() {
return MODE_TYPE;
}
}
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/GrammarServlet.java
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/RDCUtils.java
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/Constants.java
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/DialogManager.java
1.11 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/ExpandTag.java
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/GroupTag.java
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/Conditions.java
1.8 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/DMUtils.java
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
1.8 +30 -16
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
Index: RuleBasedDirectedDialog.java
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java,v
retrieving revision 1.7
retrieving revision 1.8
diff -u -r1.7 -r1.8
--- RuleBasedDirectedDialog.java 12 Jun 2005 11:22:20 -0000 1.7
+++ RuleBasedDirectedDialog.java 24 Jun 2005 11:35:46 -0000 1.8
@@ -118,20 +118,9 @@
DOMParser dp = new DOMParser();
final String rules = groupTag.getConfig();
- InputSource inputSrc = null;
- if (!RDCUtils.isStringEmpty(rules) &&
rules.startsWith("META-INF/")) {
- // unpack rules from distro, which we know validate
- digester.setValidating(false);
- final String jar =
((PageContext)ctx).getServletContext().
- getRealPath(Constants.RDC_JAR);
- inputSrc = RDCUtils.extract(jar, rules);
- } else {
- digester.setValidating(true);
- inputSrc = new
InputSource(((PageContext)ctx).getServletContext().
- getRealPath(rules));
- }
+ InputSource is1 = getRulesAsInputSource(null, ctx, rules);
try {
- dp.parse(inputSrc);
+ dp.parse(is1);
} catch (SAXException sx) {
throw new IOException("Cannot parse the config: " +
groupTag.getConfig());
@@ -216,9 +205,9 @@
}
}
+ InputSource is2 = getRulesAsInputSource(digester, ctx, rules);
try {
- navigation = (Navigation) digester.parse(((PageContext)
-
ctx).getServletContext().getRealPath(groupTag.getConfig()));
+ navigation = (Navigation) digester.parse(is2);
} catch (Exception e) {
retVal = false;
((PageContext) ctx).getOut().write("<!--
RuleBasedDirectedDialog" +
": Error parsing XML navigation rules:" +
groupTag.getConfig()+
@@ -486,6 +475,31 @@
cache.clear();
}
+ /**
+ * Obtains rules, which may be packed in the distribution jar
+ */
+ private static InputSource getRulesAsInputSource(final Digester
digester,
+ final JspContext ctx, final String rules)
+ throws IOException {
+ InputSource inputSrc = null;
+ if (!RDCUtils.isStringEmpty(rules) &&
rules.startsWith("META-INF/")) {
+ // unpack rules from distro, which we know validate
+ if (digester != null) {
+ digester.setValidating(false);
+ }
+ final String jar =
((PageContext)ctx).getServletContext().
+ getRealPath(Constants.RDC_JAR);
+ inputSrc = RDCUtils.extract(jar, rules);
+ } else {
+ if (digester != null) {
+ digester.setValidating(true);
+ }
+ inputSrc = new
InputSource(((PageContext)ctx).getServletContext().
+ getRealPath(rules));
+ }
+ return inputSrc;
+ }
+
/**
* Java Object encapsulating the XML navigation rules.
*
1.10 +0 -0
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java
1.3 +13 -4
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/resources/RDCBundle.properties
Index: RDCBundle.properties
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/resources/RDCBundle.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDCBundle.properties 1 Jun 2005 13:11:14 -0000 1.2
+++ RDCBundle.properties 24 Jun 2005 11:35:46 -0000 1.3
@@ -24,18 +24,23 @@
rdc.alpha.voicegrammar.uri = .grammar/alpha.grxml
rdc.alphanum.voicegrammar.uri = .grammar/alphanum.grxml
rdc.country.voicegrammar.uri = .grammar/countries.grxml
-rdc.creditcardtype.voicegrammar.uri = .grammar/creditcardtype.grxml
+rdc.creditcard.expiry.voicegrammar.uri = .grammar/cardexpiry.grxml
+rdc.creditcard.fullbalance.voicegrammar.uri =
.grammar/cardamountextras.grxml#full
+rdc.creditcard.minpayment.voicegrammar.uri =
.grammar/cardamountextras.grxml#minimum
+rdc.creditcard.number.dtmfgrammar.uri = .grammar/cardnumber-dtmf.grxml
+rdc.creditcard.number.voicegrammar.uri = .grammar/cardnumber.grxml
+rdc.creditcard.type.voicegrammar.uri = .grammar/creditcardtype.grxml
rdc.currency.voicegrammar.uri = builtin:grammar/currency
rdc.date.voicegrammar.uri = .grammar/date.grxml
-rdc.digits.voicegrammar.uri = .grammar/digits.grxml
rdc.digits.dtmfgrammar.uri = .grammar/digits-dtmf.grxml
+rdc.digits.voicegrammar.uri = .grammar/digits.grxml
rdc.duration.voicegrammar.uri = .grammar/duration.grxml
rdc.isbn.voicegrammar.uri = .grammar/isbn.grxml
rdc.mortgagetype.voicegrammar.uri = .grammar/mortgage-type.grxml
rdc.number.voicegrammar.uri = .grammar/number.grxml
rdc.pause.voicegrammar.uri = .grammar/pause.grxml
-rdc.percent.voicegrammar.uri = .grammar/percent.grxml
rdc.percent.dtmfgrammar.uri = .grammar/percent-dtmf.grxml
+rdc.percent.voicegrammar.uri = .grammar/percent.grxml
rdc.ssn.voicegrammar.uri = .grammar/ssn.grxml
rdc.ssn.dtmfgrammar.uri = .grammar/ssn-dtmf.grxml
rdc.time.voicegrammar.uri = .grammar/time.grxml
@@ -48,7 +53,11 @@
rdc.alpha.defaultconfig.uri = META-INF/tags/rdc/config/alpha.xml
rdc.alphanum.defaultconfig.uri = META-INF/tags/rdc/config/alphanum.xml
rdc.country.defaultconfig.uri = META-INF/tags/rdc/config/country.xml
-rdc.creditcardtype.defaultconfig.uri =
META-INF/tags/rdc/config/creditcardtype.xml
+rdc.creditcard.amount.defaultconfig.uri =
META-INF/tags/rdc/config/cardamount.xml
+rdc.creditcard.expiry.defaultconfig.uri =
META-INF/tags/rdc/config/cardexpiry.xml
+rdc.creditcard.number.defaultconfig.uri =
META-INF/tags/rdc/config/cardnumber.xml
+rdc.creditcard.securitycode.defaultconfig.uri =
META-INF/tags/rdc/config/cardsecuritycode.xml
+rdc.creditcard.type.defaultconfig.uri =
META-INF/tags/rdc/config/creditcardtype.xml
rdc.currency.defaultconfig.uri = META-INF/tags/rdc/config/currency.xml
rdc.date.defaultconfig.uri = META-INF/tags/rdc/config/date.xml
rdc.digits.defaultconfig.uri = META-INF/tags/rdc/config/digits.xml
1.3 +13 -4
jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/resources/RDCBundle_en_US.properties
Index: RDCBundle_en_US.properties
===================================================================
RCS file:
/home/cvs/jakarta-taglibs-sandbox/rdc/src/org/apache/taglibs/rdc/resources/RDCBundle_en_US.properties,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -r1.2 -r1.3
--- RDCBundle_en_US.properties 1 Jun 2005 13:11:14 -0000 1.2
+++ RDCBundle_en_US.properties 24 Jun 2005 11:35:47 -0000 1.3
@@ -24,18 +24,23 @@
rdc.alpha.voicegrammar.uri = .grammar/alpha.grxml
rdc.alphanum.voicegrammar.uri = .grammar/alphanum.grxml
rdc.country.voicegrammar.uri = .grammar/countries.grxml
-rdc.creditcardtype.voicegrammar.uri = .grammar/creditcardtype.grxml
+rdc.creditcard.expiry.voicegrammar.uri = .grammar/cardexpiry.grxml
+rdc.creditcard.fullbalance.voicegrammar.uri =
.grammar/cardamountextras.grxml#full
+rdc.creditcard.minpayment.voicegrammar.uri =
.grammar/cardamountextras.grxml#minimum
+rdc.creditcard.number.dtmfgrammar.uri = .grammar/cardnumber-dtmf.grxml
+rdc.creditcard.number.voicegrammar.uri = .grammar/cardnumber.grxml
+rdc.creditcard.type.voicegrammar.uri = .grammar/creditcardtype.grxml
rdc.currency.voicegrammar.uri = builtin:grammar/currency
rdc.date.voicegrammar.uri = .grammar/date.grxml
-rdc.digits.voicegrammar.uri = .grammar/digits.grxml
rdc.digits.dtmfgrammar.uri = .grammar/digits-dtmf.grxml
+rdc.digits.voicegrammar.uri = .grammar/digits.grxml
rdc.duration.voicegrammar.uri = .grammar/duration.grxml
rdc.isbn.voicegrammar.uri = .grammar/isbn.grxml
rdc.mortgagetype.voicegrammar.uri = .grammar/mortgage-type.grxml
rdc.number.voicegrammar.uri = .grammar/number.grxml
rdc.pause.voicegrammar.uri = .grammar/pause.grxml
-rdc.percent.voicegrammar.uri = .grammar/percent.grxml
rdc.percent.dtmfgrammar.uri = .grammar/percent-dtmf.grxml
+rdc.percent.voicegrammar.uri = .grammar/percent.grxml
rdc.ssn.voicegrammar.uri = .grammar/ssn.grxml
rdc.ssn.dtmfgrammar.uri = .grammar/ssn-dtmf.grxml
rdc.time.voicegrammar.uri = .grammar/time.grxml
@@ -48,7 +53,11 @@
rdc.alpha.defaultconfig.uri = META-INF/tags/rdc/config/alpha.xml
rdc.alphanum.defaultconfig.uri = META-INF/tags/rdc/config/alphanum.xml
rdc.country.defaultconfig.uri = META-INF/tags/rdc/config/country.xml
-rdc.creditcardtype.defaultconfig.uri =
META-INF/tags/rdc/config/creditcardtype.xml
+rdc.creditcard.amount.defaultconfig.uri =
META-INF/tags/rdc/config/cardamount.xml
+rdc.creditcard.expiry.defaultconfig.uri =
META-INF/tags/rdc/config/cardexpiry.xml
+rdc.creditcard.number.defaultconfig.uri =
META-INF/tags/rdc/config/cardnumber.xml
+rdc.creditcard.securitycode.defaultconfig.uri =
META-INF/tags/rdc/config/cardsecuritycode.xml
+rdc.creditcard.type.defaultconfig.uri =
META-INF/tags/rdc/config/creditcardtype.xml
rdc.currency.defaultconfig.uri = META-INF/tags/rdc/config/currency.xml
rdc.date.defaultconfig.uri = META-INF/tags/rdc/config/date.xml
rdc.digits.defaultconfig.uri = META-INF/tags/rdc/config/digits.xml
1.8 +0 -0 jakarta-taglibs-sandbox/rdc/src/util/taglibs20-doc.xsl
1.10 +0 -0 jakarta-taglibs-sandbox/rdc/src/util/tld20.xsl
---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]
