Ticket to login and access the Content Repository.
- *
- * A valid ticket is needed in order to access the content from the
- * repository. This method would be called evertime the tool needs to
- * upload/download files from the content repository.
- *
- * @return ITicket The ticket for repostory access
- * @throws SubmitFilesException
- */
- private ITicket getRepositoryLoginTicket() throws MdlForumException {
- repositoryService = RepositoryProxy.getRepositoryService();
- ICredentials credentials = new SimpleCredentials(
- MdlForumToolContentHandler.repositoryUser,
- MdlForumToolContentHandler.repositoryId);
- try {
- ITicket ticket = repositoryService.login(credentials,
- MdlForumToolContentHandler.repositoryWorkspaceName);
- return ticket;
- } catch (AccessDeniedException ae) {
- throw new MdlForumException("Access Denied to repository."
- + ae.getMessage());
- } catch (WorkspaceNotFoundException we) {
- throw new MdlForumException("Workspace not found."
- + we.getMessage());
- } catch (LoginException e) {
- throw new MdlForumException("Login failed." + e.getMessage());
- }
+ public MdlForumUser getUserByLoginNameAndSessionId(String loginName, Long toolSessionId) {
+ return mdlForumUserDAO.getByLoginNameAndSessionId(loginName, toolSessionId);
+ }
+
+ public MdlForumUser getUserByUID(Long uid) {
+ return mdlForumUserDAO.getByUID(uid);
+ }
+
+ public void deleteFromRepository(Long uuid, Long versionID) throws MdlForumException {
+ ITicket ticket = getRepositoryLoginTicket();
+ try {
+ repositoryService.deleteVersion(ticket, uuid, versionID);
+ } catch (Exception e) {
+ throw new MdlForumException("Exception occured while deleting files from" + " the repository "
+ + e.getMessage());
}
+ }
- /* ===============Methods implemented from ToolContentImport102Manager =============== */
-
+ public void saveOrUpdateMdlForum(MdlForum mdlForum) {
+ mdlForumDAO.saveOrUpdate(mdlForum);
+ }
+ public void saveOrUpdateMdlForumSession(MdlForumSession mdlForumSession) {
+ mdlForumSessionDAO.saveOrUpdate(mdlForumSession);
+ }
+
+ public void saveOrUpdateMdlForumUser(MdlForumUser mdlForumUser) {
+ mdlForumUserDAO.saveOrUpdate(mdlForumUser);
+ }
+
+ public MdlForumUser createMdlForumUser(UserDTO user, MdlForumSession mdlForumSession) {
+ MdlForumUser mdlForumUser = new MdlForumUser(user, mdlForumSession);
+ saveOrUpdateMdlForumUser(mdlForumUser);
+ return mdlForumUser;
+ }
+
+ public IAuditService getAuditService() {
+ return auditService;
+ }
+
+ public void setAuditService(IAuditService auditService) {
+ this.auditService = auditService;
+ }
+
/**
+ * This method verifies the credentials of the SubmitFiles Tool and gives it
+ * the Ticket to login and access the Content Repository.
+ *
+ * A valid ticket is needed in order to access the content from the
+ * repository. This method would be called evertime the tool needs to
+ * upload/download files from the content repository.
+ *
+ * @return ITicket The ticket for repostory access
+ * @throws SubmitFilesException
+ */
+ private ITicket getRepositoryLoginTicket() throws MdlForumException {
+ repositoryService = RepositoryProxy.getRepositoryService();
+ ICredentials credentials = new SimpleCredentials(MdlForumToolContentHandler.repositoryUser,
+ MdlForumToolContentHandler.repositoryId);
+ try {
+ ITicket ticket = repositoryService.login(credentials, MdlForumToolContentHandler.repositoryWorkspaceName);
+ return ticket;
+ } catch (AccessDeniedException ae) {
+ throw new MdlForumException("Access Denied to repository." + ae.getMessage());
+ } catch (WorkspaceNotFoundException we) {
+ throw new MdlForumException("Workspace not found." + we.getMessage());
+ } catch (LoginException e) {
+ throw new MdlForumException("Login failed." + e.getMessage());
+ }
+ }
+
+ /* ===============Methods implemented from ToolContentImport102Manager =============== */
+
+ /**
* Import the data for a 1.0.2 MdlForum
*/
- public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues)
- {
- Date now = new Date();
- MdlForum mdlForum = new MdlForum();
- mdlForum.setCreateDate(now);
- mdlForum.setDefineLater(Boolean.FALSE);
- mdlForum.setRunOffline(Boolean.FALSE);
- mdlForum.setToolContentId(toolContentId);
- mdlForum.setUpdateDate(now);
+ public void import102ToolContent(Long toolContentId, UserDTO user, Hashtable importValues) {
+ Date now = new Date();
+ MdlForum mdlForum = new MdlForum();
+ mdlForum.setCreateDate(now);
+ mdlForum.setDefineLater(Boolean.FALSE);
+ mdlForum.setRunOffline(Boolean.FALSE);
+ mdlForum.setToolContentId(toolContentId);
+ mdlForum.setUpdateDate(now);
- mdlForumDAO.saveOrUpdate(mdlForum);
+ mdlForumDAO.saveOrUpdate(mdlForum);
}
- /** Set the description, throws away the title value as this is not supported in 2.0 */
- public void setReflectiveData(Long toolContentId, String title, String description)
- throws ToolException, DataMissingException {
+ /**
+ * Set the description, throws away the title value as this is not supported
+ * in 2.0
+ */
+ public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException,
+ DataMissingException {
- logger.warn("Setting the reflective field on a mdlForum. This doesn't make sense as the mdlForum is for reflection and we don't reflect on reflection!");
- MdlForum mdlForum = getMdlForumByContentId(toolContentId);
- if ( mdlForum == null ) {
- throw new DataMissingException("Unable to set reflective data titled "+title
- +" on activity toolContentId "+toolContentId
- +" as the tool content does not exist.");
- }
-
- //mdlForum.setInstructions(description);
+ logger
+ .warn("Setting the reflective field on a mdlForum. This doesn't make sense as the mdlForum is for reflection and we don't reflect on reflection!");
+ MdlForum mdlForum = getMdlForumByContentId(toolContentId);
+ if (mdlForum == null) {
+ throw new DataMissingException("Unable to set reflective data titled " + title
+ + " on activity toolContentId " + toolContentId + " as the tool content does not exist.");
+ }
+
+ //mdlForum.setInstructions(description);
}
-
+
//=========================================================================================
- /* ********** Used by Spring to "inject" the linked objects ************* */
+ /* ********** Used by Spring to "inject" the linked objects ************* */
- public IMdlForumDAO getMdlForumDAO() {
- return mdlForumDAO;
- }
+ public IMdlForumDAO getMdlForumDAO() {
+ return mdlForumDAO;
+ }
- public void setMdlForumDAO(IMdlForumDAO mdlForumDAO) {
- this.mdlForumDAO = mdlForumDAO;
- }
+ public void setMdlForumDAO(IMdlForumDAO mdlForumDAO) {
+ this.mdlForumDAO = mdlForumDAO;
+ }
- public IMdlForumConfigItemDAO getMdlForumConfigItemDAO() {
- return mdlForumConfigItemDAO;
- }
+ public IMdlForumConfigItemDAO getMdlForumConfigItemDAO() {
+ return mdlForumConfigItemDAO;
+ }
- public void setMdlForumConfigItemDAO(
- IMdlForumConfigItemDAO mdlForumConfigItemDAO) {
- this.mdlForumConfigItemDAO = mdlForumConfigItemDAO;
- }
+ public void setMdlForumConfigItemDAO(IMdlForumConfigItemDAO mdlForumConfigItemDAO) {
+ this.mdlForumConfigItemDAO = mdlForumConfigItemDAO;
+ }
- public IToolContentHandler getMdlForumToolContentHandler() {
- return mdlForumToolContentHandler;
- }
+ public IToolContentHandler getMdlForumToolContentHandler() {
+ return mdlForumToolContentHandler;
+ }
- public void setMdlForumToolContentHandler(
- IToolContentHandler mdlForumToolContentHandler) {
- this.mdlForumToolContentHandler = mdlForumToolContentHandler;
- }
+ public void setMdlForumToolContentHandler(IToolContentHandler mdlForumToolContentHandler) {
+ this.mdlForumToolContentHandler = mdlForumToolContentHandler;
+ }
- public IMdlForumSessionDAO getMdlForumSessionDAO() {
- return mdlForumSessionDAO;
- }
+ public IMdlForumSessionDAO getMdlForumSessionDAO() {
+ return mdlForumSessionDAO;
+ }
- public void setMdlForumSessionDAO(IMdlForumSessionDAO sessionDAO) {
- this.mdlForumSessionDAO = sessionDAO;
- }
+ public void setMdlForumSessionDAO(IMdlForumSessionDAO sessionDAO) {
+ this.mdlForumSessionDAO = sessionDAO;
+ }
- public ILamsToolService getToolService() {
- return toolService;
- }
+ public ILamsToolService getToolService() {
+ return toolService;
+ }
- public void setToolService(ILamsToolService toolService) {
- this.toolService = toolService;
- }
+ public void setToolService(ILamsToolService toolService) {
+ this.toolService = toolService;
+ }
- public IMdlForumUserDAO getMdlForumUserDAO() {
- return mdlForumUserDAO;
- }
+ public IMdlForumUserDAO getMdlForumUserDAO() {
+ return mdlForumUserDAO;
+ }
- public void setMdlForumUserDAO(IMdlForumUserDAO userDAO) {
- this.mdlForumUserDAO = userDAO;
- }
+ public void setMdlForumUserDAO(IMdlForumUserDAO userDAO) {
+ this.mdlForumUserDAO = userDAO;
+ }
- public ILearnerService getLearnerService() {
- return learnerService;
- }
+ public ILearnerService getLearnerService() {
+ return learnerService;
+ }
- public void setLearnerService(ILearnerService learnerService) {
- this.learnerService = learnerService;
- }
+ public void setLearnerService(ILearnerService learnerService) {
+ this.learnerService = learnerService;
+ }
- public IExportToolContentService getExportContentService() {
- return exportContentService;
- }
+ public IExportToolContentService getExportContentService() {
+ return exportContentService;
+ }
- public void setExportContentService(
- IExportToolContentService exportContentService) {
- this.exportContentService = exportContentService;
- }
+ public void setExportContentService(IExportToolContentService exportContentService) {
+ this.exportContentService = exportContentService;
+ }
- public ICoreNotebookService getCoreNotebookService() {
- return coreNotebookService;
- }
+ public ICoreNotebookService getCoreNotebookService() {
+ return coreNotebookService;
+ }
- public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
- this.coreNotebookService = coreNotebookService;
- }
+ public void setCoreNotebookService(ICoreNotebookService coreNotebookService) {
+ this.coreNotebookService = coreNotebookService;
+ }
- public MdlForumOutputFactory getMdlForumOutputFactory() {
- if (mdlForumOutputFactory == null)
- {
- mdlForumOutputFactory = new MdlForumOutputFactory();
- }
- return mdlForumOutputFactory;
+ public MdlForumOutputFactory getMdlForumOutputFactory() {
+ if (mdlForumOutputFactory == null) {
+ mdlForumOutputFactory = new MdlForumOutputFactory();
}
+ return mdlForumOutputFactory;
+ }
- public void setMdlForumOutputFactory(
- MdlForumOutputFactory mdlForumOutputFactory) {
- this.mdlForumOutputFactory = mdlForumOutputFactory;
- }
+ public void setMdlForumOutputFactory(MdlForumOutputFactory mdlForumOutputFactory) {
+ this.mdlForumOutputFactory = mdlForumOutputFactory;
+ }
- /**
- * TODO: Use spring injection instead of hacking a context
- * @return
- */
- public IIntegrationService getIntegrationService() {
-
- if (integrationService==null)
- {
- String contexts[] = {"/org/lamsfoundation/lams/applicationContext.xml",
- "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
- "/org/lamsfoundation/lams/toolApplicationContext.xml",
- "/org/lamsfoundation/lams/integrationContext.xml",
- "/org/lamsfoundation/lams/learning/learningApplicationContext.xml",
- "/org/lamsfoundation/lams/contentrepository/applicationContext.xml",
- "/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml",
- "/org/lamsfoundation/lams/commonContext.xml"};
+ /**
+ * TODO: Use spring injection instead of hacking a context
+ *
+ * @return
+ */
+ public IIntegrationService getIntegrationService() {
- ApplicationContext context = new ClassPathXmlApplicationContext(contexts);
-
- if ( context == null )
- throw new MdlForumException("Unable to access application context. Cannot create integration service object.");
-
- IIntegrationService service =(IIntegrationService)context.getBean("integrationService");
- return service;
- }
- else
- {
- return integrationService;
- }
- }
+ if (integrationService == null) {
+ String contexts[] = { "/org/lamsfoundation/lams/applicationContext.xml",
+ "/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml",
+ "/org/lamsfoundation/lams/toolApplicationContext.xml",
+ "/org/lamsfoundation/lams/integrationContext.xml",
+ "/org/lamsfoundation/lams/learning/learningApplicationContext.xml",
+ "/org/lamsfoundation/lams/contentrepository/applicationContext.xml",
+ "/org/lamsfoundation/lams/tool/mdfrum/mdlForumApplicationContext.xml",
+ "/org/lamsfoundation/lams/commonContext.xml" };
- public void setIntegrationService(IIntegrationService integrationService) {
- this.integrationService = integrationService;
+ ApplicationContext context = new ClassPathXmlApplicationContext(contexts);
+
+ if (context == null)
+ throw new MdlForumException(
+ "Unable to access application context. Cannot create integration service object.");
+
+ IIntegrationService service = (IIntegrationService) context.getBean("integrationService");
+ return service;
+ } else {
+ return integrationService;
}
+ }
+
+ public void setIntegrationService(IIntegrationService integrationService) {
+ this.integrationService = integrationService;
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumServiceProxy.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumServiceProxy.java (.../MdlForumServiceProxy.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/service/MdlForumServiceProxy.java (.../MdlForumServiceProxy.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -32,49 +32,45 @@
import org.springframework.web.context.WebApplicationContext;
import org.springframework.web.context.support.WebApplicationContextUtils;
-
/**
- * This class act as the proxy between web layer and service layer. It is - * designed to decouple the presentation logic and business logic completely. - * In this way, the presentation tier will no longer be aware of the changes in + *
+ * This class act as the proxy between web layer and service layer. It is + * designed to decouple the presentation logic and business logic completely. In + * this way, the presentation tier will no longer be aware of the changes in * service layer. Therefore we can feel free to switch the business logic - * implementation.
+ * implementation. + * */ public class MdlForumServiceProxy { - public static final IMdlForumService getMdlForumService(ServletContext servletContext) - { - return (IMdlForumService)getMdlForumDomainService(servletContext); + public static final IMdlForumService getMdlForumService(ServletContext servletContext) { + return (IMdlForumService) getMdlForumDomainService(servletContext); } - - private static Object getMdlForumDomainService(ServletContext servletContext) - { - WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); - return wac.getBean("mdlForumService"); - } - - /* - * Return the mdlForum tool version of tool session manager implementation. - * It will delegate to the Spring helper method to retrieve the proper - * bean from Spring bean factory. - * @param servletContext the servletContext for current application - * @return noticeboard service object.*/ - public static final ToolSessionManager getMdlForumSessionManager(ServletContext servletContext) - { - return (ToolSessionManager)getMdlForumDomainService(servletContext); + + private static Object getMdlForumDomainService(ServletContext servletContext) { + WebApplicationContext wac = WebApplicationContextUtils.getRequiredWebApplicationContext(servletContext); + return wac.getBean("mdlForumService"); } - - + /* + * Return the mdlForum tool version of tool session manager implementation. + * It will delegate to the Spring helper method to retrieve the proper + * bean from Spring bean factory. + * @param servletContext the servletContext for current application + * @return noticeboard service object.*/ + public static final ToolSessionManager getMdlForumSessionManager(ServletContext servletContext) { + return (ToolSessionManager) getMdlForumDomainService(servletContext); + } + + /* * Return the mdlForum tool version of tool content manager implementation. * It will delegate to the Spring helper method to retrieve the proper * bean from Spring bean factory. * @param servletContext the servletContext for current application * @return noticeboard service object. */ - public static final ToolContentManager getMdlForumContentManager(ServletContext servletContext) - { - return (ToolContentManager)getMdlForumDomainService(servletContext); + public static final ToolContentManager getMdlForumContentManager(ServletContext servletContext) { + return (ToolContentManager) getMdlForumDomainService(servletContext); } } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624 --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java (.../MdlForumConstants.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumConstants.java (.../MdlForumConstants.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) @@ -25,26 +25,26 @@ package org.lamsfoundation.lams.tool.mdfrum.util; public interface MdlForumConstants { - public static final String TOOL_SIGNATURE = "mdfrum10"; - - // MdlForum session status - public static final Integer SESSION_NOT_STARTED = new Integer(0); - public static final Integer SESSION_IN_PROGRESS = new Integer(1); - public static final Integer SESSION_COMPLETED = new Integer(2); - - public static final String AUTHORING_DEFAULT_TAB = "1"; - public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList"; - public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; - public static final String AUTH_SESSION_ID = "authoringSessionId"; - - public static final int MONITORING_SUMMARY_MAX_MESSAGES = 5; - - // Attribute names - public static final String ATTR_MESSAGE = "message"; - public static final String ATTR_SESSION_MAP = "sessionMap"; - - // Parameter names - public static final String PARAM_PARENT_PAGE = "parentPage"; - - static final String FILTER_REPLACE_TEXT = "***"; + public static final String TOOL_SIGNATURE = "mdfrum10"; + + // MdlForum session status + public static final Integer SESSION_NOT_STARTED = new Integer(0); + public static final Integer SESSION_IN_PROGRESS = new Integer(1); + public static final Integer SESSION_COMPLETED = new Integer(2); + + public static final String AUTHORING_DEFAULT_TAB = "1"; + public static final String DELETED_ATTACHMENT_LIST = "deletedAttachmentList"; + public static final String AUTH_SESSION_ID_COUNTER = "authoringSessionIdCounter"; + public static final String AUTH_SESSION_ID = "authoringSessionId"; + + public static final int MONITORING_SUMMARY_MAX_MESSAGES = 5; + + // Attribute names + public static final String ATTR_MESSAGE = "message"; + public static final String ATTR_SESSION_MAP = "sessionMap"; + + // Parameter names + public static final String PARAM_PARENT_PAGE = "parentPage"; + + static final String FILTER_REPLACE_TEXT = "***"; } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumException.java =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624 --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumException.java (.../MdlForumException.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumException.java (.../MdlForumException.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) @@ -27,31 +27,31 @@ /** * * @author lfoxton - * + * */ public class MdlForumException extends RuntimeException { - /** - * - */ - private static final long serialVersionUID = -5518806968051758859L; + /** + * + */ + private static final long serialVersionUID = -5518806968051758859L; - public MdlForumException(String message) { - super(message); - } + public MdlForumException(String message) { + super(message); + } - public MdlForumException(String message, Throwable cause) { - super(message, cause); - } + public MdlForumException(String message, Throwable cause) { + super(message, cause); + } - public MdlForumException() { - super(); + public MdlForumException() { + super(); - } + } - public MdlForumException(Throwable cause) { - super(cause); + public MdlForumException(Throwable cause) { + super(cause); - } + } } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumToolContentHandler.java =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624 --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumToolContentHandler.java (.../MdlForumToolContentHandler.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/MdlForumToolContentHandler.java (.../MdlForumToolContentHandler.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) @@ -31,46 +31,46 @@ */ public class MdlForumToolContentHandler extends ToolContentHandler { - // TODO these three fields were changed to public, since accessor methods - // cannot be made static. Check if we can do this a better way. - public static String repositoryWorkspaceName = "mdlForumworkspace"; + // TODO these three fields were changed to public, since accessor methods + // cannot be made static. Check if we can do this a better way. + public static String repositoryWorkspaceName = "mdlForumworkspace"; - public static String repositoryUser = "mdlForum"; + public static String repositoryUser = "mdlForum"; - public static char[] repositoryId = { 'l', 'a', 'm', 's', '-', 'e', 'x' }; + public static char[] repositoryId = { 'l', 'a', 'm', 's', '-', 'e', 'x' }; - /** - * - */ - public MdlForumToolContentHandler() { - super(); - } + /** + * + */ + public MdlForumToolContentHandler() { + super(); + } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryWorkspaceName() - */ - public String getRepositoryWorkspaceName() { - return repositoryWorkspaceName; - } + /* + * (non-Javadoc) + * + * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryWorkspaceName() + */ + public String getRepositoryWorkspaceName() { + return repositoryWorkspaceName; + } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryUser() - */ - public String getRepositoryUser() { - return repositoryUser; - } + /* + * (non-Javadoc) + * + * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryUser() + */ + public String getRepositoryUser() { + return repositoryUser; + } - /* - * (non-Javadoc) - * - * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryId() - */ - public char[] getRepositoryId() { - return repositoryId; - } + /* + * (non-Javadoc) + * + * @see org.lamsfoundation.lams.contentrepository.client.ToolContentHandler#getRepositoryId() + */ + public char[] getRepositoryId() { + return repositoryId; + } } Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java =================================================================== diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624 --- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java (.../WebUtility.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366) +++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/util/WebUtility.java (.../WebUtility.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624) @@ -1,3 +1,25 @@ +/**************************************************************** + * Copyright (C) 2005 LAMS Foundation (http://lamsfoundation.org) + * ============================================================= + * License Information: http://lamsfoundation.org/licensing/lams/2.0/ + * + * This program is free software; you can redistribute it and/or modify + * it under the terms of the GNU General Public License as published by + * the Free Software Foundation. + * + * This program is distributed in the hope that it will be useful, + * but WITHOUT ANY WARRANTY; without even the implied warranty of + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * GNU General Public License for more details. + * + * You should have received a copy of the GNU General Public License + * along with this program; if not, write to the Free Software + * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 + * USA + * + * http://www.gnu.org/licenses/gpl.txt + * **************************************************************** + */ package org.lamsfoundation.lams.tool.mdfrum.util; import java.io.DataInputStream; @@ -12,176 +34,146 @@ import java.net.URLConnection; import java.util.HashMap; import java.util.Map.Entry; -import java.util.Set; import org.apache.log4j.Logger; import org.lamsfoundation.lams.tool.exception.ToolException; -public class WebUtility -{ - static Logger logger = Logger.getLogger(WebUtility.class.getName()); - - /** - * Uploads a file for importing sequences - * Uses a multi-part http post to post the file as well as the user, course, and - * hash server-authentication strings. - * - * Some of the java multipart posting libraries clashed with existing jboss libraries - * So instead, the multipart post is put together manually - * - * @param f - * @param urlString - * @param timestamp - * @param extUsername - * @param extCourseId - * @param hash - * @return - * @throws IOException - */ - public static InputStream performMultipartPost( - File f, - String fileParamName, - String urlString, - HashMaptoolContentID will be passed in. This
- * will be used to retrieve content for this tool.
- *
- */
- protected ActionForward unspecified(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) {
+ private static final String KEY_EXTERNAL_TOOL_CONTENT_ID = "extToolContentID";
- // Extract toolContentID, contentFolderID and ToolAccessMode from parameters.
- Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
- String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
- ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, KEY_MODE,true);
+ private static final String KEY_MODE = "mode";
- // set up mdlForumService
- if (mdlForumService == null) {
- mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext());
- }
-
- // retrieving MdlForum with given toolContentID
- // if is a new instance, customCSV should be passed, and used for the course url, otherwise the saved value should be used
- MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
-
- // Getting the custom csv from the request
- String customCSV = WebUtil.readStrParam(request, "customCSV", true);
- String userFromCSV = null;
- String courseFromCSV = null;
- String sectionFromCSV = null;
- if(customCSV==null && mdlForum==null)
- {
- logger.error("CustomCSV required if mdlForum is null");
- throw new ToolException("CustomCSV required if mdlForum is null");
- }
- else if (customCSV!=null)
- {
- String splitCSV[] = customCSV.split(",");
- if (splitCSV.length != 3)
- {
- logger.error("mdlForum tool customCSV not in required (user,course,courseURL) form: " + customCSV);
- throw new ToolException("mdlForum tool cusomCSV not in required (user,course,courseURL) form: " + customCSV);
- }
- else
- {
- userFromCSV = splitCSV[0];
- courseFromCSV = splitCSV[1];
- sectionFromCSV = splitCSV[2];
- }
- }
-
- if (mdlForum == null)
- {
- mdlForum = mdlForumService.copyDefaultContent(toolContentID);
- mdlForum.setExtUsername(userFromCSV);
- mdlForum.setExtCourseId(courseFromCSV);
- mdlForum.setExtSection(sectionFromCSV);
- mdlForum.setCreateDate(new Date());
- }
-
+ private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
+ + MdlForumConstants.TOOL_SIGNATURE + "/";
- if (mode != null && mode.isTeacher()) {
- // Set the defineLater flag so that learners cannot use content
- // while we
- // are editing. This flag is released when updateContent is called.
- mdlForum.setDefineLater(true);
- mdlForumService.saveOrUpdateMdlForum(mdlForum);
- }
-
- // if no external content id, open the mdl author page, otherwise, open the edit page
- try{
-
- // If the mdlForum has a saved course url, use it, otherwise use the one giving in the request in customCSV
- //String courseUrlToBeUsed = (mdlForum.getExtCourseUrl() != null) ? mdlForum.getExtCourseUrl() : courseUrlFromCSV;
-
- String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL).getConfigValue();
- responseUrl += RELATIVE_MOODLE_AUTHOR_URL;
- String returnUpdateUrl = URLEncoder.encode(
- TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&"
- +AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8"
- );
- responseUrl += "&lamsUpdateURL=" + returnUpdateUrl;
-
-
- if (mdlForum.getExtSection() != null)
- {
- responseUrl += "§ion=" + mdlForum.getExtSection();
- }
- else
- {
- responseUrl += "§ion=" + sectionFromCSV;
- }
-
- if (mdlForum.getExtToolContentId()!=null)
- {
- responseUrl += "&update=" + mdlForum.getExtToolContentId().toString();
- }
- else
- {
- responseUrl += "&add=forum";
- }
-
- if (mdlForum.getExtCourseId() != null)
- {
- responseUrl +="&course=" + mdlForum.getExtCourseId();
- }
- else
- {
- responseUrl +="&course=" + courseFromCSV;
- }
-
- log.debug("Sending to moodle forum edit page: " + responseUrl);
-
- response.sendRedirect(responseUrl);
- }
- catch (Exception e)
- {
- log.error("Could not redirect to mdl forum authoring", e);
- }
- return null;
+ public IIntegrationService integrationService;
+
+ /**
+ * Default method when no dispatch parameter is specified. It is expected
+ * that the parameter toolContentID will be passed in. This
+ * will be used to retrieve content for this tool.
+ *
+ */
+ protected ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
+
+ // Extract toolContentID, contentFolderID and ToolAccessMode from parameters.
+ Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
+ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
+ ToolAccessMode mode = WebUtil.readToolAccessModeParam(request, KEY_MODE, true);
+
+ // set up mdlForumService
+ if (mdlForumService == null) {
+ mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext());
}
- public ActionForward updateContent(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) {
- // TODO need error checking.
+ // retrieving MdlForum with given toolContentID
+ // if is a new instance, customCSV should be passed, and used for the course url, otherwise the saved value should be used
+ MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
- Long toolContentID = new Long(WebUtil.readLongParam(request,KEY_TOOL_CONTENT_ID));
- Long externalToolContentID = new Long(WebUtil.readLongParam(request,KEY_EXTERNAL_TOOL_CONTENT_ID));
- //String sessionMapID = WebUtil.readStrParam(request,"sessionMapID");
-
- // get mdlForum content.
- MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
- mdlForum.setExtToolContentId(externalToolContentID);
- mdlForum.setUpdateDate(new Date());
- mdlForum.setDefineLater(false);
- mdlForumService.saveOrUpdateMdlForum(mdlForum);
-
- String redirectString = Configuration.get(ConfigurationKeys.SERVER_URL)
- + "/tool/" + MdlForumConstants.TOOL_SIGNATURE + "/clearsession.do"
- + "?action=confirm&mode=author"
- + "&signature=" + MdlForumConstants.TOOL_SIGNATURE
- + "&toolContentID=" + toolContentID.toString()
- + "&defineLater=no"
- + "&customiseSessionID="
- + "&contentFolderID=0";
+ // Getting the custom csv from the request
+ String customCSV = WebUtil.readStrParam(request, "customCSV", true);
+ String userFromCSV = null;
+ String courseFromCSV = null;
+ String sectionFromCSV = null;
+ if (customCSV == null && mdlForum == null) {
+ logger.error("CustomCSV required if mdlForum is null");
+ throw new ToolException("CustomCSV required if mdlForum is null");
+ } else if (customCSV != null) {
+ String splitCSV[] = customCSV.split(",");
+ if (splitCSV.length != 3) {
+ logger.error("mdlForum tool customCSV not in required (user,course,courseURL) form: " + customCSV);
+ throw new ToolException("mdlForum tool cusomCSV not in required (user,course,courseURL) form: "
+ + customCSV);
+ } else {
+ userFromCSV = splitCSV[0];
+ courseFromCSV = splitCSV[1];
+ sectionFromCSV = splitCSV[2];
+ }
+ }
- log.debug("Manual redirect for MdlForum to: " + redirectString);
-
- try
- {
- response.sendRedirect(redirectString);
- }
- catch(Exception e)
- {
- log.error("Could not redirect to clear session action for MdlForum", e);
- }
-
- return null;
+ if (mdlForum == null) {
+ mdlForum = mdlForumService.copyDefaultContent(toolContentID);
+ mdlForum.setExtUsername(userFromCSV);
+ mdlForum.setExtCourseId(courseFromCSV);
+ mdlForum.setExtSection(sectionFromCSV);
+ mdlForum.setCreateDate(new Date());
}
+
+ if (mode != null && mode.isTeacher()) {
+ // Set the defineLater flag so that learners cannot use content
+ // while we
+ // are editing. This flag is released when updateContent is called.
+ mdlForum.setDefineLater(true);
+ mdlForumService.saveOrUpdateMdlForum(mdlForum);
+ }
+
+ // if no external content id, open the mdl author page, otherwise, open the edit page
+ try {
+
+ // If the mdlForum has a saved course url, use it, otherwise use the one giving in the request in customCSV
+ //String courseUrlToBeUsed = (mdlForum.getExtCourseUrl() != null) ? mdlForum.getExtCourseUrl() : courseUrlFromCSV;
+
+ String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL)
+ .getConfigValue();
+ responseUrl += RELATIVE_MOODLE_AUTHOR_URL;
+ String returnUpdateUrl = URLEncoder.encode(TOOL_APP_URL + "/authoring.do?dispatch=updateContent" + "&"
+ + AttributeNames.PARAM_TOOL_CONTENT_ID + "=" + toolContentID.toString(), "UTF8");
+ responseUrl += "&lamsUpdateURL=" + returnUpdateUrl;
+
+ if (mdlForum.getExtSection() != null) {
+ responseUrl += "§ion=" + mdlForum.getExtSection();
+ } else {
+ responseUrl += "§ion=" + sectionFromCSV;
+ }
+
+ if (mdlForum.getExtToolContentId() != null) {
+ responseUrl += "&update=" + mdlForum.getExtToolContentId().toString();
+ } else {
+ responseUrl += "&add=forum";
+ }
+
+ if (mdlForum.getExtCourseId() != null) {
+ responseUrl += "&course=" + mdlForum.getExtCourseId();
+ } else {
+ responseUrl += "&course=" + courseFromCSV;
+ }
+
+ log.debug("Sending to moodle forum edit page: " + responseUrl);
+
+ response.sendRedirect(responseUrl);
+ } catch (Exception e) {
+ log.error("Could not redirect to mdl forum authoring", e);
+ }
+ return null;
+ }
+
+ public ActionForward updateContent(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
+ // TODO need error checking.
+
+ Long toolContentID = new Long(WebUtil.readLongParam(request, KEY_TOOL_CONTENT_ID));
+ Long externalToolContentID = new Long(WebUtil.readLongParam(request, KEY_EXTERNAL_TOOL_CONTENT_ID));
+ //String sessionMapID = WebUtil.readStrParam(request,"sessionMapID");
+
+ // get mdlForum content.
+ MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
+ mdlForum.setExtToolContentId(externalToolContentID);
+ mdlForum.setUpdateDate(new Date());
+ mdlForum.setDefineLater(false);
+ mdlForumService.saveOrUpdateMdlForum(mdlForum);
+
+ String redirectString = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
+ + MdlForumConstants.TOOL_SIGNATURE + "/clearsession.do" + "?action=confirm&mode=author" + "&signature="
+ + MdlForumConstants.TOOL_SIGNATURE + "&toolContentID=" + toolContentID.toString() + "&defineLater=no"
+ + "&customiseSessionID=" + "&contentFolderID=0";
+
+ log.debug("Manual redirect for MdlForum to: " + redirectString);
+
+ try {
+ response.sendRedirect(redirectString);
+ } catch (Exception e) {
+ log.error("Could not redirect to clear session action for MdlForum", e);
+ }
+
+ return null;
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/ClearSessionAction.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/ClearSessionAction.java (.../ClearSessionAction.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/ClearSessionAction.java (.../ClearSessionAction.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -30,22 +30,22 @@
import org.lamsfoundation.lams.tool.ToolAccessMode;
/**
- * This class give a chance to clear HttpSession when user save/close authoring page.
- * @author Steve.Ni
- * ----------------XDoclet Tags--------------------
+ * This class give a chance to clear HttpSession when user save/close authoring
+ * page.
*
- * @struts:action path="/clearsession" validate="false"
- *
+ * @author lfoxton
+ *
+ * @struts:action path="/clearsession" validate="false"
+ *
* @version $Revision$
*/
public class ClearSessionAction extends LamsAuthoringFinishAction {
- @Override
- public void clearSession(String customiseSessionID,HttpSession session, ToolAccessMode mode) {
- if(mode.isAuthor()){
- session.removeAttribute(customiseSessionID);
- }
+ @Override
+ public void clearSession(String customiseSessionID, HttpSession session, ToolAccessMode mode) {
+ if (mode.isAuthor()) {
+ session.removeAttribute(customiseSessionID);
}
+ }
-
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java (.../LearningAction.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/LearningAction.java (.../LearningAction.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -58,148 +58,131 @@
* @author
* @version
*
- * @struts.action path="/learning" parameter="dispatch" scope="request" name="learningForm"
+ * @struts.action path="/learning" parameter="dispatch" scope="request"
+ * name="learningForm"
* @struts.action-forward name="mdlForum" path="tiles:/learning/main"
* @struts.action-forward name="runOffline" path="tiles:/learning/runOffline"
* @struts.action-forward name="defineLater" path="tiles:/learning/defineLater"
*/
public class LearningAction extends LamsDispatchAction {
- private static Logger log = Logger.getLogger(LearningAction.class);
+ private static Logger log = Logger.getLogger(LearningAction.class);
- private static final boolean MODE_OPTIONAL = false;
-
- private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" + MdlForumConstants.TOOL_SIGNATURE + "/";
+ private static final boolean MODE_OPTIONAL = false;
- public static final String RELATIVE_LEARNER_URL = "/mod/forum/view.php?";
-
- private IMdlForumService mdlForumService;
+ private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
+ + MdlForumConstants.TOOL_SIGNATURE + "/";
- public ActionForward unspecified(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response)
- throws Exception {
+ public static final String RELATIVE_LEARNER_URL = "/mod/forum/view.php?";
- //LearningForm learningForm = (LearningForm) form;
+ private IMdlForumService mdlForumService;
- // 'toolSessionID' and 'mode' paramters are expected to be present.
- // TODO need to catch exceptions and handle errors.
- //ToolAccessMode mode = WebUtil.readToolAccessModeParam(request,AttributeNames.PARAM_MODE, MODE_OPTIONAL);
+ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) throws Exception {
- Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
+ Long toolSessionID = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID);
- // set up mdlForumService
- if (mdlForumService == null) {
- mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext());
- }
+ // set up mdlForumService
+ if (mdlForumService == null) {
+ mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext());
+ }
- // Retrieve the session and content.
- MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionID);
- if (mdlForumSession == null) {
- throw new MdlForumException("Cannot retreive session with toolSessionID: "+ toolSessionID);
- }
+ // Retrieve the session and content.
+ MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionID);
+ if (mdlForumSession == null) {
+ throw new MdlForumException("Cannot retreive session with toolSessionID: " + toolSessionID);
+ }
- MdlForum mdlForum = mdlForumSession.getMdlForum();
+ MdlForum mdlForum = mdlForumSession.getMdlForum();
- // check defineLater
- if (mdlForum.isDefineLater()) {
- return mapping.findForward("defineLater");
- }
+ // check defineLater
+ if (mdlForum.isDefineLater()) {
+ return mapping.findForward("defineLater");
+ }
- MdlForumDTO mdlForumDTO = new MdlForumDTO();
- request.setAttribute("mdlForumDTO", mdlForumDTO);
+ MdlForumDTO mdlForumDTO = new MdlForumDTO();
+ request.setAttribute("mdlForumDTO", mdlForumDTO);
- // Set the content in use flag.
- if (!mdlForum.isContentInUse()) {
- mdlForum.setContentInUse(new Boolean(true));
- mdlForumService.saveOrUpdateMdlForum(mdlForum);
- }
+ // Set the content in use flag.
+ if (!mdlForum.isContentInUse()) {
+ mdlForum.setContentInUse(new Boolean(true));
+ mdlForumService.saveOrUpdateMdlForum(mdlForum);
+ }
- // check runOffline
- if (mdlForum.isRunOffline()) {
- return mapping.findForward("runOffline");
- }
-
- if (mdlForum.getExtToolContentId()!=null)
- {
- try{
- String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL).getConfigValue();
- responseUrl += RELATIVE_LEARNER_URL;
-
- String returnUrl = TOOL_APP_URL + "learning.do?"
- + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + toolSessionID.toString()
- + "&dispatch=finishActivity";
-
- returnUrl = URLEncoder.encode(returnUrl, "UTF8");
-
- responseUrl += "&id=" + mdlForumSession.getExtSessionId()
- + "&returnUrl=" + returnUrl;
-
- log.debug("Redirecting for mdl forum learner: " + responseUrl);
- response.sendRedirect(responseUrl);
- }
- catch (Exception e)
- {
- log.error("Could not redirect to mdl forum authoring", e);
- }
- }
- else
- {
- throw new MdlForumException ("External content id null for learner");
- }
- return null;
+ // check runOffline
+ if (mdlForum.isRunOffline()) {
+ return mapping.findForward("runOffline");
}
- private MdlForumUser getCurrentUser(Long toolSessionId) {
- UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(
- AttributeNames.USER);
+ if (mdlForum.getExtToolContentId() != null) {
+ try {
+ String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL)
+ .getConfigValue();
+ responseUrl += RELATIVE_LEARNER_URL;
- // attempt to retrieve user using userId and toolSessionId
- MdlForumUser mdlForumUser = mdlForumService
- .getUserByUserIdAndSessionId(new Long(user.getUserID()
- .intValue()), toolSessionId);
+ String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "="
+ + toolSessionID.toString() + "&dispatch=finishActivity";
- if (mdlForumUser == null) {
- MdlForumSession mdlForumSession = mdlForumService
- .getSessionBySessionId(toolSessionId);
- mdlForumUser = mdlForumService.createMdlForumUser(user,
- mdlForumSession);
- }
+ returnUrl = URLEncoder.encode(returnUrl, "UTF8");
- return mdlForumUser;
+ responseUrl += "&id=" + mdlForumSession.getExtSessionId() + "&returnUrl=" + returnUrl;
+
+ log.debug("Redirecting for mdl forum learner: " + responseUrl);
+ response.sendRedirect(responseUrl);
+ } catch (Exception e) {
+ log.error("Could not redirect to mdl forum authoring", e);
+ }
+ } else {
+ throw new MdlForumException("External content id null for learner");
}
+ return null;
+ }
- public ActionForward finishActivity(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) {
+ private MdlForumUser getCurrentUser(Long toolSessionId) {
+ UserDTO user = (UserDTO) SessionManager.getSession().getAttribute(AttributeNames.USER);
- Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
+ // attempt to retrieve user using userId and toolSessionId
+ MdlForumUser mdlForumUser = mdlForumService.getUserByUserIdAndSessionId(new Long(user.getUserID().intValue()),
+ toolSessionId);
- MdlForumUser mdlForumUser = getCurrentUser(toolSessionID);
+ if (mdlForumUser == null) {
+ MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionId);
+ mdlForumUser = mdlForumService.createMdlForumUser(user, mdlForumSession);
+ }
- if (mdlForumUser != null) {
- mdlForumUser.setFinishedActivity(true);
- mdlForumService.saveOrUpdateMdlForumUser(mdlForumUser);
- } else {
- log.error("finishActivity(): couldn't find MdlForumUser with id: "
- + mdlForumUser.getUserId() + "and toolSessionID: "
- + toolSessionID);
- }
+ return mdlForumUser;
+ }
- ToolSessionManager sessionMgrService = MdlForumServiceProxy
- .getMdlForumSessionManager(getServlet().getServletContext());
+ public ActionForward finishActivity(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
- String nextActivityUrl;
- try {
- nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID,
- mdlForumUser.getUserId());
- response.sendRedirect(nextActivityUrl);
- } catch (DataMissingException e) {
- throw new MdlForumException(e);
- } catch (ToolException e) {
- throw new MdlForumException(e);
- } catch (IOException e) {
- throw new MdlForumException(e);
- }
+ Long toolSessionID = WebUtil.readLongParam(request, "toolSessionID");
- return null; // TODO need to return proper page.
+ MdlForumUser mdlForumUser = getCurrentUser(toolSessionID);
+
+ if (mdlForumUser != null) {
+ mdlForumUser.setFinishedActivity(true);
+ mdlForumService.saveOrUpdateMdlForumUser(mdlForumUser);
+ } else {
+ log.error("finishActivity(): couldn't find MdlForumUser with id: " + mdlForumUser.getUserId()
+ + "and toolSessionID: " + toolSessionID);
}
+
+ ToolSessionManager sessionMgrService = MdlForumServiceProxy.getMdlForumSessionManager(getServlet()
+ .getServletContext());
+
+ String nextActivityUrl;
+ try {
+ nextActivityUrl = sessionMgrService.leaveToolSession(toolSessionID, mdlForumUser.getUserId());
+ response.sendRedirect(nextActivityUrl);
+ } catch (DataMissingException e) {
+ throw new MdlForumException(e);
+ } catch (ToolException e) {
+ throw new MdlForumException(e);
+ } catch (IOException e) {
+ throw new MdlForumException(e);
+ }
+
+ return null; // TODO need to return proper page.
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/actions/MonitoringAction.java (.../MonitoringAction.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -51,75 +51,72 @@
* @author
* @version
*
- * @struts.action path="/monitoring" parameter="dispatch" scope="request" name="monitoringForm" validate="false"
+ * @struts.action path="/monitoring" parameter="dispatch" scope="request"
+ * name="monitoringForm" validate="false"
*
* @struts.action-forward name="success" path="tiles:/monitoring/main"
*
*/
public class MonitoringAction extends LamsDispatchAction {
- private static Logger log = Logger.getLogger(MonitoringAction.class);
-
- private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/" + MdlForumConstants.TOOL_SIGNATURE + "/";
+ private static Logger log = Logger.getLogger(MonitoringAction.class);
- public static final String RELATIVE_MONITOR_URL = "/mod/forum/view.php?";
+ private static final String TOOL_APP_URL = Configuration.get(ConfigurationKeys.SERVER_URL) + "/tool/"
+ + MdlForumConstants.TOOL_SIGNATURE + "/";
- public IMdlForumService mdlForumService;
+ public static final String RELATIVE_MONITOR_URL = "/mod/forum/view.php?";
- public ActionForward unspecified(ActionMapping mapping, ActionForm form,
- HttpServletRequest request, HttpServletResponse response) {
+ public IMdlForumService mdlForumService;
- setupService();
+ public ActionForward unspecified(ActionMapping mapping, ActionForm form, HttpServletRequest request,
+ HttpServletResponse response) {
- Long toolContentID = new Long(WebUtil.readLongParam(request,AttributeNames.PARAM_TOOL_CONTENT_ID));
-
- String contentFolderID = WebUtil.readStrParam(request,AttributeNames.PARAM_CONTENT_FOLDER_ID);
-
- MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
+ setupService();
-
- if (mdlForum == null) {
- // TODO error page.
- }
+ Long toolContentID = new Long(WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_CONTENT_ID));
- MdlForumDTO mdlForumDT0 = new MdlForumDTO(mdlForum);
+ String contentFolderID = WebUtil.readStrParam(request, AttributeNames.PARAM_CONTENT_FOLDER_ID);
- Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB,true);
- mdlForumDT0.setCurrentTab(currentTab);
-
-
- for (MdlForumSessionDTO sessionDTO: mdlForumDT0.getSessionDTOs())
- {
- try {
- String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL).getConfigValue();
- responseUrl += RELATIVE_MONITOR_URL;
+ MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
- String returnUrl = TOOL_APP_URL + "learning.do?"
- + AttributeNames.PARAM_TOOL_SESSION_ID + "=" + sessionDTO.getSessionID().toString()
- + "&dispatch=finishActivity";
- returnUrl = URLEncoder.encode(returnUrl, "UTF8");
-
- responseUrl += "&id=" + sessionDTO.getExtSessionID()
- + "&returnUrl=" + returnUrl;
-
- sessionDTO.setRunTimeUrl(responseUrl);
- } catch (UnsupportedEncodingException e) {
- log.error(e);
- }
- }
-
- request.setAttribute("mdlForumDTO", mdlForumDT0);
- request.setAttribute("contentFolderID", contentFolderID);
- return mapping.findForward("success");
+ if (mdlForum == null) {
+ // TODO error page.
}
-
- /**
- * set up mdlForumService
- */
- private void setupService() {
- if (mdlForumService == null) {
- mdlForumService = MdlForumServiceProxy.getMdlForumService(this
- .getServlet().getServletContext());
- }
+
+ MdlForumDTO mdlForumDT0 = new MdlForumDTO(mdlForum);
+
+ Long currentTab = WebUtil.readLongParam(request, AttributeNames.PARAM_CURRENT_TAB, true);
+ mdlForumDT0.setCurrentTab(currentTab);
+
+ for (MdlForumSessionDTO sessionDTO : mdlForumDT0.getSessionDTOs()) {
+ try {
+ String responseUrl = mdlForumService.getConfigItem(MdlForumConfigItem.KEY_EXTERNAL_SERVER_URL)
+ .getConfigValue();
+ responseUrl += RELATIVE_MONITOR_URL;
+
+ String returnUrl = TOOL_APP_URL + "learning.do?" + AttributeNames.PARAM_TOOL_SESSION_ID + "="
+ + sessionDTO.getSessionID().toString() + "&dispatch=finishActivity";
+ returnUrl = URLEncoder.encode(returnUrl, "UTF8");
+
+ responseUrl += "&id=" + sessionDTO.getExtSessionID() + "&returnUrl=" + returnUrl;
+
+ sessionDTO.setRunTimeUrl(responseUrl);
+ } catch (UnsupportedEncodingException e) {
+ log.error(e);
+ }
}
+
+ request.setAttribute("mdlForumDTO", mdlForumDT0);
+ request.setAttribute("contentFolderID", contentFolderID);
+ return mapping.findForward("success");
+ }
+
+ /**
+ * set up mdlForumService
+ */
+ private void setupService() {
+ if (mdlForumService == null) {
+ mdlForumService = MdlForumServiceProxy.getMdlForumService(this.getServlet().getServletContext());
+ }
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java (.../AdminForm.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AdminForm.java (.../AdminForm.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -11,46 +11,45 @@
/**
* @struts.form name="mdfrum10AdminForm"
*/
-public class AdminForm extends ActionForm
-{
- private static final long serialVersionUID = 8872637862875198L;
-
- String toolAdapterServlet;
- String extServerUrl;
- String serverIdMapping;
-
- @Override
- public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
- ActionErrors ac = new ActionErrors();
- ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
- return ac;
- }
+public class AdminForm extends ActionForm {
+ private static final long serialVersionUID = 8872637862875198L;
- public String getToolAdapterServlet() {
- return toolAdapterServlet;
- }
+ String toolAdapterServlet;
+ String extServerUrl;
+ String serverIdMapping;
- public void setToolAdapterServlet(String toolAdapterServlet) {
- this.toolAdapterServlet = toolAdapterServlet;
- }
+ @Override
+ public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
+ ActionErrors ac = new ActionErrors();
+ ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
+ return ac;
+ }
- public String getServerIdMapping() {
- return serverIdMapping;
- }
+ public String getToolAdapterServlet() {
+ return toolAdapterServlet;
+ }
- public void setServerIdMapping(String serverIdMapping) {
- this.serverIdMapping = serverIdMapping;
- }
+ public void setToolAdapterServlet(String toolAdapterServlet) {
+ this.toolAdapterServlet = toolAdapterServlet;
+ }
- public String getExtServerUrl() {
- return extServerUrl;
- }
+ public String getServerIdMapping() {
+ return serverIdMapping;
+ }
- public void setExtServerUrl(String extServerUrl) {
- this.extServerUrl = extServerUrl;
- }
+ public void setServerIdMapping(String serverIdMapping) {
+ this.serverIdMapping = serverIdMapping;
+ }
- public static long getSerialVersionUID() {
- return serialVersionUID;
- }
+ public String getExtServerUrl() {
+ return extServerUrl;
+ }
+
+ public void setExtServerUrl(String extServerUrl) {
+ this.extServerUrl = extServerUrl;
+ }
+
+ public static long getSerialVersionUID() {
+ return serialVersionUID;
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AuthoringForm.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/AuthoringForm.java (.../AuthoringForm.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -22,7 +22,7 @@
*/
/* $Id$ */
-
+
package org.lamsfoundation.lams.tool.mdfrum.web.forms;
import javax.servlet.http.HttpServletRequest;
@@ -40,179 +40,176 @@
*/
public class AuthoringForm extends ActionForm {
- private static final long serialVersionUID = 3950453134542135495L;
+ private static final long serialVersionUID = 3950453134542135495L;
- // Properties
+ // Properties
- String title;
+ String title;
- String instructions;
+ String instructions;
- String offlineInstruction;
+ String offlineInstruction;
- String onlineInstruction;
+ String onlineInstruction;
- boolean lockOnFinished;
-
- boolean allowRichEditor;
-
- boolean evalcomixEvaluationByLearners;
-
- boolean evalcomixEvaluationByTeachers;
-
- String evalcomixInstrumentFormAndViewUrl;
-
- FormFile onlineFile;
+ boolean lockOnFinished;
- FormFile offlineFile;
+ boolean allowRichEditor;
- String currentTab;
+ boolean evalcomixEvaluationByLearners;
- String dispatch;
-
- String sessionMapID;
-
- Long deleteFileUuid;
+ boolean evalcomixEvaluationByTeachers;
- SessionMap sessionMap;
+ String evalcomixInstrumentFormAndViewUrl;
- @Override
- public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
- ActionErrors ac = new ActionErrors();
- ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
-
- return ac;
- }
-
- public String getSessionMapID() {
- return sessionMapID;
- }
+ FormFile onlineFile;
- public void setSessionMapID(String sessionMapID) {
- this.sessionMapID = sessionMapID;
- }
+ FormFile offlineFile;
- public String getCurrentTab() {
- return currentTab;
- }
+ String currentTab;
- public void setCurrentTab(String currentTab) {
- this.currentTab = currentTab;
- }
+ String dispatch;
- public String getDispatch() {
- return dispatch;
- }
+ String sessionMapID;
- public void setDispatch(String dispatch) {
- this.dispatch = dispatch;
- }
+ Long deleteFileUuid;
- public String getInstructions() {
- return instructions;
- }
+ SessionMap sessionMap;
- public void setInstructions(String instructions) {
- this.instructions = instructions;
- }
+ @Override
+ public ActionErrors validate(ActionMapping arg0, HttpServletRequest arg1) {
+ ActionErrors ac = new ActionErrors();
+ ac.add(ActionMessages.GLOBAL_MESSAGE, new ActionMessage("this is an error"));
- public boolean isLockOnFinished() {
- return lockOnFinished;
- }
+ return ac;
+ }
- public void setLockOnFinished(boolean lockOnFinished) {
- this.lockOnFinished = lockOnFinished;
- }
+ public String getSessionMapID() {
+ return sessionMapID;
+ }
- public FormFile getOfflineFile() {
- return offlineFile;
- }
+ public void setSessionMapID(String sessionMapID) {
+ this.sessionMapID = sessionMapID;
+ }
- public void setOfflineFile(FormFile offlineFile) {
- this.offlineFile = offlineFile;
- }
+ public String getCurrentTab() {
+ return currentTab;
+ }
- public String getOfflineInstruction() {
- return offlineInstruction;
- }
+ public void setCurrentTab(String currentTab) {
+ this.currentTab = currentTab;
+ }
- public void setOfflineInstruction(String offlineInstruction) {
- this.offlineInstruction = offlineInstruction;
- }
+ public String getDispatch() {
+ return dispatch;
+ }
- public FormFile getOnlineFile() {
- return onlineFile;
- }
+ public void setDispatch(String dispatch) {
+ this.dispatch = dispatch;
+ }
- public void setOnlineFile(FormFile onlineFile) {
- this.onlineFile = onlineFile;
- }
-
- public String getOnlineInstruction() {
- return onlineInstruction;
- }
+ public String getInstructions() {
+ return instructions;
+ }
- public void setOnlineInstruction(String onlineInstruction) {
- this.onlineInstruction = onlineInstruction;
- }
-
- public String getTitle() {
- return title;
- }
+ public void setInstructions(String instructions) {
+ this.instructions = instructions;
+ }
- public void setTitle(String title) {
- this.title = title;
- }
+ public boolean isLockOnFinished() {
+ return lockOnFinished;
+ }
- public void setSessionMap(SessionMap sessionMap) {
- this.sessionMap = sessionMap;
- }
+ public void setLockOnFinished(boolean lockOnFinished) {
+ this.lockOnFinished = lockOnFinished;
+ }
- public SessionMap getSessionMap() {
- return sessionMap;
- }
+ public FormFile getOfflineFile() {
+ return offlineFile;
+ }
- public Long getDeleteFileUuid() {
- return deleteFileUuid;
- }
+ public void setOfflineFile(FormFile offlineFile) {
+ this.offlineFile = offlineFile;
+ }
- public void setDeleteFileUuid(Long deleteFile) {
- this.deleteFileUuid = deleteFile;
- }
+ public String getOfflineInstruction() {
+ return offlineInstruction;
+ }
- public boolean isAllowRichEditor() {
- return allowRichEditor;
- }
+ public void setOfflineInstruction(String offlineInstruction) {
+ this.offlineInstruction = offlineInstruction;
+ }
- public void setAllowRichEditor(boolean allowRichEditor) {
- this.allowRichEditor = allowRichEditor;
- }
+ public FormFile getOnlineFile() {
+ return onlineFile;
+ }
- public String getEvalcomixInstrumentFormAndViewUrl() {
- return evalcomixInstrumentFormAndViewUrl;
- }
+ public void setOnlineFile(FormFile onlineFile) {
+ this.onlineFile = onlineFile;
+ }
- public void setEvalcomixInstrumentFormAndViewUrl(
- String evalcomixInstrumentFormAndViewUrl) {
- this.evalcomixInstrumentFormAndViewUrl = evalcomixInstrumentFormAndViewUrl;
- }
+ public String getOnlineInstruction() {
+ return onlineInstruction;
+ }
- public boolean isEvalcomixEvaluationByLearners() {
- return evalcomixEvaluationByLearners;
- }
+ public void setOnlineInstruction(String onlineInstruction) {
+ this.onlineInstruction = onlineInstruction;
+ }
- public void setEvalcomixEvaluationByLearners(
- boolean evalcomixEvaluationByLearners) {
- this.evalcomixEvaluationByLearners = evalcomixEvaluationByLearners;
- }
+ public String getTitle() {
+ return title;
+ }
- public boolean isEvalcomixEvaluationByTeachers() {
- return evalcomixEvaluationByTeachers;
- }
+ public void setTitle(String title) {
+ this.title = title;
+ }
- public void setEvalcomixEvaluationByTeachers(
- boolean evalcomixEvaluationByTeachers) {
- this.evalcomixEvaluationByTeachers = evalcomixEvaluationByTeachers;
- }
+ public void setSessionMap(SessionMap sessionMap) {
+ this.sessionMap = sessionMap;
+ }
+ public SessionMap getSessionMap() {
+ return sessionMap;
+ }
+
+ public Long getDeleteFileUuid() {
+ return deleteFileUuid;
+ }
+
+ public void setDeleteFileUuid(Long deleteFile) {
+ this.deleteFileUuid = deleteFile;
+ }
+
+ public boolean isAllowRichEditor() {
+ return allowRichEditor;
+ }
+
+ public void setAllowRichEditor(boolean allowRichEditor) {
+ this.allowRichEditor = allowRichEditor;
+ }
+
+ public String getEvalcomixInstrumentFormAndViewUrl() {
+ return evalcomixInstrumentFormAndViewUrl;
+ }
+
+ public void setEvalcomixInstrumentFormAndViewUrl(String evalcomixInstrumentFormAndViewUrl) {
+ this.evalcomixInstrumentFormAndViewUrl = evalcomixInstrumentFormAndViewUrl;
+ }
+
+ public boolean isEvalcomixEvaluationByLearners() {
+ return evalcomixEvaluationByLearners;
+ }
+
+ public void setEvalcomixEvaluationByLearners(boolean evalcomixEvaluationByLearners) {
+ this.evalcomixEvaluationByLearners = evalcomixEvaluationByLearners;
+ }
+
+ public boolean isEvalcomixEvaluationByTeachers() {
+ return evalcomixEvaluationByTeachers;
+ }
+
+ public void setEvalcomixEvaluationByTeachers(boolean evalcomixEvaluationByTeachers) {
+ this.evalcomixEvaluationByTeachers = evalcomixEvaluationByTeachers;
+ }
+
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/LearningForm.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/LearningForm.java (.../LearningForm.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/LearningForm.java (.../LearningForm.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -35,62 +35,62 @@
*/
public class LearningForm extends ActionForm {
- private static final long serialVersionUID = -4728946254882237144L;
-
- String title;
- String instructions;
-
- String dispatch;
- Long toolSessionID;
- String mode;
-
- String entryText;
+ private static final long serialVersionUID = -4728946254882237144L;
- public String getMode() {
- return mode;
- }
+ String title;
+ String instructions;
- public void setMode(String mode) {
- this.mode = mode;
- }
+ String dispatch;
+ Long toolSessionID;
+ String mode;
- public String getDispatch() {
- return dispatch;
- }
+ String entryText;
- public void setDispatch(String dispatch) {
- this.dispatch = dispatch;
- }
+ public String getMode() {
+ return mode;
+ }
- public Long getToolSessionID() {
- return toolSessionID;
- }
+ public void setMode(String mode) {
+ this.mode = mode;
+ }
- public void setToolSessionID(Long toolSessionID) {
- this.toolSessionID = toolSessionID;
- }
+ public String getDispatch() {
+ return dispatch;
+ }
- public String getInstructions() {
- return instructions;
- }
+ public void setDispatch(String dispatch) {
+ this.dispatch = dispatch;
+ }
- public void setInstructions(String instructions) {
- this.instructions = instructions;
- }
+ public Long getToolSessionID() {
+ return toolSessionID;
+ }
- public String getTitle() {
- return title;
- }
+ public void setToolSessionID(Long toolSessionID) {
+ this.toolSessionID = toolSessionID;
+ }
- public void setTitle(String title) {
- this.title = title;
- }
+ public String getInstructions() {
+ return instructions;
+ }
- public String getEntryText() {
- return entryText;
- }
+ public void setInstructions(String instructions) {
+ this.instructions = instructions;
+ }
- public void setEntryText(String entryText) {
- this.entryText = entryText;
- }
+ public String getTitle() {
+ return title;
+ }
+
+ public void setTitle(String title) {
+ this.title = title;
+ }
+
+ public String getEntryText() {
+ return entryText;
+ }
+
+ public void setEntryText(String entryText) {
+ this.entryText = entryText;
+ }
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/MonitoringForm.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/forms/MonitoringForm.java (.../MonitoringForm.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -32,52 +32,63 @@
*/
public class MonitoringForm extends ActionForm {
- private static final long serialVersionUID = 9096908688391850595L;
-
- String dispatch;
- boolean teacherVisible;
- Long toolSessionID;
-
- // editing message page.
- Long messageUID;
- String messageBody;
- boolean messageHidden;
-
- public String getMessageBody() {
- return messageBody;
- }
- public void setMessageBody(String messageBody) {
- this.messageBody = messageBody;
- }
- public Long getMessageUID() {
- return messageUID;
- }
- public void setMessageUID(Long messageUID) {
- this.messageUID = messageUID;
- }
- public String getDispatch() {
- return dispatch;
- }
- public void setDispatch(String dispatch) {
- this.dispatch = dispatch;
- }
- public Long getToolSessionID() {
- return toolSessionID;
- }
- public void setToolSessionID(Long toolSessionID) {
- this.toolSessionID = toolSessionID;
- }
- public boolean isTeacherVisible() {
- return teacherVisible;
- }
- public void setTeacherVisible(boolean visible) {
- this.teacherVisible = visible;
- }
- public boolean isMessageHidden() {
- return messageHidden;
- }
- public void setMessageHidden(boolean messageHidden) {
- this.messageHidden = messageHidden;
- }
+ private static final long serialVersionUID = 9096908688391850595L;
+ String dispatch;
+ boolean teacherVisible;
+ Long toolSessionID;
+
+ // editing message page.
+ Long messageUID;
+ String messageBody;
+ boolean messageHidden;
+
+ public String getMessageBody() {
+ return messageBody;
+ }
+
+ public void setMessageBody(String messageBody) {
+ this.messageBody = messageBody;
+ }
+
+ public Long getMessageUID() {
+ return messageUID;
+ }
+
+ public void setMessageUID(Long messageUID) {
+ this.messageUID = messageUID;
+ }
+
+ public String getDispatch() {
+ return dispatch;
+ }
+
+ public void setDispatch(String dispatch) {
+ this.dispatch = dispatch;
+ }
+
+ public Long getToolSessionID() {
+ return toolSessionID;
+ }
+
+ public void setToolSessionID(Long toolSessionID) {
+ this.toolSessionID = toolSessionID;
+ }
+
+ public boolean isTeacherVisible() {
+ return teacherVisible;
+ }
+
+ public void setTeacherVisible(boolean visible) {
+ this.teacherVisible = visible;
+ }
+
+ public boolean isMessageHidden() {
+ return messageHidden;
+ }
+
+ public void setMessageHidden(boolean messageHidden) {
+ this.messageHidden = messageHidden;
+ }
+
}
Index: tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java
===================================================================
diff -u -r368d06879c2737658c7d8e7a45d1476a0742d366 -r08c312af0856bca0a580ddc8494c34bb5bbc4624
--- tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 368d06879c2737658c7d8e7a45d1476a0742d366)
+++ tool_adapters/moodle/lams_tool_mdlforum/src/java/org/lamsfoundation/lams/tool/mdfrum/web/servlets/ExportServlet.java (.../ExportServlet.java) (revision 08c312af0856bca0a580ddc8494c34bb5bbc4624)
@@ -52,155 +52,143 @@
public class ExportServlet extends AbstractExportPortfolioServlet {
- private static final long serialVersionUID = -2829707715037631881L;
+ private static final long serialVersionUID = -2829707715037631881L;
- private static Logger logger = Logger.getLogger(ExportServlet.class);
+ private static Logger logger = Logger.getLogger(ExportServlet.class);
- private final String FILENAME = "mdlForum_main.html";
+ private final String FILENAME = "mdlForum_main.html";
- private IMdlForumService mdlForumService;
+ private IMdlForumService mdlForumService;
- protected String doExport(HttpServletRequest request,
- HttpServletResponse response, String directoryName, Cookie[] cookies) {
+ protected String doExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
+ Cookie[] cookies) {
- if (mdlForumService == null) {
- mdlForumService = MdlForumServiceProxy.getMdlForumService(getServletContext());
- }
+ if (mdlForumService == null) {
+ mdlForumService = MdlForumServiceProxy.getMdlForumService(getServletContext());
+ }
- try {
- if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
- request.getSession().setAttribute(AttributeNames.ATTR_MODE,
- ToolAccessMode.LEARNER);
- doLearnerExport(request, response, directoryName, cookies);
- } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER
- .toString())) {
- request.getSession().setAttribute(AttributeNames.ATTR_MODE,
- ToolAccessMode.TEACHER);
- doTeacherExport(request, response, directoryName, cookies);
- String basePath = request.getScheme() + "://" + request.getServerName()
- + ":" + request.getServerPort() + request.getContextPath();
- writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp",
- directoryName, FILENAME, cookies);
-
-
- }
- } catch (MdlForumException e) {
- logger.error("Cannot perform export for mdlForum tool.");
- }
- return FILENAME;
+ try {
+ if (StringUtils.equals(mode, ToolAccessMode.LEARNER.toString())) {
+ request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.LEARNER);
+ doLearnerExport(request, response, directoryName, cookies);
+ } else if (StringUtils.equals(mode, ToolAccessMode.TEACHER.toString())) {
+ request.getSession().setAttribute(AttributeNames.ATTR_MODE, ToolAccessMode.TEACHER);
+ doTeacherExport(request, response, directoryName, cookies);
+ String basePath = request.getScheme() + "://" + request.getServerName() + ":" + request.getServerPort()
+ + request.getContextPath();
+ writeResponseToFile(basePath + "/pages/export/exportPortfolio.jsp", directoryName, FILENAME, cookies);
+
+ }
+ } catch (MdlForumException e) {
+ logger.error("Cannot perform export for mdlForum tool.");
}
+ return FILENAME;
+ }
- protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName, Cookie[] cookies) {
- if (toolContentID == null && toolSessionID == null) {
- logger.error("Tool content Id or and session Id are null. Unable to activity title");
- } else {
- if (mdlForumService == null) {
- mdlForumService = MdlForumServiceProxy.getMdlForumService(getServletContext());
- }
+ protected String doOfflineExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
+ Cookie[] cookies) {
+ if (toolContentID == null && toolSessionID == null) {
+ logger.error("Tool content Id or and session Id are null. Unable to activity title");
+ } else {
+ if (mdlForumService == null) {
+ mdlForumService = MdlForumServiceProxy.getMdlForumService(getServletContext());
+ }
- MdlForum content = null;
- if ( toolContentID != null ) {
- content = mdlForumService.getMdlForumByContentId(toolContentID);
- } else {
- MdlForumSession session=mdlForumService.getSessionBySessionId(toolSessionID);
- if ( session != null )
- content = session.getMdlForum();
- }
- if ( content != null ) {
- //activityTitle = content.getTitle();
- }
- }
- return super.doOfflineExport(request, response, directoryName, cookies);
+ MdlForum content = null;
+ if (toolContentID != null) {
+ content = mdlForumService.getMdlForumByContentId(toolContentID);
+ } else {
+ MdlForumSession session = mdlForumService.getSessionBySessionId(toolSessionID);
+ if (session != null)
+ content = session.getMdlForum();
+ }
+ if (content != null) {
+ //activityTitle = content.getTitle();
+ }
}
-
- private void doLearnerExport(HttpServletRequest request,
- HttpServletResponse response, String directoryName, Cookie[] cookies)
- throws MdlForumException {
+ return super.doOfflineExport(request, response, directoryName, cookies);
+ }
- logger.debug("doExportLearner: toolContentID:" + toolSessionID);
+ private void doLearnerExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
+ Cookie[] cookies) throws MdlForumException {
- // check if toolSessionID available
- if (toolSessionID == null) {
- String error = "Tool Session ID is missing. Unable to continue";
- logger.error(error);
- throw new MdlForumException(error);
- }
+ logger.debug("doExportLearner: toolContentID:" + toolSessionID);
- MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionID);
+ // check if toolSessionID available
+ if (toolSessionID == null) {
+ String error = "Tool Session ID is missing. Unable to continue";
+ logger.error(error);
+ throw new MdlForumException(error);
+ }
- MdlForum mdlForum = mdlForumSession.getMdlForum();
+ MdlForumSession mdlForumSession = mdlForumService.getSessionBySessionId(toolSessionID);
- try{
- exportFileFromExternalServer(request, response,
- mdlForumSession.getExtSessionId(), mdlForum,
- directoryName + "/" + FILENAME);
- }
- catch (Exception e)
- {
- logger.error("Could not fetch export file from external servlet", e);
- throw new MdlForumException("Could not fetch export file from external servlet", e);
- }
+ MdlForum mdlForum = mdlForumSession.getMdlForum();
+
+ try {
+ exportFileFromExternalServer(request, response, mdlForumSession.getExtSessionId(), mdlForum, directoryName
+ + "/" + FILENAME);
+ } catch (Exception e) {
+ logger.error("Could not fetch export file from external servlet", e);
+ throw new MdlForumException("Could not fetch export file from external servlet", e);
}
+ }
- private void doTeacherExport(HttpServletRequest request,
- HttpServletResponse response, String directoryName, Cookie[] cookies)
- throws MdlForumException {
+ private void doTeacherExport(HttpServletRequest request, HttpServletResponse response, String directoryName,
+ Cookie[] cookies) throws MdlForumException {
- logger.debug("doExportTeacher: toolContentID:" + toolContentID);
+ logger.debug("doExportTeacher: toolContentID:" + toolContentID);
- // check if toolContentID available
- if (toolContentID == null) {
- String error = "Tool Content ID is missing. Unable to continue";
- logger.error(error);
- throw new MdlForumException(error);
- }
+ // check if toolContentID available
+ if (toolContentID == null) {
+ String error = "Tool Content ID is missing. Unable to continue";
+ logger.error(error);
+ throw new MdlForumException(error);
+ }
- MdlForum mdlForum = mdlForumService.getMdlForumByContentId(toolContentID);
- MdlForumDTO mdlForumDTO = new MdlForumDTO(mdlForum);
- request.getSession().setAttribute("mdlForumDTO", mdlForumDTO);
-
- Set