Index: lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties,v diff -u -r1.18 -r1.19 --- lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties 20 Feb 2009 04:07:27 -0000 1.18 +++ lams_tool_forum/conf/language/lams/ApplicationResources_es_ES.properties 3 Jul 2009 05:36:28 -0000 1.19 @@ -2,7 +2,7 @@ #language code: es #locale code: ES - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Feb 19 23:16:45 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu May 14 00:04:48 CST 2009 #=================== labels for Forum =================# @@ -19,7 +19,6 @@ authoring.msg.cancel.save =\u00bfEst\u00e1 seguro que desea cerrar esta ventana sin salvar previamente? label.authoring.advance.allow.edit =Permite a los estudiantes cambiar sus propios mensajes define.later.message =Por favor espere a que el instructor complete el contenido para esta actividad. -run.offline.message =Esta actividad ha sido designada para realizarse offline. Por favor solicite m\u00e1s detalles al instructor. button.try.again =Refrescar activity.description =Herramienta para debates asincr\u00f3nicos. activity.helptext =Herramienta para debates muy \u00fatil para situaciones y trabajos colaborativos en los que los estudiantes no est\u00e1n conectados todos al mismo tiempo. @@ -163,6 +162,7 @@ page.title.monitoring.view.reflection =Ver Reflexi\u00f3n topic.message.attachment.hidden =Archivo adjunto escondido label.authoring.basic.instruction =Instrucciones +label.authoring.advance.lock.on.finished =No permitir modificaciones una vez terminado title.original.message.reply =Mensaje Original label.download.marks.heading.date =Fecha error.min.less.max =El m\u00e1ximo n\u00famero de mensajes tiene que ser mayor o igual que el m\u00ednimo @@ -206,11 +206,11 @@ textsearch.any.words =contengan una o m\u00e1s de estas palabras: textsearch.excluded.words =no contengan ninguna de estas palabras: textsearch.topics =Buscar en estos temas de discusi\u00f3n: -label.responses.locked =Atenci\u00f3n: una vez finalizada esta actividad no podr\u00e1 hacer cambios. label.finish =Finalizar label.authoring.advanced.notify.mark.release =Notificar a los estudiantes cuando las calificaciones esten listas error.must.have.topic =Debe a\u00f1adir por lo menos un t\u00f3pico cuando la opci\u00f3n de "Permitir a los estudiantes de crear t\u00f3picos" esta desactivada. -label.authoring.advance.lock.on.finished =No permitir modificaciones una vez terminado +run.offline.message =Esta actividad ha sido se\u00f1alada para realizarse en forma offline. Por favor, consulte con su profesor. +label.responses.locked =Atenci\u00f3n: una vez finalizada esta actividad no podr\u00e1 hacer cambios. #======= End labels: Exported 205 labels for es ES ===== Fisheye: Tag 1.1 refers to a dead (removed) revision in file `lams_tool_forum/conf/language/lams/ApplicationResources_ru_RU.properties'. Fisheye: No comparison available. Pass `N' to diff? Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java,v diff -u -r1.6 -r1.7 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 31 Oct 2008 05:57:38 -0000 1.6 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumOutputFactory.java 3 Jul 2009 05:36:28 -0000 1.7 @@ -58,7 +58,7 @@ * @see org.lamsfoundation.lams.tool.OutputDefinitionFactory#getToolOutputDefinitions(java.lang.Object) */ @Override - public SortedMap getToolOutputDefinitions(Object toolContentObject) + public SortedMap getToolOutputDefinitions(Object toolContentObject, int definitionType) throws ToolException { SortedMap definitionMap = new TreeMap(); Index: lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java,v diff -u -r1.100 -r1.101 --- lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 2 Jul 2009 08:19:35 -0000 1.100 +++ lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java 3 Jul 2009 05:36:28 -0000 1.101 @@ -864,12 +864,13 @@ * * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ - public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) + throws ToolException { Forum forum = getForumByContentId(toolContentId); if (forum == null) { forum = getDefaultForum(); } - return getForumOutputFactory().getToolOutputDefinitions(forum); + return getForumOutputFactory().getToolOutputDefinitions(forum, definitionType); } /** Index: lams_tool_forum/web/WEB-INF/struts-config.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/struts-config.xml,v diff -u -r1.54 -r1.55 --- lams_tool_forum/web/WEB-INF/struts-config.xml 2 Feb 2009 03:21:24 -0000 1.54 +++ lams_tool_forum/web/WEB-INF/struts-config.xml 3 Jul 2009 05:36:28 -0000 1.55 @@ -18,25 +18,25 @@ type="org.lamsfoundation.lams.tool.forum.web.forms.ForumForm" /> + - Index: lams_tool_forum/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_forum/web/WEB-INF/Attic/web.xml,v diff -u -r1.33 -r1.34 --- lams_tool_forum/web/WEB-INF/web.xml 6 Feb 2009 02:20:14 -0000 1.33 +++ lams_tool_forum/web/WEB-INF/web.xml 3 Jul 2009 05:36:28 -0000 1.34 @@ -10,17 +10,21 @@ org.lamsfoundation.lams.tool.forum.ApplicationResources + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/forumApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/forum/dbupdates/autopatchContext.xml + + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + hibernateFilter @@ -29,7 +33,7 @@ sessionFactoryBeanName - forumSessionFactory + coreSessionFactory Index: lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties,v diff -u -r1.10 -r1.11 --- lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties 20 Feb 2009 04:10:23 -0000 1.10 +++ lams_tool_sbmt/conf/language/lams/ApplicationResources_es_ES.properties 3 Jul 2009 05:36:27 -0000 1.11 @@ -2,7 +2,7 @@ #language code: es #locale code: ES - # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu Feb 19 23:19:51 CST 2009 + # CVS ID: $Id$ Exported from the LAMS Community by Ernie Ghiglione on Thu May 14 00:13:56 CST 2009 #=================== labels for Submit Files =================# @@ -95,7 +95,6 @@ label.authoring.heading =Enviar Archivos label.authoring.advanced.reflectOnActivity =A\u00f1adir Anotaciones al finalizar Enviar Archivos con las siguientes instrucciones: define.later.message =El contenido para esta actividad no ha sido definido todavia. Por favor espere a que su profesor defina el contenido. -run.offline.message =Esta actividad ha sido seleccionada para modo Offline. Contacte a su instructor para m\u00e1s detalles. message.monitoring.edit.activity.not.editable =El contenido de esta actividad no se puede editar nuevamente. button.try.again =Refrescar label.submit.file.suffix =Subido los siguientes archivos @@ -125,6 +124,7 @@ monitoring.statistic.title =Estad\u00edsticas de Seguimiento message.alertContentEdit =Atenci\u00f3n: uno o m\u00e1s estudiantes han accedido esta actividad. Si desea cambiar el contenido, tenga en cuenta que algunos alumnos recibir\u00e1n informaci\u00f3n diferente. label.monitoring.heading =Seguimiento +label.authoring.advance.lock.on.finished =No permitir modificaciones una vez terminado monitoring.marked.question =Calificado monitoring.instructions.attachments =Archivos Adjuntos errors.maxdescsize =La cantidad m\u00e1xima de caracteres para describir un archivo es de {0}. @@ -139,10 +139,10 @@ event.file.submit.subject =LAMS: un estudiante ha enviado un archivo event.file.submit.body =El estudiante {0} ha enviado un archivo.\n\nEste mensaje ha sido autom\u00e1ticamente siguiendo la configuraci\u00f3n seleccionada. button.finish =Finalizar -message.warnLockOnFinish =Atenci\u00f3n: una vez finalizada esta actividad no podr\u00e1 hacer cambios. label.authoring.advanced.notify.mark.release =Notifique a los estudiantes cuando las calificaciones esten listas label.authoring.advanced.notify.onfilesubmit =Notifique a los tutores cuando el estudiante haya enviado un archivo -label.authoring.advance.lock.on.finished =No permitir modificaciones una vez terminado +run.offline.message =Esta actividad ha sido se\u00f1alada para realizarse en forma offline. Por favor, consulte con su profesor. +message.warnLockOnFinish =Atenci\u00f3n: una vez finalizada esta actividad no podr\u00e1 hacer cambios. #======= End labels: Exported 137 labels for es ES ===== Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java,v diff -u -r1.79 -r1.80 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 2 Jul 2009 08:18:31 -0000 1.79 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/SubmitFilesService.java 3 Jul 2009 05:36:27 -0000 1.80 @@ -183,8 +183,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, - * java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolContentManager#copyToolContent(java.lang.Long, java.lang.Long) */ public void copyToolContent(Long fromContentId, Long toContentId) throws ToolException { if (toContentId == null) { @@ -226,9 +225,8 @@ } /** - * If the toolContentID does not exist, then get default tool content id - * from tool core and initialize a emtpy SubmitFilesContent - * return. + * If the toolContentID does not exist, then get default tool content id from tool core and initialize a emtpy + * SubmitFilesContent return. * * @param toolContentId * @return @@ -293,8 +291,7 @@ } /** - * Export the XML fragment for the tool's content, along with any files - * needed for the content. + * Export the XML fragment for the tool's content, along with any files needed for the content. * * @throws ExportToolContentException */ @@ -359,16 +356,15 @@ } /** - * Get the definitions for possible output for an activity, based on the - * toolContentId. These may be definitions that are always available for the - * tool (e.g. number of marks for Multiple Choice) or a custom definition - * created for a particular activity such as the answer to the third - * question contains the word Koala and hence the need for the toolContentId + * Get the definitions for possible output for an activity, based on the toolContentId. These may be definitions + * that are always available for the tool (e.g. number of marks for Multiple Choice) or a custom definition created + * for a particular activity such as the answer to the third question contains the word Koala and hence the need for + * the toolContentId * - * @return SortedMap of ToolOutputDefinitions with the key being the name of - * each definition + * @return SortedMap of ToolOutputDefinitions with the key being the name of each definition */ - public SortedMap getToolOutputDefinitions(Long toolContentId) throws ToolException { + public SortedMap getToolOutputDefinitions(Long toolContentId, int definitionType) + throws ToolException { return new TreeMap(); } @@ -411,12 +407,11 @@ } /** - * This method verifies the credentials of the SubmitFiles Tool and gives it - * the Ticket to login and access the Content Repository. + * This method verifies the credentials of the SubmitFiles Tool and gives it the Ticket to login and + * access the Content Repository. * - * A valid ticket is needed in order to access the content from the - * repository. This method would be called evertime the tool needs to - * upload/download files from the content repository. + * A valid ticket is needed in order to access the content from the repository. This method would be called evertime + * the tool needs to upload/download files from the content repository. * * @return ITicket The ticket for repostory access * @throws SubmitFilesException @@ -437,8 +432,8 @@ } /** - * This method deletes the content with the given uuid and - * versionID from the content repository + * This method deletes the content with the given uuid and versionID from the content + * repository * * @param uuid * The uuid of the node to be deleted @@ -582,8 +577,8 @@ /** * Get the tool output for the given tool output names. * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, - * java.lang.Long, java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.util.List, java.lang.Long, + * java.lang.Long) */ public SortedMap getToolOutput(List names, Long toolSessionId, Long learnerId) { return new TreeMap(); @@ -592,8 +587,8 @@ /** * Get the tool output for the given tool output name. * - * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, - * java.lang.Long, java.lang.Long) + * @see org.lamsfoundation.lams.tool.ToolSessionManager#getToolOutput(java.lang.String, java.lang.Long, + * java.lang.Long) */ public ToolOutput getToolOutput(String name, Long toolSessionId, Long learnerId) { return null; @@ -602,8 +597,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolSessionManager# - * uploadFileToContent(Long,FormFile ) + * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToContent(Long,FormFile ) */ public InstructionFiles uploadFileToContent(Long contentID, FormFile uploadFile, String fileType) throws SubmitFilesException { @@ -625,8 +619,7 @@ /** * (non-Javadoc) * - * @see org.lamsfoundation.lams.tool.ToolSessionManager# - * uploadFileToSession(Long,FormFile,String,Long ) + * @see org.lamsfoundation.lams.tool.ToolSessionManager# uploadFileToSession(Long,FormFile,String,Long ) */ public void uploadFileToSession(Long sessionID, FormFile uploadFile, String fileDescription, Integer userID) throws SubmitFilesException { @@ -718,9 +711,8 @@ } /** - * This method save SubmissionDetails list into a map container: key is user - * id, value is a list container, which contains all - * FileDetailsDTO object belong to this user. + * This method save SubmissionDetails list into a map container: key is user id, value is a list container, which + * contains all FileDetailsDTO object belong to this user. */ public SortedMap getFilesUploadedBySession(Long sessionID, Locale currentLocale) { List list = submissionDetailsDAO.getSubmissionDetailsBySession(sessionID); @@ -871,8 +863,8 @@ @SuppressWarnings("unchecked") public void sendMarksToGradebook(SubmitUser user, Long toolSessionID) { submissionDetailsDAO.getSubmissionDetailsBySession(toolSessionID); - List detailsList = (List) submissionDetailsDAO.getBySessionAndLearner( - toolSessionID, user.getUserID()); + List detailsList = submissionDetailsDAO.getBySessionAndLearner(toolSessionID, user + .getUserID()); if (detailsList != null) { Float totalMark = null; for (SubmissionDetails details : detailsList) { @@ -984,8 +976,7 @@ } /** - * Set the description, throws away the title value as this is not supported - * in 2.0 + * Set the description, throws away the title value as this is not supported in 2.0 */ public void setReflectiveData(Long toolContentId, String title, String description) throws ToolException, DataMissingException { @@ -1049,9 +1040,9 @@ return submitUserDAO.getContentUser(contentId, userID); } - /*************************************************************************** + /******************************************************************************************************************* * Property Injection Methods - **************************************************************************/ + ******************************************************************************************************************/ /** * @param submitFilesContentDAO Index: lams_tool_sbmt/web/WEB-INF/web.xml =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/web/WEB-INF/Attic/web.xml,v diff -u -r1.23 -r1.24 --- lams_tool_sbmt/web/WEB-INF/web.xml 6 Feb 2009 02:24:13 -0000 1.23 +++ lams_tool_sbmt/web/WEB-INF/web.xml 3 Jul 2009 05:36:27 -0000 1.24 @@ -5,18 +5,22 @@ Learning Activity Management System + contextClass + org.jboss.spring.factory.VFSXmlWebApplicationContext + + contextConfigLocation - - classpath:/org/lamsfoundation/lams/applicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml - classpath:/org/lamsfoundation/lams/contentrepository/applicationContext.xml - classpath:/org/lamsfoundation/lams/lesson/lessonApplicationContext.xml - classpath:/org/lamsfoundation/lams/learning/learningApplicationContext.xml - classpath:/org/lamsfoundation/lams/toolApplicationContext.xml - classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml - + classpath:/org/lamsfoundation/lams/tool/sbmt/dbupdates/autopatchContext.xml + locatorFactorySelector + classpath:/org/lamsfoundation/lams/beanRefContext.xml + + + parentContextKey + context.central + + javax.servlet.jsp.jstl.fmt.localizationContext org.lamsfoundation.lams.tool.sbmt.ApplicationResources @@ -28,7 +32,7 @@ sessionFactoryBeanName - sbmtSessionFactory + coreSessionFactory