Activity lams/

2:36 pm

lfoxton

More
lams2_3:lfoxton:20090603063628
changed 21 files
lams2_3

LDEV-2366 Tool adapters to allow multiple integrated servers to user them

Committing core changes for this JIRA

- -1
- +2
/lams_admin/conf/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources.properties
- -2
- +2
/lams_admin/conf/language/lams/ApplicationResources_en_AU.properties
- History
- Source
- Diff
/lams_admin/.../ApplicationResources_en_AU.properties
- -0
- +1
/lams_admin/conf/xdoclet/struts-forms.xml
- History
- Source
- Diff
/lams_admin/conf/xdoclet/struts-forms.xml
- -94
- +101
/lams_admin/src/java/org/lamsfoundation/lams/admin/web/ServerSaveAction.java
- History
- Source
- Diff
/lams_admin/src/.../web/ServerSaveAction.java
- -0
- +4
/lams_admin/web/servermaintain.jsp
- History
- Source
- Diff
/lams_admin/web/servermaintain.jsp
- -0
- +1
/lams_admin/web/WEB-INF/struts/struts-config.xml
- History
- Source
- Diff
/lams_admin/web/.../struts/struts-config.xml
- -0
- +14
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerOrgMap.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../ExtServerOrgMap.hbm.xml
- -0
- +65
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.hbm.xml
- History
- Source
- Diff
/lams_common/.../ExtServerToolAdapterMap.hbm.xml
- -0
- +11
/lams_common/conf/hibernate/mappings/org/lamsfoundation/lams/tool/Tool.hbm.xml
- History
- Source
- Diff
/lams_common/conf/.../tool/Tool.hbm.xml
- -1
- +16
/lams_common/db/sql/create_integration_tables.sql
- History
- Source
- Diff
/lams_common/.../create_integration_tables.sql
- -2
- +2
/lams_common/db/sql/insert_types_data.sql
- History
- Source
- Diff
/lams_common/db/sql/insert_types_data.sql
- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/commonContext.xml
- History
- Source
- Diff
/lams_common/src/.../lams/commonContext.xml
- -0
- +1
/lams_common/src/java/org/lamsfoundation/lams/dao/hibernate/BaseDAO.java
- History
- Source
- Diff
/lams_common/src/.../hibernate/BaseDAO.java
- -0
- +15
/lams_common/src/java/org/lamsfoundation/lams/dbupdates/Patch0017_updateFrom23-231.sql
- History
- Source
- Diff
/lams_common/.../Patch0017_updateFrom23-231.sql
- -149
- +126
/lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerOrgMap.java
- History
- Source
- Diff
/lams_common/src/.../ExtServerOrgMap.java
… 6 more files in changeset.

2:20 pm

paulg

More
lams2_3:paulg:20090603062022
changed 4 files
lams2_3

LDEV-2366

Changes for tool adaptors reflected in Flash

- binary
/lams_central/web/lams_authoring.swf
- History
- Source
- Diff
/lams_central/web/lams_authoring.swf
- binary
/lams_central/web/lams_authoring_library.swf
- History
- Source
- Diff
/lams_central/.../lams_authoring_library.swf
- -1
- +14
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/ToolActivity.as
- History
- Source
- Diff
/lams_flash/src/.../authoring/ToolActivity.as
- -28
- +69
/lams_flash/src/central/flash/org/lamsfoundation/lams/authoring/tk/ToolkitView.as
- History
- Source
- Diff
/lams_flash/src/central/.../tk/ToolkitView.as

10:42 am

mseaton

More
lams2_3:mseaton:20090603024259
changed 2 files
lams2_3

LDEV-2363 Fix duplicate open vote (text entry).

- -1
- +1
/lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/VoteLearningAction.java
- History
- Source
- Diff
/lams_tool_vote/.../VoteLearningAction.java
- -3
- +5
/lams_tool_vote/web/learning/AllNominations.jsp
- History
- Source
- Diff
/lams_tool_vote/web/.../AllNominations.jsp

9:33 am

Modified the createId method to return the jabberID instead of null when a 409 error code is returned from the xmpp server. A 409 error code indicates that the user has already been created with this ID

