Activity lams-github/

1:11 pm

steven

More
86fab77
changed 14 files
v4.7, v4.8

Learner basic logic works.

- -9
- +25
/lams_tool_forum/conf/xdoclet/struts-actions.xml
- History
- Source
- Diff
/lams_tool_forum/conf/.../struts-actions.xml
- -1
- +5
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/persistence/MessageDao.java
- History
- Source
- Diff
/lams_tool_forum/src/.../MessageDao.java
- -9
- +15
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumService.java
- -2
- +7
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/IForumService.java
- History
- Source
- Diff
/lams_tool_forum/src/.../IForumService.java
- -1
- +1
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/DateComparator.java
- History
- Source
- Diff
/lams_tool_forum/src/.../DateComparator.java
- -1
- +2
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/ForumConstants.java
- History
- Source
- Diff
/lams_tool_forum/src/.../ForumConstants.java
- -3
- +13
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/util/TopicComparator.java
- History
- Source
- Diff
/lams_tool_forum/src/.../TopicComparator.java
- -2
- +2
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../AuthoringAction.java
- -10
- +33
/lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java
- History
- Source
- Diff
/lams_tool_forum/src/.../LearningAction.java
- -7
- +16
/lams_tool_forum/web/WEB-INF/struts-config.xml
- History
- Source
- Diff
/lams_tool_forum/web/.../struts-config.xml
- -0
- +10
/lams_tool_forum/web/jsps/learning/edit.jsp
- History
- Source
/lams_tool_forum/web/jsps/learning/edit.jsp
- -1
- +1
/lams_tool_forum/web/jsps/learning/message/topiceditform.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topiceditform.jsp
- -55
- +59
/lams_tool_forum/web/jsps/learning/message/topicview.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../topicview.jsp
- -3
- +1
/lams_tool_forum/web/jsps/learning/viewtopic.jsp
- History
- Source
- Diff
/lams_tool_forum/web/.../viewtopic.jsp

11:32 am

axiao

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

put System.getenv() in a try/catch block to handle any exception raised due to JDK versioning problems

- -1
- +7
/lams_common/src/java/org/lamsfoundation/lams/util/ConfigurationLoader.java
- History
- Source
- Diff
/lams_common/src/.../ConfigurationLoader.java

9:12 am

fmalikoff

More
2813323
added 1 file
v4.7, v4.8

Default image if the toolkit activity image fails to load

- binary
/lams_central/web/images/icon_missing.swf
- History
- Source
/lams_central/web/images/icon_missing.swf

6:07 am

fmalikoff

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

Tab javascript controller changed so authoring.jsp updated to suit.

- -0
- +1
/lams_tool_sbmt/web/authoring/authoring.jsp
- History
- Source
- Diff
/lams_tool_sbmt/web/.../authoring.jsp

6:04 am

fmalikoff

More
f7ee801
changed 74 files
v4.7, v4.8

Updating JSPs to use tag lib standard, new lams tags. Rationalising authoring down to the DHTML version (had been a DHTML and non-DHTML version). Updating URLS as per LDEV-38

- -1
- +2
/lams_tool_nb/.classpath
- History
- Source
- Diff
/lams_tool_nb/.classpath
- -4
- +2
/lams_tool_nb/build.xml
- History
- Source
- Diff
/lams_tool_nb/build.xml
- -1
- +83
/lams_tool_nb/conf/xdoclet/taglibs.xml
- History
- Source
- Diff
/lams_tool_nb/conf/xdoclet/taglibs.xml
- -0
- +1
/lams_tool_nb/conf/xdoclet/web-security.xml
- History
- Source
- Diff
/lams_tool_nb/conf/.../web-security.xml
- -1
- +1
/lams_tool_nb/db/sql/tool_insert.sql
- History
- Source
- Diff
/lams_tool_nb/db/sql/tool_insert.sql
- -2
- +1
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/NoticeboardConstants.java
- History
- Source
- Diff
/lams_tool_nb/.../NoticeboardConstants.java
- -0
- +1
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/ApplicationResources.properties
- History
- Source
- Diff
/lams_tool_nb/.../ApplicationResources.properties
- -372
- +449
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringAction.java
- History
- Source
- Diff
/lams_tool_nb/src/.../NbAuthoringAction.java
- -567
- +0
/lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/NbAuthoringV2Action.java
- History
- Source
- Diff
/lams_tool_nb/.../NbAuthoringV2Action.java
- -393
- +0
/lams_tool_nb/web/WEB-INF/jstl/c-rt.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/c-rt.tld
- -416
- +0
/lams_tool_nb/web/WEB-INF/jstl/c.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/c.tld
- -403
- +0
/lams_tool_nb/web/WEB-INF/jstl/fmt-rt.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/fmt-rt.tld
- -442
- +0
/lams_tool_nb/web/WEB-INF/jstl/fmt.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/fmt.tld
- -188
- +0
/lams_tool_nb/web/WEB-INF/jstl/sql-rt.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/sql-rt.tld
- -213
- +0
/lams_tool_nb/web/WEB-INF/jstl/sql.tld
- History
- Source
- Diff
/lams_tool_nb/web/WEB-INF/jstl/sql.tld
… 59 more files in changeset.

