Activity lams-github/

The basic activity creation method wasn't setting the activity type, so the isBlah() calls were failing. Also fixed (hopefully) the LearnerProgress relationships so that we always get the true activity object, not a proxy.

- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar

3:06 pm

fmalikoff

More
8be4342
changed 1 file
v4.7, v4.8

Hopefully fixed the LearnerProgress relationships so that we always get the true activity object, not a proxy.

- -3
- +3
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/lesson/LearnerProgress.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../LearnerProgress.hbm.xml

9:27 am

fmalikoff

More
0db78e5
changed 1 file
v4.7, v4.8

The basic activity creation method wasn't setting the activity type, so the isBlah() calls were failing.

- -8
- +21
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java

8:10 am

steven

More
263a23a
changed 1 file
v4.7, v4.8

Migrate to hibernate3

- -1
- +1
/lams_tool_sbmt/conf/hibernate/mappings/hibernate.properties
- History
- Source
- Diff
/lams_tool_sbmt/conf/.../hibernate.properties

7:35 am

steven

More
7965cc6
added 1 file
v4.7, v4.8

Add build ignore

- -0
- +1
/lams_tool_forum/.cvsignore
- History
- Source
/lams_tool_forum/.cvsignore

10:47 pm

ozgurd

More
5f80d71
changed 34 files
v4.7, v4.8

*** empty log message ***

- -1
- +1
/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/conf/.../mc/McContent.hbm.xml
- -9
- +0
/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/.../McOptsContent.hbm.xml
- -9
- +0
/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/conf/.../McQueContent.hbm.xml
- -9
- +0
/lams_tool_lamc/conf/hibernate/mappings/org/lamsfoundation/lams/tool/mc/McUsrAttempt.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/conf/.../McUsrAttempt.hbm.xml
- -44
- +5
/lams_tool_lamc/db/model/lams_tool_mc.clay
- History
- Source
- Diff
/lams_tool_lamc/db/.../lams_tool_mc.clay
- -4
- +1
/lams_tool_lamc/db/sql/create_lams_tool_lamc.sql
- History
- Source
- Diff
/lams_tool_lamc/.../create_lams_tool_lamc.sql
- -0
- +274
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McAppConstants.java
- History
- Source
/lams_tool_lamc/src/.../mc/McAppConstants.java
- -0
- +71
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McApplicationException.java
- History
- Source
/lams_tool_lamc/.../McApplicationException.java
- -0
- +40
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McComparator.java
- History
- Source
/lams_tool_lamc/src/java/.../mc/McComparator.java
- -1
- +1
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/src/.../mc/McContent.hbm.xml
- -9
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/src/.../McOptsContent.hbm.xml
- -0
- +8
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McOptsContent.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../mc/McOptsContent.java
- -9
- +0
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.hbm.xml
- History
- Source
- Diff
/lams_tool_lamc/src/.../McQueContent.hbm.xml
- -0
- +15
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McQueContent.java
- History
- Source
- Diff
/lams_tool_lamc/src/.../mc/McQueContent.java
- -0
- +113
/lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/McResources.properties
- History
- Source
/lams_tool_lamc/src/.../mc/McResources.properties
… 19 more files in changeset.

8:12 pm

fmalikoff

More
4e143f1
changed 20 files
v4.7, v4.8

More changes to suit Hibernate 3

- binary
/lams_build/lib/lams/lams-central.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-central.jar
- binary
/lams_build/lib/lams/lams-contentrepository.jar
- History
- Source
- Diff
/lams_build/.../lams-contentrepository.jar
- binary
/lams_build/lib/lams/lams-learning.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-learning.jar
- binary
/lams_build/lib/lams/lams-monitoring.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams-monitoring.jar
- binary
/lams_build/lib/lams/lams.jar
- History
- Source
- Diff
/lams_build/lib/lams/lams.jar
- -3
- +2
/lams_learning/build.xml
- History
- Source
- Diff
/lams_learning/build.xml
- -62
- +50
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/ExportPortfolioService.java
- History
- Source
- Diff
/lams_learning/.../ExportPortfolioService.java
- -9
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/export/service/IExportPortfolioService.java
- History
- Source
- Diff
/lams_learning/.../IExportPortfolioService.java
- -3
- +6
/lams_learning/src/java/org/lamsfoundation/lams/learning/progress/ProgressEngine.java
- History
- Source
- Diff
/lams_learning/src/.../ProgressEngine.java
- -5
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java
- History
- Source
- Diff
/lams_learning/src/.../ActivityMapping.java
- -16
- +10
/lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMappingStrategy.java
- History
- Source
- Diff
/lams_learning/.../ActivityMappingStrategy.java
- -23
- +25
/lams_learning/test/java/org/lamsfoundation/lams/learning/service/TestLearnerService.java
- History
- Source
- Diff
/lams_learning/.../TestLearnerService.java
- -3
- +1
/lams_learning/test/java/org/lamsfoundation/lams/learning/web/action/AbstractTestAction.java
- History
- Source
- Diff
/lams_learning/.../AbstractTestAction.java
- -152
- +0
/lams_learning/test/web/WEB-INF/spring/applicationContext.xml
- History
- Source
- Diff
/lams_learning/.../applicationContext.xml
- -74
- +0
/lams_learning/test/web/WEB-INF/spring/dataAccessContext.xml
- History
- Source
- Diff
/lams_learning/test/.../dataAccessContext.xml
… 5 more files in changeset.

