Author: niallp
Date: Tue Jan 31 04:18:48 2006
New Revision: 373801

URL: http://svn.apache.org/viewcvs?rev=373801&view=rev
Log:
Port Fix for Bug 38461 to 1.2.x branch - struts-el html tag library errorKey 
not using documented default value on OAS - thanks to Michael Manley

Modified:
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
    
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELCheckboxTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -529,7 +529,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELFileTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELFileTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -575,7 +575,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELMultiboxTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -518,7 +518,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELPasswordTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -589,7 +589,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELRadioTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -544,7 +544,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELSelectTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -545,7 +545,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -574,7 +574,7 @@
         setAltKeyExpr(null);
         setBundleExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);

Modified: 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
URL: 
http://svn.apache.org/viewcvs/struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java?rev=373801&r1=373800&r2=373801&view=diff
==============================================================================
--- 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
 (original)
+++ 
struts/el/branches/STRUTS_1_2_BRANCH/src/share/org/apache/strutsel/taglib/html/ELTextareaTag.java
 Tue Jan 31 04:18:48 2006
@@ -1,7 +1,7 @@
 /*
  * $Id$ 
  *
- * Copyright 1999-2004 The Apache Software Foundation.
+ * Copyright 1999-2006 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.
@@ -591,7 +591,7 @@
         setBundleExpr(null);
         setColsExpr(null);
         setDisabledExpr(null);
-        setErrorKey(null);
+        setErrorKeyExpr(null);
         setErrorStyleExpr(null);
         setErrorStyleClassExpr(null);
         setErrorStyleIdExpr(null);



---------------------------------------------------------------------
To unsubscribe, e-mail: [EMAIL PROTECTED]
For additional commands, e-mail: [EMAIL PROTECTED]

Reply via email to