Index: lams_central/web/WEB-INF/struts/struts-config_1_0.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/struts-config_1_0.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/struts-config_1_0.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,408 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/struts-config_1_1.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/struts-config_1_1.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/struts-config_1_1.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,695 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/struts-config_1_2.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/struts-config_1_2.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/struts-config_1_2.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,686 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/struts-html-el.tld =================================================================== diff -u -r193ad7a6ec5ee05c612dc9a7230c5d281296f643 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_central/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision 193ad7a6ec5ee05c612dc9a7230c5d281296f643) +++ lams_central/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -623,6 +703,11 @@ true +disabled +false +true + + enctype false true @@ -653,6 +738,11 @@ true +readonly +false +true + + scriptLanguage false true @@ -682,6 +772,11 @@ frame org.apache.strutsel.taglib.html.ELFrameTag +bundle +false +true + + action false true @@ -832,6 +927,11 @@ true +bundle +false +true + + disabled false true @@ -1420,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1465,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1680,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1943,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2102,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2246,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2451,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2600,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2734,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2888,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2898,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_central/web/WEB-INF/struts/struts-html.tld =================================================================== diff -u -r193ad7a6ec5ee05c612dc9a7230c5d281296f643 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_central/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision 193ad7a6ec5ee05c612dc9a7230c5d281296f643) +++ lams_central/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -623,6 +703,11 @@ true +disabled +false +true + + enctype false true @@ -653,6 +738,11 @@ true +readonly +false +true + + scriptLanguage false true @@ -682,6 +772,11 @@ frame org.apache.struts.taglib.html.FrameTag +bundle +false +true + + action false true @@ -832,6 +927,11 @@ true +bundle +false +true + + disabled false true @@ -1420,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1465,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1680,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1943,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2102,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2246,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2451,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2600,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2734,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2888,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2898,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_central/web/WEB-INF/struts/struts-nested.tld =================================================================== diff -u -r193ad7a6ec5ee05c612dc9a7230c5d281296f643 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_central/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision 193ad7a6ec5ee05c612dc9a7230c5d281296f643) +++ lams_central/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -253,11 +253,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -383,6 +408,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -393,10 +428,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -422,11 +467,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -562,6 +632,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -572,6 +652,11 @@ true +focusIndex +false +true + + method false true @@ -587,6 +672,16 @@ true +readonly +false +true + + +scriptLanguage +false +true + + style false true @@ -935,6 +1030,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -995,6 +1100,11 @@ true +useLocalEncoding +false +true + + usemap false true @@ -1024,6 +1134,11 @@ true +module +false +true + + anchor false true @@ -1049,6 +1164,11 @@ true +bundle +false +true + + linkName false true @@ -1193,6 +1313,11 @@ false true + +useLocalEncoding +false +true + messages @@ -1259,11 +1384,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1478,11 +1628,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1637,11 +1812,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1736,6 +1936,11 @@ true true + +idName +false +true + select @@ -1757,11 +1962,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1906,6 +2136,11 @@ true +bundle +false +true + + disabled false true @@ -2040,11 +2275,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2194,6 +2454,11 @@ true +bundle +false +true + + cols false true @@ -2204,6 +2469,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_central/web/WEB-INF/struts/tiles-config_1_1.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/tiles-config_1_1.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/tiles-config_1_1.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,281 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/validator-rules.xml =================================================================== diff -u --- lams_central/web/WEB-INF/struts/validator-rules.xml (revision 0) +++ lams_central/web/WEB-INF/struts/validator-rules.xml (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,313 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/web-app_2_2.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/web-app_2_2.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/web-app_2_2.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,565 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_central/web/WEB-INF/struts/web-app_2_3.dtd =================================================================== diff -u --- lams_central/web/WEB-INF/struts/web-app_2_3.dtd (revision 0) +++ lams_central/web/WEB-INF/struts/web-app_2_3.dtd (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,1059 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Index: lams_contentrepository/web/WEB-INF/struts/struts-bean.tld =================================================================== diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_contentrepository/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision 9521d8efcb3e577a474aed2d2bb69b2231d19801) +++ lams_contentrepository/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 bean -http://jakarta.apache.org/struts/tags-bean-1.0.1 +http://struts.apache.org/tags-bean cookie org.apache.struts.taglib.bean.CookieTag @@ -20,7 +20,7 @@ id true -true +false multiple @@ -42,11 +42,11 @@ define org.apache.struts.taglib.bean.DefineTag org.apache.struts.taglib.bean.DefineTei -empty +JSP id true -true +false name @@ -87,7 +87,7 @@ id true -true +false multiple @@ -128,7 +128,7 @@ id true -true +false name @@ -182,14 +182,29 @@ key -true +false true locale false true + +name +false +true + + +property +false +true + + +scope +false +true + page @@ -199,7 +214,7 @@ id true -true +false property @@ -215,7 +230,7 @@ id true -true +false multiple @@ -241,7 +256,7 @@ id true -true +false input @@ -267,7 +282,7 @@ id true -true +false name @@ -293,7 +308,7 @@ id true -true +false formBean @@ -316,16 +331,36 @@ org.apache.struts.taglib.bean.WriteTag empty +bundle +false +true + + filter false true +format +false +true + + +formatKey +false +true + + ignore false true +locale +false +true + + name true true Fisheye: Tag ac2f4dc5d7004798e4b6a37684619fed29bdea65 refers to a dead (removed) revision in file `lams_contentrepository/web/WEB-INF/struts/struts-form.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/web/WEB-INF/struts/struts-html-el.tld =================================================================== diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_contentrepository/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision 9521d8efcb3e577a474aed2d2bb69b2231d19801) +++ lams_contentrepository/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -623,6 +703,11 @@ true +disabled +false +true + + enctype false true @@ -653,6 +738,11 @@ true +readonly +false +true + + scriptLanguage false true @@ -682,6 +772,11 @@ frame org.apache.strutsel.taglib.html.ELFrameTag +bundle +false +true + + action false true @@ -832,6 +927,11 @@ true +bundle +false +true + + disabled false true @@ -1420,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1465,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1680,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1943,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2102,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2246,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2451,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2600,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2734,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2888,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2898,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_contentrepository/web/WEB-INF/struts/struts-html.tld =================================================================== diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_contentrepository/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision 9521d8efcb3e577a474aed2d2bb69b2231d19801) +++ lams_contentrepository/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 html -http://jakarta.apache.org/struts/tags-html-1.0.1 +http://struts.apache.org/tags-html base org.apache.struts.taglib.html.BaseTag @@ -21,6 +21,11 @@ false true + +server +false +true + button @@ -31,11 +36,31 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +indexed +false +true + + onblur false true @@ -126,6 +151,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -140,6 +175,21 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true @@ -235,6 +285,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -249,11 +309,51 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + name false true @@ -349,6 +449,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -364,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -374,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -393,11 +523,51 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + maxlength false true @@ -503,6 +673,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -518,6 +698,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -528,12 +718,12 @@ true -method +focusIndex false true -name +method false true @@ -548,11 +738,16 @@ true -scope +readonly false true +scriptLanguage +false +true + + style false true @@ -572,36 +767,301 @@ false true + + +frame +org.apache.struts.taglib.html.FrameTag -type +bundle false true + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +frameborder +false +true + + +frameName +false +true + + +href +false +true + + +longdesc +false +true + + +marginheight +false +true + + +marginwidth +false +true + + +name +false +true + + +noresize +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +scrolling +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + hidden org.apache.struts.taglib.html.HiddenTag +empty +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + name false true +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + property true true +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + value false true + +write +false +true + html org.apache.struts.taglib.html.HtmlTag JSP +lang +false +true + + locale false true @@ -651,6 +1111,11 @@ true +indexed +false +true + + locale false true @@ -756,11 +1221,26 @@ true +styleId +false +true + + tabindex false true +title +false +true + + +titleKey +false +true + + value false true @@ -771,11 +1251,6 @@ org.apache.struts.taglib.html.ImgTag empty -accesskey -false -true - - align false true @@ -801,6 +1276,11 @@ true +contextRelative +false +true + + height false true @@ -836,6 +1316,16 @@ true +onclick +false +true + + +ondblclick +false +true + + onkeydown false true @@ -851,6 +1341,31 @@ true +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + paramId false true @@ -866,6 +1381,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -916,6 +1441,21 @@ true +title +false +true + + +titleKey +false +true + + +useLocalEncoding +false +true + + usemap false true @@ -932,6 +1472,61 @@ +javascript +org.apache.struts.taglib.html.JavascriptValidatorTag +empty + +cdata +false +true + + +dynamicJavascript +false +false + + +formName +false +true + + +method +false +true + + +page +false +true + + +scriptLanguage +false +true + + +src +false +true + + +staticJavascript +false +false + + +htmlComment +false +true + + +bundle +false +true + + + link org.apache.struts.taglib.html.LinkTag @@ -940,6 +1535,16 @@ true +action +false +true + + +module +false +true + + anchor false true @@ -955,6 +1560,21 @@ true +indexed +false +true + + +indexId +false +true + + +bundle +false +true + + linkName false true @@ -1090,12 +1710,68 @@ true +titleKey +false +true + + transaction false true + +useLocalEncoding +false +true + +messages +org.apache.struts.taglib.html.MessagesTag +org.apache.struts.taglib.html.MessagesTei +JSP + +id +true +false + + +bundle +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +header +false +true + + +footer +false +true + + +message +false +true + + + multibox org.apache.struts.taglib.html.MultiboxTag @@ -1104,11 +1780,46 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1204,6 +1915,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -1238,6 +1959,11 @@ true +styleId +false +true + + styleClass false true @@ -1258,6 +1984,11 @@ true +filter +false +true + + labelName false true @@ -1289,6 +2020,46 @@ +optionsCollection +org.apache.struts.taglib.html.OptionsCollectionTag +empty + +filter +false +true + + +label +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +value +false +true + + + password org.apache.struts.taglib.html.PasswordTag @@ -1297,11 +2068,51 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + maxlength false true @@ -1417,6 +2228,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -1431,11 +2252,51 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + name false true @@ -1491,6 +2352,26 @@ true +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + style false true @@ -1511,10 +2392,25 @@ true +title +false +true + + +titleKey +false +true + + value true true + +idName +false +true + reset @@ -1525,6 +2421,21 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true @@ -1595,6 +2506,11 @@ true +property +false +true + + style false true @@ -1615,6 +2531,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -1625,6 +2551,16 @@ org.apache.struts.taglib.html.RewriteTag empty +action +false +true + + +module +false +true + + anchor false true @@ -1684,22 +2620,62 @@ false true + +useLocalEncoding +false +true + select org.apache.struts.taglib.html.SelectTag JSP -accesskey +alt false true +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + multiple false true @@ -1805,6 +2781,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -1819,11 +2805,31 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +indexed +false +true + + onblur false true @@ -1914,6 +2920,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -1928,11 +2944,51 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + maxlength false true @@ -2043,6 +3099,16 @@ true +title +false +true + + +titleKey +false +true + + value false true @@ -2057,6 +3123,21 @@ true +alt +false +true + + +altKey +false +true + + +bundle +false +true + + cols false true @@ -2067,6 +3148,31 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + name false true @@ -2172,10 +3278,25 @@ true +title +false +true + + +titleKey +false +true + + value false true + +xhtml +org.apache.struts.taglib.html.XhtmlTag +empty + Index: lams_contentrepository/web/WEB-INF/struts/struts-logic.tld =================================================================== diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_contentrepository/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision 9521d8efcb3e577a474aed2d2bb69b2231d19801) +++ lams_contentrepository/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -7,11 +7,31 @@ -1.0 +1.2 1.1 logic -http://jakarta.apache.org/struts/tags-logic-1.0.1 +http://struts.apache.org/tags-logic +empty +org.apache.struts.taglib.logic.EmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + equal org.apache.struts.taglib.logic.EqualTag JSP @@ -154,12 +174,12 @@ id true -true +false indexId false -true +false length @@ -318,6 +338,66 @@ +messagesNotPresent +org.apache.struts.taglib.logic.MessagesNotPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +messagesPresent +org.apache.struts.taglib.logic.MessagesPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +notEmpty +org.apache.struts.taglib.logic.NotEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + notEqual org.apache.struts.taglib.logic.NotEqualTag JSP @@ -496,6 +576,11 @@ redirect org.apache.struts.taglib.logic.RedirectTag +action +false +true + + anchor false true @@ -555,6 +640,11 @@ false true + +useLocalEncoding +false +true + Index: lams_contentrepository/web/WEB-INF/struts/struts-nested.tld =================================================================== diff -u --- lams_contentrepository/web/WEB-INF/struts/struts-nested.tld (revision 0) +++ lams_contentrepository/web/WEB-INF/struts/struts-nested.tld (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,3171 @@ + + + + + + + + + +1.2 +1.1 +nested +http://struts.apache.org/tags-nested + +nest +org.apache.struts.taglib.nested.NestedPropertyTag +JSP + +property +false +true + + + +writeNesting +org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei +JSP + +property +false +true + + +id +false +true + + +filter +false +true + + + +root +org.apache.struts.taglib.nested.NestedRootTag +JSP + +name +false +true + + + +define +org.apache.struts.taglib.nested.bean.NestedDefineTag +org.apache.struts.taglib.nested.bean.NestedDefineTei +empty + +id +true +true + + +name +false +true + + +property +false +true + + +scope +false +true + + +toScope +false +true + + +type +false +true + + +value +false +true + + + +message +org.apache.struts.taglib.nested.bean.NestedMessageTag +empty + +arg0 +false +true + + +arg1 +false +true + + +arg2 +false +true + + +arg3 +false +true + + +arg4 +false +true + + +bundle +false +true + + +key +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +size +org.apache.struts.taglib.nested.bean.NestedSizeTag +org.apache.struts.taglib.bean.SizeTei +empty + +collection +false +true + + +id +true +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +write +org.apache.struts.taglib.nested.bean.NestedWriteTag +empty + +bundle +false +true + + +filter +false +true + + +format +false +true + + +formatKey +false +true + + +ignore +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +checkbox +org.apache.struts.taglib.nested.html.NestedCheckboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +errors +org.apache.struts.taglib.nested.html.NestedErrorsTag +empty + +bundle +false +true + + +footer +false +true + + +header +false +true + + +locale +false +true + + +name +false +true + + +prefix +false +true + + +property +false +true + + +suffix +false +true + + + +file +org.apache.struts.taglib.nested.html.NestedFileTag + +accesskey +false +true + + +accept +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +form +org.apache.struts.taglib.nested.html.NestedFormTag +JSP + +action +true +true + + +acceptCharset +false +true + + +disabled +false +true + + +enctype +false +true + + +focus +false +true + + +focusIndex +false +true + + +method +false +true + + +onreset +false +true + + +onsubmit +false +true + + +readonly +false +true + + +scriptLanguage +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +target +false +true + + + +hidden +org.apache.struts.taglib.nested.html.NestedHiddenTag + +alt +false +true + + +altKey +false +true + + +indexed +false +true + + +name +false +true + + +property +true +true + + +title +false +true + + +titleKey +false +true + + +styleClass +false +true + + +styleId +false +true + + +value +false +true + + +write +false +true + + + +image +org.apache.struts.taglib.nested.html.NestedImageTag + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +locale +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +pageKey +false +true + + +property +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +img +org.apache.struts.taglib.nested.html.NestedImgTag +empty + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +height +false +true + + +hspace +false +true + + +imageName +false +true + + +ismap +false +true + + +locale +false +true + + +lowsrc +false +true + + +name +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +paramId +false +true + + +page +false +true + + +pageKey +false +true + + +action +false +true + + +module +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +useLocalEncoding +false +true + + +usemap +false +true + + +vspace +false +true + + +width +false +true + + + +link +org.apache.struts.taglib.nested.html.NestedLinkTag + +accesskey +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +indexed +false +true + + +indexId +false +true + + +bundle +false +true + + +linkName +false +true + + +name +false +true + + +onblur +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +target +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +messages +org.apache.struts.taglib.nested.html.NestedMessagesTag +org.apache.struts.taglib.html.MessagesTei +JSP + +id +true +true + + +bundle +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +header +false +true + + +footer +false +true + + +message +false +true + + + +multibox +org.apache.struts.taglib.nested.html.NestedMultiboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +options +org.apache.struts.taglib.nested.html.NestedOptionsTag +empty + +collection +false +true + + +filter +false +true + + +labelName +false +true + + +labelProperty +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + + +optionsCollection +org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag +empty + +filter +false +true + + +label +false +true + + +name +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +value +false +true + + + +password +org.apache.struts.taglib.nested.html.NestedPasswordTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +redisplay +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +size +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +radio +org.apache.struts.taglib.nested.html.NestedRadioTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +property +true +true + + +onmousedown +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +true +true + + +idName +false +true + + + +select +org.apache.struts.taglib.nested.html.NestedSelectTag +JSP + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +multiple +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +size +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +submit +org.apache.struts.taglib.nested.html.NestedSubmitTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +text +org.apache.struts.taglib.nested.html.NestedTextTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +textarea +org.apache.struts.taglib.nested.html.NestedTextareaTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +cols +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +rows +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +empty +org.apache.struts.taglib.nested.logic.NestedEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +equal +org.apache.struts.taglib.nested.logic.NestedEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +greaterEqual +org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +greaterThan +org.apache.struts.taglib.nested.logic.NestedGreaterThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +iterate +org.apache.struts.taglib.nested.logic.NestedIterateTag +org.apache.struts.taglib.nested.logic.NestedIterateTei +JSP + +collection +false +true + + +id +false +true + + +indexId +false +true + + +length +false +true + + +name +false +true + + +offset +false +true + + +property +false +true + + +scope +false +true + + +type +false +true + + + +lessEqual +org.apache.struts.taglib.nested.logic.NestedLessEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +lessThan +org.apache.struts.taglib.nested.logic.NestedLessThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +match +org.apache.struts.taglib.nested.logic.NestedMatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +messagesNotPresent +org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +messagesPresent +org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +notEmpty +org.apache.struts.taglib.nested.logic.NestedNotEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +notEqual +org.apache.struts.taglib.nested.logic.NestedNotEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notMatch +org.apache.struts.taglib.nested.logic.NestedNotMatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notPresent +org.apache.struts.taglib.nested.logic.NestedNotPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +present +org.apache.struts.taglib.nested.logic.NestedPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + + + + Fisheye: Tag ac2f4dc5d7004798e4b6a37684619fed29bdea65 refers to a dead (removed) revision in file `lams_contentrepository/web/WEB-INF/struts/struts-template.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/web/WEB-INF/struts/struts-tiles-el.tld =================================================================== diff -u --- lams_contentrepository/web/WEB-INF/struts/struts-tiles-el.tld (revision 0) +++ lams_contentrepository/web/WEB-INF/struts/struts-tiles-el.tld (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -0,0 +1,343 @@ + + + + + + + + + + +1.2 +1.1 +tiles +http://struts.apache.org/tags-tiles-el + +insert +org.apache.strutsel.taglib.tiles.ELInsertTag +JSP + +template +false +true + + +component +false +true + + +page +false +true + + +definition +false +true + + +attribute +false +false + + +name +false +true + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +flush +false +false + + +ignore +false +true + + +role +false +true + + +controllerUrl +false +true + + +controllerClass +false +true + + + +definition +org.apache.strutsel.taglib.tiles.ELDefinitionTag +JSP + +id +true +false + + +scope +false +false + + +template +false +true + + +page +false +true + + +role +false +true + + +extends +false +true + + + +put +org.apache.strutsel.taglib.tiles.ELPutTag +JSP + +name +false +false + + +value +false +true + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +putList +org.apache.strutsel.taglib.tiles.ELPutListTag +JSP + +name +true +false + + + +add +org.apache.strutsel.taglib.tiles.ELAddTag +JSP + +value +false +false + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +get +org.apache.strutsel.taglib.tiles.ELGetTag +empty + +name +true +true + + +ignore +false +true + + +flush +false +false + + +role +false +true + + + +getAsString +org.apache.strutsel.taglib.tiles.ELGetAttributeTag +empty + +name +true +true + + +ignore +false +true + + +role +false +true + + + +useAttribute +org.apache.strutsel.taglib.tiles.ELUseAttributeTag +empty + +id +false +false + + +classname +false +false + + +scope +false +false + + +name +true +true + + +ignore +false +true + + + +importAttribute +org.apache.strutsel.taglib.tiles.ELImportAttributeTag +empty + +name +false +true + + +scope +false +false + + +ignore +false +true + + + +initComponentDefinitions +org.apache.strutsel.taglib.tiles.ELInitDefinitionsTag +empty + +file +true +false + + +classname +false +false + + + + + + Fisheye: Tag ac2f4dc5d7004798e4b6a37684619fed29bdea65 refers to a dead (removed) revision in file `lams_contentrepository/web/WEB-INF/struts/struts.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_contentrepository/web/WEB-INF/validator-rules.xml =================================================================== diff -u -r9521d8efcb3e577a474aed2d2bb69b2231d19801 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_contentrepository/web/WEB-INF/validator-rules.xml (.../validator-rules.xml) (revision 9521d8efcb3e577a474aed2d2bb69b2231d19801) +++ lams_contentrepository/web/WEB-INF/validator-rules.xml (.../validator-rules.xml) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -1,7 +1,8 @@ + "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN" + "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd"> @@ -49,458 +55,127 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" - msg="errors.required"> + msg="errors.required"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (trim(value).length == 0) { - - if (i == 0) { - focusField = field; - } - fields[i++] = oRequired[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - - // Trim whitespace from left and right sides of s. - function trim(s) { - return s.replace( /^\s*/, "" ).replace( /\s*$/, "" ); - } - - ]]> - - - - - + msg="errors.required"/> + + + + msg="errors.minlength" + jsFunction="org.apache.commons.validator.javascript.validateMinLength"/> - 0) && (field.value.length < iMin)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMinLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - + msg="errors.maxlength" + jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/> - iMax) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMaxLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.invalid"/> - 0)) { - - if (!matchPattern(field.value, oMasked[x][2]("mask"))) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMasked[x][1]; - isValid = false; - } - } - } - - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - function matchPattern(value, mask) { - return mask.exec(value); - }]]> - - - - - + jsFunctionName="ByteValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - bValid = false; - } - } - } - - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="ShortValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="IntegerValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - - } else { - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isAllDigits(argvalue) { - argvalue = argvalue.toString(); - var validChars = "0123456789"; - var startFrom = 0; - if (argvalue.substring(0, 2) == "0x") { - validChars = "0123456789abcdefABCDEF"; - startFrom = 2; - } else if (argvalue.charAt(0) == "0") { - validChars = "01234567"; - startFrom = 1; - } else if (argvalue.charAt(0) == "-") { - startFrom = 1; - } - - for (var n = startFrom; n < argvalue.length; n++) { - if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false; - } - return true; - }]]> - - - - - @@ -512,81 +187,21 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.float" - jsFunctionName="FloatValidations"> + jsFunctionName="FloatValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - // remove '.' before checking digits - var tempArray = value.split('.'); - var joinedString= tempArray.join(''); - - if (!isAllDigits(joinedString)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - - } else { - var iValue = parseFloat(value); - if (isNaN(iValue)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - @@ -598,447 +213,101 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.date" - jsFunctionName="DateValidations"> + jsFunctionName="DateValidations"/> - 0) && - (datePattern.length > 0)) { - var MONTH = "MM"; - var DAY = "dd"; - var YEAR = "yyyy"; - var orderMonth = datePattern.indexOf(MONTH); - var orderDay = datePattern.indexOf(DAY); - var orderYear = datePattern.indexOf(YEAR); - if ((orderDay < orderYear && orderDay > orderMonth)) { - var iDelim1 = orderMonth + MONTH.length; - var iDelim2 = orderDay + DAY.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderDay && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderDay) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[2], matched[1], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth < orderYear && orderMonth > orderDay)) { - var iDelim1 = orderDay + DAY.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[1], matched[2], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth > orderYear && orderMonth < orderDay)) { - var iDelim1 = orderYear + YEAR.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$"); - } else if (iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$"); - } else { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[3], matched[2], matched[1])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isValidDate(day, month, year) { - if (month < 1 || month > 12) { - return false; - } - if (day < 1 || day > 31) { - return false; - } - if ((month == 4 || month == 6 || month == 9 || month == 11) && - (day == 31)) { - return false; - } - if (month == 2) { - var leap = (year % 4 == 0 && - (year % 100 != 0 || year % 400 == 0)); - if (day>29 || (day == 29 && !leap)) { - return false; - } - } - return true; - }]]> - - - - - - + msg="errors.range"/> - - - - - + depends="float" + msg="errors.range"/> - 0)) { - - var iMin = parseInt(oRange[x][2]("min")); - var iMax = parseInt(oRange[x][2]("max")); - var iValue = parseInt(field.value); - if (!(iValue >= iMin && iValue <= iMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - - + depends="double" + msg="errors.range"/> - 0)) { - - var fMin = parseFloat(oRange[x][2]("min")); - var fMax = parseFloat(oRange[x][2]("max")); - var fValue = parseFloat(field.value); - if (!(fValue >= fMin && fValue <= fMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.creditcard"/> - 0)) { - if (!luhnCheck(form[oCreditCard[x][0]].value)) { - if (i == 0) { - focusField = form[oCreditCard[x][0]]; - } - fields[i++] = oCreditCard[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - /** - * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl - */ - function luhnCheck(cardNumber) { - if (isLuhnNum(cardNumber)) { - var no_digit = cardNumber.length; - var oddoeven = no_digit & 1; - var sum = 0; - for (var count = 0; count < no_digit; count++) { - var digit = parseInt(cardNumber.charAt(count)); - if (!((count & 1) ^ oddoeven)) { - digit *= 2; - if (digit > 9) digit -= 9; - }; - sum += digit; - }; - if (sum == 0) return false; - if (sum % 10 == 0) return true; - }; - return false; - } - - function isLuhnNum(argvalue) { - argvalue = argvalue.toString(); - if (argvalue.length == 0) { - return false; - } - for (var n = 0; n < argvalue.length; n++) { - if ((argvalue.substring(n, n+1) < "0") || - (argvalue.substring(n,n+1) > "9")) { - return false; - } - } - return true; - }]]> - - - - - + msg="errors.email"/> - 0)) { - if (!checkEmail(form[oEmail[x][0]].value)) { - if (i == 0) { - focusField = form[oEmail[x][0]]; - } - fields[i++] = oEmail[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } + - /** - * Reference: Sandeep V. Tamhankar (stamhankar@hotmail.com), - * http://javascript.internet.com - */ - function checkEmail(emailStr) { - if (emailStr.length == 0) { - return true; - } - var emailPat=/^(.+)@(.+)$/; - var specialChars="\$\$<>@,;:\\\\\\\"\\.\\[\\]"; - var validChars="\[^\\s" + specialChars + "\]"; - var quotedUser="(\"[^\"]*\")"; - var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/; - var atom=validChars + '+'; - var word="(" + atom + "|" + quotedUser + ")"; - var userPat=new RegExp("^" + word + "(\\." + word + ")*$"); - var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$"); - var matchArray=emailStr.match(emailPat); - if (matchArray == null) { - return false; - } - var user=matchArray[1]; - var domain=matchArray[2]; - if (user.match(userPat) == null) { - return false; - } - var IPArray = domain.match(ipDomainPat); - if (IPArray != null) { - for (var i = 1; i <= 4; i++) { - if (IPArray[i] > 255) { - return false; - } - } - return true; - } - var domainArray=domain.match(domainPat); - if (domainArray == null) { - return false; - } - var atomPat=new RegExp(atom,"g"); - var domArr=domain.match(atomPat); - var len=domArr.length; - if ((domArr[domArr.length-1].length < 2) || - (domArr[domArr.length-1].length > 3)) { - return false; - } - if (len < 2) { - return false; - } - return true; - }]]> - + + - - Index: lams_learning/web/WEB-INF/struts/struts-bean.tld =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 bean -http://jakarta.apache.org/struts/tags-bean +http://struts.apache.org/tags-bean cookie org.apache.struts.taglib.bean.CookieTag Index: lams_learning/web/WEB-INF/struts/struts-html-el.tld =================================================================== diff -u -r7eaa24de10b2151186a637b21fa02e396fa09f1a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision 7eaa24de10b2151186a637b21fa02e396fa09f1a) +++ lams_learning/web/WEB-INF/struts/struts-html-el.tld (.../struts-html-el.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -623,6 +703,11 @@ true +disabled +false +true + + enctype false true @@ -653,6 +738,11 @@ true +readonly +false +true + + scriptLanguage false true @@ -682,6 +772,11 @@ frame org.apache.strutsel.taglib.html.ELFrameTag +bundle +false +true + + action false true @@ -832,6 +927,11 @@ true +bundle +false +true + + disabled false true @@ -1420,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1465,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1680,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1943,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2102,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2246,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2451,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2600,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2734,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2888,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2898,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_learning/web/WEB-INF/struts/struts-html.tld =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 html -http://jakarta.apache.org/struts/tags-html +http://struts.apache.org/tags-html base org.apache.struts.taglib.html.BaseTag @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -618,6 +698,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -638,22 +728,22 @@ true -name +onreset false true -onreset +onsubmit false true -onsubmit +readonly false true -scope +scriptLanguage false true @@ -677,21 +767,26 @@ false true - -type -false -true - frame org.apache.struts.taglib.html.FrameTag +bundle +false +true + + action false true +module +false +true + + anchor false true @@ -832,6 +927,16 @@ true +bundle +false +true + + +disabled +false +true + + indexed false true @@ -952,6 +1057,11 @@ org.apache.struts.taglib.html.HtmlTag JSP +lang +false +true + + locale false true @@ -1166,6 +1276,11 @@ true +contextRelative +false +true + + height false true @@ -1266,6 +1381,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -1326,6 +1451,11 @@ true +useLocalEncoding +false +true + + usemap false true @@ -1371,6 +1501,11 @@ true +scriptLanguage +false +true + + src false true @@ -1385,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1400,6 +1540,11 @@ true +module +false +true + + anchor false true @@ -1425,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1569,6 +1719,11 @@ false true + +useLocalEncoding +false +true + messages @@ -1635,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1898,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2057,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2201,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2316,6 +2551,16 @@ org.apache.struts.taglib.html.RewriteTag empty +action +false +true + + +module +false +true + + anchor false true @@ -2375,6 +2620,11 @@ false true + +useLocalEncoding +false +true + select @@ -2391,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2540,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2674,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2828,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2838,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_learning/web/WEB-INF/struts/struts-logic.tld =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -7,10 +7,10 @@ -1.0 +1.2 1.1 logic -http://jakarta.apache.org/struts/tags-logic +http://struts.apache.org/tags-logic empty org.apache.struts.taglib.logic.EmptyTag @@ -576,6 +576,11 @@ redirect org.apache.struts.taglib.logic.RedirectTag +action +false +true + + anchor false true @@ -635,6 +640,11 @@ false true + +useLocalEncoding +false +true + Index: lams_learning/web/WEB-INF/struts/struts-nested.tld =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -7,10 +7,10 @@ -1.0 +1.2 1.1 nested -http://jakarta.apache.org/struts/tags-nested +http://struts.apache.org/tags-nested nest org.apache.struts.taglib.nested.NestedPropertyTag @@ -24,13 +24,19 @@ writeNesting org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei JSP property false true +id +false +true + + filter false true @@ -247,11 +253,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -377,6 +408,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -387,10 +428,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -416,11 +467,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -556,6 +632,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -566,12 +652,12 @@ true -method +focusIndex false true -name +method false true @@ -586,11 +672,16 @@ true -scope +readonly false true +scriptLanguage +false +true + + style false true @@ -610,11 +701,6 @@ false true - -type -false -true - hidden @@ -655,10 +741,25 @@ true +styleClass +false +true + + +styleId +false +true + + value false true + +write +false +true + image @@ -929,6 +1030,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -989,6 +1100,11 @@ true +useLocalEncoding +false +true + + usemap false true @@ -1018,6 +1134,11 @@ true +module +false +true + + anchor false true @@ -1043,6 +1164,11 @@ true +bundle +false +true + + linkName false true @@ -1187,6 +1313,11 @@ false true + +useLocalEncoding +false +true + messages @@ -1253,11 +1384,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1378,6 +1534,11 @@ true +filter +false +true + + labelName false true @@ -1413,6 +1574,11 @@ org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag empty +filter +false +true + + label false true @@ -1462,11 +1628,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1621,11 +1812,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1720,6 +1936,11 @@ true true + +idName +false +true + select @@ -1741,11 +1962,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1890,6 +2136,11 @@ true +bundle +false +true + + disabled false true @@ -2024,11 +2275,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2178,6 +2454,11 @@ true +bundle +false +true + + cols false true @@ -2188,6 +2469,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_learning/web/WEB-INF/struts/struts-tiles.tld =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/struts-tiles.tld (.../struts-tiles.tld) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/struts-tiles.tld (.../struts-tiles.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 tiles -http://jakarta.apache.org/struts/tags-tiles +http://struts.apache.org/tags-tiles insert org.apache.struts.taglib.tiles.InsertTag Index: lams_learning/web/WEB-INF/struts/validator-rules.xml =================================================================== diff -u -rc47073639465a5a05b59d8e975d5274e881a908a -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_learning/web/WEB-INF/struts/validator-rules.xml (.../validator-rules.xml) (revision c47073639465a5a05b59d8e975d5274e881a908a) +++ lams_learning/web/WEB-INF/struts/validator-rules.xml (.../validator-rules.xml) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -1,7 +1,8 @@ + "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN" + "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd"> @@ -49,458 +55,127 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" - msg="errors.required"> + msg="errors.required"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (trim(value).length == 0) { - - if (i == 0) { - focusField = field; - } - fields[i++] = oRequired[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - - // Trim whitespace from left and right sides of s. - function trim(s) { - return s.replace( /^\s*/, "" ).replace( /\s*$/, "" ); - } - - ]]> - - - - - + msg="errors.required"/> + + + + msg="errors.minlength" + jsFunction="org.apache.commons.validator.javascript.validateMinLength"/> - 0) && (field.value.length < iMin)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMinLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - + msg="errors.maxlength" + jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/> - iMax) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMaxLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.invalid"/> - 0)) { - - if (!matchPattern(field.value, oMasked[x][2]("mask"))) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMasked[x][1]; - isValid = false; - } - } - } - - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - function matchPattern(value, mask) { - return mask.exec(value); - }]]> - - - - - + jsFunctionName="ByteValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - bValid = false; - } - } - } - - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="ShortValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="IntegerValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - - } else { - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isAllDigits(argvalue) { - argvalue = argvalue.toString(); - var validChars = "0123456789"; - var startFrom = 0; - if (argvalue.substring(0, 2) == "0x") { - validChars = "0123456789abcdefABCDEF"; - startFrom = 2; - } else if (argvalue.charAt(0) == "0") { - validChars = "01234567"; - startFrom = 1; - } else if (argvalue.charAt(0) == "-") { - startFrom = 1; - } - - for (var n = startFrom; n < argvalue.length; n++) { - if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false; - } - return true; - }]]> - - - - - @@ -512,81 +187,21 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.float" - jsFunctionName="FloatValidations"> + jsFunctionName="FloatValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - // remove '.' before checking digits - var tempArray = value.split('.'); - var joinedString= tempArray.join(''); - - if (!isAllDigits(joinedString)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - - } else { - var iValue = parseFloat(value); - if (isNaN(iValue)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - @@ -598,447 +213,101 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.date" - jsFunctionName="DateValidations"> + jsFunctionName="DateValidations"/> - 0) && - (datePattern.length > 0)) { - var MONTH = "MM"; - var DAY = "dd"; - var YEAR = "yyyy"; - var orderMonth = datePattern.indexOf(MONTH); - var orderDay = datePattern.indexOf(DAY); - var orderYear = datePattern.indexOf(YEAR); - if ((orderDay < orderYear && orderDay > orderMonth)) { - var iDelim1 = orderMonth + MONTH.length; - var iDelim2 = orderDay + DAY.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderDay && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderDay) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[2], matched[1], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth < orderYear && orderMonth > orderDay)) { - var iDelim1 = orderDay + DAY.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[1], matched[2], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth > orderYear && orderMonth < orderDay)) { - var iDelim1 = orderYear + YEAR.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$"); - } else if (iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$"); - } else { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[3], matched[2], matched[1])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isValidDate(day, month, year) { - if (month < 1 || month > 12) { - return false; - } - if (day < 1 || day > 31) { - return false; - } - if ((month == 4 || month == 6 || month == 9 || month == 11) && - (day == 31)) { - return false; - } - if (month == 2) { - var leap = (year % 4 == 0 && - (year % 100 != 0 || year % 400 == 0)); - if (day>29 || (day == 29 && !leap)) { - return false; - } - } - return true; - }]]> - - - - - - + msg="errors.range"/> - - - - - + depends="float" + msg="errors.range"/> - 0)) { - - var iMin = parseInt(oRange[x][2]("min")); - var iMax = parseInt(oRange[x][2]("max")); - var iValue = parseInt(field.value); - if (!(iValue >= iMin && iValue <= iMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - - + depends="double" + msg="errors.range"/> - 0)) { - - var fMin = parseFloat(oRange[x][2]("min")); - var fMax = parseFloat(oRange[x][2]("max")); - var fValue = parseFloat(field.value); - if (!(fValue >= fMin && fValue <= fMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.creditcard"/> - 0)) { - if (!luhnCheck(form[oCreditCard[x][0]].value)) { - if (i == 0) { - focusField = form[oCreditCard[x][0]]; - } - fields[i++] = oCreditCard[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - /** - * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl - */ - function luhnCheck(cardNumber) { - if (isLuhnNum(cardNumber)) { - var no_digit = cardNumber.length; - var oddoeven = no_digit & 1; - var sum = 0; - for (var count = 0; count < no_digit; count++) { - var digit = parseInt(cardNumber.charAt(count)); - if (!((count & 1) ^ oddoeven)) { - digit *= 2; - if (digit > 9) digit -= 9; - }; - sum += digit; - }; - if (sum == 0) return false; - if (sum % 10 == 0) return true; - }; - return false; - } - - function isLuhnNum(argvalue) { - argvalue = argvalue.toString(); - if (argvalue.length == 0) { - return false; - } - for (var n = 0; n < argvalue.length; n++) { - if ((argvalue.substring(n, n+1) < "0") || - (argvalue.substring(n,n+1) > "9")) { - return false; - } - } - return true; - }]]> - - - - - + msg="errors.email"/> - 0)) { - if (!checkEmail(form[oEmail[x][0]].value)) { - if (i == 0) { - focusField = form[oEmail[x][0]]; - } - fields[i++] = oEmail[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } + - /** - * Reference: Sandeep V. Tamhankar (stamhankar@hotmail.com), - * http://javascript.internet.com - */ - function checkEmail(emailStr) { - if (emailStr.length == 0) { - return true; - } - var emailPat=/^(.+)@(.+)$/; - var specialChars="\$\$<>@,;:\\\\\\\"\\.\\[\\]"; - var validChars="\[^\\s" + specialChars + "\]"; - var quotedUser="(\"[^\"]*\")"; - var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/; - var atom=validChars + '+'; - var word="(" + atom + "|" + quotedUser + ")"; - var userPat=new RegExp("^" + word + "(\\." + word + ")*$"); - var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$"); - var matchArray=emailStr.match(emailPat); - if (matchArray == null) { - return false; - } - var user=matchArray[1]; - var domain=matchArray[2]; - if (user.match(userPat) == null) { - return false; - } - var IPArray = domain.match(ipDomainPat); - if (IPArray != null) { - for (var i = 1; i <= 4; i++) { - if (IPArray[i] > 255) { - return false; - } - } - return true; - } - var domainArray=domain.match(domainPat); - if (domainArray == null) { - return false; - } - var atomPat=new RegExp(atom,"g"); - var domArr=domain.match(atomPat); - var len=domArr.length; - if ((domArr[domArr.length-1].length < 2) || - (domArr[domArr.length-1].length > 3)) { - return false; - } - if (len < 2) { - return false; - } - return true; - }]]> - + + - - Index: lams_monitoring/web/WEB-INF/struts/struts-bean.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/struts-bean.tld (.../struts-bean.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 bean -http://jakarta.apache.org/struts/tags-bean +http://struts.apache.org/tags-bean cookie org.apache.struts.taglib.bean.CookieTag Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -rdc3ace7961973e93b262349670d69142149be245 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision dc3ace7961973e93b262349670d69142149be245) +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -76,6 +76,11 @@ path="/TestScheduler.jsp" redirect="false" /> + true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -623,6 +703,11 @@ true +disabled +false +true + + enctype false true @@ -653,6 +738,11 @@ true +readonly +false +true + + scriptLanguage false true @@ -682,6 +772,11 @@ frame org.apache.strutsel.taglib.html.ELFrameTag +bundle +false +true + + action false true @@ -832,6 +927,11 @@ true +bundle +false +true + + disabled false true @@ -1420,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1465,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1680,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1943,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2102,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2246,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2451,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2600,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2734,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2888,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2898,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_monitoring/web/WEB-INF/struts/struts-html.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/struts-html.tld (.../struts-html.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 html -http://jakarta.apache.org/struts/tags-html +http://struts.apache.org/tags-html base org.apache.struts.taglib.html.BaseTag @@ -46,6 +46,11 @@ true +bundle +false +true + + disabled false true @@ -180,6 +185,11 @@ true +bundle +false +true + + disabled false true @@ -309,11 +319,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -439,6 +474,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -449,10 +494,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -478,11 +533,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -618,6 +698,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -638,22 +728,22 @@ true -name +onreset false true -onreset +onsubmit false true -onsubmit +readonly false true -scope +scriptLanguage false true @@ -677,21 +767,26 @@ false true - -type -false -true - frame org.apache.struts.taglib.html.FrameTag +bundle +false +true + + action false true +module +false +true + + anchor false true @@ -832,6 +927,16 @@ true +bundle +false +true + + +disabled +false +true + + indexed false true @@ -952,6 +1057,11 @@ org.apache.struts.taglib.html.HtmlTag JSP +lang +false +true + + locale false true @@ -1166,6 +1276,11 @@ true +contextRelative +false +true + + height false true @@ -1266,6 +1381,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -1326,6 +1451,11 @@ true +useLocalEncoding +false +true + + usemap false true @@ -1371,6 +1501,11 @@ true +scriptLanguage +false +true + + src false true @@ -1385,6 +1520,11 @@ false true + +bundle +false +true + link @@ -1400,6 +1540,11 @@ true +module +false +true + + anchor false true @@ -1425,6 +1570,11 @@ true +bundle +false +true + + linkName false true @@ -1569,6 +1719,11 @@ false true + +useLocalEncoding +false +true + messages @@ -1635,11 +1790,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1898,11 +2078,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2057,11 +2262,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2201,6 +2431,11 @@ true +bundle +false +true + + disabled false true @@ -2316,6 +2551,16 @@ org.apache.struts.taglib.html.RewriteTag empty +action +false +true + + +module +false +true + + anchor false true @@ -2375,6 +2620,11 @@ false true + +useLocalEncoding +false +true + select @@ -2391,11 +2641,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2540,6 +2815,11 @@ true +bundle +false +true + + disabled false true @@ -2674,11 +2954,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2828,6 +3133,11 @@ true +bundle +false +true + + cols false true @@ -2838,6 +3148,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Index: lams_monitoring/web/WEB-INF/struts/struts-logic.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/struts-logic.tld (.../struts-logic.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -7,10 +7,10 @@ -1.0 +1.2 1.1 logic -http://jakarta.apache.org/struts/tags-logic +http://struts.apache.org/tags-logic empty org.apache.struts.taglib.logic.EmptyTag @@ -576,6 +576,11 @@ redirect org.apache.struts.taglib.logic.RedirectTag +action +false +true + + anchor false true @@ -635,6 +640,11 @@ false true + +useLocalEncoding +false +true + Index: lams_monitoring/web/WEB-INF/struts/struts-nested.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/struts-nested.tld (.../struts-nested.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -7,10 +7,10 @@ -1.0 +1.2 1.1 nested -http://jakarta.apache.org/struts/tags-nested +http://struts.apache.org/tags-nested nest org.apache.struts.taglib.nested.NestedPropertyTag @@ -24,13 +24,19 @@ writeNesting org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei JSP property false true +id +false +true + + filter false true @@ -247,11 +253,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -377,6 +408,16 @@ true +footer +false +true + + +header +false +true + + locale false true @@ -387,10 +428,20 @@ true +prefix +false +true + + property false true + +suffix +false +true + file @@ -416,11 +467,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -556,6 +632,16 @@ true +acceptCharset +false +true + + +disabled +false +true + + enctype false true @@ -566,12 +652,12 @@ true -method +focusIndex false true -name +method false true @@ -586,11 +672,16 @@ true -scope +readonly false true +scriptLanguage +false +true + + style false true @@ -610,11 +701,6 @@ false true - -type -false -true - hidden @@ -655,10 +741,25 @@ true +styleClass +false +true + + +styleId +false +true + + value false true + +write +false +true + image @@ -929,6 +1030,16 @@ true +action +false +true + + +module +false +true + + paramName false true @@ -989,6 +1100,11 @@ true +useLocalEncoding +false +true + + usemap false true @@ -1018,6 +1134,11 @@ true +module +false +true + + anchor false true @@ -1043,6 +1164,11 @@ true +bundle +false +true + + linkName false true @@ -1187,6 +1313,11 @@ false true + +useLocalEncoding +false +true + messages @@ -1253,11 +1384,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + name false true @@ -1378,6 +1534,11 @@ true +filter +false +true + + labelName false true @@ -1413,6 +1574,11 @@ org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag empty +filter +false +true + + label false true @@ -1462,11 +1628,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1621,11 +1812,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1720,6 +1936,11 @@ true true + +idName +false +true + select @@ -1741,11 +1962,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -1890,6 +2136,11 @@ true +bundle +false +true + + disabled false true @@ -2024,11 +2275,36 @@ true +bundle +false +true + + disabled false true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true @@ -2178,6 +2454,11 @@ true +bundle +false +true + + cols false true @@ -2188,6 +2469,26 @@ true +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + indexed false true Fisheye: Tag ac2f4dc5d7004798e4b6a37684619fed29bdea65 refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/struts/struts-template.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/struts/struts-tiles.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/struts-tiles.tld (.../struts-tiles.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/struts-tiles.tld (.../struts-tiles.tld) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -8,10 +8,10 @@ -1.0 +1.2 1.1 tiles -http://jakarta.apache.org/struts/tags-tiles +http://struts.apache.org/tags-tiles insert org.apache.struts.taglib.tiles.InsertTag Index: lams_monitoring/web/WEB-INF/struts/validator-rules.xml =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rac2f4dc5d7004798e4b6a37684619fed29bdea65 --- lams_monitoring/web/WEB-INF/struts/validator-rules.xml (.../validator-rules.xml) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/validator-rules.xml (.../validator-rules.xml) (revision ac2f4dc5d7004798e4b6a37684619fed29bdea65) @@ -1,7 +1,8 @@ + "-//Apache Software Foundation//DTD Commons Validator Rules Configuration 1.1.3//EN" + "http://jakarta.apache.org/commons/dtds/validator_1_1_3.dtd">

@@ -49,458 +55,127 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" - msg="errors.required"> + msg="errors.required"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (trim(value).length == 0) { - - if (i == 0) { - focusField = field; - } - fields[i++] = oRequired[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - - // Trim whitespace from left and right sides of s. - function trim(s) { - return s.replace( /^\s*/, "" ).replace( /\s*$/, "" ); - } - - ]]> - - - - - + msg="errors.required"/> + + + + msg="errors.minlength" + jsFunction="org.apache.commons.validator.javascript.validateMinLength"/> - 0) && (field.value.length < iMin)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMinLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - + msg="errors.maxlength" + jsFunction="org.apache.commons.validator.javascript.validateMaxLength"/> - iMax) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMaxLength[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.invalid"/> - 0)) { - - if (!matchPattern(field.value, oMasked[x][2]("mask"))) { - if (i == 0) { - focusField = field; - } - fields[i++] = oMasked[x][1]; - isValid = false; - } - } - } - - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - } - function matchPattern(value, mask) { - return mask.exec(value); - }]]> - - - - - + jsFunctionName="ByteValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -128 && iValue <= 127)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oByte[x][1]; - bValid = false; - } - } - } - - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="ShortValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - } else { - - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -32768 && iValue <= 32767)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oShort[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - + jsFunctionName="IntegerValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - - if (!isAllDigits(value)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - - } else { - var iValue = parseInt(value); - if (isNaN(iValue) || !(iValue >= -2147483648 && iValue <= 2147483647)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oInteger[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isAllDigits(argvalue) { - argvalue = argvalue.toString(); - var validChars = "0123456789"; - var startFrom = 0; - if (argvalue.substring(0, 2) == "0x") { - validChars = "0123456789abcdefABCDEF"; - startFrom = 2; - } else if (argvalue.charAt(0) == "0") { - validChars = "01234567"; - startFrom = 1; - } else if (argvalue.charAt(0) == "-") { - startFrom = 1; - } - - for (var n = startFrom; n < argvalue.length; n++) { - if (validChars.indexOf(argvalue.substring(n, n+1)) == -1) return false; - } - return true; - }]]> - - - - - @@ -512,81 +187,21 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.float" - jsFunctionName="FloatValidations"> + jsFunctionName="FloatValidations"/> - = 0) { - value = field.options[si].value; - } - } else { - value = field.value; - } - - if (value.length > 0) { - // remove '.' before checking digits - var tempArray = value.split('.'); - var joinedString= tempArray.join(''); - - if (!isAllDigits(joinedString)) { - bValid = false; - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - - } else { - var iValue = parseFloat(value); - if (isNaN(iValue)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oFloat[x][1]; - bValid = false; - } - } - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - }]]> - - - - - @@ -598,447 +213,101 @@ methodParams="java.lang.Object, org.apache.commons.validator.ValidatorAction, org.apache.commons.validator.Field, - org.apache.struts.action.ActionErrors, + org.apache.struts.action.ActionMessages, + org.apache.commons.validator.Validator, javax.servlet.http.HttpServletRequest" depends="" msg="errors.date" - jsFunctionName="DateValidations"> + jsFunctionName="DateValidations"/> - 0) && - (datePattern.length > 0)) { - var MONTH = "MM"; - var DAY = "dd"; - var YEAR = "yyyy"; - var orderMonth = datePattern.indexOf(MONTH); - var orderDay = datePattern.indexOf(DAY); - var orderYear = datePattern.indexOf(YEAR); - if ((orderDay < orderYear && orderDay > orderMonth)) { - var iDelim1 = orderMonth + MONTH.length; - var iDelim2 = orderDay + DAY.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderDay && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderDay) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[2], matched[1], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth < orderYear && orderMonth > orderDay)) { - var iDelim1 = orderDay + DAY.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})(\\d{4})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{2})(\\d{2})[" + delim2 + "](\\d{4})$"); - } else if (iDelim2 == orderYear) { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})(\\d{4})$"); - } else { - dateRegexp = new RegExp("^(\\d{2})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{4})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[1], matched[2], matched[3])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else if ((orderMonth > orderYear && orderMonth < orderDay)) { - var iDelim1 = orderYear + YEAR.length; - var iDelim2 = orderMonth + MONTH.length; - var delim1 = datePattern.substring(iDelim1, iDelim1 + 1); - var delim2 = datePattern.substring(iDelim2, iDelim2 + 1); - if (iDelim1 == orderMonth && iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})(\\d{2})$"); - } else if (iDelim1 == orderMonth) { - dateRegexp = new RegExp("^(\\d{4})(\\d{2})[" + delim2 + "](\\d{2})$"); - } else if (iDelim2 == orderDay) { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})(\\d{2})$"); - } else { - dateRegexp = new RegExp("^(\\d{4})[" + delim1 + "](\\d{2})[" + delim2 + "](\\d{2})$"); - } - var matched = dateRegexp.exec(value); - if(matched != null) { - if (!isValidDate(matched[3], matched[2], matched[1])) { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } else { - if (i == 0) { - focusField = form[oDate[x][0]]; - } - fields[i++] = oDate[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - function isValidDate(day, month, year) { - if (month < 1 || month > 12) { - return false; - } - if (day < 1 || day > 31) { - return false; - } - if ((month == 4 || month == 6 || month == 9 || month == 11) && - (day == 31)) { - return false; - } - if (month == 2) { - var leap = (year % 4 == 0 && - (year % 100 != 0 || year % 400 == 0)); - if (day>29 || (day == 29 && !leap)) { - return false; - } - } - return true; - }]]> - - - - - - + msg="errors.range"/> - - - - - + depends="float" + msg="errors.range"/> - 0)) { - - var iMin = parseInt(oRange[x][2]("min")); - var iMax = parseInt(oRange[x][2]("max")); - var iValue = parseInt(field.value); - if (!(iValue >= iMin && iValue <= iMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - - - + depends="double" + msg="errors.range"/> - 0)) { - - var fMin = parseFloat(oRange[x][2]("min")); - var fMax = parseFloat(oRange[x][2]("max")); - var fValue = parseFloat(field.value); - if (!(fValue >= fMin && fValue <= fMax)) { - if (i == 0) { - focusField = field; - } - fields[i++] = oRange[x][1]; - isValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return isValid; - }]]> - - - + msg="errors.creditcard"/> - 0)) { - if (!luhnCheck(form[oCreditCard[x][0]].value)) { - if (i == 0) { - focusField = form[oCreditCard[x][0]]; - } - fields[i++] = oCreditCard[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } - /** - * Reference: http://www.ling.nwu.edu/~sburke/pub/luhn_lib.pl - */ - function luhnCheck(cardNumber) { - if (isLuhnNum(cardNumber)) { - var no_digit = cardNumber.length; - var oddoeven = no_digit & 1; - var sum = 0; - for (var count = 0; count < no_digit; count++) { - var digit = parseInt(cardNumber.charAt(count)); - if (!((count & 1) ^ oddoeven)) { - digit *= 2; - if (digit > 9) digit -= 9; - }; - sum += digit; - }; - if (sum == 0) return false; - if (sum % 10 == 0) return true; - }; - return false; - } - - function isLuhnNum(argvalue) { - argvalue = argvalue.toString(); - if (argvalue.length == 0) { - return false; - } - for (var n = 0; n < argvalue.length; n++) { - if ((argvalue.substring(n, n+1) < "0") || - (argvalue.substring(n,n+1) > "9")) { - return false; - } - } - return true; - }]]> - - - - - + msg="errors.email"/> - 0)) { - if (!checkEmail(form[oEmail[x][0]].value)) { - if (i == 0) { - focusField = form[oEmail[x][0]]; - } - fields[i++] = oEmail[x][1]; - bValid = false; - } - } - } - if (fields.length > 0) { - focusField.focus(); - alert(fields.join('\n')); - } - return bValid; - } + - /** - * Reference: Sandeep V. Tamhankar (stamhankar@hotmail.com), - * http://javascript.internet.com - */ - function checkEmail(emailStr) { - if (emailStr.length == 0) { - return true; - } - var emailPat=/^(.+)@(.+)$/; - var specialChars="\$\$<>@,;:\\\\\\\"\\.\\[\\]"; - var validChars="\[^\\s" + specialChars + "\]"; - var quotedUser="(\"[^\"]*\")"; - var ipDomainPat=/^(\d{1,3})[.](\d{1,3})[.](\d{1,3})[.](\d{1,3})$/; - var atom=validChars + '+'; - var word="(" + atom + "|" + quotedUser + ")"; - var userPat=new RegExp("^" + word + "(\\." + word + ")*$"); - var domainPat=new RegExp("^" + atom + "(\\." + atom + ")*$"); - var matchArray=emailStr.match(emailPat); - if (matchArray == null) { - return false; - } - var user=matchArray[1]; - var domain=matchArray[2]; - if (user.match(userPat) == null) { - return false; - } - var IPArray = domain.match(ipDomainPat); - if (IPArray != null) { - for (var i = 1; i <= 4; i++) { - if (IPArray[i] > 255) { - return false; - } - } - return true; - } - var domainArray=domain.match(domainPat); - if (domainArray == null) { - return false; - } - var atomPat=new RegExp(atom,"g"); - var domArr=domain.match(atomPat); - var len=domArr.length; - if ((domArr[domArr.length-1].length < 2) || - (domArr[domArr.length-1].length > 3)) { - return false; - } - if (len < 2) { - return false; - } - return true; - }]]> - + + - -