- -6
- +7
/lams_common/src/java/org/lamsfoundation/lams/util/XMPPUtil.java
- History
- Source
- Diff
/lams_common/src/java/.../util/XMPPUtil.java

5:59 am

Ernie Ghiglione

More
MAIN:ernieg:20090602215958
added 1 file
MAIN

Adding 10forums sequence for testing

- -0
- +15
/TestHarness4LAMS2/10forums.zip
- History
- Source
/TestHarness4LAMS2/10forums.zip

1:01 pm

mseaton

More
MAIN:mseaton:20090602050152
changed 2 files
MAIN

deb pkg fix for 2.3 - disable VR, fixed users for install, keep news.html for update.

- -4
- +4
/debian_installer/lams2/debian/postinst
- History
- Source
- Diff
/debian_installer/lams2/debian/postinst
- -0
- +3
/debian_installer/lams2/debian/preinst
- History
- Source
- Diff
/debian_installer/lams2/debian/preinst

11:16 am

paulg

More
lams2_3:paulg:20090602031653
changed 1 file
lams2_3

LDEV-2356

wmode turned off... presenceChat will unfortunately be shown behind the VideoRecorder but keyboard and mouse input will be detected correctly

- -2
- +0
/lams_tool_videorecorder/web/pages/learning/videoRecorder.jsp
- History
- Source
- Diff
/lams_tool_videorecorder/.../videoRecorder.jsp

2:11 am

jliew

More
lams2_3:jliew:20090601181105
deleted 1 file
lams2_3

file bootstrap.slim.xml was added on branch lams2_3 on 2009-06-30 02:30:56 +0000

- -0
- +0
/lams_build/conf/windows/jboss/bootstrap.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/bootstrap.slim.xml

2:11 am

Marcin Cieslak

LDEV-2071: Fixed a minor bug. Reconfigured slim-jboss Ant task so it "slims" JBoss 5, removing unnecessary modules.

- -47
- +53
/lams_build/build.xml
- History
- Source
- Diff
/lams_build/build.xml
- -0
- +18
/lams_build/conf/unix/jboss/bootstrap.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/bootstrap.slim.xml
- -0
- +18
/lams_build/conf/windows/jboss/bootstrap.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/bootstrap.slim.xml
- -0
- +1
/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../authoringApplicationContext.xml

2:11 am

jliew

More
lams2_3:jliew:20090601181104
deleted 1 file
lams2_3

file bootstrap.slim.xml was added on branch lams2_3 on 2009-06-30 02:30:53 +0000

- -0
- +0
/lams_build/conf/unix/jboss/bootstrap.slim.xml
- History
- Source
- Diff
/lams_build/conf/.../jboss/bootstrap.slim.xml

2:11 am

Marcin Cieslak

More
MAIN:marcin:20090601181104
deleted 2 files
MAIN

file bootstrap.slim.xml was initially added on branch lams2_3_jboss5.

- -0
- +0
/lams_build/conf/unix/jboss/bootstrap.slim.xml
- History
- Source
/lams_build/conf/unix/jboss/bootstrap.slim.xml
- -0
- +0
/lams_build/conf/windows/jboss/bootstrap.slim.xml
- History
- Source
/lams_build/conf/.../jboss/bootstrap.slim.xml

11:02 pm

Marcin Cieslak

LDEV-2071: Corrected several Application Context files. Did minor changes to prepare LAMS for JBoss 5.1.0.GA. Added retry mechanism in deadlock spot.