5:57 am

fmalikoff

More
75cb86b
deleted 1 file
v4.7, v4.8

Cache configuration no longer required, as it is now part of lams.jar and local-service.xml

- -83
- +0
/lams_contentrepository/conf/jboss/treecache.xml
- History
- Source
- Diff
/lams_contentrepository/.../treecache.xml

5:55 am

fmalikoff

More
971b10a
changed 1 file
v4.7, v4.8

Added basic theme access support. Needed for <lams:css> tag.

- -4
- +11
/lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java
- History
- Source
- Diff
/lams_common/src/java/.../dto/UserDTO.java

5:53 am

fmalikoff

More
f342930
updated 5 files
v4.7, v4.8

Include authoring client that has toolContentID, no userID in authoring calls, and expects libraryActivityUIImage. Some problems with the version built last night, so did a rebuild.

- 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

5:51 am

fmalikoff

More
015c439
changed 2 files
v4.7, v4.8

Missed listing the new field in the lams(fields) list at the top of the file.

- -1
- +1
/lams_build/conf/unix/lams/lams.dtd
- History
- Source
- Diff
/lams_build/conf/unix/lams/lams.dtd
- -1
- +1
/lams_build/conf/windows/lams/lams.dtd
- History
- Source
- Diff
/lams_build/conf/windows/lams/lams.dtd

1:36 am

dcaygill

More
c0009dd
updated 1 file
v4.7, v4.8

1)stop sending nulls (only in design, still to do activity and transitions) 2)send toolContentID, and remove userID 3)Expect libraryActivityUIImage for toolkit's TemplateActivities

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf

11:29 pm

dcaygill

More
761e405
changed 1 file
v4.7, v4.8

remove nulls from DTO.

- -0
- +34
/lams_central/src/flash/org/lamsfoundation/lams/authoring/DesignDataModel.as
- History
- Source
- Diff
/lams_central/src/.../DesignDataModel.as

5:07 pm

fmalikoff

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

Added admin to the build

- -0
- +6
/lams_build/conf/j2ee/application.xml
- History
- Source
- Diff
/lams_build/conf/j2ee/application.xml

2:57 pm

axiao

More
7492a14
changed 58 files
v4.7, v4.8

change all library tags following the best practices article "Tag Library Definitions" on the wiki

- -0
- +2
/lams_learning/build.xml
- History
- Source
- Diff
/lams_learning/build.xml
- -47
- +55
/lams_learning/conf/xdoclet/taglibs.xml
- History
- Source
- Diff
/lams_learning/conf/xdoclet/taglibs.xml
- -393
- +0
/lams_learning/web/WEB-INF/jstl/c-rt.tld
- History
- Source
- Diff
/lams_learning/web/WEB-INF/jstl/c-rt.tld
- -416
- +0
/lams_learning/web/WEB-INF/jstl/c.tld
- History
- Source
- Diff
/lams_learning/web/WEB-INF/jstl/c.tld
- -403
- +0
/lams_learning/web/WEB-INF/jstl/fmt-rt.tld
- History
- Source
- Diff
/lams_learning/web/.../jstl/fmt-rt.tld
- -442
- +0
/lams_learning/web/WEB-INF/jstl/fmt.tld
- History
- Source
- Diff
/lams_learning/web/WEB-INF/jstl/fmt.tld
- -188
- +0
/lams_learning/web/WEB-INF/jstl/sql-rt.tld
- History
- Source
- Diff
/lams_learning/web/.../jstl/sql-rt.tld
- -213
- +0
/lams_learning/web/WEB-INF/jstl/sql.tld
- History
- Source
- Diff
/lams_learning/web/WEB-INF/jstl/sql.tld
- -0
- +393
/lams_learning/web/WEB-INF/jstl/tlds/c-rt.tld
- History
- Source
/lams_learning/web/WEB-INF/jstl/tlds/c-rt.tld
- -0
- +416
/lams_learning/web/WEB-INF/jstl/tlds/c.tld
- History
- Source
/lams_learning/web/WEB-INF/jstl/tlds/c.tld
- -0
- +403
/lams_learning/web/WEB-INF/jstl/tlds/fmt-rt.tld
- History
- Source
/lams_learning/web/WEB-INF/.../tlds/fmt-rt.tld
- -0
- +442
/lams_learning/web/WEB-INF/jstl/tlds/fmt.tld
- History
- Source
/lams_learning/web/WEB-INF/jstl/tlds/fmt.tld
- -0
- +188
/lams_learning/web/WEB-INF/jstl/tlds/sql-rt.tld
- History
- Source
/lams_learning/web/WEB-INF/.../tlds/sql-rt.tld
- -0
- +213
/lams_learning/web/WEB-INF/jstl/tlds/sql.tld
- History
- Source
/lams_learning/web/WEB-INF/jstl/tlds/sql.tld
- -0
- +256
/lams_learning/web/WEB-INF/jstl/tlds/x-rt.tld
- History
- Source
/lams_learning/web/WEB-INF/jstl/tlds/x-rt.tld
… 43 more files in changeset.

