Index: lams_tool_nb/.classpath =================================================================== diff -u -r0d8c7e53c34887869e24f7d4b13fb1b3445abd46 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/.classpath (.../.classpath) (revision 0d8c7e53c34887869e24f7d4b13fb1b3445abd46) +++ lams_tool_nb/.classpath (.../.classpath) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -9,5 +9,6 @@ - + + Index: lams_tool_nb/build.xml =================================================================== diff -u -r473503bcc96f8f86e04649843deb58379322a1cb -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/build.xml (.../build.xml) (revision 473503bcc96f8f86e04649843deb58379322a1cb) +++ lams_tool_nb/build.xml (.../build.xml) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -178,15 +178,13 @@ - + - - @@ -195,7 +193,7 @@ - + Index: lams_tool_nb/conf/xdoclet/taglibs.xml =================================================================== diff -u -rec518d841ae9f6e5eb747e448d20c49d21bfce0b -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision ec518d841ae9f6e5eb747e448d20c49d21bfce0b) +++ lams_tool_nb/conf/xdoclet/taglibs.xml (.../taglibs.xml) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,6 +1,88 @@ + + + - fck-editor + 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 Index: lams_tool_nb/conf/xdoclet/web-security.xml =================================================================== diff -u -r29baacd1af7a166e0422d2c3b9c151735dace993 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision 29baacd1af7a166e0422d2c3b9c151735dace993) +++ lams_tool_nb/conf/xdoclet/web-security.xml (.../web-security.xml) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -59,5 +59,6 @@ LAMS /login.jsp + /login.jsp?failed=y Index: lams_tool_nb/db/sql/tool_insert.sql =================================================================== diff -u -rf1e0938e70d42696ac91a762ac659a4e1405209a -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision f1e0938e70d42696ac91a762ac659a4e1405209a) +++ lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -44,7 +44,7 @@ 0, 0, 'tool/lanb11/starter/learner.do', -'tool/lanb11/authoringv2.do', +'tool/lanb11/authoring.do', 'tool/lanb11/starter/authoring.do?defineLater=true', 'tool/lanb11/exportPortfolio.do', 'tool/lanb11/starter/monitor.do', Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java =================================================================== diff -u -r9c41cd7f1b9b6f1c0b322d07db8ab20c4ed7eb05 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision 9c41cd7f1b9b6f1c0b322d07db8ab20c4ed7eb05) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java (.../NoticeboardConstants.java) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -51,7 +51,6 @@ public static final String INSTRUCTIONS = "Instructions"; public static final String AUTHOR_PAGE = "authoringContent"; - public static final String AUTHOR_PAGE2 = "authoringContent2"; public static final String DISPLAY_MESSAGE = "displayMessage"; public static final String DISPLAY_LEARNER_CONTENT = "displayLearnerContent"; @@ -111,7 +110,7 @@ public static final String BUTTON_BASIC = "button.basic"; public static final String BUTTON_ADVANCED = "button.advanced"; public static final String BUTTON_INSTRUCTIONS = "button.instructions"; - public static final String BUTTON_SAVE = "button.ok"; + public static final String BUTTON_SAVE = "button.save"; public static final String BUTTON_DONE = "button.done"; public static final String BUTTON_FINISH = "button.finish"; // public static final String BUTTON_CANCEL = "button.cancel"; Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties =================================================================== diff -u -r4f0e1bee6283b7981aa9278c684515355f0a3b55 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties (.../ApplicationResources.properties) (revision 4f0e1bee6283b7981aa9278c684515355f0a3b55) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties (.../ApplicationResources.properties) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -60,6 +60,7 @@ button.cancel=Cancel button.ok=OK button.done=Done +button.save=Save button.finish=Finish button.next=Next Index: lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java =================================================================== diff -u -r85507766d15ce5b9b5eaeaef421dfa64b695da9d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d) +++ lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java (.../NbAuthoringAction.java) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -19,22 +19,30 @@ *http://www.gnu.org/licenses/gpl.txt */ +/* + * Created on Aug 8, 2005 + * + */ package org.lamsfoundation.lams.tool.noticeboard.web; -import java.io.FileNotFoundException; -import java.io.IOException; -import java.util.Map; +import java.util.Date; import java.util.HashMap; +import java.util.List; +import java.util.Map; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; - +import java.io.FileNotFoundException; +import java.io.IOException; import org.apache.log4j.Logger; -//import org.apache.struts.actions.LookupDispatchAction; import org.lamsfoundation.lams.web.action.LamsLookupDispatchAction; + + import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; +import org.apache.struts.action.ActionMessage; +import org.apache.struts.action.ActionMessages; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants; import org.lamsfoundation.lams.tool.noticeboard.NoticeboardContent; @@ -45,6 +53,7 @@ import org.lamsfoundation.lams.tool.noticeboard.service.INoticeboardService; import org.lamsfoundation.lams.tool.noticeboard.service.NoticeboardServiceProxy; import org.apache.struts.upload.FormFile; +import org.apache.struts.util.MessageResources; import org.lamsfoundation.lams.util.WebUtil; //import org.lamsfoundation.lams.contentrepository.CrNodeVersionProperty; @@ -55,49 +64,24 @@ import org.springframework.web.context.support.WebApplicationContextUtils; /** - * Creation Date: 20-05-05 - * Modified Date: 03-06-05 + * @author mtruong * - *

This Action class process any actions that are made by the user.

- *
- *

When the following buttons are pressed:
- * NoticeboardConstants.BUTTON_BASIC, NoticeboardConstants.BUTTON_ADVANCED, - * NoticeboardConstants.BUTTON_INSTRUCTIONS or NoticeboardConstants.BUTTON_DONE,
- * they switch between the tabs, but before doing so, they copy the values - * in the form (only if they are not null) and place them in the - * equivalent formbean properties (session scope). This is done so because the form - * is spread across two pages (basic and instructions, in Noticeboard tool, there is - * no Advanced page). It might be strange that all buttons forward to the same path, - * but the formbean property "method" keeps a track of what button was pressed. - * So when control returns to the jsp, it will determine the value of method and - * show the appropriate page.


+ *

This class is a simple combination of NbAuthoringStarterAction and NbAuthoringAction. + * It has been created for the purpose of supporting the new authoring page which is done using + * DHTML.

* - *

The button NoticeboardConstants.BUTTON_UPLOAD triggers an upload and will - * upload either a file of type "ONLINE" or "OFFLINE", to the content repository - * and will save the file details (filename, toolcontent id, uuid, and filetype). - * It will also conduct checks - * to see whether the same file (and same type) has been uploaded or not. - * If the same file has been uploaded (to the same noticeboard instance, ie. same - * tool content id) then, it will delete the file from the content respository - * and delete that particular entry in the table, and then it the new version - * will be uploaded to the content repository and a new entry will be saved into - * the database. It then updates the attachment map that was initially setup - * by NbAuthoringStarterAction.


+ *

The unspecified method, is the same as the execute method for NbAuthoringStarterAction. + * It will get called when the method parameter is not specified (that is on first entry + * into the authoring environment).

* - *

The button NoticeboardConstants.LINK_DELETE will trigger the deleteAttachment - * action which will delete a file from the content repository, and the entry from - * the attachment table.

- * - *

The save method persist the values of the formbean properties - * title, instructions, onlineInstructions and offlineInstructions to - * the database

- * - * + *

The save, upload and delete method is the same as that of NbAuthoringAction, to see its explanation, + * please see org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction

+ * * ----------------XDoclet Tags-------------------- * * @struts:action path="/authoring" name="NbAuthoringForm" scope="session" * type="org.lamsfoundation.lams.tool.noticeboard.web.NbAuthoringAction" - * parameter="method" validate="true" input=".authoringContent" + * parameter="method" validate="true" input="/author_page.jsp" * * @struts.action-exception key="error.exception.NbApplication" scope="request" * type="org.lamsfoundation.lams.tool.noticeboard.NbApplicationException" @@ -108,14 +92,16 @@ * path=".error" * handler="org.lamsfoundation.lams.tool.noticeboard.web.CustomStrutsExceptionHandler" * - * @struts:action-forward name="authoringContent" path=".authoringContent" + * @struts:action-forward name="authoringContent" path="/author_page.jsp" + * @struts:action-forward name="displayMessage" path=".message" * * ----------------XDoclet Tags-------------------- */ public class NbAuthoringAction extends LamsLookupDispatchAction { - static Logger logger = Logger.getLogger(NbAuthoringAction.class.getName()); + public final static String FORM="NbAuthoringForm"; + private NbToolContentHandler toolContentHandler; private NbToolContentHandler getToolContentHandler() @@ -127,364 +113,455 @@ return toolContentHandler; } - protected Map getKeyMethodMap() { Map map = new HashMap(); - map.put(NoticeboardConstants.BUTTON_BASIC, "basic" ); - map.put(NoticeboardConstants.BUTTON_ADVANCED, "advanced" ); - map.put(NoticeboardConstants.BUTTON_INSTRUCTIONS, "instructions"); - map.put(NoticeboardConstants.BUTTON_DONE, "done"); map.put(NoticeboardConstants.BUTTON_SAVE, "save"); map.put(NoticeboardConstants.BUTTON_UPLOAD, "upload"); map.put(NoticeboardConstants.LINK_DELETE, "deleteAttachment"); return map; } - - /** - * - */ - public ActionForward unspecified( - ActionMapping mapping, - ActionForm form, - HttpServletRequest request, - HttpServletResponse response) - { - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * Forwards to the basic page. - */ - public ActionForward basic(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { + + public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException { + + MessageResources resources = getResources(request); + + //to ensure that we are working with a new form, not one from previous session + NbAuthoringForm nbForm = new NbAuthoringForm(); + NbWebUtil.cleanAuthoringSession(request); - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - // return mapping.findForward(NoticeboardConstants.BASIC_PAGE); - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * Forwards to the advanced page. - */ - - public ActionForward advanced(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * Forwards to the instructions page. - */ - - public ActionForward instructions(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * Online/Offline instructions entered, form values saved and forward to the basic page. - */ - - public ActionForward done(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) { - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * Persist the values of the noticeboard content (title, content, online and offline instructions) - * into the database. - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws NbApplicationException - */ - public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException { + Long contentId = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.TOOL_CONTENT_ID)); - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - - INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); - String idAsString = nbForm.getToolContentID(); - if (idAsString == null) - { - String error = "Unable to continue. Tool content id missing"; + if(contentId == null) + { + //String error = "Tool content id missing. Unable to continue."; + String error = resources.getMessage(NoticeboardConstants.ERR_MISSING_PARAM, "Tool Content Id"); logger.error(error); throw new NbApplicationException(error); } - Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID()); + nbForm.setToolContentID(contentId.toString()); - //throws exception if the content id does not exist - checkContentId(content_id); + /* if there is a defineLater request parameter, set the form value + * If a defineLater request parameter is not present, then it is just set to null. + * This is used in the basic screen, if defineLater is set, then in the basic page, + * the three tabs {Basic, Advanced, Instructions} are not visible. + */ + nbForm.setDefineLater((String)request.getParameter(NoticeboardConstants.DEFINE_LATER)); + + request.getSession().setAttribute(NoticeboardConstants.TOOL_CONTENT_ID, contentId); + + /* + * Retrieve the Service + */ + INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + Map attachmentMap = nbForm.getAttachments(); - NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id); - nbForm.copyValuesIntoNbContent(nbContent); - /* Author has finished editing the content and mark the defineLater flag to false */ - nbContent.setDefineLater(false); - nbService.updateNoticeboard(nbContent); + if (!contentExists(nbService, contentId)) + { + // Pre-fill the form with the default content + //NoticeboardContent nb = nbService.retrieveNoticeboard(NoticeboardConstants.DEFAULT_CONTENT_ID); + Long defaultToolContentId = nbService.getToolDefaultContentIdBySignature(NoticeboardConstants.TOOL_SIGNATURE); + // logger.debug("Default tool content id is " + defaultToolContentId); + NoticeboardContent nb = nbService.retrieveNoticeboard(defaultToolContentId); - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } - - /** - * This method will either upload an online instructions file or an offline instructions file. - * It will upload an online file if the bean property onlineFile is not null and similarly, - * will upload an offline file if the bean property offlineFile is not null. - * By using the term "upload", we are saving the file information on the local database (?) - * - * @param mapping - * @param form - * @param request - * @param response - * @return - * @throws NbApplicationException - */ - public ActionForward upload(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) - throws InvalidParameterException, FileNotFoundException, RepositoryCheckedException, IOException, NbApplicationException { - - - //set up the values in the map - //call the uploadFile method from toolContentHandler - NbAuthoringForm nbForm = (NbAuthoringForm)form; - copyAuthoringFormValuesIntoFormBean(request, nbForm); - FormFile theFile; - INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + /** TODO: add a check to see if object is null */ + if (nb==null) + { + String error= "There is data missing in the database"; + logger.error(error); + throw new NbApplicationException(error); + } - Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID()); - //throws exception if the content id does not exist - checkContentId(content_id); - NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id); - - //check if the file uploaded is an online instructions file or offline instructions file. - //if one of the types is null, then the other one must have been uploaded. - //here we check if the file is an online one + //create a new noticeboard object and prefill with default content, save to database + NoticeboardContent nbContentNew = new NoticeboardContent(contentId, + nb.getTitle(), + nb.getContent(), + nb.getOnlineInstructions(), + nb.getOfflineInstructions(), + new Date(System.currentTimeMillis())); - if ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) || - (nbForm.getOfflineFile() != null && (nbForm.getOfflineFile().getFileName().trim().length() != 0))) + nbContentNew = setTrueIfDefineLaterIsSet(nbForm, nbContentNew); + + //save new tool content into db + nbService.saveNoticeboard(nbContentNew); + + //initialise the values in the form, so the values will be shown in the jsp + nbForm.populateFormWithNbContentValues(nbContentNew); + + + + + } + else //content already exists on the database + { + //get the values from the database + NoticeboardContent nb = nbService.retrieveNoticeboard(contentId); + + /* If retrieving existing content, check whether the contentInUse flag is set, if set, the + * author is not allowed to edit content + */ + + if (NbWebUtil.isContentEditable(nb)) { - boolean isOnlineFile = ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) ? true: false ); - theFile = (isOnlineFile ? nbForm.getOnlineFile() : nbForm.getOfflineFile()); - String fileType = isOnlineFile ? NoticeboardAttachment.TYPE_ONLINE : NoticeboardAttachment.TYPE_OFFLINE; - - //check to see if FileExists - NoticeboardAttachment file = nbService.retrieveAttachmentByFilename(theFile.getFileName()); - - - try - { - - if (fileExists(content_id, file, isOnlineFile)) - { - /** - * The same file belonging to the same toolcontent id already exists. - * The old version of this file is deleted from the content repository - * and the new one is saved in the content repository. - * - * The entry in the database is then updated with the new uuid and version - */ - getToolContentHandler().deleteFile(file.getUuid()); - - nbService.removeAttachment(file); - - /* NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), - theFile.getContentType(), fileType); - - file.setUuid(node.getUuid()); //only need to update the uuid, the rest of the info is the same - file.setVersionId(node.getVersion()); - nbService.saveAttachment(file); */ - - } - /** - * This is a new file and so is saved to the content repository. - * - * A new entry is added to the database. - */ - NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), - theFile.getContentType(), fileType); - file = new NoticeboardAttachment(); - file.setFilename(theFile.getFileName()); - file.setOnlineFile(isOnlineFile); - file.setNbContent(nbContent); - file.setUuid(node.getUuid()); - file.setVersionId(node.getVersion()); /** TODO: change versionId to version */ - nbService.saveAttachment(file); - - - String keyName = file.returnKeyName(); - - //add the files to the map - Map attachmentMap = nbForm.getAttachments(); - if (!attachmentMap.containsKey(keyName)) - { - attachmentMap.put(keyName, file); - } - - NbWebUtil.addUploadsToSession(request, attachmentMap); - //reset the fields so that more files can be uploaded - nbForm.setOfflineFile(null); - nbForm.setOnlineFile(null); - } - catch (FileNotFoundException e) { - logger.error("Unable to uploadfile",e); - throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); - } catch (IOException e) { - logger.error("Unable to uploadfile",e); - throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); - } catch (RepositoryCheckedException e) { - logger.error("Unable to uploadfile",e); - throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); - } + /* Define later set to true when the edit activity tab is brought up + * So that users cannot start using the content while the staff member is editing the content */ + nbForm.populateFormWithNbContentValues(nb); + nb = setTrueIfDefineLaterIsSet(nbForm, nb); + nbService.updateNoticeboard(nb); + + /** TODO: setup values in the instructions map */ + } - - nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS); + else + { + //The contentInUse flag is set and a user has already reached this activity. + saveMessages(request, null); //ensure there are no existing messages + ActionMessages message = new ActionMessages(); + message.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("message.contentInUseSet")); + saveMessages(request, message); + return mapping.findForward(NoticeboardConstants.DISPLAY_MESSAGE); + + } - return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); - } + //Setup the map containing the files that have been uploaded for this particular tool content id + + List attachmentIdList = nbService.getAttachmentIdsFromContent(nb); + for (int i=0; itoolContentId to check - */ - private void checkContentId(Long contentId) - { - if (contentId == null) - { - String error = "Unable to continue. Tool content id missing."; - - throw new NbApplicationException(error); - } - } - - /** - * This method copies the values of the request parameters richTextOnlineInstructions - * richTextOfflineInstructions richTextContent into the form properties - * onlineInstructions, offlineInstructions and content respectively. - * If a null value is returned for the request parameter, the form value is not modified. - * The request parameters are set as optional because the form spans amongst two pages. - * - * @param request HttpServlet request - * @param form The ActionForm class containing data submitted by the forms. - */ - private void copyAuthoringFormValuesIntoFormBean(HttpServletRequest request, NbAuthoringForm form) - { - String onlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_ONLINE_INSTRN, true); - String offlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_OFFLINE_INSTRN, true); - String content = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_CONTENT, true); - String title = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_TITLE, true); + + public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws NbApplicationException { + + NbAuthoringForm nbForm = (NbAuthoringForm)form; + copyAuthoringFormValuesIntoFormBean(request, nbForm); + + INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + String idAsString = nbForm.getToolContentID(); + if (idAsString == null) + { + String error = "Unable to continue. Tool content id missing"; + logger.error(error); + throw new NbApplicationException(error); + } + Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID()); + + //throws exception if the content id does not exist + checkContentId(content_id); + + NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id); + nbForm.copyValuesIntoNbContent(nbContent); + /* Author has finished editing the content and mark the defineLater flag to false */ + nbContent.setDefineLater(false); + nbService.updateNoticeboard(nbContent); + + return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); + } + + /** + * This method will either upload an online instructions file or an offline instructions file. + * It will upload an online file if the bean property onlineFile is not null and similarly, + * will upload an offline file if the bean property offlineFile is not null. + * By using the term "upload", we are saving the file information on the local database (?) + * + * @param mapping + * @param form + * @param request + * @param response + * @return + * @throws NbApplicationException + */ + public ActionForward upload(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) + throws InvalidParameterException, FileNotFoundException, RepositoryCheckedException, IOException, NbApplicationException { + + + //set up the values in the map + //call the uploadFile method from toolContentHandler + NbAuthoringForm nbForm = (NbAuthoringForm)form; + copyAuthoringFormValuesIntoFormBean(request, nbForm); + FormFile theFile; + INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + + Long content_id = NbWebUtil.convertToLong(nbForm.getToolContentID()); + //throws exception if the content id does not exist + checkContentId(content_id); + NoticeboardContent nbContent = nbService.retrieveNoticeboard(content_id); + + //check if the file uploaded is an online instructions file or offline instructions file. + //if one of the types is null, then the other one must have been uploaded. + //here we check if the file is an online one + + if ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) || + (nbForm.getOfflineFile() != null && (nbForm.getOfflineFile().getFileName().trim().length() != 0))) + { + boolean isOnlineFile = ((nbForm.getOnlineFile() != null && (nbForm.getOnlineFile().getFileName().trim().length() != 0)) ? true: false ); + theFile = (isOnlineFile ? nbForm.getOnlineFile() : nbForm.getOfflineFile()); + String fileType = isOnlineFile ? NoticeboardAttachment.TYPE_ONLINE : NoticeboardAttachment.TYPE_OFFLINE; + + //check to see if FileExists + NoticeboardAttachment file = nbService.retrieveAttachmentByFilename(theFile.getFileName()); + + + try + { + + if (fileExists(content_id, file, isOnlineFile)) + { + /** + * The same file belonging to the same toolcontent id already exists. + * The old version of this file is deleted from the content repository + * and the new one is saved in the content repository. + * + * The entry in the database is then updated with the new uuid and version + */ + getToolContentHandler().deleteFile(file.getUuid()); + + nbService.removeAttachment(file); + + /* NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), + theFile.getContentType(), fileType); + + file.setUuid(node.getUuid()); //only need to update the uuid, the rest of the info is the same + file.setVersionId(node.getVersion()); + nbService.saveAttachment(file); */ + + } + /** + * This is a new file and so is saved to the content repository. + * + * A new entry is added to the database. + */ + NodeKey node = getToolContentHandler().uploadFile(theFile.getInputStream(), theFile.getFileName(), + theFile.getContentType(), fileType); + file = new NoticeboardAttachment(); + file.setFilename(theFile.getFileName()); + file.setOnlineFile(isOnlineFile); + file.setNbContent(nbContent); + file.setUuid(node.getUuid()); + file.setVersionId(node.getVersion()); + nbService.saveAttachment(file); + + + String keyName = file.returnKeyName(); + + //add the files to the map + Map attachmentMap = nbForm.getAttachments(); + if (!attachmentMap.containsKey(keyName)) + { + attachmentMap.put(keyName, file); + } + + NbWebUtil.addUploadsToSession(request, attachmentMap); + //reset the fields so that more files can be uploaded + nbForm.setOfflineFile(null); + nbForm.setOnlineFile(null); + } + catch (FileNotFoundException e) { + logger.error("Unable to uploadfile",e); + throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); + } catch (IOException e) { + logger.error("Unable to uploadfile",e); + throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); + } catch (RepositoryCheckedException e) { + logger.error("Unable to uploadfile",e); + throw new NbApplicationException("Unable to upload file, exception was "+e.getMessage()); + } + } + + nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS); + + return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); + } + + + public ActionForward deleteAttachment(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) + throws InvalidParameterException, RepositoryCheckedException, NbApplicationException { + + Long uuid = NbWebUtil.convertToLong(request.getParameter(NoticeboardConstants.UUID)); + + NbAuthoringForm nbForm = (NbAuthoringForm)form; + // copyAuthoringFormValuesIntoFormBean(request, nbForm); + + INoticeboardService nbService = NoticeboardServiceProxy.getNbService(getServlet().getServletContext()); + + if (uuid == null) + { + String error = "Unable to continue. The file uuid is missing."; + logger.error(error); + throw new NbApplicationException(error); + } + NoticeboardAttachment attachment = nbService.retrieveAttachmentByUuid(uuid); + if (attachment == null) + { + String error = "Unable to continue. The file does not exist"; + logger.error(error); + throw new NbApplicationException(error); + + } + String keyName = attachment.returnKeyName(); + + //remove entry from map + Map attachmentMap = nbForm.getAttachments(); + attachmentMap.remove(keyName); + NbWebUtil.addUploadsToSession(request, attachmentMap); + + //remove entry from content repository + try + { + getToolContentHandler().deleteFile(uuid); + } + catch (RepositoryCheckedException e) { + logger.error("Unable to delete file",e); + throw new NbApplicationException("Unable to delete file, exception was "+e.getMessage()); + } + + //remove entry from db + nbService.removeAttachment(attachment); + + nbForm.setMethod(NoticeboardConstants.INSTRUCTIONS); + + return mapping.findForward(NoticeboardConstants.AUTHOR_PAGE); + } + + + + /** + * It is assumed that the contentId is passed as a http parameter + * if the contentId is null, an exception is thrown, otherwise proceed as normal + * + * @param contentId the toolContentId to check + */ + private void checkContentId(Long contentId) + { + if (contentId == null) + { + String error = "Unable to continue. Tool content id missing."; + + throw new NbApplicationException(error); + } + } + + /** + * This method copies the values of the request parameters richTextOnlineInstructions + * richTextOfflineInstructions richTextContent into the form properties + * onlineInstructions, offlineInstructions and content respectively. + * + * @param request HttpServlet request + * @param form The ActionForm class containing data submitted by the forms. + */ + private void copyAuthoringFormValuesIntoFormBean(HttpServletRequest request, NbAuthoringForm form) + { + String onlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_ONLINE_INSTRN, true); + String offlineInstruction = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_OFFLINE_INSTRN, true); + String content = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_CONTENT, true); + String title = WebUtil.readStrParam(request, NoticeboardConstants.RICH_TEXT_TITLE, true); - if(title != null) - form.setTitle(title); - if(content != null) - form.setContent(content); - if(onlineInstruction != null) - form.setOnlineInstructions(onlineInstruction); - if(offlineInstruction != null) - form.setOfflineInstructions(offlineInstruction); - - } - /** - * This method checks whether a file - * already exists in the database. If this file already exists, then the - * type of file is checked, along with the associated toolContentId. - * If both files are also of the same type, ie. - * both are offline files or both are online files and the tool content Id matches - * toolContentId, then this method will - * return true, to indicate that the file already exists in the database. - * Otherwise false is returned. - * @param filename The filename of the attachment to check - * @param isOnlineFile A boolean to indicate whether it is an online File. 1 indicates an online file. The value 0 indicates an offline file. - * @return - */ - private boolean fileExists(Long toolContentId, NoticeboardAttachment fileFromDatabase, boolean isFileUploadedAnOnlineFile) - { - /** - * TODO: check whether they refer to the same contentIdk - */ - if (fileFromDatabase == null) - { - return false; - } - else - { - /** - * true && true = true <-- both files are both online files - * true && false = false <-- the files are different types - * false && true = false <-- the files are different types - * false && false = true <-- both files are offline files - */ - if (fileFromDatabase.isOnlineFile() && isFileUploadedAnOnlineFile && fileFromDatabase.getNbContent().getNbContentId().equals(toolContentId)) - { - return true; - } - else - return false; - } - } + + form.setTitle(title); + + form.setContent(content); + + form.setOnlineInstructions(onlineInstruction); + + form.setOfflineInstructions(offlineInstruction); + + } + + /* private void copyFormValuesIntoNbContent(HttpServletRequest request, NoticeboardContent nbContent) + { + nbContent.setTitle((String)request.getParameter(NoticeboardConstants.RICH_TEXT_TITLE)); + nbContent.setContent((String)request.getParameter(NoticeboardConstants.RICH_TEXT_CONTENT)); + nbContent.setOnlineInstructions((String)request.getParameter(NoticeboardConstants.RICH_TEXT_ONLINE_INSTRN)); + nbContent.setOfflineInstructions((String)request.getParameter(NoticeboardConstants.RICH_TEXT_OFFLINE_INSTRN)); + + } */ + + + + + + /** + * This method checks whether a file + * already exists in the database. If this file already exists, then the + * type of file is checked, along with the associated toolContentId. + * If both files are also of the same type, ie. + * both are offline files or both are online files and the tool content Id matches + * toolContentId, then this method will + * return true, to indicate that the file already exists in the database. + * Otherwise false is returned. + * @param filename The filename of the attachment to check + * @param isOnlineFile A boolean to indicate whether it is an online File. 1 indicates an online file. The value 0 indicates an offline file. + * @return + */ + private boolean fileExists(Long toolContentId, NoticeboardAttachment fileFromDatabase, boolean isFileUploadedAnOnlineFile) + { + + if (fileFromDatabase == null) + { + return false; + } + else + { + /** + * true && true = true <-- both files are both online files + * true && false = false <-- the files are different types + * false && true = false <-- the files are different types + * false && false = true <-- both files are offline files + */ + if (fileFromDatabase.isOnlineFile() && isFileUploadedAnOnlineFile && fileFromDatabase.getNbContent().getNbContentId().equals(toolContentId)) + { + return true; + } + else + return false; + } + } + + +} - - - - - - - - - -} \ No newline at end of file Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringV2Action.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/c-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/c.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/fmt-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/fmt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/sql-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/sql.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/jstl/tlds/c-rt.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/c-rt.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/c-rt.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -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_tool_nb/web/WEB-INF/jstl/tlds/c.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/c.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/c.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,416 @@ + + + + 1.0 + 1.2 + c + http://java.sun.com/jstl/core + JSTL core + JSTL 1.0 core library + + + + 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. + + + 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> + + + + + out + org.apache.taglibs.standard.tag.el.core.OutTag + JSP + + Like <%= ... >, but for expressions. + + + value + true + false + + + default + false + false + + + escapeXml + false + false + + + + + if + 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 + + + test + true + false + + + var + false + false + + + scope + false + false + + + + + import + 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'. + + + url + true + false + + + var + false + false + + + scope + false + false + + + varReader + false + false + + + context + false + false + + + charEncoding + false + 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 + + + items + false + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + varStatus + false + false + + + + + forTokens + org.apache.taglibs.standard.tag.el.core.ForTokensTag + JSP + + Iterates over tokens, separated by the supplied delimeters + + + items + true + false + + + delims + true + false + + + begin + false + false + + + end + false + false + + + step + false + false + + + var + false + false + + + 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' + + + + + param + org.apache.taglibs.standard.tag.el.core.ParamTag + JSP + + Adds a parameter to a containing 'import' tag's URL. + + + name + true + false + + + value + false + false + + + + + redirect + org.apache.taglibs.standard.tag.el.core.RedirectTag + JSP + + Redirects to a new URL. + + + var + false + false + + + scope + false + false + + + url + true + false + + + context + false + false + + + + + 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.el.core.SetTag + JSP + + Sets the result of an expression evaluation in a 'scope' + + + var + false + false + + + value + false + false + + + target + false + false + + + property + false + false + + + 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). + + + var + false + false + + + scope + false + false + + + value + true + false + + + context + false + false + + + + + when + org.apache.taglibs.standard.tag.el.core.WhenTag + JSP + + Subtag of <choose> that includes its body if its + condition evalutes to 'true' + + + test + true + false + + + + Index: lams_tool_nb/web/WEB-INF/jstl/tlds/fmt-rt.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/fmt-rt.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/fmt-rt.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -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_tool_nb/web/WEB-INF/jstl/tlds/fmt.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/fmt.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/fmt.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,442 @@ + + + + 1.0 + 1.2 + fmt + http://java.sun.com/jstl/fmt + JSTL fmt + JSTL 1.0 i18n-capable formatting library + + + + 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 + + + value + false + false + + + + + setLocale + org.apache.taglibs.standard.tag.el.fmt.SetLocaleTag + empty + + Stores the given locale in the locale configuration variable + + + value + true + false + + + variant + false + false + + + 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 + + + value + true + false + + + + + setTimeZone + org.apache.taglibs.standard.tag.el.fmt.SetTimeZoneTag + empty + + Stores the given time zone in the time zone configuration variable + + + value + true + false + + + var + false + false + + + scope + false + false + + + + + bundle + org.apache.taglibs.standard.tag.el.fmt.BundleTag + JSP + + Loads a resource bundle to be used by its tag body + + + basename + true + false + + + prefix + false + 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 + + + basename + true + false + + + var + false + false + + + scope + false + false + + + + + message + org.apache.taglibs.standard.tag.el.fmt.MessageTag + JSP + + Maps key to localized message and performs parametric replacement + + + key + false + false + + + bundle + false + false + + + var + false + false + + + scope + false + false + + + + + param + org.apache.taglibs.standard.tag.el.fmt.ParamTag + JSP + + Supplies an argument for parametric replacement to a containing + <message> tag + + + value + false + false + + + + + formatNumber + org.apache.taglibs.standard.tag.el.fmt.FormatNumberTag + JSP + + Formats a numeric value as a number, currency, or percentage + + + value + false + false + + + type + false + false + + + pattern + false + false + + + currencyCode + false + false + + + currencySymbol + false + false + + + groupingUsed + false + false + + + maxIntegerDigits + false + false + + + minIntegerDigits + false + false + + + maxFractionDigits + false + false + + + minFractionDigits + false + false + + + var + false + false + + + scope + false + false + + + + + parseNumber + org.apache.taglibs.standard.tag.el.fmt.ParseNumberTag + JSP + + Parses the string representation of a number, currency, or percentage + + + value + false + false + + + type + false + false + + + pattern + false + false + + + parseLocale + false + false + + + integerOnly + false + false + + + var + false + false + + + 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 + + + value + true + false + + + type + false + false + + + dateStyle + false + false + + + timeStyle + false + false + + + pattern + false + false + + + timeZone + false + false + + + var + false + false + + + scope + false + false + + + + + parseDate + org.apache.taglibs.standard.tag.el.fmt.ParseDateTag + JSP + + Parses the string representation of a date and/or time + + + value + false + false + + + type + false + false + + + dateStyle + false + false + + + timeStyle + false + false + + + pattern + false + false + + + timeZone + false + false + + + parseLocale + false + false + + + var + false + false + + + scope + false + false + + + + Index: lams_tool_nb/web/WEB-INF/jstl/tlds/sql-rt.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/sql-rt.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/sql-rt.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -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_tool_nb/web/WEB-INF/jstl/tlds/sql.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/sql.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/sql.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,213 @@ + + + + 1.0 + 1.2 + sql + http://java.sun.com/jstl/sql + JSTL sql + JSTL 1.0 sql library + + + + 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. + + + dataSource + false + false + + + isolation + false + false + + + + + query + org.apache.taglibs.standard.tag.el.sql.QueryTag + JSP + + Executes the SQL query defined in its body or through the + sql attribute. + + + var + true + false + + + scope + false + false + + + sql + false + false + + + dataSource + false + false + + + startRow + false + false + + + maxRows + false + false + + + + + update + org.apache.taglibs.standard.tag.el.sql.UpdateTag + JSP + + Executes the SQL update defined in its body or through the + sql attribute. + + + var + false + false + + + scope + false + false + + + sql + false + false + + + dataSource + false + false + + + + + param + org.apache.taglibs.standard.tag.el.sql.ParamTag + JSP + + Sets a parameter in an SQL statement to the specified value. + + + value + false + false + + + + + dateParam + org.apache.taglibs.standard.tag.el.sql.DateParamTag + empty + + Sets a parameter in an SQL statement to the specified java.util.Date val +ue. + + + value + true + true + + + type + false + true + + + + + setDataSource + org.apache.taglibs.standard.tag.el.sql.SetDataSourceTag + empty + + Creates a simple DataSource suitable only for prototyping. + + + var + false + false + + + scope + false + false + + + dataSource + false + false + + + driver + false + false + + + url + false + false + + + user + false + false + + + password + false + false + + + Index: lams_tool_nb/web/WEB-INF/jstl/tlds/x-rt.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/x-rt.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/x-rt.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -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_tool_nb/web/WEB-INF/jstl/tlds/x.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/jstl/tlds/x.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/jstl/tlds/x.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,273 @@ + + + + 1.0 + 1.2 + x + http://java.sun.com/jstl/xml + JSTL XML + JSTL 1.0 XML library + + + + 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> + + + + + out + org.apache.taglibs.standard.tag.el.xml.ExprTag + empty + + Like <%= ... >, but for XPath expressions. + + + select + true + false + + + escapeXml + false + false + + + + + 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.el.xml.ParamTag + JSP + + Adds a parameter to a containing 'transform' tag's Transformer + + + name + true + false + + + value + false + false + + + + + parse + org.apache.taglibs.standard.tag.el.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 + false + + + systemId + false + false + + + filter + false + false + + + + + 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.el.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 + false + + + xml + false + false + + + xmlSystemId + false + false + + + xslt + false + false + + + xsltSystemId + false + false + + + + + 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 + + + + Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/x-rt.tld'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/WEB-INF/jstl/x.tld'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/WEB-INF/lams.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/lams.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/lams.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,48 @@ + + + + + + 1.0 + 1.1 + lams + + + + + + LAMSURL + org.lamsfoundation.lams.web.tag.LAMSURLTag + + + + + + user + org.lamsfoundation.lams.web.tag.UserTag + + + + property + true + true + + + + + + + css + org.lamsfoundation.lams.web.tag.CssTag + + + + + + WebAppURL + org.lamsfoundation.lams.web.tag.WebAppURLTag + + + + + Index: lams_tool_nb/web/WEB-INF/struts-config.xml =================================================================== diff -u -r3b34f29723c10f5421cc048010e0d199f586b1d9 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision 3b34f29723c10f5421cc048010e0d199f586b1d9) +++ lams_tool_nb/web/WEB-INF/struts-config.xml (.../struts-config.xml) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -78,41 +78,6 @@ /> - - - - - - + + + + + + + + + + +1.2 +1.1 +bean +http://struts.apache.org/tags-bean-el + +include +org.apache.strutsel.taglib.bean.ELIncludeTag +org.apache.struts.taglib.bean.IncludeTei +empty + +anchor +false +true + + +forward +false +true + + +href +false +true + + +id +true +false + + +name +false +true + + +page +false +true + + +transaction +false +true + + + +message +org.apache.strutsel.taglib.bean.ELMessageTag +empty + +arg0 +false +true + + +arg1 +false +true + + +arg2 +false +true + + +arg3 +false +true + + +arg4 +false +true + + +bundle +false +true + + +key +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +page +org.apache.strutsel.taglib.bean.ELPageTag +empty + +id +true +false + + +property +true +true + + + +resource +org.apache.strutsel.taglib.bean.ELResourceTag +org.apache.struts.taglib.bean.ResourceTei +empty + +id +true +false + + +input +false +true + + +name +true +true + + + +size +org.apache.strutsel.taglib.bean.ELSizeTag +org.apache.struts.taglib.bean.SizeTei +empty + +collection +false +true + + +id +true +false + + +name +false +true + + +property +false +true + + +scope +false +true + + + +struts +org.apache.strutsel.taglib.bean.ELStrutsTag +org.apache.struts.taglib.bean.StrutsTei +empty + +id +true +false + + +formBean +false +true + + +forward +false +true + + +mapping +false +true + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-bean.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-bean.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-bean.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,382 @@ + + + + + + + + + + +1.2 +1.1 +bean +http://struts.apache.org/tags-bean + +cookie +org.apache.struts.taglib.bean.CookieTag +org.apache.struts.taglib.bean.CookieTei +empty + +id +true +false + + +multiple +false +true + + +name +true +true + + +value +false +true + + + +define +org.apache.struts.taglib.bean.DefineTag +org.apache.struts.taglib.bean.DefineTei +JSP + +id +true +false + + +name +false +true + + +property +false +true + + +scope +false +true + + +toScope +false +true + + +type +false +true + + +value +false +true + + + +header +org.apache.struts.taglib.bean.HeaderTag +org.apache.struts.taglib.bean.HeaderTei +empty + +id +true +false + + +multiple +false +true + + +name +true +true + + +value +false +true + + + +include +org.apache.struts.taglib.bean.IncludeTag +org.apache.struts.taglib.bean.IncludeTei +empty + +anchor +false +true + + +forward +false +true + + +href +false +true + + +id +true +false + + +name +false +true + + +page +false +true + + +transaction +false +true + + + +message +org.apache.struts.taglib.bean.MessageTag +empty + +arg0 +false +true + + +arg1 +false +true + + +arg2 +false +true + + +arg3 +false +true + + +arg4 +false +true + + +bundle +false +true + + +key +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +page +org.apache.struts.taglib.bean.PageTag +org.apache.struts.taglib.bean.PageTei +empty + +id +true +false + + +property +true +true + + + +parameter +org.apache.struts.taglib.bean.ParameterTag +org.apache.struts.taglib.bean.ParameterTei +empty + +id +true +false + + +multiple +false +true + + +name +true +true + + +value +false +true + + + +resource +org.apache.struts.taglib.bean.ResourceTag +org.apache.struts.taglib.bean.ResourceTei +empty + +id +true +false + + +input +false +true + + +name +true +true + + + +size +org.apache.struts.taglib.bean.SizeTag +org.apache.struts.taglib.bean.SizeTei +empty + +collection +false +true + + +id +true +false + + +name +false +true + + +property +false +true + + +scope +false +true + + + +struts +org.apache.struts.taglib.bean.StrutsTag +org.apache.struts.taglib.bean.StrutsTei +empty + +id +true +false + + +formBean +false +true + + +forward +false +true + + +mapping +false +true + + + +write +org.apache.struts.taglib.bean.WriteTag +empty + +bundle +false +true + + +filter +false +true + + +format +false +true + + +formatKey +false +true + + +ignore +false +true + + +locale +false +true + + +name +true +true + + +property +false +true + + +scope +false +true + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-html-el.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-html-el.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-html-el.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,3302 @@ + + + + + + + + + + +1.2 +1.1 +html +http://struts.apache.org/tags-html-el + +base +org.apache.strutsel.taglib.html.ELBaseTag +empty + +target +false +true + + +server +false +true + + + +button +org.apache.strutsel.taglib.html.ELButtonTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +cancel +org.apache.strutsel.taglib.html.ELCancelTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +checkbox +org.apache.strutsel.taglib.html.ELCheckboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +errors +org.apache.strutsel.taglib.html.ELErrorsTag +empty + +bundle +false +true + + +footer +false +true + + +header +false +true + + +locale +false +true + + +name +false +true + + +prefix +false +true + + +property +false +true + + +suffix +false +true + + + +file +org.apache.strutsel.taglib.html.ELFileTag + +accesskey +false +true + + +accept +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +form +org.apache.strutsel.taglib.html.ELFormTag +JSP + +action +true +true + + +acceptCharset +false +true + + +disabled +false +true + + +enctype +false +true + + +focus +false +true + + +focusIndex +false +true + + +method +false +true + + +onreset +false +true + + +onsubmit +false +true + + +readonly +false +true + + +scriptLanguage +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +target +false +true + + + +frame +org.apache.strutsel.taglib.html.ELFrameTag + +bundle +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +frameborder +false +true + + +frameName +false +true + + +href +false +true + + +longdesc +false +true + + +marginheight +false +true + + +marginwidth +false +true + + +name +false +true + + +noresize +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +scrolling +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + + +hidden +org.apache.strutsel.taglib.html.ELHiddenTag +empty + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + +write +false +true + + + +html +org.apache.strutsel.taglib.html.ELHtmlTag +JSP + +lang +false +true + + +locale +false +true + + +xhtml +false +true + + + +image +org.apache.strutsel.taglib.html.ELImageTag + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +locale +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +pageKey +false +true + + +property +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +img +org.apache.strutsel.taglib.html.ELImgTag +empty + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +contextRelative +false +true + + +height +false +true + + +hspace +false +true + + +imageName +false +true + + +ismap +false +true + + +locale +false +true + + +lowsrc +false +true + + +name +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +paramId +false +true + + +page +false +true + + +pageKey +false +true + + +action +false +true + + +module +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +useLocalEncoding +false +true + + +usemap +false +true + + +vspace +false +true + + +width +false +true + + + +javascript +org.apache.strutsel.taglib.html.ELJavascriptValidatorTag +empty + +cdata +false +true + + +dynamicJavascript +false +false + + +formName +false +true + + +method +false +true + + +page +false +true + + +scriptLanguage +false +true + + +src +false +true + + +staticJavascript +false +false + + +htmlComment +false +true + + +bundle +false +true + + + +link +org.apache.strutsel.taglib.html.ELLinkTag + +accesskey +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +indexed +false +true + + +indexId +false +true + + +bundle +false +true + + +linkName +false +true + + +name +false +true + + +onblur +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +target +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +messages +org.apache.strutsel.taglib.html.ELMessagesTag +org.apache.struts.taglib.html.MessagesTei +JSP + +id +true +false + + +bundle +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +header +false +true + + +footer +false +true + + +message +false +true + + + +multibox +org.apache.strutsel.taglib.html.ELMultiboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +option +org.apache.strutsel.taglib.html.ELOptionTag + +bundle +false +true + + +disabled +false +true + + +key +false +true + + +locale +false +true + + +style +false +true + + +styleId +false +true + + +styleClass +false +true + + +value +true +true + + + +options +org.apache.strutsel.taglib.html.ELOptionsTag +empty + +collection +false +true + + +filter +false +true + + +labelName +false +true + + +labelProperty +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + + +optionsCollection +org.apache.strutsel.taglib.html.ELOptionsCollectionTag +empty + +filter +false +true + + +label +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +value +false +true + + + +password +org.apache.strutsel.taglib.html.ELPasswordTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +redisplay +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +size +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +radio +org.apache.strutsel.taglib.html.ELRadioTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +property +true +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +true +true + + +idName +false +true + + + +reset +org.apache.strutsel.taglib.html.ELResetTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +rewrite +org.apache.strutsel.taglib.html.ELRewriteTag +empty + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +name +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +select +org.apache.strutsel.taglib.html.ELSelectTag +JSP + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +multiple +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +size +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +submit +org.apache.strutsel.taglib.html.ELSubmitTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +text +org.apache.strutsel.taglib.html.ELTextTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +textarea +org.apache.strutsel.taglib.html.ELTextareaTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +cols +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +rows +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +xhtml +org.apache.struts.taglib.html.XhtmlTag +empty + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-html.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-html.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-html.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,3302 @@ + + + + + + + + + + +1.2 +1.1 +html +http://struts.apache.org/tags-html + +base +org.apache.struts.taglib.html.BaseTag +empty + +target +false +true + + +server +false +true + + + +button +org.apache.struts.taglib.html.ButtonTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +cancel +org.apache.struts.taglib.html.CancelTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +checkbox +org.apache.struts.taglib.html.CheckboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +errors +org.apache.struts.taglib.html.ErrorsTag +empty + +bundle +false +true + + +footer +false +true + + +header +false +true + + +locale +false +true + + +name +false +true + + +prefix +false +true + + +property +false +true + + +suffix +false +true + + + +file +org.apache.struts.taglib.html.FileTag + +accesskey +false +true + + +accept +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +form +org.apache.struts.taglib.html.FormTag +JSP + +action +true +true + + +acceptCharset +false +true + + +disabled +false +true + + +enctype +false +true + + +focus +false +true + + +focusIndex +false +true + + +method +false +true + + +onreset +false +true + + +onsubmit +false +true + + +readonly +false +true + + +scriptLanguage +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +target +false +true + + + +frame +org.apache.struts.taglib.html.FrameTag + +bundle +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +frameborder +false +true + + +frameName +false +true + + +href +false +true + + +longdesc +false +true + + +marginheight +false +true + + +marginwidth +false +true + + +name +false +true + + +noresize +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +scrolling +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + + +hidden +org.apache.struts.taglib.html.HiddenTag +empty + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + +write +false +true + + + +html +org.apache.struts.taglib.html.HtmlTag +JSP + +lang +false +true + + +locale +false +true + + +xhtml +false +true + + + +image +org.apache.struts.taglib.html.ImageTag + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +locale +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +pageKey +false +true + + +property +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +img +org.apache.struts.taglib.html.ImgTag +empty + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +contextRelative +false +true + + +height +false +true + + +hspace +false +true + + +imageName +false +true + + +ismap +false +true + + +locale +false +true + + +lowsrc +false +true + + +name +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +paramId +false +true + + +page +false +true + + +pageKey +false +true + + +action +false +true + + +module +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +useLocalEncoding +false +true + + +usemap +false +true + + +vspace +false +true + + +width +false +true + + + +javascript +org.apache.struts.taglib.html.JavascriptValidatorTag +empty + +cdata +false +true + + +dynamicJavascript +false +false + + +formName +false +true + + +method +false +true + + +page +false +true + + +scriptLanguage +false +true + + +src +false +true + + +staticJavascript +false +false + + +htmlComment +false +true + + +bundle +false +true + + + +link +org.apache.struts.taglib.html.LinkTag + +accesskey +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +indexed +false +true + + +indexId +false +true + + +bundle +false +true + + +linkName +false +true + + +name +false +true + + +onblur +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +target +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +messages +org.apache.struts.taglib.html.MessagesTag +org.apache.struts.taglib.html.MessagesTei +JSP + +id +true +false + + +bundle +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +header +false +true + + +footer +false +true + + +message +false +true + + + +multibox +org.apache.struts.taglib.html.MultiboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +option +org.apache.struts.taglib.html.OptionTag + +bundle +false +true + + +disabled +false +true + + +key +false +true + + +locale +false +true + + +style +false +true + + +styleId +false +true + + +styleClass +false +true + + +value +true +true + + + +options +org.apache.struts.taglib.html.OptionsTag +empty + +collection +false +true + + +filter +false +true + + +labelName +false +true + + +labelProperty +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + + +optionsCollection +org.apache.struts.taglib.html.OptionsCollectionTag +empty + +filter +false +true + + +label +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +value +false +true + + + +password +org.apache.struts.taglib.html.PasswordTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +redisplay +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +size +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +radio +org.apache.struts.taglib.html.RadioTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +property +true +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +true +true + + +idName +false +true + + + +reset +org.apache.struts.taglib.html.ResetTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +rewrite +org.apache.struts.taglib.html.RewriteTag +empty + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +name +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +select +org.apache.struts.taglib.html.SelectTag +JSP + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +multiple +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +size +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +submit +org.apache.struts.taglib.html.SubmitTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +text +org.apache.struts.taglib.html.TextTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +textarea +org.apache.struts.taglib.html.TextareaTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +cols +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +rows +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +xhtml +org.apache.struts.taglib.html.XhtmlTag +empty + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic-el.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic-el.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic-el.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,382 @@ + + + + + + + + + +1.2 +1.1 +logic +http://struts.apache.org/tags-logic-el + +forward +org.apache.strutsel.taglib.logic.ELForwardTag +empty + +name +true +true + + + +iterate +org.apache.strutsel.taglib.logic.ELIterateTag +org.apache.struts.taglib.logic.IterateTei +JSP + +collection +false +true + + +id +true +false + + +indexId +false +false + + +length +false +true + + +name +false +true + + +offset +false +true + + +property +false +true + + +scope +false +true + + +type +false +true + + + +match +org.apache.strutsel.taglib.logic.ELMatchTag +JSP + +cookie +false +true + + +expr +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +messagesNotPresent +org.apache.strutsel.taglib.logic.ELMessagesNotPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +messagesPresent +org.apache.strutsel.taglib.logic.ELMessagesPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +notMatch +org.apache.strutsel.taglib.logic.ELNotMatchTag +JSP + +cookie +false +true + + +expr +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notPresent +org.apache.strutsel.taglib.logic.ELNotPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +present +org.apache.strutsel.taglib.logic.ELPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +redirect +org.apache.strutsel.taglib.logic.ELRedirectTag + +action +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +name +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-logic.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,652 @@ + + + + + + + + + +1.2 +1.1 +logic +http://struts.apache.org/tags-logic + +empty +org.apache.struts.taglib.logic.EmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +equal +org.apache.struts.taglib.logic.EqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +forward +org.apache.struts.taglib.logic.ForwardTag +empty + +name +true +true + + + +greaterEqual +org.apache.struts.taglib.logic.GreaterEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +greaterThan +org.apache.struts.taglib.logic.GreaterThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +iterate +org.apache.struts.taglib.logic.IterateTag +org.apache.struts.taglib.logic.IterateTei +JSP + +collection +false +true + + +id +true +false + + +indexId +false +false + + +length +false +true + + +name +false +true + + +offset +false +true + + +property +false +true + + +scope +false +true + + +type +false +true + + + +lessEqual +org.apache.struts.taglib.logic.LessEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +lessThan +org.apache.struts.taglib.logic.LessThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +match +org.apache.struts.taglib.logic.MatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +messagesNotPresent +org.apache.struts.taglib.logic.MessagesNotPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +messagesPresent +org.apache.struts.taglib.logic.MessagesPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +notEmpty +org.apache.struts.taglib.logic.NotEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +notEqual +org.apache.struts.taglib.logic.NotEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notMatch +org.apache.struts.taglib.logic.NotMatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notPresent +org.apache.struts.taglib.logic.NotPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +present +org.apache.struts.taglib.logic.PresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +redirect +org.apache.struts.taglib.logic.RedirectTag + +action +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +name +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-nested.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-nested.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-nested.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,3171 @@ + + + + + + + + + +1.2 +1.1 +nested +http://struts.apache.org/tags-nested + +nest +org.apache.struts.taglib.nested.NestedPropertyTag +JSP + +property +false +true + + + +writeNesting +org.apache.struts.taglib.nested.NestedWriteNestingTag +org.apache.struts.taglib.nested.NestedWriteNestingTei +JSP + +property +false +true + + +id +false +true + + +filter +false +true + + + +root +org.apache.struts.taglib.nested.NestedRootTag +JSP + +name +false +true + + + +define +org.apache.struts.taglib.nested.bean.NestedDefineTag +org.apache.struts.taglib.nested.bean.NestedDefineTei +empty + +id +true +true + + +name +false +true + + +property +false +true + + +scope +false +true + + +toScope +false +true + + +type +false +true + + +value +false +true + + + +message +org.apache.struts.taglib.nested.bean.NestedMessageTag +empty + +arg0 +false +true + + +arg1 +false +true + + +arg2 +false +true + + +arg3 +false +true + + +arg4 +false +true + + +bundle +false +true + + +key +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +size +org.apache.struts.taglib.nested.bean.NestedSizeTag +org.apache.struts.taglib.bean.SizeTei +empty + +collection +false +true + + +id +true +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +write +org.apache.struts.taglib.nested.bean.NestedWriteTag +empty + +bundle +false +true + + +filter +false +true + + +format +false +true + + +formatKey +false +true + + +ignore +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +scope +false +true + + + +checkbox +org.apache.struts.taglib.nested.html.NestedCheckboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +errors +org.apache.struts.taglib.nested.html.NestedErrorsTag +empty + +bundle +false +true + + +footer +false +true + + +header +false +true + + +locale +false +true + + +name +false +true + + +prefix +false +true + + +property +false +true + + +suffix +false +true + + + +file +org.apache.struts.taglib.nested.html.NestedFileTag + +accesskey +false +true + + +accept +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +form +org.apache.struts.taglib.nested.html.NestedFormTag +JSP + +action +true +true + + +acceptCharset +false +true + + +disabled +false +true + + +enctype +false +true + + +focus +false +true + + +focusIndex +false +true + + +method +false +true + + +onreset +false +true + + +onsubmit +false +true + + +readonly +false +true + + +scriptLanguage +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +target +false +true + + + +hidden +org.apache.struts.taglib.nested.html.NestedHiddenTag + +alt +false +true + + +altKey +false +true + + +indexed +false +true + + +name +false +true + + +property +true +true + + +title +false +true + + +titleKey +false +true + + +styleClass +false +true + + +styleId +false +true + + +value +false +true + + +write +false +true + + + +image +org.apache.struts.taglib.nested.html.NestedImageTag + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +locale +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +pageKey +false +true + + +property +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +img +org.apache.struts.taglib.nested.html.NestedImgTag +empty + +accesskey +false +true + + +align +false +true + + +alt +false +true + + +altKey +false +true + + +border +false +true + + +bundle +false +true + + +height +false +true + + +hspace +false +true + + +imageName +false +true + + +ismap +false +true + + +locale +false +true + + +lowsrc +false +true + + +name +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +paramId +false +true + + +page +false +true + + +pageKey +false +true + + +action +false +true + + +module +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +src +false +true + + +srcKey +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +title +false +true + + +titleKey +false +true + + +useLocalEncoding +false +true + + +usemap +false +true + + +vspace +false +true + + +width +false +true + + + +link +org.apache.struts.taglib.nested.html.NestedLinkTag + +accesskey +false +true + + +action +false +true + + +module +false +true + + +anchor +false +true + + +forward +false +true + + +href +false +true + + +indexed +false +true + + +indexId +false +true + + +bundle +false +true + + +linkName +false +true + + +name +false +true + + +onblur +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +page +false +true + + +paramId +false +true + + +paramName +false +true + + +paramProperty +false +true + + +paramScope +false +true + + +property +false +true + + +scope +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +target +false +true + + +title +false +true + + +titleKey +false +true + + +transaction +false +true + + +useLocalEncoding +false +true + + + +messages +org.apache.struts.taglib.nested.html.NestedMessagesTag +org.apache.struts.taglib.html.MessagesTei +JSP + +id +true +true + + +bundle +false +true + + +locale +false +true + + +name +false +true + + +property +false +true + + +header +false +true + + +footer +false +true + + +message +false +true + + + +multibox +org.apache.struts.taglib.nested.html.NestedMultiboxTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +options +org.apache.struts.taglib.nested.html.NestedOptionsTag +empty + +collection +false +true + + +filter +false +true + + +labelName +false +true + + +labelProperty +false +true + + +name +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + + +optionsCollection +org.apache.struts.taglib.nested.html.NestedOptionsCollectionTag +empty + +filter +false +true + + +label +false +true + + +name +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +value +false +true + + + +password +org.apache.struts.taglib.nested.html.NestedPasswordTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +redisplay +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +size +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +radio +org.apache.struts.taglib.nested.html.NestedRadioTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +property +true +true + + +onmousedown +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +true +true + + +idName +false +true + + + +select +org.apache.struts.taglib.nested.html.NestedSelectTag +JSP + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +multiple +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +size +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +submit +org.apache.struts.taglib.nested.html.NestedSubmitTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +indexed +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +text +org.apache.struts.taglib.nested.html.NestedTextTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +maxlength +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +size +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +textarea +org.apache.struts.taglib.nested.html.NestedTextareaTag + +accesskey +false +true + + +alt +false +true + + +altKey +false +true + + +bundle +false +true + + +cols +false +true + + +disabled +false +true + + +errorKey +false +true + + +errorStyle +false +true + + +errorStyleClass +false +true + + +errorStyleId +false +true + + +indexed +false +true + + +name +false +true + + +onblur +false +true + + +onchange +false +true + + +onclick +false +true + + +ondblclick +false +true + + +onfocus +false +true + + +onkeydown +false +true + + +onkeypress +false +true + + +onkeyup +false +true + + +onmousedown +false +true + + +onmousemove +false +true + + +onmouseout +false +true + + +onmouseover +false +true + + +onmouseup +false +true + + +property +true +true + + +readonly +false +true + + +rows +false +true + + +style +false +true + + +styleClass +false +true + + +styleId +false +true + + +tabindex +false +true + + +title +false +true + + +titleKey +false +true + + +value +false +true + + + +empty +org.apache.struts.taglib.nested.logic.NestedEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +equal +org.apache.struts.taglib.nested.logic.NestedEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +greaterEqual +org.apache.struts.taglib.nested.logic.NestedGreaterEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +greaterThan +org.apache.struts.taglib.nested.logic.NestedGreaterThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +iterate +org.apache.struts.taglib.nested.logic.NestedIterateTag +org.apache.struts.taglib.nested.logic.NestedIterateTei +JSP + +collection +false +true + + +id +false +true + + +indexId +false +true + + +length +false +true + + +name +false +true + + +offset +false +true + + +property +false +true + + +scope +false +true + + +type +false +true + + + +lessEqual +org.apache.struts.taglib.nested.logic.NestedLessEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +lessThan +org.apache.struts.taglib.nested.logic.NestedLessThanTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +match +org.apache.struts.taglib.nested.logic.NestedMatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +messagesNotPresent +org.apache.struts.taglib.nested.logic.NestedMessagesNotPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +messagesPresent +org.apache.struts.taglib.nested.logic.NestedMessagesPresentTag +JSP + +name +false +true + + +property +false +true + + +message +false +true + + + +notEmpty +org.apache.struts.taglib.nested.logic.NestedNotEmptyTag +JSP + +name +false +true + + +property +false +true + + +scope +false +true + + + +notEqual +org.apache.struts.taglib.nested.logic.NestedNotEqualTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notMatch +org.apache.struts.taglib.nested.logic.NestedNotMatchTag +JSP + +cookie +false +true + + +header +false +true + + +location +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +scope +false +true + + +value +true +true + + + +notPresent +org.apache.struts.taglib.nested.logic.NestedNotPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + +present +org.apache.struts.taglib.nested.logic.NestedPresentTag +JSP + +cookie +false +true + + +header +false +true + + +name +false +true + + +parameter +false +true + + +property +false +true + + +role +false +true + + +scope +false +true + + +user +false +true + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles-el.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles-el.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles-el.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,343 @@ + + + + + + + + + + +1.2 +1.1 +tiles +http://struts.apache.org/tags-tiles-el + +insert +org.apache.strutsel.taglib.tiles.ELInsertTag +JSP + +template +false +true + + +component +false +true + + +page +false +true + + +definition +false +true + + +attribute +false +false + + +name +false +true + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +flush +false +false + + +ignore +false +true + + +role +false +true + + +controllerUrl +false +true + + +controllerClass +false +true + + + +definition +org.apache.strutsel.taglib.tiles.ELDefinitionTag +JSP + +id +true +false + + +scope +false +false + + +template +false +true + + +page +false +true + + +role +false +true + + +extends +false +true + + + +put +org.apache.strutsel.taglib.tiles.ELPutTag +JSP + +name +false +false + + +value +false +true + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +putList +org.apache.strutsel.taglib.tiles.ELPutListTag +JSP + +name +true +false + + + +add +org.apache.strutsel.taglib.tiles.ELAddTag +JSP + +value +false +false + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +get +org.apache.strutsel.taglib.tiles.ELGetTag +empty + +name +true +true + + +ignore +false +true + + +flush +false +false + + +role +false +true + + + +getAsString +org.apache.strutsel.taglib.tiles.ELGetAttributeTag +empty + +name +true +true + + +ignore +false +true + + +role +false +true + + + +useAttribute +org.apache.strutsel.taglib.tiles.ELUseAttributeTag +empty + +id +false +false + + +classname +false +false + + +scope +false +false + + +name +true +true + + +ignore +false +true + + + +importAttribute +org.apache.strutsel.taglib.tiles.ELImportAttributeTag +empty + +name +false +true + + +scope +false +false + + +ignore +false +true + + + +initComponentDefinitions +org.apache.strutsel.taglib.tiles.ELInitDefinitionsTag +empty + +file +true +false + + +classname +false +false + + + + + + Index: lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles.tld =================================================================== diff -u --- lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles.tld (revision 0) +++ lams_tool_nb/web/WEB-INF/struts/tlds/struts-tiles.tld (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,344 @@ + + + + + + + + + + +1.2 +1.1 +tiles +http://struts.apache.org/tags-tiles + +insert +org.apache.struts.taglib.tiles.InsertTag +JSP + +template +false +true + + +component +false +true + + +page +false +true + + +definition +false +true + + +attribute +false +false + + +name +false +true + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +flush +false +false + + +ignore +false +true + + +role +false +true + + +controllerUrl +false +true + + +controllerClass +false +true + + + +definition +org.apache.struts.taglib.tiles.DefinitionTag +JSP + +id +true +false + + +scope +false +false + + +template +false +true + + +page +false +true + + +role +false +true + + +extends +false +true + + + +put +org.apache.struts.taglib.tiles.PutTag +JSP + +name +false +false + + +value +false +true + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +putList +org.apache.struts.taglib.tiles.PutListTag +JSP + +name +true +false + + + +add +org.apache.struts.taglib.tiles.AddTag +JSP + +value +false +false + + +content +false +true + + +direct +false +false + + +type +false +false + + +beanName +false +true + + +beanProperty +false +true + + +beanScope +false +false + + +role +false +true + + + +get +org.apache.struts.taglib.tiles.GetTag +empty + +name +true +true + + +ignore +false +true + + +flush +false +false + + +role +false +true + + + +getAsString +org.apache.struts.taglib.tiles.GetAttributeTag +empty + +name +true +true + + +ignore +false +true + + +role +false +true + + + +useAttribute +org.apache.struts.taglib.tiles.UseAttributeTag +org.apache.struts.taglib.tiles.UseAttributeTei +empty + +id +false +false + + +classname +false +false + + +scope +false +false + + +name +true +true + + +ignore +false +true + + + +importAttribute +org.apache.struts.taglib.tiles.ImportAttributeTag +empty + +name +false +true + + +scope +false +false + + +ignore +false +true + + + +initComponentDefinitions +org.apache.struts.taglib.tiles.InitDefinitionsTag +empty + +file +true +false + + +classname +false +false + + + + + + Index: lams_tool_nb/web/WEB-INF/web.xml =================================================================== diff -u -r85507766d15ce5b9b5eaeaef421dfa64b695da9d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d) +++ lams_tool_nb/web/WEB-INF/web.xml (.../web.xml) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -133,11 +133,93 @@ + + + - fck-editor + 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 + + @@ -196,6 +278,7 @@ LAMS /login.jsp + /login.jsp?failed=y Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/a_Advanced.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/a_Basic.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/a_Instructions.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/authorContent.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/author_page.jsp =================================================================== diff -u -rffbc47494b72d5222b6fc95db0347f7732d93310 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/author_page.jsp (.../author_page.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) +++ lams_tool_nb/web/author_page.jsp (.../author_page.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,33 +1,26 @@ -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %> -<% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String root = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -String pathToLams = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; + + -%> - - + + Noticeboard tool - - + + - +css/tool_custom.css" rel="stylesheet" type="text/css"> - + - +

Noticeboard

@@ -51,9 +44,9 @@ - + - +
images/aqua_tab_s_left.gif" name="tab_left_b" width="8" height="25" border="0" id="tab_left_b"/> images/aqua_tab_s_right.gif" name="tab_right_b" width="8" height="25" border="0" id="tab_right_b"/>
@@ -62,9 +55,9 @@ - + - +
images/aqua_tab_left.gif" name="tab_left_a" width="8" height="22" border="0" id="tab_left_a" /> images/aqua_tab_right.gif" name="tab_right_a" width="9" height="22" border="0" id="tab_right_a" />
@@ -73,9 +66,9 @@ - + - +
images/aqua_tab_left.gif" width="8" height="22" id="tab_left_i" name="tab_left_i" /> images/aqua_tab_right.gif" width="9" height="22" border="0" id="tab_right_i" name="tab_right_i"/>
@@ -124,8 +117,7 @@
-Cancel - + @@ -244,7 +236,7 @@ - @@ -265,8 +257,7 @@
-Cancel - + @@ -279,7 +270,7 @@ Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page/css/aqua.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page/css/base.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page/css/tool_custom.css'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page/css/xp.css'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/author_page/images/aqua_tab_centre.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Index: lams_tool_nb/web/author_page/images/aqua_tab_left.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Index: lams_tool_nb/web/author_page/images/aqua_tab_right.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Index: lams_tool_nb/web/author_page/images/aqua_tab_s_centre.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Index: lams_tool_nb/web/author_page/images/aqua_tab_s_left.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Index: lams_tool_nb/web/author_page/images/aqua_tab_s_right.gif =================================================================== diff -u -r1186a113f98c243e375a9e80df090e2393a8e78d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 Binary files differ Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/author_page/js/tabcontroller.js'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/css/tool_custom.css =================================================================== diff -u --- lams_tool_nb/web/css/tool_custom.css (revision 0) +++ lams_tool_nb/web/css/tool_custom.css (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -0,0 +1,59 @@ +.button{ + float:right; + font-size: 12px; + color: #000000; + text-decoration:none; + text-align: center; + background-color:#B4C8FE; + margin: 2px 5px 2px 5px; + padding:3px; + width: 80px; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-top-color: #FFFFFF; + border-right-color: #0D3F59; + border-bottom-color: #0D3F59; + border-left-color: #FFFFFF; +} + +.button:link{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + +.button:visited{ + color: #000000; + text-decoration:none; + background-color:#B4C8FE; +} + + + +.button:hover{ + text-decoration:none; + background-color:#FFFFFF; +} + +.button:active{ + text-decoration:none; + background-color:#CCCCCC; + border-top-width: 1px; + border-right-width: 1px; + border-bottom-width: 1px; + border-left-width: 1px; + border-top-style: solid; + border-right-style: solid; + border-bottom-style: solid; + border-left-style: solid; + border-bottom-color: #FFFFFF; + border-left-color: #0D3F59; + border-top-color: #0D3F59; + border-right-color: #FFFFFF; +} \ No newline at end of file Index: lams_tool_nb/web/errorbox.jsp =================================================================== diff -u -r7819406b2a723d745cab2bcbab2eac4c2f982b0b -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/errorbox.jsp (.../errorbox.jsp) (revision 7819406b2a723d745cab2bcbab2eac4c2f982b0b) +++ lams_tool_nb/web/errorbox.jsp (.../errorbox.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,43 +1,14 @@ - - -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html-el" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ page import="org.apache.struts.action.Action" %> -<% -String cprotocol = request.getProtocol(); -if(cprotocol.startsWith("HTTPS")){ - cprotocol = "https://"; -}else{ - cprotocol = "http://"; -} -String pathToShare = cprotocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; -%>
- Error occured + Error occured Index: lams_tool_nb/web/exportPortfolio.jsp =================================================================== diff -u -rc779fd0817b5606c133f85671477b4996c1810a4 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision c779fd0817b5606c133f85671477b4996c1810a4) +++ lams_tool_nb/web/exportPortfolio.jsp (.../exportPortfolio.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,5 +1,4 @@ -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c" %>

Index: lams_tool_nb/web/footer.jsp =================================================================== diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/footer.jsp (.../footer.jsp) (revision a766c8fe51dfa314947b20ef98e525d63b328fbe) +++ lams_tool_nb/web/footer.jsp (.../footer.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,23 +1,3 @@ -
Index: lams_tool_nb/web/header.jsp =================================================================== diff -u -ra766c8fe51dfa314947b20ef98e525d63b328fbe -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/header.jsp (.../header.jsp) (revision a766c8fe51dfa314947b20ef98e525d63b328fbe) +++ lams_tool_nb/web/header.jsp (.../header.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,35 +1,8 @@ - - -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-lams" prefix="lams" %> <%@ 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()+"/"; + -%>
@@ -39,15 +12,15 @@
- + /images/spacer.gif"> - + /doc/LAMS_Learner_Guide_b60.pdf" target = 0> [HELP] - space image + /images/spacer.gif" alt="space image">
Index: lams_tool_nb/web/index.jsp =================================================================== diff -u -r85507766d15ce5b9b5eaeaef421dfa64b695da9d -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/index.jsp (.../index.jsp) (revision 85507766d15ce5b9b5eaeaef421dfa64b695da9d) +++ lams_tool_nb/web/index.jsp (.../index.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,20 +1,17 @@ -<%@ page language="java" import="java.util.*" %> <%@ page import="org.lamsfoundation.lams.tool.noticeboard.NoticeboardConstants" %> -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> +<%@ taglib uri="tags-html-el" prefix="html" %> <% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; String authorUrl = "/starter/authoring?toolContentID="+355; -String learnerUrl = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=learner"; +String learnerUrl = "/starter/learner?toolSessionID="+455+"&mode=learner"; String learnerUrlTeacher = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=teacher"; -String learnerUrlAuthor = "/starter/learner?userId="+555+"&toolSessionID="+455+"&mode=author"; -String monitoringUrl = "/starter/monitor?toolContentID="+355; +String learnerUrlAuthor = "/starter/learner?&toolSessionID="+455+"&mode=author"; +String monitoringUrl = "/starter/monitor?toolContentID="+355; String exportPortfolioTeacher ="/exportPortfolio.do?mode=teacher&toolContentID=355"; String exportPortfolioStudent = "/exportPortfolio.do?mode=learner&toolSessionID=455&userID=555"; %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="tags-core" prefix="c" %> Index: lams_tool_nb/web/learnerContent.jsp =================================================================== diff -u -r7f56014100e2571ab98aa73c32d588fe4fac369a -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision 7f56014100e2571ab98aa73c32d588fe4fac369a) +++ lams_tool_nb/web/learnerContent.jsp (.../learnerContent.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,6 +1,6 @@ -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> Index: lams_tool_nb/web/login.jsp =================================================================== diff -u -rdc855a0d112dca81ef7a2378a48c0a7d8cfb0fab -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/login.jsp (.../login.jsp) (revision dc855a0d112dca81ef7a2378a48c0a7d8cfb0fab) +++ lams_tool_nb/web/login.jsp (.../login.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,24 +1,15 @@ +<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ page language="java" import="java.util.*" pageEncoding="UTF-8"%> -<% -String path = request.getContextPath(); -String basePath = request.getScheme()+"://"+request.getServerName()+":"+request.getServerPort()+path+"/"; -%> - - - + System logon required - - + - You need login here. + You need login here. Index: lams_tool_nb/web/message.jsp =================================================================== diff -u -rdf8425ccbe3a47be373585c09d61502c3890f7aa -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/message.jsp (.../message.jsp) (revision df8425ccbe3a47be373585c09d61502c3890f7aa) +++ lams_tool_nb/web/message.jsp (.../message.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,7 +1,7 @@ -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %>
Index: lams_tool_nb/web/monitoringContent.jsp =================================================================== diff -u -rdf8425ccbe3a47be373585c09d61502c3890f7aa -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/monitoringContent.jsp (.../monitoringContent.jsp) (revision df8425ccbe3a47be373585c09d61502c3890f7aa) +++ lams_tool_nb/web/monitoringContent.jsp (.../monitoringContent.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -1,9 +1,10 @@ -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> -<%@ taglib uri="/WEB-INF/struts/struts-bean.tld" prefix="bean" %> -<%@ taglib uri="/WEB-INF/struts/struts-logic.tld" prefix="logic" %> -<%@ taglib uri="fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-bean" prefix="bean" %> +<%@ taglib uri="tags-logic" prefix="logic" %> +<%@ taglib uri="tags-fck-editor" prefix="FCK" %> +<%@ taglib uri="tags-lams" prefix="lams" %>
Fisheye: Tag f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 refers to a dead (removed) revision in file `lams_tool_nb/web/noticeBoard.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_nb/web/template/template.jsp =================================================================== diff -u -rffbc47494b72d5222b6fc95db0347f7732d93310 -rf7ee8015c7b814fea6af3a86648cbfa3c4b2ed80 --- lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision ffbc47494b72d5222b6fc95db0347f7732d93310) +++ lams_tool_nb/web/template/template.jsp (.../template.jsp) (revision f7ee8015c7b814fea6af3a86648cbfa3c4b2ed80) @@ -18,37 +18,27 @@ http://www.gnu.org/licenses/gpl.txt --> +<%@ taglib uri="tags-html-el" prefix="html" %> +<%@ taglib uri="tags-fmt" prefix="fmt" %> +<%@ taglib uri="tags-core" prefix="c" %> +<%@ taglib uri="tags-tiles" prefix="tiles" %> +<%@ taglib uri="tags-lams" prefix="lams" %> -<%@ taglib uri="/WEB-INF/struts/struts-tiles.tld" prefix="tiles" %> -<%@ taglib uri="/WEB-INF/struts/struts-html-el.tld" prefix="html" %> -<%@ taglib uri="/WEB-INF/jstl/fmt.tld" prefix="fmt" %> -<%@ taglib uri="/WEB-INF/jstl/c.tld" prefix="c" %> + + -<% -String protocol = request.getProtocol(); -if(protocol.startsWith("HTTPS")){ - protocol = "https://"; -}else{ - protocol = "http://"; -} -String pathToRoot = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/"; -String pathToShare = protocol+request.getServerName()+":"+request.getServerPort()+request.getContextPath()+"/../.."; -%> - <tiles:getAsString name="title"/> - + - - - - + +