Index: lams_admin/build.xml =================================================================== diff -u -r9f81dad9963e3c259b41ce95ef13e5b24cb2871c -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_admin/build.xml (.../build.xml) (revision 9f81dad9963e3c259b41ce95ef13e5b24cb2871c) +++ lams_admin/build.xml (.../build.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -143,7 +143,8 @@ - Index: lams_central/build.xml =================================================================== diff -u -r8472fa7e3d4a6d7751d510d2b3910e808b804fbb -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/build.xml (.../build.xml) (revision 8472fa7e3d4a6d7751d510d2b3910e808b804fbb) +++ lams_central/build.xml (.../build.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -220,7 +220,8 @@ Index: lams_central/conf/xdoclet/taglibs.xml =================================================================== diff -u -r21a863a43f70c5031702508737bc34e7323e1d36 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision 21a863a43f70c5031702508737bc34e7323e1d36) +++ lams_central/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,82 +1,77 @@ + - - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + + tags-permittedTaglibs + /WEB-INF/jstl/tlds/permittedTaglibs.tld + + + + tags-scriptfree + /WEB-INF/jstl/tlds/scriptfree.tld + + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + + tags-lams + /WEB-INF/lams.tld + - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - - - - tags-logic - /WEB-INF/struts/tlds/struts-logic.tld - - - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - tags-c - /WEB-INF/struts/tlds/c.tld - - - - - - http://java.sun.com/jstl/fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - http://java.sun.com/jstl/fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - http://java.sun.com/jstl/core - /WEB-INF/jstl/tlds/c.tld - - - - http://java.sun.com/jstl/core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - - - tags-lams - /WEB-INF/lams.tld - + + \ No newline at end of file Index: lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java =================================================================== diff -u -r8c4e9a9877ec2192b3e4326aff5385331c80b0ca -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision 8c4e9a9877ec2192b3e4326aff5385331c80b0ca) +++ lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java (.../AuthoringService.java) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -653,14 +653,14 @@ Iterator iter = acts.iterator(); while (iter.hasNext()) { Activity activity = (Activity) iter.next(); - if ( activity.getActivityTypeId() != null && - Activity.TOOL_ACTIVITY_TYPE == activity.getActivityTypeId().intValue() ) { - // TODO can't just cast.... - try { - lamsCoreToolService.notifyToolToDeleteContent((ToolActivity)activity); + if (activity.isToolActivity()) + { + try { + ToolActivity toolActivity = (ToolActivity) activityDAO.getActivityByActivityId(activity.getActivityId()); + lamsCoreToolService.notifyToolToDeleteContent(toolActivity); } catch (ToolException e) { log.error("Unable to delete tool content for activity"+activity - +" as activity threw exception does not exist",e); + +" as activity threw an exception",e); } } } Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/jstl/tlds/c-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/jstl/tlds/c.tld =================================================================== diff -u -r9bef1de27d0d527d75191115a535bc2c4311ade9 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision 9bef1de27d0d527d75191115a535bc2c4311ade9) +++ lams_central/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,415 +1,562 @@ - - - - 1.0 - 1.2 - c - http://java.sun.com/jstl/core + + + + + JSTL 1.1 core library JSTL core - JSTL 1.0 core library + 1.1 + c + http://java.sun.com/jsp/jstl/core + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlCoreTLV + org.apache.taglibs.standard.tlv.JstlCoreTLV - - expressionAttributes - - out:value - out:default - out:escapeXml - if:test - import:url - import:context - import:charEncoding - forEach:items - forEach:begin - forEach:end - forEach:step - forTokens:items - forTokens:begin - forTokens:end - forTokens:step - param:encode - param:name - param:value - redirect:context - redirect:url - set:property - set:target - set:value - url:context - url:value - when:test - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP Catches any Throwable that occurs in its body and optionally exposes it. + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + +Name of the exported scoped variable for the +exception thrown from a nested action. The type of the +scoped variable is the type of the exception thrown. + var false false + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + choose

org.apache.taglibs.standard.tag.common.core.ChooseTag

JSP - - Simple conditional tag that establishes a context for - mutually exclusive conditional operations, marked by - <when> and <otherwise> - - out - org.apache.taglibs.standard.tag.el.core.OutTag - JSP - Like <%= ... >, but for expressions. + Simple conditional tag, which evalutes its body if the + supplied condition is true and optionally exposes a Boolean + scripting variable representing the evaluation of this condition - - value - true - false - - - default - false - false - - - escapeXml - false - false - - - - if - org.apache.taglibs.standard.tag.el.core.IfTag + org.apache.taglibs.standard.tag.rt.core.IfTag JSP - - Simple conditional tag, which evalutes its body if the - supplied condition is true and optionally exposes a Boolean - scripting variable representing the evaluation of this condition - + +The test condition that determines whether or +not the body content should be processed. + test true - false + true + boolean + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false + + Retrieves an absolute or relative URL and exposes its contents + to either the page, a String in 'var', or a Reader in 'varReader'. + import - org.apache.taglibs.standard.tag.el.core.ImportTag + org.apache.taglibs.standard.tag.rt.core.ImportTag

org.apache.taglibs.standard.tei.ImportTEI

JSP - - Retrieves an absolute or relative URL and exposes its contents - to either the page, a String in 'var', or a Reader in 'varReader'. - + +The URL of the resource to import. + url true - false + true + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is String. + var false false + +Scope for var. + scope false false + +Name of the exported scoped variable for the +resource's content. The type of the scoped +variable is Reader. + varReader false false + +Name of the context when accessing a relative +URL resource that belongs to a foreign +context. + context false - false + true + +Character encoding of the content at the input +resource. + charEncoding false - false + true - forEach - org.apache.taglibs.standard.tag.el.core.ForEachTag - org.apache.taglibs.standard.tei.ForEachTEI - JSP The basic iteration tag, accepting many different collection types and supporting subsetting and other functionality + forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + +Collection of items to iterate over. + items false - false + true + java.lang.Object + +If items specified: +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. +If items not specified: +Iteration begins with index set at the value +specified. + begin false - false + true + int + +If items specified: +Iteration ends at the item located at the +specified index (inclusive). +If items not specified: +Iteration ends when index reaches the value +specified. + end false - false + true + int + +Iteration will only process every step items of +the collection, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. Its type depends +on the object of the underlying collection. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested +visibility. + varStatus false false - forTokens - org.apache.taglibs.standard.tag.el.core.ForTokensTag - JSP Iterates over tokens, separated by the supplied delimeters + forTokens + org.apache.taglibs.standard.tag.rt.core.ForTokensTag + JSP + +String of tokens to iterate over. + items true - false + true + java.lang.String + +The set of delimiters (the characters that +separate the tokens in the string). + delims true - false + true + java.lang.String + +Iteration begins at the token located at the +specified index. First token has index 0. + begin false - false + true + int + +Iteration ends at the token located at the +specified index (inclusive). + end false - false + true + int + +Iteration will only process every step tokens +of the string, starting with the first one. + step false - false + true + int + +Name of the exported scoped variable for the +current item of the iteration. This scoped +variable has nested visibility. + var false false + +Name of the exported scoped variable for the +status of the iteration. Object exported is of +type +javax.servlet.jsp.jstl.core.LoopTag +Status. This scoped variable has nested +visibility. + varStatus false false - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag + + Like <%= ... >, but for expressions. + + out + org.apache.taglibs.standard.tag.rt.core.OutTag JSP + + +Expression to be evaluated. + + value + true + true + + + +Default value if the resulting value is null. + + default + false + true + + + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default value is +true. + + escapeXml + false + true + + + + + - Subtag of <choose> that follows <when> tags - and runs only if all of the prior conditions evaluated to - 'false' + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.core.ParamTag - JSP - Adds a parameter to a containing 'import' tag's URL. + Adds a parameter to a containing 'import' tag's URL. + param + org.apache.taglibs.standard.tag.rt.core.ParamTag + JSP + +Name of the query string parameter. + name true - false + true + +Value of the parameter. + value false - false + true - redirect - org.apache.taglibs.standard.tag.el.core.RedirectTag - JSP - Redirects to a new URL. + Redirects to a new URL. + redirect + org.apache.taglibs.standard.tag.rt.core.RedirectTag + JSP - var + +The URL of the resource to redirect to. + + url false - false + true - scope - false - false - - - url - true - false - - + +Name of the context when redirecting to a relative URL +resource that belongs to a foreign context. + context false - false + true + + Removes a scoped variable (from a particular scope, if specified). + remove

org.apache.taglibs.standard.tag.common.core.RemoveTag

empty - - Removes a scoped variable (from a particular scope, if specified). - + +Name of the scoped variable to be removed. + var true false + +Scope for var. + scope false false - - set - org.apache.taglibs.standard.tag.el.core.SetTag - JSP + - Sets the result of an expression evaluation in a 'scope' + Sets the result of an expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.rt.core.SetTag + JSP + +Name of the exported scoped variable to hold the value +specified in the action. The type of the scoped variable is +whatever type the value expression evaluates to. + var false false + +Expression to be evaluated. + value false - false + true + +Target object whose property will be set. Must evaluate to +a JavaBeans object with setter property property, or to a +java.util.Map object. + target false - false + true + +Name of the property to be set in the target object. + property false - false + true + +Scope for var. + scope false false - url - org.apache.taglibs.standard.tag.el.core.UrlTag - JSP - Prints or exposes a URL with optional query parameters - (via the c:param tag). + Creates a URL with optional query parameters. + url + org.apache.taglibs.standard.tag.rt.core.UrlTag + JSP + +Name of the exported scoped variable for the +processed url. The type of the scoped variable is +String. + var false false + +Scope for var. + scope false false + +URL to be processed. + value - true - false + false + true + +Name of the context when specifying a relative URL +resource that belongs to a foreign context. + context false - false + true - when - org.apache.taglibs.standard.tag.el.core.WhenTag - JSP - Subtag of <choose> that includes its body if its - condition evalutes to 'true' + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + when + org.apache.taglibs.standard.tag.rt.core.WhenTag + JSP + +The test condition that determines whether or not the +body content should be processed. + test true - false + true + boolean Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/jstl/tlds/fmt-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/jstl/tlds/fmt.tld =================================================================== diff -u -r9bef1de27d0d527d75191115a535bc2c4311ade9 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/web/WEB-INF/jstl/tlds/fmt.tld (.../fmt.tld) (revision 9bef1de27d0d527d75191115a535bc2c4311ade9) +++ lams_central/web/WEB-INF/jstl/tlds/fmt.tld (.../fmt.tld) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,438 +1,667 @@ - - - - 1.0 - 1.2 - fmt - http://java.sun.com/jstl/fmt + + + + + JSTL 1.1 i18n-capable formatting library JSTL fmt - JSTL 1.0 i18n-capable formatting library + 1.1 + fmt + http://java.sun.com/jsp/jstl/fmt + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlFmtTLV + org.apache.taglibs.standard.tlv.JstlFmtTLV - - expressionAttributes - - requestEncoding:value - setLocale:value - setLocale:variant - timeZone:value - setTimeZone:value - bundle:basename - bundle:prefix - setBundle:basename - message:key - message:bundle - param:value - formatNumber:value - formatNumber:pattern - formatNumber:currencyCode - formatNumber:currencySymbol - formatNumber:groupingUsed - formatNumber:maxIntegerDigits - formatNumber:minIntegerDigits - formatNumber:maxFractionDigits - formatNumber:minFractionDigits - parseNumber:value - parseNumber:pattern - parseNumber:parseLocale - parseNumber:integerOnly - formatDate:value - formatDate:pattern - formatDate:timeZone - parseDate:value - parseDate:pattern - parseDate:timeZone - parseDate:parseLocale - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - requestEncoding - org.apache.taglibs.standard.tag.el.fmt.RequestEncodingTag - empty Sets the request character encoding + requestEncoding + org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag + empty + +Name of character encoding to be applied when +decoding request parameters. + value false - false + true - setLocale - org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag - empty Stores the given locale in the locale configuration variable + setLocale + org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag + empty + +A String value is interpreted as the +printable representation of a locale, which +must contain a two-letter (lower-case) +language code (as defined by ISO-639), +and may contain a two-letter (upper-case) +country code (as defined by ISO-3166). +Language and country codes must be +separated by hyphen (-) or underscore +(_). + value true - false + true + +Vendor- or browser-specific variant. +See the java.util.Locale javadocs for +more information on variants. + variant false - false + true + +Scope of the locale configuration variable. + scope false false - timeZone - org.apache.taglibs.standard.tag.el.fmt.TimeZoneTag - JSP Specifies the time zone for any time formatting or parsing actions nested in its body + timeZone + org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag + JSP + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See +java.util.TimeZone for more information on +supported time zone formats. + value true - false + true - setTimeZone - org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag - empty Stores the given time zone in the time zone configuration variable + setTimeZone + org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag + empty + +The time zone. A String value is interpreted as +a time zone ID. This may be one of the time zone +IDs supported by the Java platform (such as +"America/Los_Angeles") or a custom time zone +ID (such as "GMT-8"). See java.util.TimeZone for +more information on supported time zone +formats. + value true - false + true + +Name of the exported scoped variable which +stores the time zone of type +java.util.TimeZone. + var false false + +Scope of var or the time zone configuration +variable. + scope false false - bundle - org.apache.taglibs.standard.tag.el.fmt.BundleTag - JSP Loads a resource bundle to be used by its tag body + bundle + org.apache.taglibs.standard.tag.rt.fmt.BundleTag + JSP + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Prefix to be prepended to the value of the message +key of any nested <fmt:message> action. + prefix false - false + true - setBundle - org.apache.taglibs.standard.tag.el.fmt.SetBundleTag - empty Loads a resource bundle and stores it in the named scoped variable or the bundle configuration variable + setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag + empty + +Resource bundle base name. This is the bundle's +fully-qualified resource name, which has the same +form as a fully-qualified class name, that is, it uses +"." as the package component separator and does not +have any file type (such as ".class" or ".properties") +suffix. + basename true - false + true + +Name of the exported scoped variable which stores +the i18n localization context of type +javax.servlet.jsp.jstl.fmt.LocalizationC +ontext. + var false false + +Scope of var or the localization context +configuration variable. + scope false false - message - org.apache.taglibs.standard.tag.el.fmt.MessageTag - JSP Maps key to localized message and performs parametric replacement + message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag + JSP + +Message key to be looked up. + key false - false + true + +Localization context in whose resource +bundle the message key is looked up. + bundle false - false + true + +Name of the exported scoped variable +which stores the localized message. + var false false + +Scope of var. + scope false false - param - org.apache.taglibs.standard.tag.el.fmt.ParamTag - JSP Supplies an argument for parametric replacement to a containing <message> tag + param + org.apache.taglibs.standard.tag.rt.fmt.ParamTag + JSP + +Argument used for parametric replacement. + value false - false + true - formatNumber - org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag - JSP Formats a numeric value as a number, currency, or percentage + formatNumber + org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag + JSP + +Numeric value to be formatted. + value false - false + true + +Specifies whether the value is to be +formatted as number, currency, or +percentage. + type false - false + true + +Custom formatting pattern. + pattern false - false + true + +ISO 4217 currency code. Applied only +when formatting currencies (i.e. if type is +equal to "currency"); ignored otherwise. + currencyCode false - false + true + +Currency symbol. Applied only when +formatting currencies (i.e. if type is equal +to "currency"); ignored otherwise. + currencySymbol false - false + true + +Specifies whether the formatted output +will contain any grouping separators. + groupingUsed false - false + true + +Maximum number of digits in the integer +portion of the formatted output. + maxIntegerDigits false - false + true + +Minimum number of digits in the integer +portion of the formatted output. + minIntegerDigits false - false + true + +Maximum number of digits in the +fractional portion of the formatted output. + maxFractionDigits false - false + true + +Minimum number of digits in the +fractional portion of the formatted output. + minFractionDigits false - false + true + +Name of the exported scoped variable +which stores the formatted result as a +String. + var false false + +Scope of var. + scope false false - parseNumber - org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag - JSP Parses the string representation of a number, currency, or percentage + parseNumber + org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag + JSP + +String to be parsed. + value false - false + true + +Specifies whether the string in the value +attribute should be parsed as a number, +currency, or percentage. + type false - false + true + +Custom formatting pattern that determines +how the string in the value attribute is to be +parsed. + pattern false - false + true + +Locale whose default formatting pattern (for +numbers, currencies, or percentages, +respectively) is to be used during the parse +operation, or to which the pattern specified +via the pattern attribute (if present) is +applied. + parseLocale false - false + true + +Specifies whether just the integer portion of +the given value should be parsed. + integerOnly false - false + true + +Name of the exported scoped variable which +stores the parsed result (of type +java.lang.Number). + var false false + +Scope of var. + scope false false - formatDate - org.apache.taglibs.standard.tag.el.fmt.FormatDateTag - empty Formats a date and/or time using the supplied styles and pattern + formatDate + org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag + empty + +Date and/or time to be formatted. + value true - false + true + +Specifies whether the time, the date, or both +the time and date components of the given +date are to be formatted. + type false - false + true + +Predefined formatting style for dates. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a date or both a date and +time (i.e. if type is missing or is equal to +"date" or "both"); ignored otherwise. + dateStyle false - false + true + +Predefined formatting style for times. Follows +the semantics defined in class +java.text.DateFormat. Applied only +when formatting a time or both a date and +time (i.e. if type is equal to "time" or "both"); +ignored otherwise. + timeStyle false - false + true + +Custom formatting style for dates and times. + pattern false - false + true + +Time zone in which to represent the formatted +time. + timeZone false - false + true + +Name of the exported scoped variable which +stores the formatted result as a String. + var false false + +Scope of var. + scope false false - parseDate - org.apache.taglibs.standard.tag.el.fmt.ParseDateTag - JSP Parses the string representation of a date and/or time + parseDate + org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag + JSP + +Date string to be parsed. + value false - false + true + +Specifies whether the date string in the +value attribute is supposed to contain a +time, a date, or both. + type false - false + true + +Predefined formatting style for days +which determines how the date +component of the date string is to be +parsed. Applied only when formatting a +date or both a date and time (i.e. if type +is missing or is equal to "date" or "both"); +ignored otherwise. + dateStyle false - false + true + +Predefined formatting styles for times +which determines how the time +component in the date string is to be +parsed. Applied only when formatting a +time or both a date and time (i.e. if type +is equal to "time" or "both"); ignored +otherwise. + timeStyle false - false + true + +Custom formatting pattern which +determines how the date string is to be +parsed. + pattern false - false + true + +Time zone in which to interpret any time +information in the date string. + timeZone false - false + true + +Locale whose predefined formatting styles +for dates and times are to be used during +the parse operation, or to which the +pattern specified via the pattern +attribute (if present) is applied. + parseLocale false - false + true + +Name of the exported scoped variable in +which the parsing result (of type +java.util.Date) is stored. + var false false + +Scope of var. + scope false false Index: lams_central/web/WEB-INF/jstl/tlds/fn.tld =================================================================== diff -u --- lams_central/web/WEB-INF/jstl/tlds/fn.tld (revision 0) +++ lams_central/web/WEB-INF/jstl/tlds/fn.tld (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -0,0 +1,207 @@ + + + + + JSTL 1.1 functions library + JSTL functions + 1.1 + fn + http://java.sun.com/jsp/jstl/functions + + + + Tests if an input string contains the specified substring. + + contains + org.apache.taglibs.standard.functions.Functions + boolean contains(java.lang.String, java.lang.String) + + <c:if test="${fn:contains(name, searchString)}"> + + + + + + Tests if an input string contains the specified substring in a case insensitive way. + + containsIgnoreCase + org.apache.taglibs.standard.functions.Functions + boolean containsIgnoreCase(java.lang.String, java.lang.String) + + <c:if test="${fn:containsIgnoreCase(name, searchString)}"> + + + + + + Tests if an input string ends with the specified suffix. + + endsWith + org.apache.taglibs.standard.functions.Functions + boolean endsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:endsWith(filename, ".txt")}"> + + + + + + Escapes characters that could be interpreted as XML markup. + + escapeXml + org.apache.taglibs.standard.functions.Functions + java.lang.String escapeXml(java.lang.String) + + ${fn:escapeXml(param:info)} + + + + + + Returns the index withing a string of the first occurrence of a specified substring. + + indexOf + org.apache.taglibs.standard.functions.Functions + int indexOf(java.lang.String, java.lang.String) + + ${fn:indexOf(name, "-")} + + + + + + Joins all elements of an array into a string. + + join + org.apache.taglibs.standard.functions.Functions + java.lang.String join(java.lang.String[], java.lang.String) + + ${fn:join(array, ";")} + + + + + + Returns the number of items in a collection, or the number of characters in a string. + + length + org.apache.taglibs.standard.functions.Functions + int length(java.lang.Object) + + You have ${fn:length(shoppingCart.products)} in your shopping cart. + + + + + + Returns a string resulting from replacing in an input string all occurrences + of a "before" string into an "after" substring. + + replace + org.apache.taglibs.standard.functions.Functions + java.lang.String replace(java.lang.String, java.lang.String, java.lang.String) + + ${fn:replace(text, "-", "•")} + + + + + + Splits a string into an array of substrings. + + split + org.apache.taglibs.standard.functions.Functions + java.lang.String[] split(java.lang.String, java.lang.String) + + ${fn:split(customerNames, ";")} + + + + + + Tests if an input string starts with the specified prefix. + + startsWith + org.apache.taglibs.standard.functions.Functions + boolean startsWith(java.lang.String, java.lang.String) + + <c:if test="${fn:startsWith(product.id, "100-")}"> + + + + + + Returns a subset of a string. + + substring + org.apache.taglibs.standard.functions.Functions + java.lang.String substring(java.lang.String, int, int) + + P.O. Box: ${fn:substring(zip, 6, -1)} + + + + + + Returns a subset of a string following a specific substring. + + substringAfter + org.apache.taglibs.standard.functions.Functions + java.lang.String substringAfter(java.lang.String, java.lang.String) + + P.O. Box: ${fn:substringAfter(zip, "-")} + + + + + + Returns a subset of a string before a specific substring. + + substringBefore + org.apache.taglibs.standard.functions.Functions + java.lang.String substringBefore(java.lang.String, java.lang.String) + + Zip (without P.O. Box): ${fn:substringBefore(zip, "-")} + + + + + + Converts all of the characters of a string to lower case. + + toLowerCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toLowerCase(java.lang.String) + + Product name: ${fn.toLowerCase(product.name)} + + + + + + Converts all of the characters of a string to upper case. + + toUpperCase + org.apache.taglibs.standard.functions.Functions + java.lang.String toUpperCase(java.lang.String) + + Product name: ${fn.UpperCase(product.name)} + + + + + + Removes white spaces from both ends of a string. + + trim + org.apache.taglibs.standard.functions.Functions + java.lang.String trim(java.lang.String) + + Name: ${fn.trim(name)} + + + + Index: lams_central/web/WEB-INF/jstl/tlds/permittedTaglibs.tld =================================================================== diff -u --- lams_central/web/WEB-INF/jstl/tlds/permittedTaglibs.tld (revision 0) +++ lams_central/web/WEB-INF/jstl/tlds/permittedTaglibs.tld (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -0,0 +1,34 @@ + + + + + Restricts JSP pages to the JSTL tag libraries + + permittedTaglibs + 1.1 + permittedTaglibs + http://jakarta.apache.org/taglibs/standard/permittedTaglibs + + + + javax.servlet.jsp.jstl.tlv.PermittedTaglibsTLV + + + + Whitespace-separated list of taglib URIs to permit. This example + TLD for the Standard Taglib allows only JSTL 'el' taglibs to be + imported. + + permittedTaglibs + + http://java.sun.com/jsp/jstl/core + http://java.sun.com/jsp/jstl/fmt + http://java.sun.com/jsp/jstl/sql + http://java.sun.com/jsp/jstl/xml + + + + Index: lams_central/web/WEB-INF/jstl/tlds/scriptfree.tld =================================================================== diff -u --- lams_central/web/WEB-INF/jstl/tlds/scriptfree.tld (revision 0) +++ lams_central/web/WEB-INF/jstl/tlds/scriptfree.tld (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -0,0 +1,51 @@ + + + + + Validates JSP pages to prohibit use of scripting elements. + + 1.1 + scriptfree + http://jakarta.apache.org/taglibs/standard/scriptfree + + + + Validates prohibitions against scripting elements. + + + javax.servlet.jsp.jstl.tlv.ScriptFreeTLV + + + + Controls whether or not declarations are considered valid. + + allowDeclarations + false + + + + Controls whether or not scriptlets are considered valid. + + allowScriptlets + false + + + + Controls whether or not top-level expressions are considered valid. + + allowExpressions + false + + + + Controls whether or not expressions used to supply request-time + attribute values are considered valid. + + allowRTExpressions + false + + + Index: lams_central/web/WEB-INF/jstl/tlds/x.tld =================================================================== diff -u --- lams_central/web/WEB-INF/jstl/tlds/x.tld (revision 0) +++ lams_central/web/WEB-INF/jstl/tlds/x.tld (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -0,0 +1,448 @@ + + + + + JSTL 1.1 XML library + JSTL XML + 1.1 + x + http://java.sun.com/jsp/jstl/xml + + + + Provides validation features for JSTL XML tags. + + + org.apache.taglibs.standard.tlv.JstlXmlTLV + + + + + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + + choose + org.apache.taglibs.standard.tag.common.core.ChooseTag + JSP + + + + + Like <%= ... >, but for XPath expressions. + + out + org.apache.taglibs.standard.tag.rt.xml.ExprTag + empty + + +XPath expression to be evaluated. + + select + true + false + + + +Determines whether characters <,>,&,'," in the +resulting string should be converted to their +corresponding character entity codes. Default +value is true. + + escapeXml + false + true + + + + + + XML conditional tag, which evalutes its body if the + supplied XPath expression evalutes to 'true' as a boolean + + if + org.apache.taglibs.standard.tag.common.xml.IfTag + JSP + + +The test condition that tells whether or not the +body content should be processed. + + select + true + false + + + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + + var + false + false + + + +Scope for var. + + scope + false + false + + + + + + XML iteration tag. + + forEach + org.apache.taglibs.standard.tag.common.xml.ForEachTag + JSP + + +Name of the exported scoped variable for the +current item of the iteration. This scoped variable +has nested visibility. Its type depends on the +result of the XPath expression in the select +attribute. + + var + false + false + + + +XPath expression to be evaluated. + + select + true + false + + + +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. + + begin + false + true + int + + + +Iteration ends at the item located at the specified +index (inclusive). + + end + false + true + int + + + +Iteration will only process every step items of +the collection, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility. + + varStatus + false + false + + + + + + Subtag of <choose> that follows <when> tags + and runs only if all of the prior conditions evaluated to + 'false' + + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP + + + + + Adds a parameter to a containing 'transform' tag's Transformer + + param + org.apache.taglibs.standard.tag.rt.xml.ParamTag + JSP + + +Name of the transformation parameter. + + name + true + true + + + +Value of the parameter. + + value + false + true + + + + + + Parses XML content from 'source' attribute or 'body' + + parse + org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tei.XmlParseTEI + JSP + + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is implementation +dependent. + + var + false + false + + + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is +org.w3c.dom.Document. + + varDom + false + false + + + +Scope for var. + + scope + false + false + + + +Scope for varDom. + + scopeDom + false + false + + + +Deprecated. Use attribute 'doc' instead. + + xml + false + true + + + +Source XML document to be parsed. + + doc + false + true + + + +The system identifier (URI) for parsing the +XML document. + + systemId + false + true + + + +Filter to be applied to the source +document. + + filter + false + true + + + + + + Saves the result of an XPath expression evaluation in a 'scope' + + set + org.apache.taglibs.standard.tag.common.xml.SetTag + empty + + +Name of the exported scoped variable to hold +the value specified in the action. The type of the +scoped variable is whatever type the select +expression evaluates to. + + var + true + false + + + +XPath expression to be evaluated. + + select + false + false + + + +Scope for var. + + scope + false + false + + + + + + Conducts a transformation given a source XML document + and an XSLT stylesheet + + transform + org.apache.taglibs.standard.tag.rt.xml.TransformTag + org.apache.taglibs.standard.tei.XmlTransformTEI + JSP + + +Name of the exported +scoped variable for the +transformed XML +document. The type of the +scoped variable is +org.w3c.dom.Document. + + var + false + false + + + +Scope for var. + + scope + false + false + + + +Result +Object that captures or +processes the transformation +result. + + result + false + true + + + +Deprecated. Use attribute +'doc' instead. + + xml + false + true + + + +Source XML document to be +transformed. (If exported by +<x:set>, it must correspond +to a well-formed XML +document, not a partial +document.) + + doc + false + true + + + +Deprecated. Use attribute +'docSystemId' instead. + + xmlSystemId + false + true + + + +The system identifier (URI) +for parsing the XML +document. + + docSystemId + false + true + + + +javax.xml.transform.Source +Transformation stylesheet as +a String, Reader, or +Source object. + + xslt + false + true + + + +The system identifier (URI) +for parsing the XSLT +stylesheet. + + xsltSystemId + false + true + + + + + + Subtag of <choose> that includes its body if its + expression evalutes to 'true' + + when + org.apache.taglibs.standard.tag.common.xml.WhenTag + JSP + + +The test condition that tells whether or +not the body content should be +processed + + select + true + false + + + + Index: lams_central/web/WEB-INF/lams.tld =================================================================== diff -u -rea18e09d16f8fcfdb3a26850a859f86f6cd5ecaf -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision ea18e09d16f8fcfdb3a26850a859f86f6cd5ecaf) +++ lams_central/web/WEB-INF/lams.tld (.../lams.tld) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -42,11 +42,6 @@ css org.lamsfoundation.lams.web.tag.CssTag - - - localLink - false - Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/struts/tlds/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/struts/tlds/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/struts/tlds/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_central/web/WEB-INF/struts/tlds/struts-tiles-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_central/web/WEB-INF/web.xml =================================================================== diff -u -r9cf6f80b33044116d7378e7eb384f771ac486a6b -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/web/WEB-INF/web.xml (.../web.xml) (revision 9cf6f80b33044116d7378e7eb384f771ac486a6b) +++ lams_central/web/WEB-INF/web.xml (.../web.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,8 +1,6 @@ - - - + - - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - + - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + tags-permittedTaglibs + /WEB-INF/jstl/tlds/permittedTaglibs.tld + + + tags-scriptfree + /WEB-INF/jstl/tlds/scriptfree.tld + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + tags-lams + /WEB-INF/lams.tld + - - tags-logic - /WEB-INF/struts/tlds/struts-logic.tld - + - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - tags-c - /WEB-INF/struts/tlds/c.tld - - - - - - http://java.sun.com/jstl/fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - http://java.sun.com/jstl/fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - http://java.sun.com/jstl/core - /WEB-INF/jstl/tlds/c.tld - - - - http://java.sun.com/jstl/core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - - - tags-lams - /WEB-INF/lams.tld - -

Index: lams_central/web/passwordChangeContent.jsp =================================================================== diff -u -r68909e565bd650320fcaae20ecae19a2a46111c5 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision 68909e565bd650320fcaae20ecae19a2a46111c5) +++ lams_central/web/passwordChangeContent.jsp (.../passwordChangeContent.jsp) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,5 +1,5 @@ <%@page import="org.lamsfoundation.lams.web.PasswordChangeActionForm" %> -<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-bean" prefix="bean" %> Index: lams_monitoring/build.xml =================================================================== diff -u -rc1dfdde7a9d5ed9b49fc9772bbb9f018b085d00b -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/build.xml (.../build.xml) (revision c1dfdde7a9d5ed9b49fc9772bbb9f018b085d00b) +++ lams_monitoring/build.xml (.../build.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -19,6 +19,9 @@ + + + @@ -194,7 +197,8 @@ - - + Index: lams_monitoring/conf/xdoclet/taglibs.xml =================================================================== diff -u -rc61209d8bbbe245fc3eb11f8c5d0a2ee7a67ad26 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision c61209d8bbbe245fc3eb11f8c5d0a2ee7a67ad26) +++ lams_monitoring/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,86 +1,63 @@ - - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - - - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - - - - tags-logic - /WEB-INF/struts/tlds/struts-logic.tld - - - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - tags-c - /WEB-INF/struts/tlds/c.tld - - - - - - - tags-fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - tags-fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - tags-core - /WEB-INF/jstl/tlds/c.tld - - - - tags-core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - - tags-fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - - - - - - tags-lams - /WEB-INF/lams.tld - \ No newline at end of file + + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + + + + + tags-lams + /WEB-INF/lams.tld + + \ No newline at end of file Index: lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/test/web/WEB-INF/struts/tiles-defs.xml (.../tiles-defs.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -19,9 +19,6 @@ http://www.gnu.org/licenses/gpl.txt --> - Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/tlds/c-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/jstl/tlds/c.tld =================================================================== diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb) +++ lams_monitoring/web/WEB-INF/jstl/tlds/c.tld (.../c.tld) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,415 +1,562 @@ - - - - 1.0 - 1.2 - c - http://java.sun.com/jstl/core + + + + + JSTL 1.1 core library JSTL core - JSTL 1.0 core library + 1.1 + c + http://java.sun.com/jsp/jstl/core + + Provides core validation features for JSTL tags. + - org.apache.taglibs.standard.tlv.JstlCoreTLV + org.apache.taglibs.standard.tlv.JstlCoreTLV - - expressionAttributes - - out:value - out:default - out:escapeXml - if:test - import:url - import:context - import:charEncoding - forEach:items - forEach:begin - forEach:end - forEach:step - forTokens:items - forTokens:begin - forTokens:end - forTokens:step - param:encode - param:name - param:value - redirect:context - redirect:url - set:property - set:target - set:value - url:context - url:value - when:test - - - Whitespace-separated list of colon-separated token pairs - describing tag:attribute combinations that accept expressions. - The validator uses this information to determine which - attributes need their syntax validated. - - - catch - org.apache.taglibs.standard.tag.common.core.CatchTag - JSP Catches any Throwable that occurs in its body and optionally exposes it. + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + +Name of the exported scoped variable for the +exception thrown from a nested action. The type of the +scoped variable is the type of the exception thrown. + var false false + + Simple conditional tag that establishes a context for + mutually exclusive conditional operations, marked by + <when> and <otherwise> + choose

