Fisheye: Tag cf892946d1a342e2f00d5e38a67a4251650ac758 refers to a dead (removed) revision in file `lams_tool_zoom/conf/hibernate/mappings/org/lamsfoundation/lams/tool/zoom/model/ZoomConfig.hbm.xml'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_zoom/db/sql/create_lams_tool_zoom.sql =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcf892946d1a342e2f00d5e38a67a4251650ac758 --- lams_tool_zoom/db/sql/create_lams_tool_zoom.sql (.../create_lams_tool_zoom.sql) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/db/sql/create_lams_tool_zoom.sql (.../create_lams_tool_zoom.sql) (revision cf892946d1a342e2f00d5e38a67a4251650ac758) @@ -46,13 +46,6 @@ FOREIGN KEY (zoom_session_uid) REFERENCES tl_lazoom10_session (uid) ON DELETE CASCADE ON UPDATE CASCADE ); -CREATE TABLE tl_lazoom10_config ( - uid bigint(20) NOT NULL AUTO_INCREMENT, - config_key varchar(255), - config_value varchar(255), - PRIMARY KEY (uid) -); - CREATE TABLE tl_lazoom10_api ( uid bigint(20) NOT NULL AUTO_INCREMENT, email varchar(64), Fisheye: Tag cf892946d1a342e2f00d5e38a67a4251650ac758 refers to a dead (removed) revision in file `lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/dto/ConfigDTO.java'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag cf892946d1a342e2f00d5e38a67a4251650ac758 refers to a dead (removed) revision in file `lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/model/ZoomConfig.java'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java =================================================================== diff -u -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 -rcf892946d1a342e2f00d5e38a67a4251650ac758 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java (.../IZoomService.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/IZoomService.java (.../IZoomService.java) (revision cf892946d1a342e2f00d5e38a67a4251650ac758) @@ -28,7 +28,6 @@ import org.apache.tomcat.util.json.JSONException; import org.lamsfoundation.lams.notebook.model.NotebookEntry; import org.lamsfoundation.lams.tool.zoom.model.Zoom; -import org.lamsfoundation.lams.tool.zoom.model.ZoomConfig; import org.lamsfoundation.lams.tool.zoom.model.ZoomSession; import org.lamsfoundation.lams.tool.zoom.model.ZoomUser; import org.lamsfoundation.lams.usermanagement.dto.UserDTO; @@ -122,58 +121,14 @@ */ public ZoomUser createZoomUser(UserDTO user, ZoomSession zoomSession); - /** - * - * @param id - * @param idType - * @param signature - * @param userID - * @param title - * @param entry - * @return - */ Long createNotebookEntry(Long id, Integer idType, String signature, Integer userID, String entry); - /** - * - * @param uid - * @return - */ NotebookEntry getNotebookEntry(Long uid); - /** - * - * @param notebookEntry - */ void updateNotebookEntry(NotebookEntry notebookEntry); - /** - * - * @param uid - * @param title - * @param entry - */ void updateNotebookEntry(Long uid, String entry); - /** - * - * @param key - */ - ZoomConfig getConfig(String key); - - /** - * - * @param key - */ - String getConfigValue(String key); - - /** - * - * @param key - * @param value - */ - void saveOrUpdateConfigEntry(ZoomConfig zoomConfig); - boolean chooseApiKeys(Long zoomUid); String createMeeting(Long zoomUid) throws IOException, JSONException; Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java =================================================================== diff -u -r1db671237e173c5f999e0bbb6c50e5af0cf7c132 -rcf892946d1a342e2f00d5e38a67a4251650ac758 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision 1db671237e173c5f999e0bbb6c50e5af0cf7c132) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/service/ZoomService.java (.../ZoomService.java) (revision cf892946d1a342e2f00d5e38a67a4251650ac758) @@ -71,7 +71,6 @@ import org.lamsfoundation.lams.tool.zoom.dto.ZoomUserDTO; import org.lamsfoundation.lams.tool.zoom.model.Zoom; import org.lamsfoundation.lams.tool.zoom.model.ZoomApi; -import org.lamsfoundation.lams.tool.zoom.model.ZoomConfig; import org.lamsfoundation.lams.tool.zoom.model.ZoomSession; import org.lamsfoundation.lams.tool.zoom.model.ZoomUser; import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants; @@ -510,33 +509,6 @@ return zoomUser; } - @Override - @SuppressWarnings("unchecked") - public ZoomConfig getConfig(String key) { - List list = zoomConfigDAO.findByProperty(ZoomConfig.class, "key", key); - if (list.isEmpty()) { - return null; - } else { - return list.get(0); - } - } - - @Override - @SuppressWarnings("unchecked") - public String getConfigValue(String key) { - List list = zoomConfigDAO.findByProperty(ZoomConfig.class, "key", key); - if (list.isEmpty()) { - return null; - } else { - return list.get(0).getValue(); - } - } - - @Override - public void saveOrUpdateConfigEntry(ZoomConfig zoomConfig) { - zoomConfigDAO.insertOrUpdate(zoomConfig); - } - /** * Set the description, throws away the title value as this is not supported in 2.0 */ Index: lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java =================================================================== diff -u -r2cf1e086b82a29fae22136351fc7a44821181323 -rcf892946d1a342e2f00d5e38a67a4251650ac758 --- lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java (.../AdminAction.java) (revision 2cf1e086b82a29fae22136351fc7a44821181323) +++ lams_tool_zoom/src/java/org/lamsfoundation/lams/tool/zoom/web/actions/AdminAction.java (.../AdminAction.java) (revision cf892946d1a342e2f00d5e38a67a4251650ac758) @@ -31,26 +31,11 @@ import org.apache.struts.action.ActionMapping; import org.apache.struts.actions.MappingDispatchAction; import org.lamsfoundation.lams.tool.zoom.dto.ConfigDTO; -import org.lamsfoundation.lams.tool.zoom.model.ZoomConfig; import org.lamsfoundation.lams.tool.zoom.service.IZoomService; import org.lamsfoundation.lams.tool.zoom.service.ZoomServiceProxy; import org.lamsfoundation.lams.tool.zoom.util.ZoomConstants; import org.lamsfoundation.lams.tool.zoom.web.forms.AdminForm; -/** - * - * - * - * - * - * - * - * - * - * - * @author Ernie Ghiglione - * - */ public class AdminAction extends MappingDispatchAction { private IZoomService zoomService; @@ -76,37 +61,14 @@ return mapping.findForward("view-success"); } - public ActionForward edit(ActionMapping mapping, ActionForm form, HttpServletRequest request, - HttpServletResponse response) { - - AdminForm adminForm = (AdminForm) form; - - return mapping.findForward("edit-success"); - } - public ActionForward save(ActionMapping mapping, ActionForm form, HttpServletRequest request, HttpServletResponse response) throws Exception { if (!isCancelled(request)) { - AdminForm adminForm = (AdminForm) form; } return mapping.findForward("save-success"); } - - private void updateConfig(String key, String value) { - - ZoomConfig config = zoomService.getConfig(key); - - if (config == null) { - config = new ZoomConfig(key, value); - } else { - config.setValue(value); - } - - zoomService.saveOrUpdateConfigEntry(config); - } - -} +} \ No newline at end of file Fisheye: Tag cf892946d1a342e2f00d5e38a67a4251650ac758 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/admin/edit.jsp'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag cf892946d1a342e2f00d5e38a67a4251650ac758 refers to a dead (removed) revision in file `lams_tool_zoom/web/pages/zoom/end_meeting.jsp'. Fisheye: No comparison available. Pass `N' to diff?