You are viewing a plain text version of this content. The canonical link for it is here.
Posted to taglibs-dev@jakarta.apache.org by ra...@apache.org on 2005/07/29 19:04:28 UTC
svn commit: r226400 - in /jakarta/taglibs/proper/rdc/trunk:
src/org/apache/taglibs/rdc/ src/org/apache/taglibs/rdc/core/
src/org/apache/taglibs/rdc/dm/
src/org/apache/taglibs/rdc/sampleapps/mortgage/
src/org/apache/taglibs/rdc/sampleapps/mortgage/strut...
Author: rahul
Date: Fri Jul 29 10:04:13 2005
New Revision: 226400
URL: http://svn.apache.org/viewcvs?rev=226400&view=rev
Log:
1) No need for config attribute of group to be rtexprvalue false.
2) Add ASL to package.html files.
3) Many minor cosmetic changes.
Modified:
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alpha.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alphanum.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Country.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/CreditCardType.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Currency.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Date.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Digits.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Duration.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/GrammarServlet.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ISBN.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Number.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Percent.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/RDCUtils.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SelectOne.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SocialSecurityNumber.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Time.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USMajorCity.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USState.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ZipCode.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/Constants.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/DialogManager.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/ExpandTag.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupModel.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupTag.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/Conditions.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DMUtils.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/MortgageBean.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/HTMLMenuLinks.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/MusicStoreAppBean.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/package.html
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/OfferSummary.java
jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/package.html
jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alpha.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alpha.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alpha.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alpha.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alphanum.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alphanum.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alphanum.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Alphanum.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Country.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Country.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Country.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Country.java Fri Jul 29 10:04:13 2005
@@ -15,7 +15,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import org.apache.taglibs.rdc.core.BaseModel;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/CreditCardType.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/CreditCardType.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/CreditCardType.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/CreditCardType.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import org.apache.taglibs.rdc.core.BaseModel;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Currency.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Currency.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Currency.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Currency.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.text.DecimalFormat;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Date.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Date.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Date.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Date.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.text.ParsePosition;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Digits.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Digits.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Digits.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Digits.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Duration.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Duration.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Duration.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Duration.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/GrammarServlet.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/GrammarServlet.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/GrammarServlet.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/GrammarServlet.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-//$Id$
package org.apache.taglibs.rdc;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ISBN.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ISBN.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ISBN.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ISBN.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Number.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Number.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Number.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Number.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import org.apache.taglibs.rdc.core.BaseModel;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Percent.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Percent.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Percent.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Percent.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/RDCUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/RDCUtils.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/RDCUtils.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/RDCUtils.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SelectOne.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SelectOne.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SelectOne.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SelectOne.java Fri Jul 29 10:04:13 2005
@@ -15,7 +15,6 @@
* limitations under the License.
*
*/
-
package org.apache.taglibs.rdc;
import java.io.Serializable;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SocialSecurityNumber.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SocialSecurityNumber.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SocialSecurityNumber.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/SocialSecurityNumber.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Time.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Time.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Time.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/Time.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.text.ParsePosition;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USMajorCity.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USMajorCity.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USMajorCity.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USMajorCity.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import org.apache.taglibs.rdc.core.BaseModel;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USState.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USState.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USState.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/USState.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import org.apache.taglibs.rdc.core.BaseModel;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ZipCode.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ZipCode.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ZipCode.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/ZipCode.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-
package org.apache.taglibs.rdc;
import java.util.regex.Pattern;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/Constants.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/Constants.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/Constants.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/Constants.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.core;
import java.util.Locale;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/DialogManager.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/DialogManager.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/DialogManager.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/DialogManager.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/ExpandTag.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/ExpandTag.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/ExpandTag.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/ExpandTag.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-//$Id$
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupModel.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupModel.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupModel.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupModel.java Fri Jul 29 10:04:13 2005
@@ -42,11 +42,14 @@
// The list of currently active children
// An active child is defined as one that is neither DORMANT nor DONE
protected List activeChildren;
+ // Strategy specific instance data that needs to be cached
+ protected transient Object instanceData;
public GroupModel() {
super();
this.localMap = new LinkedHashMap();
this.activeChildren = new ArrayList();
+ this.instanceData = null;
} // GroupModel constructor
@@ -104,4 +107,21 @@
activeChildren = list;
}
+ /**
+ * Get the instance data
+ *
+ * @return Returns the instanceData.
+ */
+ public Object getInstanceData() {
+ return instanceData;
+ }
+
+ /**
+ * Set the instance data
+ *
+ * @param instanceData The instanceData to set.
+ */
+ public void setInstanceData(Object instanceData) {
+ this.instanceData = instanceData;
+ }
}
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupTag.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupTag.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupTag.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/GroupTag.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/IncludeFSMFragmentTag.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-//$Id$
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsErrorsTag.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-//$Id$
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/StrutsSubmitTag.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-//$Id$
package org.apache.taglibs.rdc.core;
import java.io.IOException;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/core/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/Conditions.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/Conditions.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/Conditions.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/Conditions.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.dm;
import java.text.MessageFormat;
@@ -163,7 +162,7 @@
name, String.class, lruCache, tempVars);
} catch (Exception e) {
MessageFormat msgFormat = new MessageFormat(ERR_BAD_EXPR);
- log.error(msgFormat.format(new Object[] {e.getMessage()}));
+ log.error(msgFormat.format(new Object[] {e.getMessage()}), e);
}
if (elem != null && elem.hasAttribute(attr)) {
lvalue = elem.getAttribute(attr);
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DMUtils.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DMUtils.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DMUtils.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DMUtils.java Fri Jul 29 10:04:13 2005
@@ -16,12 +16,12 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.dm;
import java.text.MessageFormat;
import java.util.LinkedHashMap;
import java.util.List;
+import java.util.Map;
import java.util.StringTokenizer;
import java.util.regex.Pattern;
import java.util.regex.Matcher;
@@ -81,10 +81,7 @@
* @param BaseModel
*/
public static boolean isChildDone(BaseModel model) {
- if (model instanceof BaseModel &&
- model.getState() == Constants.FSM_DONE) {
- return true;
- } else if (model instanceof GroupModel) {
+ if (model instanceof GroupModel) {
GroupModel grpModel = (GroupModel) model;
if (grpModel.getGroupConfirm() != null) {
if (grpModel.getState() == Constants.GRP_STATE_DONE) {
@@ -100,6 +97,9 @@
} else if (model instanceof ComponentModel &&
model.getState() == Constants.FSM_DONE) {
return true;
+ } else if (model instanceof BaseModel &&
+ model.getState() == Constants.FSM_DONE) {
+ return true;
}
return false;
}
@@ -108,6 +108,35 @@
// PACKAGE METHODS
// ******************
/**
+ * Activate child so it takes over the dialog from the next turn
+ */
+ static int invokeDormantChild(Map children, List activeChildren,
+ String id) {
+ if (id == null) {
+ log.info("Null ID of identified target");
+ return Constants.GRP_ALL_CHILDREN_DONE;
+ }
+ BaseModel model = (BaseModel) children.get(id);
+ if (model != null) {
+ if (model.getState() == Constants.FSM_DORMANT) {
+ activeChildren.add(id);
+ if (model instanceof BaseModel) {
+ model.setState(Constants.FSM_INPUT);
+ } else if (model instanceof GroupModel) {
+ model.setState(Constants.GRP_STATE_RUNNING);
+ } else if (model instanceof ComponentModel) {
+ model.setState(Constants.FSM_INPUT);
+ }
+ }
+ return Constants.GRP_SOME_CHILD_RUNNING;
+ } else {
+ log.info("ID \"" + id + "\" of target in group dialog " +
+ "configuration is invalid");
+ return Constants.GRP_ALL_CHILDREN_DONE;
+ }
+ }
+
+ /**
* Two pass evaluation:
* 1) Substitute value-of RDCs
* 2) Evaluate using the EL evaluator
@@ -248,7 +277,7 @@
value = exprEvaluator.evaluate(expr, retType, varResolver, null);
} catch (javax.servlet.jsp.el.ELException e) {
MessageFormat msgFormat = new MessageFormat(ERR_BAD_EXPR);
- log.warn(msgFormat.format(new Object[] {e.getMessage()}));
+ log.warn(msgFormat.format(new Object[] {e.getMessage()}), e);
return null;
} // end of try-catch
return value;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/DialogManagerImpl.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.dm;
import java.text.MessageFormat;
@@ -297,7 +296,7 @@
MessageFormat msgFormat =
new MessageFormat(ERR_SET_PROPERTY);
log.error(msgFormat.format(new Object[] {propertyName,
- model.getId(), e.getMessage()}));
+ model.getId(), e.getMessage()}), e);
}
}
}
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/RuleBasedDirectedDialog.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.dm;
import java.io.IOException;
@@ -50,7 +49,6 @@
import org.apache.taglibs.rdc.RDCUtils;
import org.apache.taglibs.rdc.core.BaseModel;
-import org.apache.taglibs.rdc.core.ComponentModel;
import org.apache.taglibs.rdc.core.GroupTag;
import org.apache.taglibs.rdc.core.GroupModel;
import org.apache.taglibs.rdc.core.Constants;
@@ -105,6 +103,12 @@
throws JspException, IOException {
boolean retVal = super.initialize(ctx, bodyFragment);
+
+ GroupModel groupModel = (GroupModel) stateMap.get(groupTag.getId());
+ if (groupModel.getInstanceData() != null) {
+ navigation = (Navigation) groupModel.getInstanceData();
+ return retVal;
+ }
Digester digester = new Digester();
digester.setErrorHandler(new NavigationRulesErrorHandler());
@@ -244,6 +248,7 @@
log.error(errMsg);
((PageContext) ctx).getOut().write(errMsg);
}
+ groupModel.setInstanceData(navigation);
return retVal;
}
@@ -361,21 +366,24 @@
if (navRule.getConditions().size() == 0) {
currentExec = navRule.getTarget();
- invokeChild(children, activeChildren, currentExec);
+ groupState = DMUtils.invokeDormantChild(children,
+ activeChildren, currentExec);
} else {
List conditionals = navRule.getConditions();
currentExec = identifyTarget(conditionals, groupTag,
groupModel, lruCache, tempVars);
+ if (activeChildren.size() > 0) {
+ activeChildren.remove(0);
+ }
if (currentExec != null) {
- invokeChild(children, activeChildren, currentExec);
+ groupState = DMUtils.invokeDormantChild(children,
+ activeChildren, currentExec);
} else {
currentExec = navRule.getDefaultTarget();
if (currentExec != null) {
- invokeChild(children, activeChildren, currentExec);
+ groupState = DMUtils.invokeDormantChild(children,
+ activeChildren, currentExec);
} else {
- if (activeChildren.size() > 0) {
- activeChildren.remove(0);
- }
groupState = Constants.GRP_ALL_CHILDREN_DONE;
log.info("RuleBasedDirectedDialog: None" +
" of the conditions satisfied for " +
@@ -396,7 +404,7 @@
groupState = Constants.GRP_ALL_CHILDREN_DONE;
}
- } // end method dialogManagerOD()
+ } // end method dialogManager()
/**
* Render next child in execution order if:
@@ -417,50 +425,6 @@
}
return false;
}
-
- /**
- * Activate child so it takes over the dialog from the next turn
- */
- private void invokeChild(Map children, List activeChildren,
- String id) {
- if (id == null) {
- if (activeChildren.size() > 0) {
- activeChildren.remove(0);
- }
- groupState = Constants.GRP_ALL_CHILDREN_DONE;
- log.info("Null ID of identified target");
- return;
- }
- BaseModel model = (BaseModel) children.get(id);
- if (model != null) {
- if (groupState != Constants.GRP_SOME_CHILD_RUNNING) {
- groupState = Constants.GRP_SOME_CHILD_RUNNING;
- }
- if (activeChildren.size() > 0) {
- activeChildren.remove(0);
- }
- activeChildren.add(id);
- if (model instanceof BaseModel) {
- model.setState(Constants.FSM_INPUT);
- } else if (model instanceof GroupModel) {
- model.setState(Constants.GRP_STATE_RUNNING);
- } else if (model instanceof ComponentModel) {
- model.setState(Constants.FSM_INPUT);
- }
- } else {
- // Invalid child ID specified in XML navigation rules
- // Abort group execution -- return values collected
- // upto this point
- if (activeChildren.size() > 0) {
- // Directed dialog
- activeChildren.remove(0);
- }
- groupState = Constants.GRP_ALL_CHILDREN_DONE;
- log.info("ID \"" + id + "\" of target in navigation rule " +
- "is invalid");
- }
- }
-
/**
* Evaluate the given list of Condition objects with respect
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/SimpleDirectedDialog.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,6 @@
*
*
*/
-/*$Id$*/
package org.apache.taglibs.rdc.dm;
import java.util.Map;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/dm/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/MortgageBean.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/MortgageBean.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/MortgageBean.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/MortgageBean.java Fri Jul 29 10:04:13 2005
@@ -16,7 +16,7 @@
*
*
*/
- package org.apache.taglibs.rdc.sampleapps.mortgage.struts;
+package org.apache.taglibs.rdc.sampleapps.mortgage.struts;
import javax.servlet.http.HttpServletRequest;
import org.apache.struts.action.ActionErrors;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/mortgage/struts/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/HTMLMenuLinks.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/HTMLMenuLinks.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/HTMLMenuLinks.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/HTMLMenuLinks.java Fri Jul 29 10:04:13 2005
@@ -15,7 +15,6 @@
* limitations under the License.
*
*/
-
package org.apache.taglibs.rdc.sampleapps.musicstore;
import java.util.Locale;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/MusicStoreAppBean.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/MusicStoreAppBean.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/MusicStoreAppBean.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/MusicStoreAppBean.java Fri Jul 29 10:04:13 2005
@@ -14,7 +14,6 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*
- *
*/
package org.apache.taglibs.rdc.sampleapps.musicstore;
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/struts/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/Image.java Fri Jul 29 10:04:13 2005
@@ -15,7 +15,6 @@
* limitations under the License.
*
*/
-
package org.apache.taglibs.rdc.sampleapps.musicstore.ws;
/**
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/OfferSummary.java
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/OfferSummary.java?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/OfferSummary.java (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/OfferSummary.java Fri Jul 29 10:04:13 2005
@@ -15,7 +15,6 @@
* limitations under the License.
*
*/
-
package org.apache.taglibs.rdc.sampleapps.musicstore.ws;
/**
Modified: jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/package.html
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/package.html?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/package.html (original)
+++ jakarta/taglibs/proper/rdc/trunk/src/org/apache/taglibs/rdc/sampleapps/musicstore/ws/package.html Fri Jul 29 10:04:13 2005
@@ -1,4 +1,24 @@
<html>
+<!--
+ *
+ *
+ * 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.
+ *
+ *
+ *
+-->
<head>
</head>
<body>
Modified: jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml
URL: http://svn.apache.org/viewcvs/jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml?rev=226400&r1=226399&r2=226400&view=diff
==============================================================================
--- jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml (original)
+++ jakarta/taglibs/proper/rdc/trunk/xml/rdc.xml Fri Jul 29 10:04:13 2005
@@ -686,7 +686,7 @@
<attribute>
<name>config</name>
<required>false</required>
- <rtexprvalue>false</rtexprvalue>
+ <rtexprvalue>true</rtexprvalue>
<description>The strategy specific config attribute.</description>
</attribute>
<attribute>
---------------------------------------------------------------------
To unsubscribe, e-mail: taglibs-dev-unsubscribe@jakarta.apache.org
For additional commands, e-mail: taglibs-dev-help@jakarta.apache.org