org.apache.taglibs.standard.tag.common.core.ChooseTag

org.apache.taglibs.standard.tei.ImportTEI

org.apache.taglibs.standard.tag.common.core.RemoveTag

org.apache.taglibs.standard.tag.common.xml.IfTag

JSP - - XML conditional tag, which evalutes its body if the - supplied XPath expression evalutes to 'true' as a boolean - + +The test condition that tells whether or not the +body content should be processed. + select true false + +Name of the exported scoped variable for the +resulting value of the test condition. The type +of the scoped variable is Boolean. + var false false + +Scope for var. + scope false false - forEach - org.apache.taglibs.standard.tag.common.xml.ForEachTag - JSP XML iteration tag. + forEach + org.apache.taglibs.standard.tag.common.xml.ForEachTag + JSP + +Name of the exported scoped variable for the +current item of the iteration. This scoped variable +has nested visibility. Its type depends on the +result of the XPath expression in the select +attribute. + var false false + +XPath expression to be evaluated. + select true false + + +Iteration begins at the item located at the +specified index. First item of the collection has +index 0. + + begin + false + true + int + + + +Iteration ends at the item located at the specified +index (inclusive). + + end + false + true + int + + + +Iteration will only process every step items of +the collection, starting with the first one. + + step + false + true + int + + + +Name of the exported scoped variable for the +status of the iteration. Object exported is of type +javax.servlet.jsp.jstl.core.LoopTagStatus. This scoped variable has nested visibility. + + varStatus + false + false + - otherwise - org.apache.taglibs.standard.tag.common.core.OtherwiseTag - JSP Subtag of <choose> that follows <when> tags and runs only if all of the prior conditions evaluated to 'false' + otherwise + org.apache.taglibs.standard.tag.common.core.OtherwiseTag + JSP - param - org.apache.taglibs.standard.tag.el.xml.ParamTag - JSP Adds a parameter to a containing 'transform' tag's Transformer + param + org.apache.taglibs.standard.tag.rt.xml.ParamTag + JSP + +Name of the transformation parameter. + name true - false + true + +Value of the parameter. + value false - false + true - parse - org.apache.taglibs.standard.tag.el.xml.ParseTag - org.apache.taglibs.standard.tei.XmlParseTEI - JSP Parses XML content from 'source' attribute or 'body' + parse + org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tei.XmlParseTEI + JSP + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is implementation +dependent. + var false false + +Name of the exported scoped variable for +the parsed XML document. The type of the +scoped variable is +org.w3c.dom.Document. + varDom false false + +Scope for var. + scope false false + +Scope for varDom. + scopeDom false false + +Deprecated. Use attribute 'doc' instead. + xml false - false + true + +Source XML document to be parsed. + + doc + false + true + + + +The system identifier (URI) for parsing the +XML document. + systemId false - false + true + +Filter to be applied to the source +document. + filter false - false + true - set - org.apache.taglibs.standard.tag.common.xml.SetTag - empty Saves the result of an XPath expression evaluation in a 'scope' + set + org.apache.taglibs.standard.tag.common.xml.SetTag + empty + +Name of the exported scoped variable to hold +the value specified in the action. The type of the +scoped variable is whatever type the select +expression evaluates to. + var true false + +XPath expression to be evaluated. + select false false + +Scope for var. + scope false false - transform - org.apache.taglibs.standard.tag.el.xml.TransformTag - org.apache.taglibs.standard.tei.XmlTransformTEI - JSP Conducts a transformation given a source XML document and an XSLT stylesheet + transform + org.apache.taglibs.standard.tag.rt.xml.TransformTag + org.apache.taglibs.standard.tei.XmlTransformTEI + JSP + +Name of the exported +scoped variable for the +transformed XML +document. The type of the +scoped variable is +org.w3c.dom.Document. + var false false + +Scope for var. + scope false false + +Result +Object that captures or +processes the transformation +result. + result false - false + true + +Deprecated. Use attribute +'doc' instead. + xml false - false + true + +Source XML document to be +transformed. (If exported by +<x:set>, it must correspond +to a well-formed XML +document, not a partial +document.) + + doc + false + true + + + +Deprecated. Use attribute +'docSystemId' instead. + xmlSystemId false - false + true + +The system identifier (URI) +for parsing the XML +document. + + docSystemId + false + true + + + +javax.xml.transform.Source +Transformation stylesheet as +a String, Reader, or +Source object. + xslt false - false + true + +The system identifier (URI) +for parsing the XSLT +stylesheet. + xsltSystemId false - false + true - when - org.apache.taglibs.standard.tag.common.xml.WhenTag - JSP Subtag of <choose> that includes its body if its expression evalutes to 'true' + when + org.apache.taglibs.standard.tag.common.xml.WhenTag + JSP + +The test condition that tells whether or +not the body content should be +processed + select true false Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/struts/tlds/struts-bean-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/struts/tlds/struts-html-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag ccd319d5814f7182b441e35cd615aa162fef83fb refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/struts/tlds/struts-logic-el.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== diff -u -rb484303f0791f74da268d0706057ce4dd4281946 -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision b484303f0791f74da268d0706057ce4dd4281946) +++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -1,8 +1,6 @@ - - - + - - - - - tags-bean - /WEB-INF/struts/tlds/struts-bean.tld - + + + + + + tags-bean + /WEB-INF/struts/tlds/struts-bean.tld + + + tags-html + /WEB-INF/struts/tlds/struts-html.tld + + + tags-logic + /WEB-INF/struts/tlds/struts-logic.tld + + + tags-tiles + /WEB-INF/struts/tlds/struts-tiles.tld + + + + + + tags-fmt + /WEB-INF/jstl/tlds/fmt.tld + + + tags-core + /WEB-INF/jstl/tlds/c.tld + + + tags-function + /WEB-INF/jstl/tlds/fn.tld + + + tags-xml + /WEB-INF/jstl/tlds/x.tld + + + + + + fck-editor + /WEB-INF/fckeditor/tlds/FCKeditor.tld + + + + + + tags-lams + /WEB-INF/lams.tld + + - - tags-html - /WEB-INF/struts/tlds/struts-html.tld - - - - tags-logic - /WEB-INF/struts/tlds/struts-logic.tld - - - - tags-tiles - /WEB-INF/struts/tlds/struts-tiles.tld - - - - tags-bean-el - /WEB-INF/struts/tlds/struts-bean-el.tld - - - - tags-html-el - /WEB-INF/struts/tlds/struts-html-el.tld - - - - tags-logic-el - /WEB-INF/struts/tlds/struts-logic-el.tld - - - - tags-tiles-el - /WEB-INF/struts/tlds/struts-tiles-el.tld - - - - tags-c - /WEB-INF/struts/tlds/c.tld - - - - - - - tags-fmt - /WEB-INF/jstl/tlds/fmt.tld - - - - tags-fmt-rt - /WEB-INF/jstl/tlds/fmt-rt.tld - - - - tags-core - /WEB-INF/jstl/tlds/c.tld - - - - tags-core-rt - /WEB-INF/jstl/tlds/c-rt.tld - - - - - - - tags-fck-editor - /WEB-INF/fckeditor/tlds/FCKeditor.tld - - - - - - - tags-lams - /WEB-INF/lams.tld - - -<%@ taglib uri="tags-html-el" prefix="html-el" %> -<%@ taglib uri="tags-bean-el" prefix="bean-el" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_monitoring/web/gate/scheduleGateContent.jsp =================================================================== diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb) +++ lams_monitoring/web/gate/scheduleGateContent.jsp (.../scheduleGateContent.jsp) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -18,9 +18,9 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html-el" %> -<%@ taglib uri="tags-bean-el" prefix="bean-el" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_monitoring/web/gate/sychGateContent.jsp =================================================================== diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb) +++ lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -18,9 +18,9 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html-el" %> -<%@ taglib uri="tags-bean-el" prefix="bean-el" %> -<%@ taglib uri="tags-logic-el" prefix="logic-el" %> +<%@ taglib uri="tags-html" prefix="html" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> <%@ taglib uri="tags-core" prefix="c" %> <%@ taglib uri="tags-fmt" prefix="fmt" %> Index: lams_monitoring/web/systemErrorContent.jsp =================================================================== diff -u -r411ed0a4c93b7bc699baee8c66bdc540ec34c7cb -rccd319d5814f7182b441e35cd615aa162fef83fb --- lams_monitoring/web/systemErrorContent.jsp (.../systemErrorContent.jsp) (revision 411ed0a4c93b7bc699baee8c66bdc540ec34c7cb) +++ lams_monitoring/web/systemErrorContent.jsp (.../systemErrorContent.jsp) (revision ccd319d5814f7182b441e35cd615aa162fef83fb) @@ -19,7 +19,7 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="tags-html-el" prefix="html-el" %> +<%@ taglib uri="tags-html" prefix="html" %> <%@ taglib uri="tags-logic" prefix="logic" %>