Index: lams_tool_notebook/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/build.properties,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_notebook/build.properties 20 Jul 2006 01:11:09 -0000 1.1 +++ lams_tool_notebook/build.properties 12 Mar 2007 05:14:24 -0000 1.1.2.1 @@ -2,8 +2,19 @@ # project-wide properties signature=lantbk11 +#project version +tool.version=20070227 + package=org/lamsfoundation/lams/tool/notebook package.name=org.lamsfoundation.lams.tool.notebook weblib=lib +# hide tool option +hideTool=false +# Minimum compatible version +min.server.version.number=2.0.200612051427 + +# Language files package +language.files.package=org.lamsfoundation.lams.tool.notebook + Index: lams_tool_notebook/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/build.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_notebook/build.xml 28 Sep 2006 23:31:51 -0000 1.3 +++ lams_tool_notebook/build.xml 12 Mar 2007 05:14:24 -0000 1.3.2.1 @@ -81,9 +81,11 @@ + + @@ -350,7 +352,21 @@ + + + + + + + + + + + + + + @@ -372,6 +388,13 @@ + + + + + + + @@ -384,14 +407,18 @@ dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" - deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" - toolTablesScriptPath="${db.scripts}/create_lams_tool_notebook.sql" - toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_notebook.sql" - toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" - toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" - toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolVersion="${tool.version}" + hideTool="${hideTool}" + minServerVersionNumber="${min.server.version.number}" + toolUpdateScriptPath="${build.deploy}/sql/updateTo${tool.version}.sql" + toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_notebook.sql" + toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_notebook.sql" + toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" + toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" + toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" @@ -407,7 +434,7 @@ - + @@ -423,6 +450,10 @@ + + + Index: lams_tool_notebook/.settings/org.eclipse.core.resources.prefs =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/.settings/Attic/org.eclipse.core.resources.prefs,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_notebook/.settings/org.eclipse.core.resources.prefs 20 Jul 2006 01:11:10 -0000 1.1 +++ lams_tool_notebook/.settings/org.eclipse.core.resources.prefs 12 Mar 2007 05:14:25 -0000 1.1.2.1 @@ -1,4 +1,3 @@ -#Wed Mar 22 11:10:51 EST 2006 +#Mon Mar 12 14:21:42 EST 2007 eclipse.preferences.version=1 encoding//conf/xdoclet/web-settings.xml=UTF-8 -encoding//web/WEB-INF/web.xml=UTF-8 Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_ar_JO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_cy_GB.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_de_DE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_en_AU.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_ko_KR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_no_NO.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_notebook/conf/language/ApplicationResources_sv_SE.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_notebook/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/db/sql/tool_insert.sql,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_notebook/db/sql/tool_insert.sql 3 Nov 2006 00:10:04 -0000 1.4 +++ lams_tool_notebook/db/sql/tool_insert.sql 12 Mar 2007 05:14:23 -0000 1.4.2.1 @@ -25,7 +25,10 @@ moderation_url, help_url, language_file, -create_date_time +classpath_addition, +context_file, +create_date_time, +modified_date_time ) VALUES ( @@ -34,7 +37,7 @@ 'Notebook', 'Notebook', 'notebook', -'20061102', +'@tool_version@', NULL, NULL, 0, @@ -52,5 +55,8 @@ 'tool/lantbk11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lantbk11', 'org.lamsfoundation.lams.tool.notebook.ApplicationResources', +'./lams-tool-lantbk11.jar', +'/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml', +NOW(), NOW() ) Index: lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 23 Nov 2006 06:00:19 -0000 1.8 +++ lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java 12 Mar 2007 05:14:24 -0000 1.8.2.1 @@ -139,8 +139,10 @@ } // get any existing notebook entry - NotebookEntry nbEntry = notebookService.getEntry(notebookUser - .getEntryUID()); + NotebookEntry nbEntry = null; + if ( notebookUser != null ) { + nbEntry = notebookService.getEntry(notebookUser.getEntryUID()); + } if (nbEntry != null) { learningForm.setEntryText(nbEntry.getEntry()); } Index: lams_tool_notebook/web/pages/learning/notebook.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_notebook/web/pages/learning/notebook.jsp,v diff -u -r1.15 -r1.15.2.1 --- lams_tool_notebook/web/pages/learning/notebook.jsp 3 Dec 2006 03:33:01 -0000 1.15 +++ lams_tool_notebook/web/pages/learning/notebook.jsp 12 Mar 2007 05:14:24 -0000 1.15.2.1 @@ -37,17 +37,19 @@ styleClass="text-area"> + +
+ + button.finish + +
+ -
- - button.finish - -
Index: lams_tool_sbmt/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v diff -u -r1.11 -r1.11.2.1 --- lams_tool_sbmt/build.properties 17 Jan 2006 05:12:08 -0000 1.11 +++ lams_tool_sbmt/build.properties 12 Mar 2007 05:14:17 -0000 1.11.2.1 @@ -7,7 +7,18 @@ #name of this project signature=lasbmt11 +#project version +tool.version=20070227 + +# Minimum compatible version +min.server.version.number=2.0.200612051427 + #submit files package definition sbmt.package=org.lamsfoundation.lams.tool.sbmt sbmt.path=org/lamsfoundation/lams/tool/sbmt +# hide tool option +hideTool=false + +# Language files package +language.files.package=org.lamsfoundation.lams.tool.sbmt \ No newline at end of file Index: lams_tool_sbmt/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.xml,v diff -u -r1.36 -r1.36.2.1 --- lams_tool_sbmt/build.xml 13 Dec 2006 06:28:49 -0000 1.36 +++ lams_tool_sbmt/build.xml 12 Mar 2007 05:14:17 -0000 1.36.2.1 @@ -102,7 +102,7 @@ + depends="init,fail-if-no-xdoclet-1.2.x,check-driver-present,panic-if-driver-not-present"> - + + + - - - - - - - - - - + @@ -350,9 +343,23 @@ - + + + + + + + + + + + + + + + @@ -371,6 +378,13 @@ + + + + + + + @@ -384,14 +398,18 @@ dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="${db.driver}" - deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" - toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_sbmt.sql" - toolTablesScriptPath="${db.scripts}/create_lams_tool_sbmt.sql" - toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" - toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" - toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolVersion="${tool.version}" + hideTool="${hideTool}" + minServerVersionNumber="${min.server.version.number}" + toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" + toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_sbmt.sql" + toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_sbmt.sql" + toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" + toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" + toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" @@ -408,9 +426,7 @@ - - + @@ -428,6 +444,11 @@ + + + + Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/language/ApplicationResources_cy_GB.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.5.2.1 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/language/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_sbmt/conf/language/ApplicationResources_vi_VN.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_sbmt/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/db/sql/tool_insert.sql,v diff -u -r1.19 -r1.19.2.1 --- lams_tool_sbmt/db/sql/tool_insert.sql 3 Nov 2006 00:10:18 -0000 1.19 +++ lams_tool_sbmt/db/sql/tool_insert.sql 12 Mar 2007 05:14:17 -0000 1.19.2.1 @@ -25,7 +25,10 @@ moderation_url, help_url, language_file, -create_date_time +classpath_addition, +context_file, +create_date_time, +modified_date_time ) VALUES ( @@ -34,7 +37,7 @@ 'Submit File', 'Submit File Tool Description', 'submitfile', -'20061102', +'@tool_version@', NULL, NULL, 0, @@ -52,6 +55,9 @@ 'tool/lasbmt11/moderation.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasbmt11', 'org.lamsfoundation.lams.tool.sbmt.ApplicationResources', +'./lams-tool-lasbmt11.jar', +'/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml', +NOW(), NOW() ); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java,v diff -u -r1.41 -r1.41.2.1 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 15 Dec 2006 03:39:41 -0000 1.41 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 12 Mar 2007 05:14:17 -0000 1.41.2.1 @@ -28,14 +28,14 @@ import java.io.IOException; import java.util.Iterator; import java.util.List; +import java.util.Locale; import javax.servlet.http.HttpServletRequest; import javax.servlet.http.HttpServletResponse; import javax.servlet.http.HttpSession; import org.apache.commons.lang.StringUtils; import org.apache.log4j.Logger; -import org.apache.struts.action.ActionErrors; import org.apache.struts.action.ActionForm; import org.apache.struts.action.ActionForward; import org.apache.struts.action.ActionMapping; @@ -49,9 +49,9 @@ import org.lamsfoundation.lams.tool.ToolSessionManager; import org.lamsfoundation.lams.tool.exception.DataMissingException; import org.lamsfoundation.lams.tool.exception.ToolException; -import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesContent; import org.lamsfoundation.lams.tool.sbmt.SubmitFilesSession; +import org.lamsfoundation.lams.tool.sbmt.SubmitUser; import org.lamsfoundation.lams.tool.sbmt.dto.FileDetailsDTO; import org.lamsfoundation.lams.tool.sbmt.dto.SubmitUserDTO; import org.lamsfoundation.lams.tool.sbmt.exception.SubmitFilesException; @@ -63,6 +63,7 @@ import org.lamsfoundation.lams.util.FileUtil; import org.lamsfoundation.lams.util.FileValidatorUtil; import org.lamsfoundation.lams.util.WebUtil; +import org.lamsfoundation.lams.web.filter.LocaleFilter; import org.lamsfoundation.lams.web.session.SessionManager; import org.lamsfoundation.lams.web.util.AttributeNames; import org.lamsfoundation.lams.web.util.SessionMap; @@ -121,10 +122,17 @@ //get session from shared session. HttpSession ss = SessionManager.getSession(); - //get back login user DTO - UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); - Integer userID = user.getUserID(); + Integer userID = null; + if ( mode != null && mode.isTeacher() ) { + //monitoring mode - user is specified in URL + userID = WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false); + } else { + UserDTO user = (UserDTO) ss.getAttribute(AttributeNames.USER); + userID = user.getUserID(); + } + + ISubmitFilesService submitFilesService = getService(); SubmitFilesSession session = submitFilesService.getSessionById(sessionID); SubmitFilesContent content = session.getContent(); @@ -292,13 +300,14 @@ //validate uploaded form private boolean validateUploadForm(LearnerForm learnerForm, HttpServletRequest request) { ActionMessages errors = new ActionMessages(); + Locale preferredLocale = (Locale) request.getSession().getAttribute(LocaleFilter.PREFERRED_LOCALE_KEY); if(learnerForm.getFile() == null || StringUtils.isBlank(learnerForm.getFile().getFileName())){ errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required", - this.getResources(request).getMessage("learner.form.filepath.displayname"))); + this.getResources(request).getMessage(preferredLocale,"learner.form.filepath.displayname"))); } if(StringUtils.isBlank(learnerForm.getDescription())){ errors.add(ActionMessages.GLOBAL_MESSAGE,new ActionMessage("errors.required", - this.getResources(request).getMessage("label.learner.fileDescription"))); + this.getResources(request).getMessage(preferredLocale,"label.learner.fileDescription"))); } FileValidatorUtil.validateFileSize(learnerForm.getFile(),false,errors); Index: lams_tool_scribe/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/build.properties,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_scribe/build.properties 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/build.properties 12 Mar 2007 05:14:32 -0000 1.1.2.1 @@ -2,8 +2,20 @@ # project-wide properties signature=lascrb11 +# project version +tool.version=20070227 + +# hide tool option +hideTool=true + package=org/lamsfoundation/lams/tool/scribe package.name=org.lamsfoundation.lams.tool.scribe weblib=lib +# Minimum compatible version +min.server.version.number=2.0.200612051427 +# Language files package +language.files.package=org.lamsfoundation.lams.tool.scribe + + Index: lams_tool_scribe/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/build.xml,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_scribe/build.xml 7 Nov 2006 23:02:34 -0000 1.3 +++ lams_tool_scribe/build.xml 12 Mar 2007 05:14:32 -0000 1.3.2.1 @@ -81,9 +81,11 @@ + + @@ -350,7 +352,21 @@ + + + + + + + + + + + + + + @@ -372,6 +388,13 @@ + + + + + + + @@ -384,14 +407,18 @@ dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" - deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" - toolTablesScriptPath="${db.scripts}/create_lams_tool_scribe.sql" - toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_scribe.sql" - toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" - toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" - toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolVersion="${tool.version}" + hideTool="${hideTool}" + minServerVersionNumber="${min.server.version.number}" + toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" + toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_scribe.sql" + toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_scribe.sql" + toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" + toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" + toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" @@ -407,8 +434,9 @@ - + + @@ -422,15 +450,19 @@ - Marking activity as invalid - set it to valid if debugging or use the combined chat/scribe or forum/scribe activity. This is not an error. + + + + Index: lams_tool_scribe/.settings/org.eclipse.core.resources.prefs =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/.settings/Attic/org.eclipse.core.resources.prefs,v diff -u -r1.1 -r1.1.2.1 --- lams_tool_scribe/.settings/org.eclipse.core.resources.prefs 15 Sep 2006 03:09:53 -0000 1.1 +++ lams_tool_scribe/.settings/org.eclipse.core.resources.prefs 12 Mar 2007 05:14:32 -0000 1.1.2.1 @@ -1,4 +1,3 @@ -#Wed Mar 22 11:10:51 EST 2006 +#Mon Mar 12 14:21:42 EST 2007 eclipse.preferences.version=1 encoding//conf/xdoclet/web-settings.xml=UTF-8 -encoding//web/WEB-INF/web.xml=UTF-8 Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_cy_GB.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_it_IT.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_scribe/conf/language/ApplicationResources_vi_VN.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_scribe/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_scribe/db/sql/tool_insert.sql,v diff -u -r1.3 -r1.3.2.1 --- lams_tool_scribe/db/sql/tool_insert.sql 24 Oct 2006 06:50:50 -0000 1.3 +++ lams_tool_scribe/db/sql/tool_insert.sql 12 Mar 2007 05:14:31 -0000 1.3.2.1 @@ -25,7 +25,10 @@ moderation_url, help_url, language_file, -create_date_time +classpath_addition, +context_file, +create_date_time, +modified_date_time ) VALUES ( @@ -34,7 +37,7 @@ 'Scribe', 'Scribe', 'scribe', -'20061024', +'@tool_version@', NULL, NULL, 0, @@ -52,5 +55,8 @@ 'tool/lascrb11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lascrb11', 'org.lamsfoundation.lams.tool.scribe.ApplicationResources', +'./lams-tool-lascrb11.jar', +'/org/lamsfoundation/lams/tool/scribe/scribeApplicationContext.xml', +NOW(), NOW() ) Index: lams_tool_survey/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/build.properties,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_survey/build.properties 13 Sep 2006 07:20:18 -0000 1.2 +++ lams_tool_survey/build.properties 12 Mar 2007 05:16:55 -0000 1.2.2.1 @@ -10,3 +10,15 @@ ### project properties ### signature=lasurv11 project.displayname = lams survey tool + +# project version +tool.version=20070220 + +# hide tool option +hideTool=false + +# Minimum compatible version +min.server.version.number=2.0.200612051427 + +# Language files package +language.files.package=org.lamsfoundation.lams.tool.survey Index: lams_tool_survey/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/build.xml,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_survey/build.xml 28 Sep 2006 23:38:36 -0000 1.4 +++ lams_tool_survey/build.xml 12 Mar 2007 05:16:55 -0000 1.4.2.1 @@ -317,13 +317,27 @@ - - + + - + + + + + + + + + + + + + + + @@ -336,6 +350,13 @@ + + + + + + + @@ -355,14 +376,18 @@ dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" - deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" - toolTablesScriptPath="${db.scripts}/create_lams_tool_survey.sql" - toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_survey.sql" - toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" - toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" - toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolVersion="${tool.version}" + hideTool="${hideTool}" + minServerVersionNumber="${min.server.version.number}" + toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" + toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_survey.sql" + toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_survey.sql" + toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" + toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" + toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml" lamsEarPath="${jboss.deploy}" @@ -381,8 +406,7 @@ - + @@ -401,6 +425,10 @@ + + + + - + - + - + - + - + - + @@ -30,10 +30,10 @@ - + - + @@ -43,10 +43,10 @@ - + - + @@ -56,10 +56,10 @@ - + - + @@ -69,41 +69,40 @@ - + - + - - - - - + + + + - + - + - + @@ -112,28 +111,28 @@ - + - + - +
- + - + - + @@ -143,10 +142,10 @@ - + - + @@ -156,24 +155,24 @@ - + - + - + - + @@ -183,16 +182,16 @@ - + - + - + @@ -203,13 +202,13 @@ - + - + @@ -218,24 +217,24 @@ - + - +
- + - + - + @@ -245,17 +244,17 @@ - + - + - + @@ -265,10 +264,10 @@ - + - + @@ -279,13 +278,13 @@ - + - + @@ -294,24 +293,24 @@ - + - +
- + - + - + @@ -321,17 +320,17 @@ - + - + - + @@ -341,16 +340,16 @@ - + - + - + @@ -360,22 +359,22 @@ - + - + - + - + @@ -385,10 +384,10 @@ - + - + @@ -399,20 +398,20 @@ - + - + - + @@ -421,28 +420,28 @@ - + - + - +
- + - + - + @@ -452,22 +451,22 @@ - + - + - + - + @@ -477,10 +476,10 @@ - + - + @@ -490,21 +489,21 @@ - + - + - + @@ -513,24 +512,24 @@ - + - +
- + - + - + @@ -540,22 +539,22 @@ - + - + - + - + @@ -565,59 +564,59 @@ - + - + - + - + - + - + - + - + - + - + @@ -627,33 +626,33 @@ - + - + - + - + - + @@ -662,28 +661,28 @@ - + - + - +
- + - + - + @@ -693,10 +692,10 @@ - + - + @@ -706,31 +705,31 @@ - + - + - + - + - + @@ -740,10 +739,10 @@ - + - + @@ -753,27 +752,27 @@ - + - + - + - + @@ -782,15 +781,15 @@ - + - + - + Index: lams_tool_survey/db/sql/create_lams_tool_survey.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/create_lams_tool_survey.sql,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_survey/db/sql/create_lams_tool_survey.sql 2 Nov 2006 02:31:48 -0000 1.8 +++ lams_tool_survey/db/sql/create_lams_tool_survey.sql 12 Mar 2007 05:16:54 -0000 1.8.2.1 @@ -35,7 +35,7 @@ user_uid bigint, answer_choices varchar(255), udpate_date datetime, -answer_text varchar(255), +answer_text text, primary key (uid) ); Index: lams_tool_survey/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/db/sql/tool_insert.sql,v diff -u -r1.4 -r1.4.2.1 --- lams_tool_survey/db/sql/tool_insert.sql 3 Nov 2006 00:10:53 -0000 1.4 +++ lams_tool_survey/db/sql/tool_insert.sql 12 Mar 2007 05:16:54 -0000 1.4.2.1 @@ -27,7 +27,10 @@ moderation_url, help_url, language_file, -create_date_time +classpath_addition, +context_file, +create_date_time, +modified_date_time ) VALUES ( @@ -36,7 +39,7 @@ 'Survey', 'Survey', 'survey', -'20061102', +'@tool_version@', NULL, NULL, 0, @@ -54,5 +57,8 @@ 'tool/lasurv11/moderate.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lasurv11', 'org.lamsfoundation.lams.tool.survey.ApplicationResources', +'./lams-tool-lasurv11.jar', +'/org/lamsfoundation/lams/tool/survey/surveyApplicationContext.xml', +NOW(), NOW() ) Index: lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java,v diff -u -r1.14 -r1.14.2.1 --- lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 24 Nov 2006 00:28:46 -0000 1.14 +++ lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java 12 Mar 2007 05:16:55 -0000 1.14.2.1 @@ -142,7 +142,14 @@ // get back the survey and question list and display them on page ISurveyService service = getSurveyService(); - SurveyUser surveyUser = getCurrentUser(service,sessionId); + SurveyUser surveyUser = null; + if ( mode != null && mode.isTeacher() ) { + //monitoring mode - user is specified in URL + surveyUser = getSpecifiedUser(service, sessionId, + WebUtil.readIntParam(request, AttributeNames.PARAM_USER_ID, false)); + } else { + surveyUser = getCurrentUser(service,sessionId); + } Survey survey; List answers = service.getQuestionAnswers(sessionId,surveyUser.getUid()); @@ -571,5 +578,8 @@ } return surveyUser; } + private SurveyUser getSpecifiedUser(ISurveyService service, Long sessionId, Integer userId) { + return service.getUserByIDAndSession(new Long(userId.intValue()),sessionId); + } } Index: lams_tool_survey/web/pages/learning/result.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/learning/result.jsp,v diff -u -r1.11 -r1.11.2.1 --- lams_tool_survey/web/pages/learning/result.jsp 3 Dec 2006 03:35:59 -0000 1.11 +++ lams_tool_survey/web/pages/learning/result.jsp 12 Mar 2007 05:16:54 -0000 1.11.2.1 @@ -124,12 +124,13 @@ +
+ test="${sessionMap.reflectOn}"> @@ -145,6 +146,7 @@
+ Index: lams_tool_survey/web/pages/monitoring/summary.jsp =================================================================== RCS file: /usr/local/cvsroot/lams_tool_survey/web/pages/monitoring/summary.jsp,v diff -u -r1.6 -r1.6.2.1 --- lams_tool_survey/web/pages/monitoring/summary.jsp 12 Dec 2006 00:25:44 -0000 1.6 +++ lams_tool_survey/web/pages/monitoring/summary.jsp 12 Mar 2007 05:16:55 -0000 1.6.2.1 @@ -166,7 +166,7 @@ - + Index: lams_tool_vote/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/build.properties,v diff -u -r1.2 -r1.2.2.1 --- lams_tool_vote/build.properties 29 Apr 2006 13:58:10 -0000 1.2 +++ lams_tool_vote/build.properties 12 Mar 2007 05:17:10 -0000 1.2.2.1 @@ -3,6 +3,18 @@ #name of this project signature=lavote11 +#project version +tool.version=20070214 + +# hide tool option +hideTool=false + +# Minimum compatible version +min.server.version.number=2.0.200612051427 + +# Language files package +language.files.package=org.lamsfoundation.lams.tool.vote + #submit files package definition vote.package=org.lamsfoundation.lams.tool.vote vote.path=org/lamsfoundation/lams/tool/vote Index: lams_tool_vote/build.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/build.xml,v diff -u -r1.9 -r1.9.2.1 --- lams_tool_vote/build.xml 26 Oct 2006 01:00:38 -0000 1.9 +++ lams_tool_vote/build.xml 12 Mar 2007 05:17:10 -0000 1.9.2.1 @@ -133,23 +133,16 @@ - - + + + + - - - - - - - - - - + @@ -355,9 +348,23 @@ - + + + + + + + + + + + + + + + @@ -376,6 +383,13 @@ + + + + + + + @@ -389,14 +403,18 @@ dbUsername="${db.username}" dbDriverUrl="${db.url}" dbDriverClass="com.mysql.jdbc.Driver" - deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" + deployFiles="${build.deploy}/${product}.war,${build.deploy}/${product}.jar" toolJarFileName="${product}.jar" toolSignature="${signature}" - toolTablesScriptPath="${db.scripts}/create_lams_tool_vote.sql" - toolTablesDeleteScriptPath="${db.scripts}/drop_lams_tool_vote.sql" - toolActivityInsertScriptPath="${db.scripts}/activity_insert.sql" - toolLibraryInsertScriptPath="${db.scripts}/library_insert.sql" - toolInsertScriptPath="${db.scripts}/tool_insert.sql" + toolVersion="${tool.version}" + hideTool="${hideTool}" + minServerVersionNumber="${min.server.version.number}" + toolUpdateScriptPath="${build.deploy}/sql/updatescripts/updateTo${tool.version}.sql" + toolTablesScriptPath="${build.deploy}/sql/create_lams_tool_vote.sql" + toolTablesDeleteScriptPath="${build.deploy}/sql/drop_lams_tool_vote.sql" + toolActivityInsertScriptPath="${build.deploy}/sql/activity_insert.sql" + toolLibraryInsertScriptPath="${build.deploy}/sql/library_insert.sql" + toolInsertScriptPath="${build.deploy}/sql/tool_insert.sql" toolApplicationContextPath="/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml" lamsEarPath="${jboss.deploy}" @@ -413,9 +431,7 @@ - - + @@ -434,6 +450,10 @@ + + + Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_cy_GB.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.4.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_da_DK.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.2.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_de_DE.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_el_GR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_es_ES.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_fr_FR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_mi_NZ.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.1.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_pt_BR.properties'. Fisheye: No comparison available. Pass `N' to diff? Fisheye: Tag 1.3.2.1 refers to a dead (removed) revision in file `lams_tool_vote/conf/language/ApplicationResources_sv_SE.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_vote/db/model/lams_tool_vote.clay =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/model/lams_tool_vote.clay,v diff -u -r1.17 -r1.17.2.1 --- lams_tool_vote/db/model/lams_tool_vote.clay 11 Nov 2006 15:56:56 -0000 1.17 +++ lams_tool_vote/db/model/lams_tool_vote.clay 12 Mar 2007 05:17:10 -0000 1.17.2.1 @@ -1,18 +1,18 @@ - - + + Voting Tool for Lams 1.1 - + - + - + @@ -25,7 +25,7 @@ - + @@ -38,33 +38,33 @@ - + - + - + - + - + @@ -78,18 +78,18 @@ - + - + - + @@ -99,11 +99,11 @@
- + - + @@ -116,7 +116,7 @@ - + @@ -129,7 +129,7 @@ - + @@ -142,27 +142,27 @@ - + - + - + - + @@ -175,7 +175,7 @@ - + @@ -189,20 +189,20 @@ - + - + - + @@ -212,11 +212,11 @@
- - + + - + @@ -229,7 +229,7 @@ - + @@ -242,7 +242,7 @@ - + @@ -254,22 +254,22 @@ - - + + - - + + - + @@ -282,7 +282,7 @@ - + @@ -296,13 +296,13 @@ - + - + @@ -312,11 +312,11 @@
- + - + @@ -329,13 +329,13 @@ - + - + @@ -348,7 +348,7 @@ - + @@ -362,13 +362,13 @@ - + - + @@ -378,11 +378,11 @@
- + - + @@ -395,7 +395,7 @@ - + @@ -408,38 +408,38 @@ - + - + - + - + - + - + @@ -452,7 +452,7 @@ - + @@ -465,7 +465,7 @@ - + @@ -478,7 +478,7 @@ - + @@ -491,7 +491,7 @@ - + @@ -504,19 +504,19 @@ - + - + - + @@ -529,10 +529,10 @@ - + - + @@ -542,7 +542,7 @@ - + @@ -555,26 +555,26 @@ - + - +
- + - + @@ -587,14 +587,14 @@ - + - + @@ -607,14 +607,14 @@ - + - + @@ -628,13 +628,13 @@ - + - + Index: lams_tool_vote/db/sql/create_lams_tool_vote.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/create_lams_tool_vote.sql,v diff -u -r1.21 -r1.21.2.1 --- lams_tool_vote/db/sql/create_lams_tool_vote.sql 11 Nov 2006 15:56:56 -0000 1.21 +++ lams_tool_vote/db/sql/create_lams_tool_vote.sql 12 Mar 2007 05:17:09 -0000 1.21.2.1 @@ -39,8 +39,8 @@ uid BIGINT(20) NOT NULL AUTO_INCREMENT , user_id BIGINT(20) NOT NULL , vote_session_id BIGINT(20) NOT NULL - , username VARCHAR(100) - , fullname VARCHAR(20) + , username VARCHAR(255) + , fullname VARCHAR(255) , responseFinalised TINYINT(1) NOT NULL DEFAULT 0 , finalScreenRequested TINYINT(1) NOT NULL DEFAULT 0 , PRIMARY KEY (uid) Index: lams_tool_vote/db/sql/tool_insert.sql =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/db/sql/tool_insert.sql,v diff -u -r1.8 -r1.8.2.1 --- lams_tool_vote/db/sql/tool_insert.sql 13 Nov 2006 20:35:40 -0000 1.8 +++ lams_tool_vote/db/sql/tool_insert.sql 12 Mar 2007 05:17:09 -0000 1.8.2.1 @@ -46,7 +46,10 @@ moderation_url, help_url, language_file, -create_date_time +classpath_addition, +context_file, +create_date_time, +modified_date_time ) VALUES ( @@ -55,7 +58,7 @@ 'Voting', 'Voting', 'vote', -'20061113', +'@tool_version@', NULL, NULL, 0, @@ -73,6 +76,9 @@ 'tool/lavote11/monitoringStarter.do', 'http://wiki.lamsfoundation.org/display/lamsdocs/lavote11', 'org.lamsfoundation.lams.tool.vote.ApplicationResources', +'./lams-tool-lavote11.jar', +'/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml', +NOW(), NOW() ) Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java,v diff -u -r1.43 -r1.43.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 8 Nov 2006 22:07:04 -0000 1.43 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/VoteAppConstants.java 12 Mar 2007 05:17:10 -0000 1.43.2.1 @@ -274,7 +274,6 @@ public static final String FROM_TOOL_CONTENT_ID ="fromToolContentId"; public static final String TO_TOOL_CONTENT_ID ="toToolContentId"; public static final String LEARNER_REPORT ="learnerReport"; - public static final String INDIVIDUAL_LEARNER_REPORT ="individualLearnerReport"; public static final String MAP_USER_RESPONSES ="mapUserResponses"; public static final String MAP_MAIN_REPORT ="mapMainReport"; public static final String MAP_STATS ="mapStats"; Index: lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java,v diff -u -r1.43 -r1.43.2.1 --- lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 27 Nov 2006 09:57:11 -0000 1.43 +++ lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningStarterAction.java 12 Mar 2007 05:17:10 -0000 1.43.2.1 @@ -78,13 +78,6 @@ path="/monitoring/LearnerRep.jsp" redirect="false" /> - - - - - - +
+
+ + + +
+ -
- - - -
- Fisheye: Tag 1.8.2.1 refers to a dead (removed) revision in file `lams_tool_vote/web/learning/LearnerRep.jsp'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_www/web/news.html =================================================================== RCS file: /usr/local/cvsroot/lams_www/web/Attic/news.html,v diff -u -r1.6 -r1.6.4.1 --- lams_www/web/news.html 5 Dec 2006 00:59:53 -0000 1.6 +++ lams_www/web/news.html 12 Mar 2007 05:23:13 -0000 1.6.4.1 @@ -1,14 +1,13 @@

Latest News & Updates

  • -

    Welcome to LAMS 2.0!

    - With over a 100 new features the new generation LAMS is finally here.
    - If you want to learn more about LAMS, join the LAMS Community where teachers and developers share their experiences and ideas on the usage of LAMS.
    +

    Welcome to LAMS 2.0.1!

    +

    LAMS 2.0.1 is a new release with bug fixes and improvements, many of which have been suggested by the LAMS Community.
    -Find a bug or want to share new features? Let us know about it in the LAMS Community.
    -LAMS is currently being translated to 25 languages by more than 50 volunteers. Want to help out? + If you want to learn more about LAMS, join the LAMS Community where teachers and developers share their experiences and ideas on the usage of LAMS.
    -

    -

    + Found a bug or wanted to share new features? Let us know about it.
    + LAMS is currently being translated to 25 languages by more than 50 volunteers. Want to help out? +