Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringResources.properties =================================================================== diff -u -r62a9d980560721c476979fc695ce1e9a5508dc75 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringResources.properties (.../MonitoringResources.properties) (revision 62a9d980560721c476979fc695ce1e9a5508dc75) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/MonitoringResources.properties (.../MonitoringResources.properties) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1,2 +1,7 @@ # Resources for parameter 'org.lamsfoundation.lams.monitoring.MonitoringResources' -# Project P/lams_monitoring \ No newline at end of file +# Project P/lams_monitoring + +label.synch.gate=Synch Gate +label.permission.gate=Permission Gate +label.schedule.gate=Schedule Gate +lable.description=Description \ No newline at end of file Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java (.../IMonitoringService.java) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -24,6 +24,7 @@ import java.util.List; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.GateActivity; import org.lamsfoundation.lams.lesson.Lesson; import org.lamsfoundation.lams.tool.service.LamsToolServiceException; import org.lamsfoundation.lams.usermanagement.Organisation; @@ -86,13 +87,13 @@ * is triggerred by the system scheduler. * @param gate the id of the gate we need to open. */ - public void openGate(Long gateId); + public GateActivity openGate(Long gateId); /** * Set the gate to closed. * @param gate the id of the gate we need to close. */ - public void closeGate(Long gateId); + public GateActivity closeGate(Long gateId); /** * This method returns a string representing a list of all Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java (.../MonitoringService.java) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -301,21 +301,23 @@ /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#openGate(org.lamsfoundation.lams.learningdesign.GateActivity) */ - public void openGate(Long gateId) + public GateActivity openGate(Long gateId) { GateActivity gate = (GateActivity)activityDAO.getActivityByActivityId(gateId); gate.setGateOpen(new Boolean(true)); activityDAO.update(gate); + return gate; } /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#closeGate(org.lamsfoundation.lams.learningdesign.GateActivity) */ - public void closeGate(Long gateId) + public GateActivity closeGate(Long gateId) { GateActivity gate = (GateActivity)activityDAO.getActivityByActivityId(gateId); gate.setGateOpen(new Boolean(false)); activityDAO.update(gate); + return gate; } /** * @see org.lamsfoundation.lams.monitoring.service.IMonitoringService#forceCompleteLessonByUser(long) Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java (.../GateAction.java) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java (.../GateAction.java) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -36,6 +36,7 @@ import org.lamsfoundation.lams.learning.service.ILearnerService; import org.lamsfoundation.lams.learning.web.util.LessonLearnerDataManager; import org.lamsfoundation.lams.learningdesign.Activity; +import org.lamsfoundation.lams.learningdesign.GateActivity; import org.lamsfoundation.lams.learningdesign.PermissionGateActivity; import org.lamsfoundation.lams.learningdesign.ScheduleGateActivity; import org.lamsfoundation.lams.learningdesign.SynchGateActivity; @@ -71,6 +72,7 @@ * @struts:action name="GateForm" * path="/gate" * parameter="method" + * scope="session" * validate="false" * @struts.action-exception key="error.system.monitor" scope="request" * type="org.lamsfoundation.lams.monitoring.service.MonitoringServiceException" @@ -79,7 +81,6 @@ * @struts:action-forward name="viewSynchGate" path=".viewSynchGate" * @struts:action-forward name="viewPermissionGate" path=".viewPermissionGate" * @struts:action-forward name="viewScheduleGate" path=".viewScheduleGate" - * @struts:action-forward name="openGate" path=".openGate" * ----------------XDoclet Tags-------------------- * */ @@ -98,7 +99,6 @@ private static final String VIEW_SYNCH_GATE = "viewSynchGate"; private static final String VIEW_PERMISSION_GATE = "viewPermissionGate"; private static final String VIEW_SCHEDULE_GATE="viewScheduleGate"; - private static final String OPEN_GATE = "openGate"; //--------------------------------------------------------------------- // Class level constants - session attributes //--------------------------------------------------------------------- @@ -157,19 +157,9 @@ .size(); gateForm.set("totalLearners",new Integer(totalLearners)); - //dispatch the view according to the type of the gate. - if(gate.isSynchGate()) - return viewSynchGate(mapping,gateForm,(SynchGateActivity)gate); - else if(gate.isScheduleGate()) - return viewScheduleGate(mapping,gateForm,(ScheduleGateActivity)gate); - else if(gate.isPermissionGate()) - return viewPermissionGate(mapping,gateForm,(PermissionGateActivity)gate); - else - throw new MonitoringServiceException("Invalid gate activity. " + - "gate id ["+gate.getActivityId()+"] - the type ["+ - gate.getActivityTypeId()+"] is not a gate type"); + + return findViewByGateType(mapping, gateForm, gate); } - /** * Open the gate if is closed. * @@ -195,53 +185,104 @@ DynaActionForm gateForm = (DynaActionForm)form; - monitoringService.openGate((Long)gateForm.get("activityId")); - - return mapping.findForward(OPEN_GATE); + GateActivity gate = monitoringService.openGate((Long)gateForm.get("activityId")); + + return findViewByGateType(mapping, gateForm, gate); } + //--------------------------------------------------------------------- + // Helper Methods + //--------------------------------------------------------------------- /** + * Dispatch view the according to the gate type. * - * @param mapping - * @param gateForm - * @param permissionGate - * @return + * @param mapping An ActionMapping class that will be used by the Action + * class to tell the ActionServlet where to send the end-user. + * @param gateForm The ActionForm class that will contain any data submitted + * by the end-user via a form. + * @param permissionGate the gate acitivty object + * @return An ActionForward class that will be returned to the ActionServlet + * indicating where the user is to go next. */ + private ActionForward findViewByGateType(ActionMapping mapping, + DynaActionForm gateForm, + Activity gate) + { + //dispatch the view according to the type of the gate. + if(gate.isSynchGate()) + return viewSynchGate(mapping,gateForm,(SynchGateActivity)gate); + else if(gate.isScheduleGate()) + return viewScheduleGate(mapping,gateForm,(ScheduleGateActivity)gate); + else if(gate.isPermissionGate()) + return viewPermissionGate(mapping,gateForm,(PermissionGateActivity)gate); + else + throw new MonitoringServiceException("Invalid gate activity. " + + "gate id ["+gate.getActivityId()+"] - the type ["+ + gate.getActivityTypeId()+"] is not a gate type"); + } + + + + /** + * Set up the form attributes specific to the permission gate and navigate + * to the permission gate view. + * @param mapping An ActionMapping class that will be used by the Action + * class to tell the ActionServlet where to send the end-user. + * @param gateForm The ActionForm class that will contain any data submitted + * by the end-user via a form. + * @param permissionGate the gate acitivty object + * @return An ActionForward class that will be returned to the ActionServlet + * indicating where the user is to go next. + */ private ActionForward viewPermissionGate(ActionMapping mapping, DynaActionForm gateForm, PermissionGateActivity permissionGate) { + gateForm.set("gate",permissionGate); gateForm.set("waitingLearners",new Integer(permissionGate.getWaitingLearners().size())); return mapping.findForward(VIEW_PERMISSION_GATE); } /** - * @param mapping - * @param gateForm - * @param scheduleGate - * @return + * Set up the form attributes specific to the schedule gate and navigate + * to the schedule gate view. + * + * @param mapping An ActionMapping class that will be used by the Action + * class to tell the ActionServlet where to send the end-user. + * @param gateForm The ActionForm class that will contain any data submitted + * by the end-user via a form. + * @param permissionGate the gate acitivty object + * @return An ActionForward class that will be returned to the ActionServlet + * indicating where the user is to go next. */ private ActionForward viewScheduleGate(ActionMapping mapping, DynaActionForm gateForm, ScheduleGateActivity scheduleGate) { + gateForm.set("gate",scheduleGate); gateForm.set("waitingLearners",new Integer(scheduleGate.getWaitingLearners().size())); //gateForm.set("startingTime",scheduleGate.get); return mapping.findForward(VIEW_SCHEDULE_GATE); } /** + * Set up the form attributes specific to the synch gate and navigate + * to the synch gate view. * - * @param mapping - * @param gateForm - * @param synchgate - * @return + * @param mapping An ActionMapping class that will be used by the Action + * class to tell the ActionServlet where to send the end-user. + * @param gateForm The ActionForm class that will contain any data submitted + * by the end-user via a form. + * @param permissionGate the gate acitivty object + * @return An ActionForward class that will be returned to the ActionServlet + * indicating where the user is to go next. */ private ActionForward viewSynchGate(ActionMapping mapping, DynaActionForm gateForm, SynchGateActivity synchgate) { + gateForm.set("gate",synchgate); gateForm.set("waitingLearners",new Integer(synchgate.getWaitingLearners().size())); return mapping.findForward(VIEW_SYNCH_GATE); } Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/c-1_0-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/c-1_0.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/jstl/c-rt.tld =================================================================== diff -u --- lams_monitoring/web/WEB-INF/jstl/c-rt.tld (revision 0) +++ lams_monitoring/web/WEB-INF/jstl/c-rt.tld (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,393 @@ + + + + 1.0 + 1.2 + c_rt + http://java.sun.com/jstl/core_rt + JSTL core RT + JSTL 1.0 core library + + + + org.apache.taglibs.standard.tlv.JstlCoreTLV + + + Provides core validation features for JSTL tags. + + + + + catch + org.apache.taglibs.standard.tag.common.core.CatchTag + JSP + + Catches any Throwable that occurs in its body and optionally + exposes it. + + + var + false + false + + + + + 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> + + + + + if + 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 + + + test + true + true + boolean + + + var + false + false + + + scope + false + false + + + + + import + 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'. + + + url + true + true + + + var + false + false + + + scope + false + false + + + varReader + false + false + + + context + false + true + + + charEncoding + false + true + + + + + forEach + org.apache.taglibs.standard.tag.rt.core.ForEachTag + org.apache.taglibs.standard.tei.ForEachTEI + JSP + + The basic iteration tag, accepting many different + collection types and supporting subsetting and other + functionality + + + items + false + true + java.lang.Object + + + begin + false + true + int + + + end + false + true + int + + + step + false + true + int + + + var + false + false + + + varStatus + false + false + + + + + forTokens + org.apache.taglibs.standard.tag.rt.core.ForTokensTag + JSP + + Iterates over tokens, separated by the supplied delimeters + + + items + true + true + java.lang.String + + + delims + true + true + java.lang.String + + + begin + false + true + int + + + end + false + true + int + + + step + false + true + int + + + var + false + false + + + varStatus + false + false + + + + + out + org.apache.taglibs.standard.tag.rt.core.OutTag + JSP + + Like <%= ... >, but for expressions. + + + value + true + true + + + default + false + true + + + escapeXml + false + true + + + + + + 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' + + + + + param + org.apache.taglibs.standard.tag.rt.core.ParamTag + JSP + + Adds a parameter to a containing 'import' tag's URL. + + + name + true + true + + + value + false + true + + + + + redirect + org.apache.taglibs.standard.tag.rt.core.RedirectTag + JSP + + Redirects to a new URL. + + + var + false + false + + + scope + false + false + + + url + false + true + + + context + false + true + + + + + remove + org.apache.taglibs.standard.tag.common.core.RemoveTag + empty + + Removes a scoped variable (from a particular scope, if specified). + + + var + true + false + + + scope + false + false + + + + + set + org.apache.taglibs.standard.tag.rt.core.SetTag + JSP + + Sets the result of an expression evaluation in a 'scope' + + + var + false + false + + + value + false + true + + + target + false + true + + + property + false + true + + + scope + false + false + + + + + url + org.apache.taglibs.standard.tag.rt.core.UrlTag + JSP + + Creates a URL with optional query parameters. + + + var + false + false + + + scope + false + false + + + value + false + true + + + context + false + true + + + + + when + org.apache.taglibs.standard.tag.rt.core.WhenTag + JSP + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + + + test + true + true + boolean + + + + Index: lams_monitoring/web/WEB-INF/jstl/c.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/jstl/c.tld (.../c.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/jstl/c.tld (.../c.tld) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1,562 +1,415 @@ - - - - - JSTL 1.1 core library - JSTL core - 1.1 + + + + 1.0 + 1.2 c - http://java.sun.com/jsp/jstl/core + http://java.sun.com/jstl/core + JSTL core + JSTL 1.0 core library - - 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 - 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 + Like <%= ... >, but for expressions. + + value + true + false + + + default + false + false + + + escapeXml + false + false + + + + if - org.apache.taglibs.standard.tag.rt.core.IfTag + org.apache.taglibs.standard.tag.el.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 - true - boolean + 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 - - 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.rt.core.ImportTag + org.apache.taglibs.standard.tag.el.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 - true + false - -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 - true + false - -Character encoding of the content at the input -resource. - charEncoding false - true + false + 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 - true - java.lang.Object + false - -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 - true - int + false - -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 - true - int + false - -Iteration will only process every step items of -the collection, starting with the first one. - step false - true - int + false - -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 - true - java.lang.String + false - -The set of delimiters (the characters that -separate the tokens in the string). - delims true - true - java.lang.String + false - -Iteration begins at the token located at the -specified index. First token has index 0. - begin false - true - int + false - -Iteration ends at the token located at the -specified index (inclusive). - end false - true - int + false - -Iteration will only process every step tokens -of the string, starting with the first one. - step false - true - int + false - -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 - - 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' - 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' + - - Adds a parameter to a containing 'import' tag's URL. - param - org.apache.taglibs.standard.tag.rt.core.ParamTag + org.apache.taglibs.standard.tag.el.core.ParamTag JSP + + Adds a parameter to a containing 'import' tag's URL. + - -Name of the query string parameter. - name true - true + false - -Value of the parameter. - value false - true + false - - Redirects to a new URL. - redirect - org.apache.taglibs.standard.tag.rt.core.RedirectTag + org.apache.taglibs.standard.tag.el.core.RedirectTag JSP + + Redirects to a new URL. + - -The URL of the resource to redirect to. - - url + var false - true + false - -Name of the context when redirecting to a relative URL -resource that belongs to a foreign context. - + scope + false + false + + + url + true + false + + context false - true + false - - 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 - - - Sets the result of an expression evaluation in a 'scope' - + set - org.apache.taglibs.standard.tag.rt.core.SetTag + org.apache.taglibs.standard.tag.el.core.SetTag JSP + + Sets the result of an expression evaluation in a 'scope' + - -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 - true + false - -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 - true + false - -Name of the property to be set in the target object. - property false - true + false - -Scope for var. - scope false false - - Creates a URL with optional query parameters. - url - org.apache.taglibs.standard.tag.rt.core.UrlTag + org.apache.taglibs.standard.tag.el.core.UrlTag JSP + + Prints or exposes a URL with optional query parameters + (via the c:param tag). + - -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 - false - true + true + false - -Name of the context when specifying a relative URL -resource that belongs to a foreign context. - context false - true + false - - Subtag of <choose> that includes its body if its - condition evalutes to 'true' - when - org.apache.taglibs.standard.tag.rt.core.WhenTag + org.apache.taglibs.standard.tag.el.core.WhenTag JSP + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + - -The test condition that determines whether or not the -body content should be processed. - test true - true - boolean + false Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/fmt-1_0-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/fmt-1_0.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/jstl/fmt-rt.tld =================================================================== diff -u --- lams_monitoring/web/WEB-INF/jstl/fmt-rt.tld (revision 0) +++ lams_monitoring/web/WEB-INF/jstl/fmt-rt.tld (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,403 @@ + + + + 1.0 + 1.2 + fmt_rt + http://java.sun.com/jstl/fmt_rt + JSTL fmt RT + JSTL 1.0 i18n-capable formatting library + + + + org.apache.taglibs.standard.tlv.JstlFmtTLV + + + Provides core validation features for JSTL tags. + + + + + requestEncoding + org.apache.taglibs.standard.tag.rt.fmt.RequestEncodingTag + empty + + Sets the request character encoding + + + value + false + true + + + + + setLocale + org.apache.taglibs.standard.tag.rt.fmt.SetLocaleTag + empty + + Stores the given locale in the locale configuration variable + + + value + true + true + + + variant + false + true + + + scope + false + false + + + + + timeZone + org.apache.taglibs.standard.tag.rt.fmt.TimeZoneTag + JSP + + Specifies the time zone for any time formatting or parsing actions + nested in its body + + + value + true + true + + + + + setTimeZone + org.apache.taglibs.standard.tag.rt.fmt.SetTimeZoneTag + empty + + Stores the given time zone in the time zone configuration variable + + + value + true + true + + + var + false + false + + + scope + false + false + + + + + bundle + org.apache.taglibs.standard.tag.rt.fmt.BundleTag + JSP + + Loads a resource bundle to be used by its tag body + + + basename + true + true + + + prefix + false + true + + + + + setBundle + org.apache.taglibs.standard.tag.rt.fmt.SetBundleTag + empty + + Loads a resource bundle and stores it in the named scoped variable or + the bundle configuration variable + + + basename + true + true + + + var + false + false + + + scope + false + false + + + + + message + org.apache.taglibs.standard.tag.rt.fmt.MessageTag + JSP + + Maps key to localized message and performs parametric replacement + + + key + false + true + + + bundle + false + true + + + var + false + false + + + scope + false + false + + + + + param + org.apache.taglibs.standard.tag.rt.fmt.ParamTag + JSP + + Supplies an argument for parametric replacement to a containing + <message> tag + + + value + false + true + + + + + formatNumber + org.apache.taglibs.standard.tag.rt.fmt.FormatNumberTag + JSP + + Formats a numeric value as a number, currency, or percentage + + + value + false + true + + + type + false + true + + + pattern + false + true + + + currencyCode + false + true + + + currencySymbol + false + true + + + groupingUsed + false + true + + + maxIntegerDigits + false + true + + + minIntegerDigits + false + true + + + maxFractionDigits + false + true + + + minFractionDigits + false + true + + + var + false + false + + + scope + false + false + + + + + parseNumber + org.apache.taglibs.standard.tag.rt.fmt.ParseNumberTag + JSP + + Parses the string representation of a number, currency, or percentage + + + value + false + true + + + type + false + true + + + pattern + false + true + + + parseLocale + false + true + + + integerOnly + false + true + + + var + false + false + + + scope + false + false + + + + + formatDate + org.apache.taglibs.standard.tag.rt.fmt.FormatDateTag + empty + + Formats a date and/or time using the supplied styles and pattern + + + value + true + true + + + type + false + true + + + dateStyle + false + true + + + timeStyle + false + true + + + pattern + false + true + + + timeZone + false + true + + + var + false + false + + + scope + false + false + + + + + parseDate + org.apache.taglibs.standard.tag.rt.fmt.ParseDateTag + JSP + + Parses the string representation of a date and/or time + + + value + false + true + + + type + false + true + + + dateStyle + false + true + + + timeStyle + false + true + + + pattern + false + true + + + timeZone + false + true + + + parseLocale + false + true + + + var + false + false + + + scope + false + false + + + + Index: lams_monitoring/web/WEB-INF/jstl/fmt.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/jstl/fmt.tld (.../fmt.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/jstl/fmt.tld (.../fmt.tld) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1,667 +1,438 @@ - - - - - JSTL 1.1 i18n-capable formatting library - JSTL fmt - 1.1 + + + + 1.0 + 1.2 fmt - http://java.sun.com/jsp/jstl/fmt + http://java.sun.com/jstl/fmt + JSTL fmt + JSTL 1.0 i18n-capable formatting library - - 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 - true + false + 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 - true + false - -Vendor- or browser-specific variant. -See the java.util.Locale javadocs for -more information on variants. - variant false - true + false - -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 - true + false + 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 - true + false - -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 - true + false - -Prefix to be prepended to the value of the message -key of any nested <fmt:message> action. - prefix false - true + false + 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 - true + false - -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 - true + false - -Localization context in whose resource -bundle the message key is looked up. - bundle false - true + false - -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 - true + false + 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 - true + false - -Specifies whether the value is to be -formatted as number, currency, or -percentage. - type false - true + false - -Custom formatting pattern. - pattern false - true + false - -ISO 4217 currency code. Applied only -when formatting currencies (i.e. if type is -equal to "currency"); ignored otherwise. - currencyCode false - true + false - -Currency symbol. Applied only when -formatting currencies (i.e. if type is equal -to "currency"); ignored otherwise. - currencySymbol false - true + false - -Specifies whether the formatted output -will contain any grouping separators. - groupingUsed false - true + false - -Maximum number of digits in the integer -portion of the formatted output. - maxIntegerDigits false - true + false - -Minimum number of digits in the integer -portion of the formatted output. - minIntegerDigits false - true + false - -Maximum number of digits in the -fractional portion of the formatted output. - maxFractionDigits false - true + false - -Minimum number of digits in the -fractional portion of the formatted output. - minFractionDigits false - true + false - -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 - true + false - -Specifies whether the string in the value -attribute should be parsed as a number, -currency, or percentage. - type false - true + false - -Custom formatting pattern that determines -how the string in the value attribute is to be -parsed. - pattern false - true + false - -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 - true + false - -Specifies whether just the integer portion of -the given value should be parsed. - integerOnly false - true + false - -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 - true + false - -Specifies whether the time, the date, or both -the time and date components of the given -date are to be formatted. - type false - true + false - -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 - true + false - -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 - true + false - -Custom formatting style for dates and times. - pattern false - true + false - -Time zone in which to represent the formatted -time. - timeZone false - true + false - -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 - true + false - -Specifies whether the date string in the -value attribute is supposed to contain a -time, a date, or both. - type false - true + false - -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 - true + false - -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 - true + false - -Custom formatting pattern which -determines how the date string is to be -parsed. - pattern false - true + false - -Time zone in which to interpret any time -information in the date string. - timeZone false - true + false - -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 - true + false - -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 Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/permittedTaglibs.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/scriptfree.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/sql-1_0-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/sql-1_0.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/jstl/sql-rt.tld =================================================================== diff -u --- lams_monitoring/web/WEB-INF/jstl/sql-rt.tld (revision 0) +++ lams_monitoring/web/WEB-INF/jstl/sql-rt.tld (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,188 @@ + + + + 1.0 + 1.2 + sql_rt + http://java.sun.com/jstl/sql_rt + JSTL sql RT + JSTL 1.0 sql library + + + + org.apache.taglibs.standard.tlv.JstlSqlTLV + + + Provides core validation features for JSTL tags. + + + + + transaction + org.apache.taglibs.standard.tag.rt.sql.TransactionTag + JSP + + Provides nested database action elements with a shared Connection, + set up to execute all statements as one transaction. + + + dataSource + false + true + + + isolation + false + true + + + + + query + org.apache.taglibs.standard.tag.rt.sql.QueryTag + JSP + + Executes the SQL query defined in its body or through the + sql attribute. + + + var + true + false + + + scope + false + false + + + sql + false + true + + + dataSource + false + true + + + startRow + false + true + + + maxRows + false + true + + + + + update + org.apache.taglibs.standard.tag.rt.sql.UpdateTag + JSP + + Executes the SQL update defined in its body or through the + sql attribute. + + + var + false + false + + + scope + false + false + + + sql + false + true + + + dataSource + false + true + + + + + param + org.apache.taglibs.standard.tag.rt.sql.ParamTag + JSP + + Sets a parameter in an SQL statement to the specified value. + + + value + false + true + + + + + dateParam + org.apache.taglibs.standard.tag.rt.sql.DateParamTag + empty + + Sets a parameter in an SQL statement to the specified java.util.Date value. + + + value + true + true + + + type + false + true + + + + + setDataSource + org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag + empty + + Creates a simple DataSource suitable only for prototyping. + + + var + false + false + + + scope + false + false + + + dataSource + false + true + + + driver + false + true + + + url + false + true + + + user + false + true + + + password + false + true + + + Index: lams_monitoring/web/WEB-INF/jstl/sql.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/jstl/sql.tld (.../sql.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/jstl/sql.tld (.../sql.tld) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1,289 +1,213 @@ - - - - - JSTL 1.1 sql library - JSTL sql - 1.1 + + + + 1.0 + 1.2 sql - http://java.sun.com/jsp/jstl/sql + http://java.sun.com/jstl/sql + JSTL sql + JSTL 1.0 sql library - - Provides core validation features for JSTL tags. - - org.apache.taglibs.standard.tlv.JstlSqlTLV + org.apache.taglibs.standard.tlv.JstlSqlTLV + + expressionAttributes + + transaction:dataSource + transaction:isolation + query:sql + query:dataSource + query:startRow + query:maxRows + update:sql + update:dataSource + param:value + dateParam:value + dateParam:type + setDataSource:dataSource + setDataSource:driver + setDataSource:url + setDataSource:user + setDataSource:password + + + 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. + + + transaction + org.apache.taglibs.standard.tag.el.sql.TransactionTag + JSP Provides nested database action elements with a shared Connection, set up to execute all statements as one transaction. - transaction - org.apache.taglibs.standard.tag.rt.sql.TransactionTag - JSP - -DataSource associated with the database to access. A -String value represents a relative path to a JNDI -resource or the parameters for the JDBC -DriverManager facility. - dataSource false - true + false - -Transaction isolation level. If not specified, it is the -isolation level the DataSource has been configured -with. - isolation false - true + false + query + org.apache.taglibs.standard.tag.el.sql.QueryTag + JSP Executes the SQL query defined in its body or through the sql attribute. - query - org.apache.taglibs.standard.tag.rt.sql.QueryTag - JSP - -Name of the exported scoped variable for the -query result. The type of the scoped variable is -javax.servlet.jsp.jstl.sql. -Result (see Chapter 16 "Java APIs"). - var true false - -Scope of var. - scope false false - -SQL query statement. - sql false - true + false - -Data source associated with the database to -query. A String value represents a relative path -to a JNDI resource or the parameters for the -DriverManager class. - dataSource false - true + false - -The returned Result object includes the rows -starting at the specified index. The first row of -the original query result set is at index 0. If not -specified, rows are included starting from the -first row at index 0. - startRow false - true + false - -The maximum number of rows to be included in -the query result. If not specified, or set to -1, no -limit on the maximum number of rows is -enforced. - maxRows false - true + false + update + org.apache.taglibs.standard.tag.el.sql.UpdateTag + JSP Executes the SQL update defined in its body or through the sql attribute. - update - org.apache.taglibs.standard.tag.rt.sql.UpdateTag - JSP - -Name of the exported scoped variable for the result -of the database update. The type of the scoped -variable is java.lang.Integer. - var false false - -Scope of var. - scope false false - -SQL update statement. - sql false - true + false - -Data source associated with the database to update. -A String value represents a relative path to a JNDI -resource or the parameters for the JDBC -DriverManager class. - dataSource false - true + false + param + org.apache.taglibs.standard.tag.el.sql.ParamTag + JSP Sets a parameter in an SQL statement to the specified value. - param - org.apache.taglibs.standard.tag.rt.sql.ParamTag - JSP - -Parameter value. - value false - true + false - - Sets a parameter in an SQL statement to the specified java.util.Date value. - dateParam - org.apache.taglibs.standard.tag.rt.sql.DateParamTag + org.apache.taglibs.standard.tag.el.sql.DateParamTag empty + + Sets a parameter in an SQL statement to the specified java.util.Date val +ue. + - -Parameter value for DATE, TIME, or -TIMESTAMP column in a database table. - value true true - -One of "date", "time" or "timestamp". - type false true + setDataSource + org.apache.taglibs.standard.tag.el.sql.SetDataSourceTag + empty Creates a simple DataSource suitable only for prototyping. - setDataSource - org.apache.taglibs.standard.tag.rt.sql.SetDataSourceTag - empty - -Name of the exported scoped variable -for the data source specified. Type can -be String or DataSource. - var false false - -If var is specified, scope of the -exported variable. Otherwise, scope of -the data source configuration variable. - scope false false - -Data source. If specified as a string, it -can either be a relative path to a JNDI -resource, or a JDBC parameters string -as defined in Section 10.1.1. - dataSource false - true + false - -JDBC parameter: driver class name. - driver false - true + false - -JDBC parameter: URL associated with -the database. - url false - true + false - -JDBC parameter: database user on -whose behalf the connection to the -database is being made. - user false - true + false - -JDBC parameter: user password - password false - true + false Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/x-1_0-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag d69bdbfcb5ca7fd3e10605130abc321de6d4619a refers to a dead (removed) revision in file `lams_monitoring/web/WEB-INF/jstl/x-1_0.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_monitoring/web/WEB-INF/jstl/x-rt.tld =================================================================== diff -u --- lams_monitoring/web/WEB-INF/jstl/x-rt.tld (revision 0) +++ lams_monitoring/web/WEB-INF/jstl/x-rt.tld (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,256 @@ + + + + 1.0 + 1.2 + x_rt + http://java.sun.com/jstl/xml_rt + JSTL XML RT + JSTL 1.0 XML library + + + + org.apache.taglibs.standard.tlv.JstlXmlTLV + + + Provides validation features for JSTL XML tags. + + + + + 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.rt.xml.ExprTag + empty + + Like <%= ... >, but for XPath expressions. + + + select + true + false + + + escapeXml + false + true + + + + + if + 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 + + + select + true + false + + + var + false + false + + + scope + false + false + + + + + forEach + org.apache.taglibs.standard.tag.common.xml.ForEachTag + JSP + + XML iteration tag. + + + var + false + false + + + select + true + 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' + + + + + param + org.apache.taglibs.standard.tag.rt.xml.ParamTag + JSP + + Adds a parameter to a containing 'transform' tag's Transformer + + + name + true + true + + + value + false + true + + + + + parse + org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tei.XmlParseTEI + JSP + + Parses XML content from 'source' attribute or 'body' + + + var + false + false + + + varDom + false + false + + + scope + false + false + + + scopeDom + false + false + + + xml + false + true + + + systemId + false + true + + + filter + false + true + + + + + set + org.apache.taglibs.standard.tag.common.xml.SetTag + empty + + Saves the result of an XPath expression evaluation in a 'scope' + + + var + true + false + + + select + false + false + + + scope + false + false + + + + + transform + org.apache.taglibs.standard.tag.rt.xml.TransformTag + org.apache.taglibs.standard.tei.XmlTransformTEI + JSP + + Conducts a transformation given a source XML document + and an XSLT stylesheet + + + var + false + false + + + scope + false + false + + + result + false + true + + + xml + false + true + + + xmlSystemId + false + true + + + xslt + false + true + + + xsltSystemId + 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' + + + select + true + false + + + + Index: lams_monitoring/web/WEB-INF/jstl/x.tld =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/jstl/x.tld (.../x.tld) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/jstl/x.tld (.../x.tld) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1,444 +1,269 @@ - - - - - JSTL 1.1 XML library - JSTL XML - 1.1 + + + + 1.0 + 1.2 x - http://java.sun.com/jsp/jstl/xml + http://java.sun.com/jstl/xml + JSTL XML + JSTL 1.0 XML library - - Provides validation features for JSTL XML tags. - org.apache.taglibs.standard.tlv.JstlXmlTLV + + expressionAttributes + + out:escapeXml + parse:xml + parse:systemId + parse:filter + transform:xml + transform:xmlSystemId + transform:xslt + transform:xsltSystemId + transform:result + + + 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. + + + 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> - choose - org.apache.taglibs.standard.tag.common.core.ChooseTag - JSP + out + org.apache.taglibs.standard.tag.el.xml.ExprTag + empty 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 + false - - 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 + + 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 - - XML iteration tag. - forEach org.apache.taglibs.standard.tag.common.xml.ForEachTag JSP + + XML iteration tag. + - -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 - true + false - -Value of the parameter. - value false - true + false - - Parses XML content from 'source' attribute or 'body' - parse - org.apache.taglibs.standard.tag.rt.xml.ParseTag + org.apache.taglibs.standard.tag.el.xml.ParseTag org.apache.taglibs.standard.tei.XmlParseTEI JSP + + Parses XML content from 'source' attribute or 'body' + - -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 + false - -Source XML document to be parsed. - - doc - false - true - - - -The system identifier (URI) for parsing the -XML document. - systemId false - true + false - -Filter to be applied to the source -document. - filter false - true + false - - Saves the result of an XPath expression evaluation in a 'scope' - set org.apache.taglibs.standard.tag.common.xml.SetTag empty + + Saves the result of an XPath expression evaluation in a 'scope' + - -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 - true + false - -Deprecated. Use attribute -'doc' instead. - xml false - true + false - -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 + false - -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 + false - -The system identifier (URI) -for parsing the XSLT -stylesheet. - xsltSystemId false - true + false + 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 Index: lams_monitoring/web/WEB-INF/lib/hibernate2.jar =================================================================== diff -u Binary files differ Index: lams_monitoring/web/WEB-INF/lib/lams.jar =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a Binary files differ Index: lams_monitoring/web/WEB-INF/lib/lams_learning.jar =================================================================== diff -u Binary files differ Index: lams_monitoring/web/WEB-INF/lib/log4j-1.2.9.jar =================================================================== diff -u Binary files differ Index: lams_monitoring/web/WEB-INF/lib/spring.jar =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a Binary files differ Index: lams_monitoring/web/WEB-INF/struts/.struts-config.mex =================================================================== diff -u -r9f3dd3ba6a4a04baca65a99516e36e5e47e0e962 -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/struts/.struts-config.mex (.../.struts-config.mex) (revision 9f3dd3ba6a4a04baca65a99516e36e5e47e0e962) +++ lams_monitoring/web/WEB-INF/struts/.struts-config.mex (.../.struts-config.mex) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -1 +1 @@ - \ No newline at end of file + \ No newline at end of file Index: lams_monitoring/web/WEB-INF/struts/struts-config.xml =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/web/WEB-INF/struts/struts-config.xml (.../struts-config.xml) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -14,8 +14,9 @@ + - + @@ -78,7 +79,7 @@ path="/gate" type="org.lamsfoundation.lams.monitoring.web.GateAction" name="GateForm" - scope="request" + scope="session" parameter="method" unknown="false" validate="false" @@ -105,11 +106,6 @@ path=".viewScheduleGate" redirect="false" /> - Index: lams_monitoring/web/WEB-INF/web.xml =================================================================== diff -u -ra6f97daf5700d31210f30cee139752e9234ef40d -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision a6f97daf5700d31210f30cee139752e9234ef40d) +++ lams_monitoring/web/WEB-INF/web.xml (.../web.xml) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -105,11 +105,11 @@ *.jsp - + + + org.springframework.web.context.ContextLoaderListener + + - - - org.springframework.web.context.ContextLoaderListener - - action org.apache.struts.action.ActionServlet Index: lams_monitoring/web/footer.jsp =================================================================== diff -u --- lams_monitoring/web/footer.jsp (revision 0) +++ lams_monitoring/web/footer.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,30 @@ + + + + + + + + +
+ + \ No newline at end of file Index: lams_monitoring/web/gate/gateInfo.jsp =================================================================== diff -u --- lams_monitoring/web/gate/gateInfo.jsp (revision 0) +++ lams_monitoring/web/gate/gateInfo.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,19 @@ + + + + + + + + + + +  + + + + + out of + re waiting in front of the gate. + + \ No newline at end of file Index: lams_monitoring/web/gate/openGate.jsp =================================================================== diff -u --- lams_monitoring/web/gate/openGate.jsp (revision 0) +++ lams_monitoring/web/gate/openGate.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,21 @@ + + Class cannot continue until the gate is opened by you + + + + + + + + Gate has been opened + + + + +
Active + + +
Active + + + Index: lams_monitoring/web/gate/permissionGateContent.jsp =================================================================== diff -u --- lams_monitoring/web/gate/permissionGateContent.jsp (revision 0) +++ lams_monitoring/web/gate/permissionGateContent.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,52 @@ + +<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean-el.tld" prefix="bean-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic-el.tld" prefix="logic-el" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> + + + + + + + + + + +
+ + + + + + + <%@ include file="gateInfo.jsp" %> + + + <%@ include file="openGate.jsp" %> +
 
 
 