- -3
- +8
/lams_build/conf/unix/jboss/jbossweb/war-deployers-jboss-beans.xml
- History
- Source
- Diff
/lams_build/.../war-deployers-jboss-beans.xml
- -3
- +8
/lams_build/conf/windows/jboss/jbossweb/war-deployers-jboss-beans.xml
- History
- Source
- Diff
/lams_build/.../war-deployers-jboss-beans.xml
- binary
/lams_build/lib/jbossweb/jbossweb.jar
- History
- Source
- Diff
/lams_build/lib/jbossweb/jbossweb.jar
- -0
- +5
/lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../authoringApplicationContext.xml
- -1
- +3
/lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml
- History
- Source
- Diff
/lams_central/.../workspaceApplicationContext.xml
- -7
- +5
/lams_common/src/java/org/lamsfoundation/lams/applicationContext.xml
- History
- Source
- Diff
/lams_common/src/.../applicationContext.xml
- -3
- +4
/lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml
- History
- Source
- Diff
/lams_common/.../toolApplicationContext.xml
- -11
- +2
/lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml
- History
- Source
- Diff
/lams_gradebook/.../gradebookApplicationContext.xml
- -2
- +4
/lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml
- History
- Source
- Diff
/lams_learning/.../learningApplicationContext.xml
- -1
- +7
/lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java
- History
- Source
- Diff
/lams_learning/src/.../LearnerService.java
- -13
- +9
/lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/monitoringApplicationContext.xml
- History
- Source
- Diff
/lams_monitoring/.../monitoringApplicationContext.xml

10:08 am

asukkar

More
MAIN:asukkar:20090526020847
changed 1100 files
MAIN

2.3 installer changes.

- -13
- +0
/unix_installer/upgrader-package/assembly/lams.ear/lams-www.war/news-2.0.2.html
- History
- Source
- Diff
/unix_installer/.../news-2.0.2.html
- -118
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/lams.properties
- History
- Source
- Diff
/unix_installer/.../lams.properties
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/license
- History
- Source
- Diff
/unix_installer/upgrader-package/.../license
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/readme
- History
- Source
- Diff
/unix_installer/upgrader-package/.../readme
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/update-lams.sh
- History
- Source
- Diff
/unix_installer/.../update-lams.sh
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/bin/ant
- History
- Source
- Diff
/unix_installer/upgrader-package/.../bin/ant
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/bin/antRun
- History
- Source
- Diff
/unix_installer/upgrader-package/.../antRun
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/bin/antRun.pl
- History
- Source
- Diff
/unix_installer/.../antRun.pl
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/bin/complete-ant-cmd.pl
- History
- Source
- Diff
/unix_installer/.../complete-ant-cmd.pl
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/bin/runant.pl
- History
- Source
- Diff
/unix_installer/.../runant.pl
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/lib/ant-contrib-1.0b3.jar
- History
- Source
- Diff
/unix_installer/.../ant-contrib-1.0b3.jar
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/lib/ant-launcher.jar
- History
- Source
- Diff
/unix_installer/.../ant-launcher.jar
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/lib/ant.jar
- History
- Source
- Diff
/unix_installer/upgrader-package/.../ant.jar
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant/lib/mysql-connector-java-3.1.12-bin.jar
- History
- Source
- Diff
/unix_installer/.../mysql-connector-java-3.1.12-bin.jar
- binary
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/ant-scripts/copyllid.class
- History
- Source
- Diff
/unix_installer/.../copyllid.class
… 1085 more files in changeset.

9:57 am

asukkar

More
MAIN:asukkar:20090526015753
changed 185 files
MAIN

2.3 installer changes.

- -91
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_ar_JO.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_ar_JO.properties
- -98
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_cy_GB.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_cy_GB.properties
- -98
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_da_DK.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_da_DK.properties
- -91
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_de_DE.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_de_DE.properties
- -98
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_mi_NZ.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_mi_NZ.properties
- -98
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_no_NO.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_no_NO.properties
- -98
- +0
/unix_installer/upgrader-package/build/lams-unix-updater-2.0.2/language-pack/lams-dictionary.jar/org/lamsfoundation/lams/tool/chat/ApplicationResources_sv_SE.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_sv_SE.properties
- -27
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/deployLibrary.xml
- History
- Source
- Diff
/unix_installer/.../deployLibrary.xml
- -2
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/learninglibrary1_insert.sql
- History
- Source
- Diff
/unix_installer/.../learninglibrary1_insert.sql
- -15
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/libraryActivity1_insert.sql
- History
- Source
- Diff
/unix_installer/.../libraryActivity1_insert.sql
- -16
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/toolActivity1_insert.sql
- History
- Source
- Diff
/unix_installer/.../toolActivity1_insert.sql
- -16
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/toolActivity2_insert.sql
- History
- Source
- Diff
/unix_installer/.../toolActivity2_insert.sql
- -14
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/language/lams/ApplicationResources.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources.properties
- -14
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/language/lams/ApplicationResources_ar_JO.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_ar_JO.properties
- -14
- +0
/unix_installer/upgrader-package/language-pack/library/chatscribe/language/lams/ApplicationResources_cy_GB.properties
- History
- Source
- Diff
/unix_installer/.../ApplicationResources_cy_GB.properties
… 170 more files in changeset.

