Index: lams_build/lib/lams/lams.jar =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e Binary files differ Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml (.../BasicToolVO.hbm.xml) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/BasicToolVO.hbm.xml (.../BasicToolVO.hbm.xml) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -78,40 +78,7 @@ - - - - - - - - @hibernate.property - column="moderation_url" - length="65535" - not-null="true" - - - - - - @hibernate.property - column="contribute_url" - length="65535" - not-null="true" - - Index: lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml (.../Tool.hbm.xml) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -277,36 +277,6 @@ - - @hibernate.property - column="moderation_url" - length="65535" - not-null="false" - - - - - - @hibernate.property - column="contribute_url" - length="65535" - not-null="false" - - - - contributionTypes) { - if (toolActivity != null) { - if (toolActivity.getTool().getSupportsModeration()) - contributionTypes.add(ContributionTypes.MODERATION); - if (toolActivity.getTool().getSupportsContribute()) - contributionTypes.add(ContributionTypes.CONTRIBUTION); - } } @Override Index: lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/src/java/org/lamsfoundation/lams/tool/BasicToolVO.java (.../BasicToolVO.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -64,12 +64,6 @@ /** persistent field */ private String monitorUrl; - - /** persistent field */ - private String contributeUrl; - - /** persistent field */ - private String moderationUrl; /** persistent field */ private String helpUrl; @@ -124,8 +118,6 @@ String exportPortfolioLearnerUrl, String exportPortfolioClassUrl, String monitorUrl, - String contributeUrl, - String moderationUrl, String helpUrl, long defaultToolContentId, String toolSignature, @@ -148,8 +140,6 @@ this.exportPortfolioLearnerUrl=exportPortfolioLearnerUrl; this.exportPortfolioClassUrl=exportPortfolioClassUrl; this.monitorUrl=monitorUrl; - this.contributeUrl=contributeUrl; - this.moderationUrl=moderationUrl; this.helpUrl = helpUrl; this.defaultToolContentId=defaultToolContentId; this.toolSignature=toolSignature; @@ -211,20 +201,6 @@ } /* (non-Javadoc) - * @see org.lamsfoundation.lams.tool.IToolVO#getContributeUrl() - */ - public String getContributeUrl() { - return contributeUrl; - } - - /* (non-Javadoc) - * @see org.lamsfoundation.lams.tool.IToolVO#setContributeUrl(java.lang.String) - */ - public void setContributeUrl(String contributeUrl) { - this.contributeUrl = contributeUrl; - } - - /* (non-Javadoc) * @see org.lamsfoundation.lams.tool.IToolVO#getHelpUrl() */ public String getHelpUrl() { @@ -356,17 +332,6 @@ } /* (non-Javadoc) - * @see org.lamsfoundation.lams.tool.IToolVO#getModerationUrl() - */ - public String getModerationUrl() { - return moderationUrl; - } - - public void setModerationUrl(String moderationUrl) { - this.moderationUrl = moderationUrl; - } - - /* (non-Javadoc) * @see org.lamsfoundation.lams.tool.IToolVO#getMonitorUrl() */ public String getMonitorUrl() { Index: lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (.../IToolVO.java) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/src/java/org/lamsfoundation/lams/tool/IToolVO.java (.../IToolVO.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -31,10 +31,6 @@ public abstract void setAuthorUrl(String authorUrl); - public abstract String getContributeUrl(); - - public abstract void setContributeUrl(String contributeUrl); - public abstract String getHelpUrl(); public abstract void setHelpUrl(String helpUrl); @@ -63,8 +59,6 @@ public abstract String getLearnerUrl(); - public abstract String getModerationUrl(); - public abstract String getMonitorUrl(); public abstract String getServiceName(); Index: lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/src/java/org/lamsfoundation/lams/tool/Tool.java (.../Tool.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -64,12 +64,6 @@ private String monitorUrl; /** persistent field */ - private String contributeUrl; - - /** persistent field */ - private String moderationUrl; - - /** persistent field */ private String pedagogicalPlannerUrl; /** persistent field */ @@ -148,8 +142,6 @@ this.learnerProgressUrl = learnerProgressUrl; this.authorUrl = authorUrl; this.monitorUrl = monitorUrl; - this.contributeUrl = contributeUrl; - this.moderationUrl = moderationUrl; this.exportPortfolioLearnerUrl = exportPortfolioLearnerUrl; this.exportPortfolioClassUrl = exportPortfolioClassUrl; @@ -226,14 +218,6 @@ this.learnerProgressUrl = learnerProgressUrl; } - /** - * Does this tool support contribute? Will be true if the contributeURL is not null/empty string. - */ - public boolean getSupportsContribute() { - String contributeURL = getContributeUrl(); - return contributeURL != null && contributeURL.trim().length() > 0; - } - public String getAuthorUrl() { return authorUrl; } @@ -242,14 +226,6 @@ this.authorUrl = authorUrl; } - /** - * Does this tool support moderation? Will be true if the moderateURL is not null/empty string. - */ - public boolean getSupportsModeration() { - String url = getModerationUrl(); - return url != null && url.trim().length() > 0; - } - public long getDefaultToolContentId() { return defaultToolContentId; } @@ -360,36 +336,6 @@ } /** - * @return Returns the contributeUrl. - */ - public String getContributeUrl() { - return contributeUrl; - } - - /** - * @param contributeUrl - * The contributUrl to set. - */ - public void setContributeUrl(String contributeUrl) { - this.contributeUrl = contributeUrl; - } - - /** - * @return Returns the moderationUrl. - */ - public String getModerationUrl() { - return moderationUrl; - } - - /** - * @param moderationUrl - * The moderationUrl to set. - */ - public void setModerationUrl(String moderationUrl) { - this.moderationUrl = moderationUrl; - } - - /** * @return Returns the monitorUrl. */ public String getMonitorUrl() { @@ -509,10 +455,9 @@ public IToolVO createBasicToolVO() { IToolVO vo = new BasicToolVO(toolId, supportsGrouping, learnerUrl, learnerPreviewUrl, learnerProgressUrl, - authorUrl, exportPortfolioLearnerUrl, exportPortfolioClassUrl, monitorUrl, contributeUrl, - moderationUrl, helpUrl, defaultToolContentId, toolSignature, toolDisplayName, description, serviceName, - createDateTime, groupingSupportTypeId, toolIdentifier, toolVersion, languageFile, supportsOutputs, - extLmsId); + authorUrl, exportPortfolioLearnerUrl, exportPortfolioClassUrl, monitorUrl, helpUrl, + defaultToolContentId, toolSignature, toolDisplayName, description, serviceName, createDateTime, + groupingSupportTypeId, toolIdentifier, toolVersion, languageFile, supportsOutputs, extLmsId); return vo; } Index: lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java =================================================================== diff -u -rc135649b64e98c9233da20bdcfb7689598116314 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java (.../AuthoringToolDTO.java) (revision c135649b64e98c9233da20bdcfb7689598116314) +++ lams_common/src/java/org/lamsfoundation/lams/tool/dto/AuthoringToolDTO.java (.../AuthoringToolDTO.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -62,8 +62,6 @@ this.toolContentID = new Long(tool.getDefaultToolContentId()); this.description = tool.getDescription(); this.toolDisplayName = tool.getToolDisplayName(); - this.supportsModeration = new Boolean(tool.getSupportsModeration()); - this.supportsContribute = new Boolean(tool.getSupportsContribute()); this.authoringURL = tool.getAuthorUrl(); this.helpURL = tool.getHelpUrl(); } Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsCoreToolService.java (.../ILamsCoreToolService.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -346,15 +346,6 @@ boolean isContentEdited(Activity activity); - /** - * Return the moderate url for monitoring. - * - * @param activity - * the requested activity - must be a a ToolActivity. System Activities don't support moderation. - * @return the tool access url with tool content id - */ - String getToolModerateURL(ToolActivity activity) throws LamsToolServiceException; - String getToolAuthorURL(Long lessonID, ToolActivity activity, ToolAccessMode mode); /** Index: lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java =================================================================== diff -u -r5b6e51b5d96619f619209830fdab0ed1ef572c05 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 5b6e51b5d96619f619209830fdab0ed1ef572c05) +++ lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsCoreToolService.java (.../LamsCoreToolService.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -585,14 +585,7 @@ @Override public String getToolContributionURL(Long lessonID, Activity activity) throws LamsToolServiceException { - - if (activity.isToolActivity()) { - ToolActivity toolActivity = (ToolActivity) activity; - String url = toolActivity.getTool().getContributeUrl(); - if (url != null) { - return setupToolURLWithToolContent(toolActivity, url); - } - } else if (activity.isSystemToolActivity()) { + if (activity.isSystemToolActivity()) { SystemTool sysTool = systemToolDAO.getSystemToolByActivityTypeId(activity.getActivityTypeId()); if (sysTool != null) { return setupURLWithActivityLessonID(activity, lessonID, sysTool.getContributeUrl()); @@ -602,19 +595,6 @@ } @Override - public String getToolModerateURL(ToolActivity activity) throws LamsToolServiceException { - - if (activity.isToolActivity()) { - ToolActivity toolActivity = activity; - String url = toolActivity.getTool().getModerationUrl(); - if (url != null) { - return setupToolURLWithToolContent(toolActivity, url); - } - } - return null; - } - - @Override public String getToolAuthorURL(Long lessonID, ToolActivity activity, ToolAccessMode mode) { String url = activity.getTool().getAuthorUrl(); url = WebUtil.appendParameterToURL(url, AttributeNames.PARAM_TOOL_CONTENT_ID, activity.getToolContentId() Index: lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java =================================================================== diff -u -rbf965a1a2768bdec78ccb7b0ff8f7b694580e02c -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision bf965a1a2768bdec78ccb7b0ff8f7b694580e02c) +++ lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/ContributeDTOFactory.java (.../ContributeDTOFactory.java) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -133,9 +133,7 @@ String url = null; if (activity.isToolActivity()) { ToolActivity toolActivity = (ToolActivity) activity; - if (contributionTypeEntry.equals(ContributionTypes.MODERATION)) { - url = toolService.getToolModerateURL(toolActivity); - } else if (contributionTypeEntry.equals(ContributionTypes.CONTENT_EDITED)) { + if (contributionTypeEntry.equals(ContributionTypes.CONTENT_EDITED)) { url = toolService.getToolAuthorURL(lessonID, toolActivity, ToolAccessMode.TEACHER); } } Index: lams_tool_assessment/db/sql/tool_insert.sql =================================================================== diff -u -r0e8805899410bfd0e2c8ec130cc6e5dde3c652a9 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_assessment/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 0e8805899410bfd0e2c8ec130cc6e5dde3c652a9) +++ lams_tool_assessment/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -52,8 +50,6 @@ 'tool/laasse10/definelater.do', 'tool/laasse10/exportPortfolio?mode=learner', 'tool/laasse10/exportPortfolio?mode=teacher', -'tool/laasse10/contribute.do', -'tool/laasse10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laasse10', 'org.lamsfoundation.lams.tool.assessment.ApplicationResources', NOW(), Index: lams_tool_bbb/db/sql/tool_insert.sql =================================================================== diff -u -rdf5534fd49894e3369fc98f8273d9e2fefbb4817 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_bbb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision df5534fd49894e3369fc98f8273d9e2fefbb4817) +++ lams_tool_bbb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, admin_url, language_file, @@ -50,8 +48,6 @@ 'tool/labbb10/authoring.do?mode=teacher', 'tool/labbb10/exportPortfolio?mode=learner', 'tool/labbb10/exportPortfolio?mode=teacher', -'tool/labbb10/contribute.do', -'tool/labbb10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/labbb10', 'tool/labbb10/admin/view.do', 'org.lamsfoundation.lams.tool.bbb.ApplicationResources', Index: lams_tool_chat/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_chat/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_chat/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lachat11/authoring.do?mode=teacher', 'tool/lachat11/exportPortfolio?mode=learner', 'tool/lachat11/exportPortfolio?mode=teacher', -'tool/lachat11/contribute.do', -'tool/lachat11/moderate.do', 'tool/lachat11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lachat11', 'org.lamsfoundation.lams.tool.chat.ApplicationResources', Index: lams_tool_daco/db/sql/tool_insert.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_daco/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_daco/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -52,8 +50,6 @@ 'tool/ladaco10/definelater.do', 'tool/ladaco10/exportPortfolio?mode=learner', 'tool/ladaco10/exportPortfolio?mode=teacher', -'tool/ladaco10/contribute.do', -'tool/ladaco10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/ladaco10', 'org.lamsfoundation.lams.tool.daco.ApplicationResources', NOW(), Index: lams_tool_eadventure/db/sql/tool_insert.sql =================================================================== diff -u -r7322054ababd8f5387c3424cdd38d99c3ab49e02 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_eadventure/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7322054ababd8f5387c3424cdd38d99c3ab49e02) +++ lams_tool_eadventure/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -53,8 +51,6 @@ 'tool/eueadv10/definelater.do', 'tool/eueadv10/exportPortfolio?mode=learner', 'tool/eueadv10/exportPortfolio?mode=teacher', -'tool/eueadv10/contribute.do', -'tool/eueadv10/moderate.do', 'tool/eueadv10/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/eueadv10', 'org.eucm.lams.tool.eadventure.ApplicationResources', Index: lams_tool_forum/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_forum/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lafrum11/defineLater.do', 'tool/lafrum11/exportPortfolio?mode=learner', 'tool/lafrum11/exportPortfolio?mode=teacher', -'tool/lafrum11/contribute.do', -'tool/lafrum11/moderate.do', 'tool/lafrum11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lafrum11', 'org.lamsfoundation.lams.tool.forum.ApplicationResources', Index: lams_tool_gmap/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_gmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_gmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -50,8 +48,6 @@ 'tool/lagmap10/authoring.do?mode=teacher', 'tool/lagmap10/exportPortfolio?mode=learner', 'tool/lagmap10/exportPortfolio?mode=teacher', -'tool/lagmap10/contribute.do', -'tool/lagmap10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lagmap10', 'org.lamsfoundation.lams.tool.gmap.ApplicationResources', NOW(), Index: lams_tool_images/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_images/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_images/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -53,8 +51,6 @@ 'tool/laimag10/definelater.do', 'tool/laimag10/exportPortfolio?mode=learner', 'tool/laimag10/exportPortfolio?mode=teacher', -'tool/laimag10/contribute.do', -'tool/laimag10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laimag10', 'org.lamsfoundation.lams.tool.imageGallery.ApplicationResources', NOW(), Index: lams_tool_imscc/db/sql/tool_insert.sql =================================================================== diff -u -r7f68f72a3d80b8e24ba596d34ccea104ca285d05 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_imscc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7f68f72a3d80b8e24ba596d34ccea104ca285d05) +++ lams_tool_imscc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -53,8 +51,6 @@ 'tool/laimsc11/definelater.do', 'tool/laimsc11/exportPortfolio?mode=learner', 'tool/laimsc11/exportPortfolio?mode=teacher', -'tool/laimsc11/contribute.do', -'tool/laimsc11/moderate.do', 'tool/laimsc11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laimsc11', 'org.lamsfoundation.lams.tool.commonCartridge.ApplicationResources', Index: lams_tool_kaltura/db/sql/tool_insert.sql =================================================================== diff -u -r5fd453ea4cb0fa72cb94a5706e75f68a319de46b -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_kaltura/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 5fd453ea4cb0fa72cb94a5706e75f68a319de46b) +++ lams_tool_kaltura/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lakalt11/authoring.do?mode=teacher', 'tool/lakalt11/exportPortfolio?mode=learner', 'tool/lakalt11/exportPortfolio?mode=teacher', -'tool/lakalt11/contribute.do', -'tool/lakalt11/moderate.do', 'tool/lakalt11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lakalt11', 'org.lamsfoundation.lams.tool.kaltura.ApplicationResources', Index: lams_tool_lamc/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_lamc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lamc11/defineLaterStarter.do', 'tool/lamc11/exportPortfolio?mode=learner', 'tool/lamc11/exportPortfolio?mode=teacher', -'tool/lamc11/monitoringStarter.do', -'tool/lamc11/monitoringStarter.do', 'tool/lamc11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lamc11', 'org.lamsfoundation.lams.tool.mc.ApplicationResources', Index: lams_tool_laqa/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_laqa/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -42,8 +42,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -73,8 +71,6 @@ 'tool/laqa11/defineLaterStarter.do', 'tool/laqa11/exportPortfolio?mode=learner', 'tool/laqa11/exportPortfolio?mode=teacher', -'tool/laqa11/monitoringStarter.do', -'tool/laqa11/monitoringStarter.do', 'tool/laqa11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/laqa11', 'org.lamsfoundation.lams.tool.qa.ApplicationResources', Index: lams_tool_larsrc/db/sql/tool_insert.sql =================================================================== diff -u -r1dc15c329f1868b8e3091b662405f4ea3ceb7ea2 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_larsrc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 1dc15c329f1868b8e3091b662405f4ea3ceb7ea2) +++ lams_tool_larsrc/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -52,8 +50,6 @@ 'tool/larsrc11/definelater.do', 'tool/larsrc11/exportPortfolio?mode=learner', 'tool/larsrc11/exportPortfolio?mode=teacher', -'tool/larsrc11/contribute.do', -'tool/larsrc11/moderate.do', 'tool/larsrc11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/larsrc11', 'org.lamsfoundation.lams.tool.rsrc.ApplicationResources', Index: lams_tool_leader/db/sql/tool_insert.sql =================================================================== diff -u -r17ddd3aac11d9fecc83159a9c829e989754accfb -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_leader/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 17ddd3aac11d9fecc83159a9c829e989754accfb) +++ lams_tool_leader/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -50,8 +48,6 @@ 'tool/lalead11/authoring.do?mode=teacher', 'tool/lalead11/exportPortfolio?mode=learner', 'tool/lalead11/exportPortfolio?mode=teacher', -'tool/lalead11/contribute.do', -'tool/lalead11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lalead11', 'org.lamsfoundation.lams.tool.leaderselection.ApplicationResources', NOW(), Index: lams_tool_mindmap/db/sql/tool_insert.sql =================================================================== diff -u -r26ce6de9fba8494203a85a4ce076b6ffea4238ed -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_mindmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 26ce6de9fba8494203a85a4ce076b6ffea4238ed) +++ lams_tool_mindmap/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lamind10/authoring.do?mode=teacher', 'tool/lamind10/exportPortfolio?mode=learner', 'tool/lamind10/exportPortfolio?mode=teacher', -'tool/lamind10/contribute.do', -'tool/lamind10/moderate.do', 'tool/lamind10/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lamind10', 'org.lamsfoundation.lams.tool.mindmap.ApplicationResources', Index: lams_tool_nb/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_nb/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -50,8 +48,6 @@ 'tool/lanb11/authoring.do?defineLater=true', 'tool/lanb11/portfolioExport?mode=learner', 'tool/lanb11/portfolioExport?mode=teacher', -NULL, -NULL, 'tool/lanb11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lanb11', 'org.lamsfoundation.lams.tool.noticeboard.ApplicationResources', Index: lams_tool_notebook/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_notebook/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_notebook/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lantbk11/authoring.do?mode=teacher', 'tool/lantbk11/exportPortfolio?mode=learner', 'tool/lantbk11/exportPortfolio?mode=teacher', -'tool/lantbk11/contribute.do', -'tool/lantbk11/moderate.do', 'tool/lantbk11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lantbk11', 'org.lamsfoundation.lams.tool.notebook.ApplicationResources', Index: lams_tool_pixlr/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_pixlr/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_pixlr/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -51,8 +49,6 @@ 'tool/lapixl10/authoring.do?mode=teacher', 'tool/lapixl10/exportPortfolio?mode=learner', 'tool/lapixl10/exportPortfolio?mode=teacher', -'tool/lapixl10/contribute.do', -'tool/lapixl10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lapixl10', 'org.lamsfoundation.lams.tool.pixlr.ApplicationResources', NOW(), Index: lams_tool_sbmt/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_sbmt/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -50,8 +48,6 @@ 'tool/lasbmt11/definelater.do?mode=teacher', 'tool/lasbmt11/exportPortfolio?mode=learner', 'tool/lasbmt11/exportPortfolio?mode=teacher', -'tool/lasbmt11/contribute.do', -'tool/lasbmt11/moderation.do', 'tool/lasbmt11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasbmt11', 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources', Index: lams_tool_scratchie/db/sql/tool_insert.sql =================================================================== diff -u -r7f8e34f36196eb71f16ec1984091704d36682166 -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_scratchie/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 7f8e34f36196eb71f16ec1984091704d36682166) +++ lams_tool_scratchie/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -53,8 +51,6 @@ 'tool/lascrt11/definelater.do', 'tool/lascrt11/exportPortfolio?mode=learner', 'tool/lascrt11/exportPortfolio?mode=teacher', -'tool/lascrt11/contribute.do', -'tool/lascrt11/moderate.do', 'tool/lascrt11/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lascrt11', 'org.lamsfoundation.lams.tool.scratchie.ApplicationResources', Index: lams_tool_scribe/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_scribe/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_scribe/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -50,8 +48,6 @@ 'tool/lascrb11/authoring.do?mode=teacher', 'tool/lascrb11/exportPortfolio?mode=learner', 'tool/lascrb11/exportPortfolio?mode=teacher', -'tool/lascrb11/contribute.do', -'tool/lascrb11/moderate.do', 'tool/lascrb11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lascrb11', 'org.lamsfoundation.lams.tool.scribe.ApplicationResources', Index: lams_tool_spreadsheet/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_spreadsheet/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_spreadsheet/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -51,8 +49,6 @@ 'tool/lasprd10/definelater.do', 'tool/lasprd10/exportPortfolio?mode=learner', 'tool/lasprd10/exportPortfolio?mode=teacher', -'tool/lasprd10/contribute.do', -'tool/lasprd10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasprd10', 'org.lamsfoundation.lams.tool.spreadsheet.ApplicationResources', NOW(), Index: lams_tool_survey/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_survey/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_survey/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -52,8 +50,6 @@ 'tool/lasurv11/definelater.do', 'tool/lasurv11/exportPortfolio?mode=learner', 'tool/lasurv11/exportPortfolio?mode=teacher', -'tool/lasurv11/contribute.do', -'tool/lasurv11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasurv11', 'org.lamsfoundation.lams.tool.survey.ApplicationResources', NOW(), Index: lams_tool_task/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_task/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_task/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -23,8 +23,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -53,8 +51,6 @@ 'tool/latask10/definelater.do', 'tool/latask10/exportPortfolio?mode=learner', 'tool/latask10/exportPortfolio?mode=teacher', -'tool/latask10/contribute.do', -'tool/latask10/moderate.do', 'tool/latask10/authoring/initPedagogicalPlannerForm.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/latask10', 'org.lamsfoundation.lams.tool.taskList.ApplicationResources', Index: lams_tool_videorecorder/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_videorecorder/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_videorecorder/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -50,8 +48,6 @@ 'tool/lavidr10/authoring.do?mode=teacher', 'tool/lavidr10/exportPortfolio?mode=learner', 'tool/lavidr10/exportPortfolio?mode=teacher', -'tool/lavidr10/contribute.do', -'tool/lavidr10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavidr10', 'org.lamsfoundation.lams.tool.videoRecorder.ApplicationResources', NOW(), Index: lams_tool_vote/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_vote/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_vote/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -42,8 +42,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -72,8 +70,6 @@ 'tool/lavote11/defineLaterStarter.do', 'tool/lavote11/exportPortfolio?mode=learner', 'tool/lavote11/exportPortfolio?mode=teacher', -'tool/lavote11/monitoringStarter.do', -'tool/lavote11/monitoringStarter.do', 'tool/lavote11/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavote11', 'org.lamsfoundation.lams.tool.vote.ApplicationResources', Index: lams_tool_wiki/db/sql/tool_insert.sql =================================================================== diff -u -r126d84999e520648cb187e465cb4aaa3baad222e -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_wiki/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 126d84999e520648cb187e465cb4aaa3baad222e) +++ lams_tool_wiki/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, pedagogical_planner_url, help_url, language_file, @@ -51,8 +49,6 @@ 'tool/lawiki10/authoring.do?mode=teacher', 'tool/lawiki10/exportPortfolio?mode=learner', 'tool/lawiki10/exportPortfolio?mode=teacher', -'tool/lawiki10/contribute.do', -'tool/lawiki10/moderate.do', 'tool/lawiki10/pedagogicalPlanner.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lawiki10', 'org.lamsfoundation.lams.tool.wiki.ApplicationResources', Index: lams_tool_wookie/db/sql/tool_insert.sql =================================================================== diff -u -re81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a -r279ab8b6c6d02f80bb949e44011343f6c7150f6e --- lams_tool_wookie/db/sql/tool_insert.sql (.../tool_insert.sql) (revision e81fdf5aa1e9c04fd0b7a624d8b8419b13cac81a) +++ lams_tool_wookie/db/sql/tool_insert.sql (.../tool_insert.sql) (revision 279ab8b6c6d02f80bb949e44011343f6c7150f6e) @@ -21,8 +21,6 @@ define_later_url, export_pfolio_learner_url, export_pfolio_class_url, -contribute_url, -moderation_url, help_url, language_file, create_date_time, @@ -51,8 +49,6 @@ 'tool/lawook10/authoring.do?mode=teacher', 'tool/lawook10/exportPortfolio?mode=learner', 'tool/lawook10/exportPortfolio?mode=teacher', -'tool/lawook10/contribute.do', -'tool/lawook10/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lawook10', 'org.lamsfoundation.lams.tool.wookie.ApplicationResources', NOW(),