+ +
+ + + \ No newline at end of file Index: lams_monitoring/web/gate/scheduleGateContent.jsp =================================================================== diff -u --- lams_monitoring/web/gate/scheduleGateContent.jsp (revision 0) +++ lams_monitoring/web/gate/scheduleGateContent.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,52 @@ + +<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean-el.tld" prefix="bean-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic-el.tld" prefix="logic-el" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> + + + + + + + + + + +
+ + + + + + + <%@ include file="gateInfo.jsp" %> + + + +
 
 
 
+ +
+ + + \ No newline at end of file Index: lams_monitoring/web/gate/sychGateContent.jsp =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/web/gate/sychGateContent.jsp (.../sychGateContent.jsp) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -18,44 +18,29 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/struts-html-el.tld" prefix="html-el" %> -<%@ taglib uri="/WEB-INF/struts-bean-el.tld" prefix="bean-el" %> -<%@ taglib uri="/WEB-INF/struts-logic-el.tld" prefix="logic-el" %> -<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> +<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-bean-el.tld" prefix="bean-el" %> +<%@ taglib uri="/WEB-INF/struts/struts-logic-el.tld" prefix="logic-el" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> Index: lams_monitoring/web/header.jsp =================================================================== diff -u --- lams_monitoring/web/header.jsp (revision 0) +++ lams_monitoring/web/header.jsp (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,54 @@ + +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ page contentType="text/html; charset=iso-8859-1" language="java" %> +<% +String protocol = request.getProtocol(); +if(protocol.startsWith("HTTPS")){ + protocol = "https://"; +}else{ + protocol = "http://"; +} +String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; + +%> + + + Index: lams_monitoring/web/images/spacer.gif =================================================================== diff -u Binary files differ Index: lams_monitoring/web/images/synch_active.gif =================================================================== diff -u Binary files differ Index: lams_monitoring/web/images/synch_not_active.gif =================================================================== diff -u Binary files differ Index: lams_monitoring/web/learner.css =================================================================== diff -u --- lams_monitoring/web/learner.css (revision 0) +++ lams_monitoring/web/learner.css (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -0,0 +1,365 @@ +.mainHeader { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 16pt; + color: #000000; +} + +.button { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + color: #666666; + background-color: #e0e7eb border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + width: 80px; +} + +.linkButton { + background-color: #e0e7eb border: #666666; + font-family: arial, helvetica, sans-serif; + font-size: 12px; + text-decoration: none; + color: #666666; + border: 1px solid; + border-color: #666666 #666666 #666666 #666666; + padding: 1px 6px 1px 6px; +} + +.linkButtonover { + background-color: #708a8b; + font-family: arial, helvetica, sans-serif; + font-size: 12px; + text-decoration: none; + color: #666666; + border: 1px solid; + border-color: #666666 #666666 #666666 #666666; + margin: 1px; + padding: 2px 6px 2px 6px; + +} + +.buttonover { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + background-color: #708a8b; + width: 80px; + border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; +} + +.longButton { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + color: #666666; + background-color: #e0e7eb border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + width: 120px; +} + +.longButtonover { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + color: #ffffff; + background-color: #708a8b; + width: 120px; + border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; +} + +.extendingButton { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + color: #666666; + background-color: #e0e7eb border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; +} + +.extendingButtonover { + font-family: arial, helvetica, sans-serif; + font-size: 12px; + color: #ffffff; + background-color: #708a8b; + border: #666666; + border-style: solid; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; +} + +.body { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #000000; +} + +.lightBody { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #666666; +} + +.note { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 9px; + color: #000000; +} + +.subHeader { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 14px; + color: #666666; + font-weight: bold; + letter-spacing: normal; +} + +.error { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #ff0000; + font-weight: bold; +} + +.smallText { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 10px; + color: #333333; +} + +.successMessage { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #33855c; + font-weight: bold; +} + +.heading { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 14pt; + color: #666666; + font-style: normal; +} + +.tableHeader { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #ffffff; + font-weight: bold; +} + +.tableHeaderBlack { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; +} + +.bodyBold { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #000000; + font-weight: bold; +} + +a.nav:link { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #000000; + font-weight: bold; + text-decoration: none; +} + +a.nav:hover { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #000000; + font-weight: bold; + text-decoration: underline; +} + +a.nav:visited { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #666666; + font-weight: bold; + text-decoration: underline; +} + +a.brightNav:link { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #6600ff; + font-weight: bold; + text-decoration: none; +} + +a.brightNav:hover { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #cc3399; + font-weight: bold; + text-decoration: underline; +} + +a.brightNav:visited { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #6699ff; + font-weight: bold; + text-decoration: none; +} + +a.navLarge:link { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 18px; + color: #666666; + font-weight: normal; + text-decoration: none; +} + +a.navLarge:hover { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 18px; + color: #000000; + font-weight: bold; + text-decoration: underline; + background-color: #3399cc; +} + +a.navLarge:visited { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 18px; + color: #666666; + font-weight: normal; + text-decoration: none; +} + +.textField { + background-color: #ffffff; + font-family: arial; + font-size: 10pt; + color: #000000; + font-weight: plain; + border: 1px solid #666666; +} + +textarea { + background-color: #ffffff; + font-family: arial; + font-size: 10pt; + color: #000000; + font-weight: plain; + border: 1px solid #666666; +} + +body { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + color: #000000; +} + +.mouseOverTableRow { + background-color: #b5cece; +} + +.lightTableBorders { + margin-left: auto; + border-collapse: seperated; + border-spacing: 0; + border: 0px; + empty-cells: show; + margin-right: auto; + cell-spacing: 0px; + padding: 2 px; +} + +.lightTableBorders TD { + margin-left: auto; + border: 1px solid #cccccc; + empty-cells: show; + margin-right: auto; + padding: 2 px; +} + +.lightTableBorders TR { + margin-left: auto; + border: 1px solid #cccccc; + empty-cells: show; + margin-right: auto; + padding: 2 px; +} + +#footer { + position: absolute; + top: 4px; + right: 10px; + z-index: 5; +} + +#footerTable { + position: relative; + top: 0px; + left: 0px; + z-index: 4; +} + +.lightNote { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 9px; + color: #666666; +} + +a.lightNoteLink:link { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 9px; + color: #666666; + text-decoration: underline; +} + +a.lightNoteLink:hover { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 9px; + color: #666666; + text-decoration: underline; +} + +a.lightNoteLink:visited { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 9px; + color: #666666; + text-decoration: underline; +} + +.tableStyle { + border: thin solid #668a80; +} + +.tableHeaderStyle { + font-family: verdana, arial, helvetica, sans-serif; + font-size: 12px; + font-weight: bold; + color: #ffffff; + background: #668a80; +} +.tblOddDataCel { BACKGROUND-COLOR: white;} + +.tblEvenDataCel {BACKGROUND-COLOR: #D6E6F1;} + Index: lams_monitoring/web/template/template.jsp =================================================================== diff -u -rb6df3bbcefaf4633858d1d3161063abc3b620e7e -rd69bdbfcb5ca7fd3e10605130abc321de6d4619a --- lams_monitoring/web/template/template.jsp (.../template.jsp) (revision b6df3bbcefaf4633858d1d3161063abc3b620e7e) +++ lams_monitoring/web/template/template.jsp (.../template.jsp) (revision d69bdbfcb5ca7fd3e10605130abc321de6d4619a) @@ -18,10 +18,10 @@ http://www.gnu.org/licenses/gpl.txt --> -<%@ taglib uri="/WEB-INF/struts-tiles.tld" prefix="tiles" %> -<%@ taglib uri="/WEB-INF/struts-html.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/c.tld" prefix="c" %> +<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> +<%@ taglib uri="/WEB-INF/struts/struts-html.tld" prefix="html" %> +<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> +<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %>
- + - - - - - - - - - - - - - - - - - - + + + + + <%@ include file="gateInfo.jsp" %> + + + <%@ include file="openGate.jsp" %>
 
 
- -
 
- test -
 
 
 
- +
+ + + + + + + + + +
+ + + + + [HELP] + + space image +
+