9:46 am

asukkar

More
MAIN:asukkar:20090526014622
changed 173 files
MAIN

2.3 installer changes.

- -0
- +111
/unix_installer/installer-package/build-helper.xml
- History
- Source
/unix_installer/.../build-helper.xml
- -0
- +1
/unix_installer/installer-package/build.xml
- History
- Source
- Diff
/unix_installer/.../build.xml
- binary
/unix_installer/installer-package/install-lams.sh
- History
- Source
- Diff
/unix_installer/.../install-lams.sh
- -7
- +0
/unix_installer/installer-package/ant-scripts/.configure-deploy.xml.swp
- History
- Source
- Diff
/unix_installer/.../.configure-deploy.xml.swp
- -2
- +2
/unix_installer/installer-package/ant-scripts/configure-database.xml
- History
- Source
- Diff
/unix_installer/.../configure-database.xml
- -0
- +10
/unix_installer/installer-package/ant-scripts/configure-deploy.xml
- History
- Source
- Diff
/unix_installer/.../configure-deploy.xml
- -2
- +2
/unix_installer/installer-package/ant-scripts/version.properties
- History
- Source
- Diff
/unix_installer/.../version.properties
- -0
- +69
/unix_installer/installer-package/conf/unix/jboss/ejb-deployer.slim.xml
- History
- Source
/unix_installer/.../ejb-deployer.slim.xml
- -0
- +395
/unix_installer/installer-package/conf/unix/jboss/jboss-service.slim.xml
- History
- Source
/unix_installer/.../jboss-service.slim.xml
- -0
- +0
/unix_installer/installer-package/conf/unix/jboss/jboss-service.xml
- History
- Source
- Diff
/unix_installer/.../jboss-service.xml
- -2
- +2
/unix_installer/installer-package/conf/unix/jboss/log4j.xml
- History
- Source
- Diff
/unix_installer/.../log4j.xml
- -0
- +0
/unix_installer/installer-package/conf/unix/jboss/login-config.xml
- History
- Source
- Diff
/unix_installer/.../login-config.xml
- -0
- +1038
/unix_installer/installer-package/conf/unix/jboss/standardjboss.slim.xml
- History
- Source
/unix_installer/.../standardjboss.slim.xml
- -39
- +1
/unix_installer/installer-package/conf/unix/jboss/service/mysql-ds.xml
- History
- Source
- Diff
/unix_installer/.../mysql-ds.xml
- -0
- +0
/unix_installer/installer-package/conf/unix/jboss/tomcat/jboss-service.xml
- History
- Source
- Diff
/unix_installer/.../jboss-service.xml
… 158 more files in changeset.

9:05 am

lfoxton

More
MAIN:lfoxton:20090526010545
changed 4 files
MAIN

final commit before lams2_3_0 tag

- -0
- +3
/win_installer/.settings/org.eclipse.core.resources.prefs
- History
- Source
/win_installer/.../org.eclipse.core.resources.prefs
- binary
/win_installer/updater/src/updater.nsi
- History
- Source
- Diff
/win_installer/updater/src/updater.nsi
- binary
/win_installer/updater/src/sql/removeConfigs.sql
- History
- Source
- Diff
/win_installer/updater/.../removeConfigs.sql
- -1
- +3
/win_installer/utils/src/ant/revert.xml
- History
- Source
- Diff
/win_installer/utils/src/ant/revert.xml

2:16 am

Marcin Cieslak

LDEV-2071, LDEV-2201, LDEV-57: Changed the Transaction Manager to Hibernate instead of JTA. Synchronized code in 2 more spots as deadlock exceptions had been thrown.