Index: lams_tool_dimdim/.classpath =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r05ca07ef40c870800a42b5f700f667509cde1993 --- lams_tool_dimdim/.classpath (.../.classpath) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_dimdim/.classpath (.../.classpath) (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -2,7 +2,6 @@ - @@ -11,5 +10,6 @@ + Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/AuthoringController.java =================================================================== diff -u --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/AuthoringController.java (revision 0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/AuthoringController.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,37 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +/* $Id: AuthoringAction.java,v 1.12 2016/12/07 13:47:24 marcin Exp $ */ + +package org.lamsfoundation.lams.tool.dimdim.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/authoring") +public class AuthoringController { + @RequestMapping("") + public String execute() throws Exception { + return "index"; + } +} \ No newline at end of file Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java =================================================================== diff -u --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java (revision 0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/LearningController.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,60 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +/* $Id: LearningAction.java,v 1.18 2016/12/07 13:47:24 marcin Exp $ */ + +package org.lamsfoundation.lams.tool.dimdim.web.controller; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.lamsfoundation.lams.learning.service.ILearnerService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +@Controller +@RequestMapping("/learning") +public class LearningController { + + @Autowired + private WebApplicationContext applicationContext; + + @RequestMapping("") + public String execute(HttpServletRequest request) { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + + WebApplicationContext wac = WebApplicationContextUtils + .getRequiredWebApplicationContext(applicationContext.getServletContext()); + ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService"); + String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return "index"; + } +} \ No newline at end of file Index: lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/MonitoringController.java =================================================================== diff -u --- lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/MonitoringController.java (revision 0) +++ lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/controller/MonitoringController.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,41 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +/* $Id: MonitoringAction.java,v 1.16 2016/12/07 13:47:24 marcin Exp $ */ + +package org.lamsfoundation.lams.tool.dimdim.web.controller; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/monitoring") +public class MonitoringController { + @RequestMapping("") + public String execute() throws IOException, ServletException { + return "index"; + } +} \ No newline at end of file Index: lams_tool_dimdim/web/WEB-INF/spring-servlet.xml =================================================================== diff -u --- lams_tool_dimdim/web/WEB-INF/spring-servlet.xml (revision 0) +++ lams_tool_dimdim/web/WEB-INF/spring-servlet.xml (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_dimdim/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_dimdim/web/WEB-INF/web.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r05ca07ef40c870800a42b5f700f667509cde1993 --- lams_tool_dimdim/web/WEB-INF/web.xml (.../web.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_dimdim/web/WEB-INF/web.xml (.../web.xml) (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -35,25 +35,16 @@ /* - - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - + < + spring + + org.springframework.web.servlet.DispatcherServlet + + 1 - + - action + spring *.do Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_dimdim/web/index.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_dimdim/web/index.jsp =================================================================== diff -u --- lams_tool_dimdim/web/index.jsp (revision 0) +++ lams_tool_dimdim/web/index.jsp (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file Index: lams_tool_eadventure/.classpath =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r05ca07ef40c870800a42b5f700f667509cde1993 --- lams_tool_eadventure/.classpath (.../.classpath) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_eadventure/.classpath (.../.classpath) (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -7,7 +7,6 @@ - @@ -27,5 +26,6 @@ + Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/AuthoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/MonitoringAction.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/AuthoringConroller.java =================================================================== diff -u --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/AuthoringConroller.java (revision 0) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/AuthoringConroller.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,36 @@ +/**************************************************************** + * 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 + * **************************************************************** + */ +/* $$Id$$ */ +package org.eucm.lams.tool.eadventure.web.controller; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("authoring") +public class AuthoringConroller { + @RequestMapping("/start") + public String execute() throws Exception { + return "index"; + } +} \ No newline at end of file Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java =================================================================== diff -u --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java (revision 0) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/LearningController.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,60 @@ +/**************************************************************** + * 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 version 2.0 + * 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 + * **************************************************************** + */ + +/* $Id$ */ +package org.eucm.lams.tool.eadventure.web.controller; + +import javax.servlet.http.HttpServletRequest; +import javax.servlet.http.HttpSession; + +import org.lamsfoundation.lams.learning.service.ILearnerService; +import org.lamsfoundation.lams.usermanagement.dto.UserDTO; +import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.session.SessionManager; +import org.lamsfoundation.lams.web.util.AttributeNames; +import org.springframework.beans.factory.annotation.Autowired; +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; +import org.springframework.web.context.WebApplicationContext; +import org.springframework.web.context.support.WebApplicationContextUtils; + +@Controller +@RequestMapping("/learning") +public class LearningController { + + @Autowired + private WebApplicationContext applicationContext; + + @RequestMapping("/start") + public String execute(HttpServletRequest request) { + HttpSession ss = SessionManager.getSession(); + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + long toolSessionId = WebUtil.readLongParam(request, AttributeNames.PARAM_TOOL_SESSION_ID); + + WebApplicationContext wac = WebApplicationContextUtils + .getRequiredWebApplicationContext(applicationContext.getServletContext()); + ILearnerService learnerService = (ILearnerService) wac.getBean("learnerService"); + String finishURL = learnerService.completeToolSession(toolSessionId, user.getUserID().longValue()); + return "index"; + } +} \ No newline at end of file Index: lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/MonitoringController.java =================================================================== diff -u --- lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/MonitoringController.java (revision 0) +++ lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/controller/MonitoringController.java (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,41 @@ +/**************************************************************** + * 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 version 2.0 + * 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 + * **************************************************************** + */ + +/* $Id$ */ +package org.eucm.lams.tool.eadventure.web.controller; + +import java.io.IOException; + +import javax.servlet.ServletException; + +import org.springframework.stereotype.Controller; +import org.springframework.web.bind.annotation.RequestMapping; + +@Controller +@RequestMapping("/monitoring") +public class MonitoringController { + @RequestMapping("/summary") + public String execute() throws IOException, ServletException { + return "index"; + } +} \ No newline at end of file Index: lams_tool_eadventure/web/WEB-INF/spring-servlet.xml =================================================================== diff -u --- lams_tool_eadventure/web/WEB-INF/spring-servlet.xml (revision 0) +++ lams_tool_eadventure/web/WEB-INF/spring-servlet.xml (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,17 @@ + + + + + + + + + + + \ No newline at end of file Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_eadventure/web/WEB-INF/struts-config.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_eadventure/web/WEB-INF/web.xml =================================================================== diff -u -r7475d08afc280b5e2e5ddf04e8bf35e3166aaf80 -r05ca07ef40c870800a42b5f700f667509cde1993 --- lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 7475d08afc280b5e2e5ddf04e8bf35e3166aaf80) +++ lams_tool_eadventure/web/WEB-INF/web.xml (.../web.xml) (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -36,24 +36,15 @@ - action - org.apache.struts.action.ActionServlet - - config - /WEB-INF/struts-config.xml - - - debug - 999 - - - detail - 1 - + spring + + org.springframework.web.servlet.DispatcherServlet + + 1 - action + spring *.do Fisheye: Tag 05ca07ef40c870800a42b5f700f667509cde1993 refers to a dead (removed) revision in file `lams_tool_eadventure/web/index.html'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_eadventure/web/index.jsp =================================================================== diff -u --- lams_tool_eadventure/web/index.jsp (revision 0) +++ lams_tool_eadventure/web/index.jsp (revision 05ca07ef40c870800a42b5f700f667509cde1993) @@ -0,0 +1,5 @@ + + + This tool is not supported anymore. + + \ No newline at end of file