8:09 pm

fmalikoff

More
29879f8
changed 2 files
v4.7, v4.8

*** empty log message ***

- -38
- +19
/lams_learning/test/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_learning/test/.../struts-config.xml
- -1
- +7
/lams_learning/test/web/WEB-INF/struts/tiles-defs.xml
- History
- Source
- Diff
/lams_learning/test/.../struts/tiles-defs.xml

7:54 pm

fmalikoff

More
79c858a
changed 33 files
v4.7, v4.8

More changes to suit Hibernate 3

- -5
- +5
/lams_central/src/java/org/lamsfoundation/lams/authoring/ObjectExtractor.java
- History
- Source
- Diff
/lams_central/src/.../ObjectExtractor.java
- -75
- +14
/lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java
- History
- Source
- Diff
/lams_central/src/.../AuthoringService.java
- -6
- +24
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java
- History
- Source
- Diff
/lams_common/src/.../Activity.java
- -7
- +4
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ChosenGrouping.java
- History
- Source
- Diff
/lams_common/src/.../ChosenGrouping.java
- -0
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/Grouping.java
- History
- Source
- Diff
/lams_common/src/.../Grouping.java
- -19
- +31
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/GroupingActivity.java
- History
- Source
- Diff
/lams_common/src/.../GroupingActivity.java
- -6
- +5
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/LearningDesign.java
- History
- Source
- Diff
/lams_common/src/.../LearningDesign.java
- -0
- +8
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/NullActivity.java
- History
- Source
- Diff
/lams_common/src/.../NullActivity.java
- -21
- +21
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/OptionsActivity.java
- History
- Source
- Diff
/lams_common/src/.../OptionsActivity.java
- -20
- +18
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ParallelActivity.java
- History
- Source
- Diff
/lams_common/src/.../ParallelActivity.java
- -21
- +19
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/PermissionGateActivity.java
- History
- Source
- Diff
/lams_common/.../PermissionGateActivity.java
- -9
- +6
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/RandomGrouping.java
- History
- Source
- Diff
/lams_common/src/.../RandomGrouping.java
- -25
- +23
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/ScheduleGateActivity.java
- History
- Source
- Diff
/lams_common/.../ScheduleGateActivity.java
- -20
- +18
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SequenceActivity.java
- History
- Source
- Diff
/lams_common/src/.../SequenceActivity.java
- -2
- +13
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/SimpleActivity.java
- History
- Source
- Diff
/lams_common/src/.../SimpleActivity.java
… 18 more files in changeset.

1:31 pm

steven

More
473503b
changed 1 file
v4.7, v4.8

fix for middlegen

- -1
- +1
/lams_tool_nb/build.xml
- History
- Source
- Diff
/lams_tool_nb/build.xml

12:41 pm

steven

More
759c8f8
changed 16 files
v4.7, v4.8

Migrate to hibernate3

- -2
- +0
/lams_tool_sbmt/.classpath
- History
- Source
- Diff
/lams_tool_sbmt/.classpath
- -1
- +1
/lams_tool_sbmt/build.xml
- History
- Source
- Diff
/lams_tool_sbmt/build.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../InstructionFiles.hbm.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/conf/.../sbmt/Learner.hbm.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmissionDetails.hbm.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesContent.hbm.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesReport.hbm.xml
- -2
- +2
/lams_tool_sbmt/conf/hibernate/mappings/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesSession.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/InstructionFiles.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../InstructionFiles.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/Learner.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/src/.../sbmt/Learner.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmissionDetails.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmissionDetails.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesContent.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesContent.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesReport.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesReport.hbm.xml
- -2
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/SubmitFilesSession.hbm.xml
- History
- Source
- Diff
/lams_tool_sbmt/.../SubmitFilesSession.hbm.xml
- -1
- +2
/lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/MonitoringAction.java
- History
- Source
- Diff
/lams_tool_sbmt/src/.../MonitoringAction.java
- -27
- +96
/lams_tool_sbmt/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_tool_sbmt/web/WEB-INF/web.xml

12:07 pm

steven

More
1f43a71
changed 2 files
v4.7, v4.8

Fix a weird bug. This bug never happen before hibhernate3. When login happens, all cookies expcept JSESSIONID cookie will be removed by some progams/system ( I will trace it later). So I have to change the shared sesson cookies name to JSESSIONID, instead of a customized.

- -5
- +4
/lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java
- History
- Source
- Diff
/lams_common/src/.../SessionManager.java
- -3
- +0
/lams_common/src/java/org/lamsfoundation/lams/web/session/SystemSessionFilter.java
- History
- Source
- Diff
/lams_common/src/.../SystemSessionFilter.java

10:34 am

steven

More
4b9d1df
changed 1 file
v4.7, v4.8

Fix a weird bug. This bug never happen before hibhernate3. When login happens, all cookies expcept JSESSIONID cookie will be removed by some progams/system ( I will trace it later). So I have to change the shared sesson cookies name to JSESSIONID, instead of a customized.