Index: lams_tool_sbmt/.classpath =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/.classpath,v diff -u -r1.9 -r1.10 --- lams_tool_sbmt/.classpath 10 Aug 2005 02:21:22 -0000 1.9 +++ lams_tool_sbmt/.classpath 23 Aug 2005 01:52:06 -0000 1.10 @@ -1,6 +1,6 @@ - + Index: lams_tool_sbmt/.project =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/.project,v diff -u -r1.4 -r1.5 --- lams_tool_sbmt/.project 25 Jul 2005 07:05:55 -0000 1.4 +++ lams_tool_sbmt/.project 23 Aug 2005 01:52:06 -0000 1.5 @@ -54,6 +54,11 @@ + JBOSS4 + 2 + D:/jboss-4.0.2/server/default/deploy/lams.ear/lams-tool-lasbmt11.war/WEB-INF/classes + + JBOSS_DEPLOY 2 D:/jboss-3.2.6/server/default/deploy/lams.ear/lams-tool-lasbmt11.war/WEB-INF/classes Index: lams_tool_sbmt/build.properties =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/build.properties,v diff -u -r1.5 -r1.6 --- lams_tool_sbmt/build.properties 18 Aug 2005 04:36:16 -0000 1.5 +++ lams_tool_sbmt/build.properties 23 Aug 2005 01:52:06 -0000 1.6 @@ -1,67 +1,21 @@ -# Abt properties for building the Lams Submit Files Tool +#################################################################################################### +## NOTE: Most variables are defined in ../lams_build/common.properties file. +## You could define same name variable in this file to override value in common.properties. +##################################################################################################### +#properties for building the Lams Submit Files Tool #name of this project signature=lasbmt11 -name=lams_tool_lasbmt11 -product=lams-tool-lasbmt11 -# Directory where third party jars reside. -sharedlib=../lams_build/lib -j2eelibs=D:/eclipseplugins/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4 - -deploy.tool.dir=../lams_build/deploy-tool -build.deploy=${build}/deploy -sql=${basedir}/db/sql - -#middlegen properties -middlegen = ${conf}/middlegen -gui = true - -#xdoclet version number -xdoclet.version=1.2.3 - -#web application properties -sessiontimeout=120 - -#database access -db.name=lams -db.driver=com.mysql.jdbc.Driver -db.url=jdbc:mysql://localhost/${db.name} -db.username=lams -db.password=lamsdemo -db.driver.jar=${sharedlib}/mysql/mysql-connector-java-3.1.7-bin.jar -db.scripts=${basedir}/db/sql - #submit files package definition sbmt.package=org.lamsfoundation.lams.tool.sbmt sbmt.path=org/lamsfoundation/lams/tool/sbmt -#configuration files -conf.dir=${basedir}/conf -conf.middlegen.dir=${conf.dir}/middlegen -conf.hibernate.dir=${conf.dir}/hibernate -conf.hibernate.mapping.dir=${conf.hibernate.dir}/mappings -conf.web.dir=${basedir}/web -conf.webinf.dir=${conf.web.dir}/WEB-INF -conf.xdoclet.dir=${conf.dir}/xdoclet -conf.struts.dir=${conf.webinf.dir}/struts +#JBoss root. Open comment if using another folder +#jboss.home=D:/jboss-4.0.2/ -# Build directory -build=${basedir}/build -build.classes.java=${build}/classes/java -build.classes.test=${build}/classes/test/java -build.lib=${build}/lib -build.report=${build}/report -build.web=${build}/web - -# Source directory under the current root -src.dir=${basedir}/src -src.dir.java=${src.dir}/java -src.dir.test=${basedir}/test/java - -jboss.home=D:/jboss-4.0.2/ -jboss.deploy=${jboss.home}server/default/deploy/lams.ear +#Repository directory contentrepository.location = D:/repository -# the URL used to access LAMS -toolContext=/lams/tool/lasbmt11 +# Open comment if use different folder +#j2eelibs=D:/eclipseplugins/myeclipse/eclipse/plugins/com.genuitec.eclipse.j2eedt.core_3.8.4/data/libraryset/1.4 \ 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.13 -r1.14 --- lams_tool_sbmt/build.xml 1 Aug 2005 01:27:28 -0000 1.13 +++ lams_tool_sbmt/build.xml 23 Aug 2005 01:52:06 -0000 1.14 @@ -24,7 +24,7 @@ - + @@ -93,7 +93,7 @@ - + @@ -368,11 +368,11 @@ dbDriverClass="${db.driver}" deployFiles="${build.lib}/${product}.war,${build.lib}/${product}.jar" toolSignature="${signature}" - toolTablesDeleteScriptPath="${sql}/drop_lams_tool_sbmt.sql" - toolTablesScriptPath="${sql}/create_lams_tool_sbmt.sql" - toolActivityInsertScriptPath="${sql}/activity_insert.sql" - toolLibraryInsertScriptPath="${sql}/library_insert.sql" - toolInsertScriptPath="${sql}/tool_insert.sql" + 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" lamsEarPath="${jboss.deploy}" toolContext="${toolContext}" toolWebUri="${product}.war" Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java,v diff -u -r1.4 -r1.5 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 18 Aug 2005 00:23:43 -0000 1.4 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/util/SbmtConstants.java 23 Aug 2005 01:52:06 -0000 1.5 @@ -29,4 +29,5 @@ public static final String TOOL_SESSION_ID = "toolSessionID"; public static final String TOOL_CONTENT_ID = "toolContentID"; + public static final String USER_ID = "userID"; } 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.18 -r1.19 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 18 Aug 2005 00:23:43 -0000 1.18 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/LearnerAction.java 23 Aug 2005 01:52:06 -0000 1.19 @@ -60,7 +60,7 @@ DynaActionForm authForm= (DynaActionForm)form; Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID); - Long userID = (Long)authForm.get("userID"); + Long userID = (Long)authForm.get(SbmtConstants.USER_ID); //get submission information from content table.E.g., title, instruction submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); @@ -95,7 +95,7 @@ DynaActionForm authForm= (DynaActionForm)form; if(!isTokenValid(request,true)){ Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID); - Long userID = (Long)authForm.get("userID"); + Long userID = (Long)authForm.get(SbmtConstants.USER_ID); submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); List filesUploaded = submitFilesService.getFilesUploadedByUser(userID,sessionID); @@ -108,7 +108,7 @@ } Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID); - Long userID = (Long)authForm.get("userID"); + Long userID = (Long)authForm.get(SbmtConstants.USER_ID); FormFile uploadedFile= (FormFile) authForm.get("filePath"); String fileDescription = (String) authForm.get("fileDescription"); @@ -144,7 +144,7 @@ HttpServletResponse response){ DynaActionForm authForm= (DynaActionForm)form; Long sessionID =(Long) authForm.get(SbmtConstants.TOOL_SESSION_ID); - Long userID = (Long)authForm.get("userID"); + Long userID = (Long)authForm.get(SbmtConstants.USER_ID); submitFilesService = SubmitFilesServiceProxy.getSubmitFilesService(this.getServlet().getServletContext()); submitFilesService.finishSubmission(sessionID,userID); Index: lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java =================================================================== RCS file: /usr/local/cvsroot/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java,v diff -u -r1.15 -r1.16 --- lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 18 Aug 2005 00:23:43 -0000 1.15 +++ lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java 23 Aug 2005 01:52:06 -0000 1.16 @@ -201,8 +201,7 @@ //return FileDetailsDTO list according to the given sessionID Map userFilesMap = submitFilesService.getFilesUploadedBySession(sessionID); request.setAttribute(SbmtConstants.TOOL_SESSION_ID,sessionID); -// request.setAttribute("user", -// submitFilesService.getUserDetails(userID)); +// request.setAttribute("user",submitFilesService.getUserDetails(userID)); request.setAttribute("report",userFilesMap); return mapping.findForward("allUserMarks"); 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.6 -r1.7 --- lams_tool_sbmt/web/WEB-INF/web.xml 11 Aug 2005 04:48:38 -0000 1.6 +++ lams_tool_sbmt/web/WEB-INF/web.xml 23 Aug 2005 01:52:06 -0000 1.7 @@ -199,7 +199,7 @@ fck-editor - /WEB-INF/fckEditor/tlds/FCKeditor.tld + /WEB-INF/fckeditor/tlds/FCKeditor.tld