2:34 pm

fmalikoff

More
8ba43ae
changed 6 files
v4.7, v4.8

Added new tags to help with the lams url, the local tool url + the stylesheets.

- -0
- +107
/lams_central/src/java/org/lamsfoundation/lams/web/tag/CssTag.java
- History
- Source
/lams_central/src/java/org/.../web/tag/CssTag.java
- -0
- +81
/lams_central/src/java/org/lamsfoundation/lams/web/tag/LAMSURLTag.java
- History
- Source
/lams_central/src/java/.../web/tag/LAMSURLTag.java
- -1
- +3
/lams_central/src/java/org/lamsfoundation/lams/web/tag/UserTag.java
- History
- Source
- Diff
/lams_central/src/java/.../tag/UserTag.java
- -0
- +92
/lams_central/src/java/org/lamsfoundation/lams/web/tag/WebAppURLTag.java
- History
- Source
/lams_central/src/java/.../tag/WebAppURLTag.java
- -0
- +21
/lams_central/web/WEB-INF/lams.tld
- History
- Source
- Diff
/lams_central/web/WEB-INF/lams.tld
- -0
- +21
/lams_monitoring/web/WEB-INF/lams.tld
- History
- Source
- Diff
/lams_monitoring/web/WEB-INF/lams.tld

2:32 pm

fmalikoff

More
124d402
changed 2 files
v4.7, v4.8

Fixed context-param entry for the resource file. The <context-param> tags were in the wrong places.

- -0
- +5
/lams_central/conf/xdoclet/web-settings.xml
- History
- Source
- Diff
/lams_central/conf/.../web-settings.xml
- -0
- +5
/lams_central/web/WEB-INF/web.xml
- History
- Source
- Diff
/lams_central/web/WEB-INF/web.xml

2:31 pm

mtruong

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

changed the values of the constants, to reflect the new field names in the wddx packet

- -67
- +82
/lams_common/src/java/org/lamsfoundation/lams/util/wddx/WDDXTAGS.java
- History
- Source
- Diff
/lams_common/src/java/.../wddx/WDDXTAGS.java

2:31 pm

fmalikoff

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

Made themeName and imgRoot variables that must be set by calling code.

- -4
- +3
/lams_central/web/includes/javascript/tabcontroller.js
- History
- Source
- Diff
/lams_central/web/.../tabcontroller.js

2:31 pm

mtruong

More
86a0f18
changed 6 files
v4.7, v4.8

for any values that are null, it will return null instead of sending the special null values.

- -16
- +16
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/DesignDetailDTO.java
- History
- Source
- Diff
/lams_common/src/.../dto/DesignDetailDTO.java
- -7
- +7
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/GroupingDTO.java
- History
- Source
- Diff
/lams_common/src/.../dto/GroupingDTO.java
- -33
- +58
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningDesignDTO.java
- History
- Source
- Diff
/lams_common/src/.../LearningDesignDTO.java
- -4
- +4
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LearningLibraryDTO.java
- History
- Source
- Diff
/lams_common/src/.../LearningLibraryDTO.java
- -7
- +8
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/MonitoringActivityDTO.java
- History
- Source
- Diff
/lams_common/.../MonitoringActivityDTO.java
- -10
- +10
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/TransitionDTO.java
- History
- Source
- Diff
/lams_common/src/.../dto/TransitionDTO.java

2:30 pm

mtruong

More
8400bc6
changed 2 files
v4.7, v4.8

changed libraryActivityUiImage to libraryActivityUIImage

for any properties that are null, it will return null, instead of sending the special null value

- -45
- +45
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/AuthoringActivityDTO.java
- History
- Source
- Diff
/lams_common/.../AuthoringActivityDTO.java
- -12
- +12
/lams_common/src/java/org/lamsfoundation/lams/learningdesign/dto/LibraryActivityDTO.java
- History
- Source
- Diff
/lams_common/src/.../LibraryActivityDTO.java

2:27 pm

Added checks, so that it will only set the value if the field is present in the wddx packet. Will also update any activities that exist in a learning design, and delete unused ones. instead of creating new entries each time al earning design is saved