Fisheye on lams-github/lams_contentrepository/src

lams-github (v4.7): LDEV-5357 Fix redirect with HTTP when HTTPS is used

Marcin Cieslak — Fri, 14 Jul 2023 16:17:55 +0200

Marcin Cieslak committed 62f153f on branch v4.7, v4.8 in lams-github

LDEV-5357 Fix redirect with HTTP when HTTPS is used

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-13, +16)

| History

| Source

| Diff

lams-github (v4.7): LDEV-5357 Fix zipped website displaying after introducing UUIDs

Marcin Cieslak — Fri, 14 Jul 2023 13:05:03 +0200

Marcin Cieslak committed 78eab2e on branch v4.7, v4.8 in lams-github

LDEV-5357 Fix zipped website displaying after introducing UUIDs

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(-17, +12)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/IRepositoryService.java	(-193, +147)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java	(-113, +58)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-5357 Use UUIDs for file downloads

Marcin Cieslak — Fri, 27 Jan 2023 18:07:35 +0100

Marcin Cieslak committed 2de8f80 on branch v4.7, v4.8 in lams-github

LDEV-5357 Use UUIDs for file downloads

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java

(-10, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java

(-14, +15)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java

(-13, +12)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20230127.sql

(-0, +23)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

(-9, +9)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java

(-26, +7)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-7, +10)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/IToolContentFullHandler.java

(-2, +2)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/ToolContentHandler.java

(-69, +57)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java

(-1, +1)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/IRepositoryService.java

(-6, +6)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

(-10, +8)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java

(-14, +13)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java

(-5, +5)

| History

| Source

| Diff

… 42 more files in changeset.

lams-github (v4.7): LDEV-5349 Reintroduce zipped website as Shared Resource

Marcin Cieslak — Tue, 13 Dec 2022 10:17:42 +0100

Marcin Cieslak committed f007d7e on branch v4.7, v4.8 in lams-github

LDEV-5349 Reintroduce zipped website as Shared Resource

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_larsrc/conf/language/lams/ApplicationResources.properties

(-0, +4)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/ResourceConstants.java

(-3, +7)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dbupdates/patch20221212.sql

(-0, +14)

| History

| Source

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/model/ResourceItem.java

(-1, +12)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/ResourceServiceImpl.java

(-0, +65)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/AuthoringController.java

(-1, +13)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/LearningController.java

(-1, +2)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/controller/ViewItemController.java

(-4, +9)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/authoring/basic.jsp

(-1, +3)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/authoring/parts/addwebsite.jsp

(-0, +108)

| History

| Source

· /lams_tool_larsrc/web/pages/authoring/parts/itemlist.jsp

(-1, +12)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/itemreview/itemContent.jsp

(-2, +13)

| History

| Source

| Diff

· /lams_tool_larsrc/web/pages/itemreview/mainframe.jsp

(-0, +7)

| History

| Source

| Diff

… 3 more files in changeset.

lams-github (v4.7): LDEV-4962 Use complex portrait UUID in tools...

Marcin Cieslak — Wed, 05 Feb 2020 07:10:02 +0100

Marcin Cieslak committed 0e7d403 on branch v4.7, v4.8 in lams-github

LDEV-4962 Use complex portrait UUID in tools

Conflicts:

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

(-1, +1)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-0, +2)

| History

| Source

| Diff

· /lams_tool_assessment/src/java/org/.../assessment/dao/hibernate/AssessmentUserDAOHibernate.java

(-5, +4)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java

(-8, +5)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/controller/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/hibernate/McUserDAO.java

(-42, +34)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/dao/hibernate/QaUsrRespDAO.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/model/QaUsrResp.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/.../rsrc/dao/hibernate/ResourceItemVisitDAOHibernate.java

(-31, +24)

| History

| Source

| Diff

· /lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/dto/VisitLogDTO.java

(-6, +4)

| History

| Source

| Diff

· /lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/dao/hibernate/NotebookUserDAO.java

(-8, +10)

| History

| Source

| Diff

· /lams_tool_notebook/src/java/org/lamsfoundation/.../notebook/web/controller/MonitoringController.java

(-2, +2)

| History

| Source

| Diff

· /lams_tool_preview/src/java/org/.../peerreview/dao/hibernate/PeerreviewUserDAOHibernate.java

(-88, +80)

| History

| Source

| Diff

… 11 more files in changeset.

lams-github (v4.7): LDEV-4962 Introduce complex portrait UUIDs...

Marcin Cieslak — Tue, 04 Feb 2020 16:10:39 +0100

Marcin Cieslak committed 365a2c2 on branch v4.7, v4.8 in lams-github

LDEV-4962 Introduce complex portrait UUIDs

Conflicts:

lams_common/src/java/org/lamsfoundation/lams/util/WebUtil.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/dao/hibernate/AssessmentUserDAOHibernate.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/AssessmentServiceImpl.java

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/service/IAssessmentService.java

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/LogEventController.java

(-8, +13)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/form/UserForm.java

(-3, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitActionForm.java

(-3, +3)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitController.java

(-3, +6)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveController.java

(-5, +6)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/tag/PortraitTag.java

(-20, +27)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/confidencelevel/ConfidenceLevelDTO.java

(-14, +14)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java

(-4, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java

(-5, +13)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20200204.sql

(-0, +23)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/User.java

(-9, +10)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dao/hibernate/UserDAO.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/dto/UserDTO.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java

(-6, +8)

| History

| Source

| Diff

… 24 more files in changeset.

lams-github (v4.7): LDEV-4929 Add missing service method names to xApplicationContext.xmls...

Andrey Balan — Wed, 18 Dec 2019 23:21:37 +0100

Andrey Balan committed 713a4d2 on branch v4.7, v4.8 in lams-github

LDEV-4929 Add missing service method names to xApplicationContext.xmls

* Alphabetize method names in to xApplicationContext.xmls

· /lams_central/src/java/org/lamsfoundation/lams/authoring/authoringApplicationContext.xml

(-10, +8)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java

(-1, +0)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/workspaceApplicationContext.xml

(-6, +5)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/comments/commentsContext.xml

(-2, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

(-35, +49)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integrationContext.xml

(-4, +6)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/IExportToolContentService.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/LearningDesignValidator.java

(-1, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/notebook/service/ICoreNotebookService.java

(-2, +0)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/toolApplicationContext.xml

(-11, +14)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/ldapContext.xml

(-0, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/ILdapService.java

(-1, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-13, +12)

| History

| Source

| Diff

· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/gradebookApplicationContext.xml

(-4, +4)

| History

| Source

| Diff

· /lams_learning/src/java/org/lamsfoundation/lams/learning/learningApplicationContext.xml

(-14, +15)

| History

| Source

| Diff

… 28 more files in changeset.

lams-github (v4.7): Merge remote-tracking branch 'origin/master' into develop

Marcin Cieslak — Thu, 18 Apr 2019 07:59:09 +0200

Marcin Cieslak committed c1c22ca on branch v4.7, v4.8 in lams-github

Merge remote-tracking branch 'origin/master' into develop

· /lams_common/src/java/org/lamsfoundation/lams/usermanagement/service/UserManagementService.java	(-7, +10)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/web/session/SessionManager.java	(-2, +9)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-22, +40)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-53, +83)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4801 Always use a transaction for when logging in user to CR

Marcin Cieslak — Sun, 14 Apr 2019 12:59:43 +0200

Marcin Cieslak committed 790d59c on branch v4.7, v4.8 in lams-github

LDEV-4801 Always use a transaction for when logging in user to CR

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4801 Revert changes of FileDAO...

Marcin Cieslak — Sun, 14 Apr 2019 12:35:29 +0200

Marcin Cieslak committed ea80430 on branch v4.7, v4.8 in lams-github

LDEV-4801 Revert changes of FileDAO

They did not lead to fixing the problem and were actually unnecessary:

FileDAO does not use DB connections, so no need for transactions.

· /lams_contentrepository/src/java/org/.../lams/contentrepository/CheckCredentialTicketBeforeAdvice.java	(-2, +3)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(-7, +7)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(-0, +6)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java	(-10, +24)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/IRepositoryService.java	(-41, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-22, +40)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java	(-74, +43)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-53, +83)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): Revert "LDEV-4801 Do throw an exception in FileDAO when file is not found."...

Marcin Cieslak — Sun, 14 Apr 2019 12:30:58 +0200

Marcin Cieslak committed 1e26200 on branch v4.7, v4.8 in lams-github

Revert "LDEV-4801 Do throw an exception in FileDAO when file is not found."

This reverts commit 6f700a19baae0fa813ac85e0b4559d0afe27523a.

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(-5, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java	(-6, +8)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-3, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java	(-3, +0)	\| History	\| Source	\| Diff
· /lams_tool_images/src/java/org/lamsfoundation/.../tool/imageGallery/service/ImageGalleryServiceImpl.java	(-4, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4801 Wrap in a transaction a method which uses a DB connection

Marcin Cieslak — Sun, 14 Apr 2019 11:55:18 +0200

Marcin Cieslak committed 3791c37 on branch v4.7, v4.8 in lams-github

LDEV-4801 Wrap in a transaction a method which uses a DB connection

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-1, +2)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4801 Do throw an exception in FileDAO when file is not found....

Marcin Cieslak — Fri, 12 Apr 2019 10:38:01 +0200

Marcin Cieslak committed 6f700a1 on branch v4.7, v4.8 in lams-github

LDEV-4801 Do throw an exception in FileDAO when file is not found.

An attempt to fix leaked connections.

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(-1, +5)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/file/FileDAO.java	(-8, +6)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java	(-0, +3)	\| History	\| Source	\| Diff
· /lams_tool_images/src/java/org/lamsfoundation/.../tool/imageGallery/service/ImageGalleryServiceImpl.java	(-1, +4)	\| History	\| Source	\| Diff

lams-github (v4.7): Merge remote-tracking branch 'origin/master' into develop

Marcin Cieslak — Sun, 07 Apr 2019 19:23:58 +0200

Marcin Cieslak committed 1df79e8 on branch v4.7, v4.8 in lams-github

Merge remote-tracking branch 'origin/master' into develop

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeController.java	(-2, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-40, +22)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-57, +27)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4802 Make all DAO calls in content repository go through service...

Marcin Cieslak — Sun, 07 Apr 2019 09:21:37 +0200

Marcin Cieslak committed d140daa on branch v4.7, v4.8 in lams-github

LDEV-4802 Make all DAO calls in content repository go through service

Some classes in content repository were using DAO methods directly,

without enveloping them in a transaction. Now they all go through

RepositoryService.

These methods need to start with "dao" prefix so they are not picked up

by CheckCredentialTicketBeforeAdvice.

· /lams_contentrepository/src/java/org/.../lams/contentrepository/CheckCredentialTicketBeforeAdvice.java	(-3, +2)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml	(-7, +7)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/INodeDAO.java	(-3, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/dao/hibernate/NodeDAO.java	(-6, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/INodeFactory.java	(-24, +10)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/IRepositoryService.java	(-0, +41)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-40, +22)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleRepository.java	(-43, +74)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-83, +53)	\| History	\| Source	\| Diff
· /lams_learning/src/java/org/lamsfoundation/lams/learning/command/CommandWebsocketServer.java	(-1, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4802 Allow TX writing when getting a file item from repository...

Marcin Cieslak — Sat, 06 Apr 2019 07:19:36 +0200

Marcin Cieslak committed 0bf13f3 on branch v4.7, v4.8 in lams-github

LDEV-4802 Allow TX writing when getting a file item from repository

Attempt to fix

java.lang.Exception: Connection across boundary

when downloading a file. It leaks a connection.

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/applicationContext.xml

(-4, +3)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4755 Fix files with zero length being uploaded after viruse scan...

Marcin Cieslak — Wed, 06 Mar 2019 10:39:30 +0100

Marcin Cieslak committed 9592b43 on branch v4.7, v4.8 in lams-github

LDEV-4755 Fix files with zero length being uploaded after viruse scan

Antivirus scan read the stream so it would be at its end when file got

written to drive.

· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(-0, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/.classpath	(-21, +26)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-1, +8)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4755 Initial virus scanning implementation

Marcin Cieslak — Sat, 19 Jan 2019 15:49:42 +0100

Marcin Cieslak committed 783f965 on branch v4.7, v4.8 in lams-github

LDEV-4755 Initial virus scanning implementation

· /lams_common/src/java/org/lamsfoundation/lams/util/FileUtil.java	(-1, +37)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/ToolContentHandler.java	(-14, +13)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/service/NodeFactory.java	(-1, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/SimpleVersionedNode.java	(-26, +35)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4696 Make all @ManyToOne and @OneToOne lazy...

Marcin Cieslak — Mon, 26 Nov 2018 16:23:36 +0100

Marcin Cieslak committed 82b696d on branch v4.7, v4.8 in lams-github

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

· /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java

(-15, +15)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java

(-5, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-7, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java

(-1, +1)

| History

| Source

| Diff

… 156 more files in changeset.

lams-github (v4.7): LDEV-4696 Make all @ManyToOne and @OneToOne lazy...

Marcin Cieslak — Mon, 26 Nov 2018 16:23:36 +0100

Marcin Cieslak committed 1ee503e on branch v4.7, v4.8 in lams-github

LDEV-4696 Make all @ManyToOne and @OneToOne lazy

Hibernate 3 used lazy loading of single-object relationships by default.

JPA's default setting is eager. When loading entities all references are

loaded immediately using JOINs. A large entity, like Learning Design,

can have a query consisting of 25 JOINs. It makes it very slow.

There is no way to change JPA's default behaviour. In order to make JPA

annotations behave like old Hibernate, each of them got an explicit

attribute saying that loading is lazy.

· /lams_common/src/java/org/lamsfoundation/lams/comments/Comment.java

(-15, +15)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/comments/CommentLike.java

(-5, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/events/Subscription.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtCourseClassMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerLessonMap.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtServerToolAdapterMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/integration/ExtUserUseridMap.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Activity.java

(-7, +8)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ActivityEvaluation.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/BranchActivityEntry.java

(-4, +4)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/Competence.java

(-1, +2)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/CompetenceMapping.java

(-2, +3)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/ComplexActivity.java

(-1, +1)

| History

| Source

| Diff

… 156 more files in changeset.

lams-github (v4.7): LDEV-4696 Removing legacy parameters and deprecated methods

Thu, 01 Nov 2018 04:23:52 +0100

Fiona Malikoff committed 8846e87 on branch v4.7, v4.8 in lams-github

LDEV-4696 Removing legacy parameters and deprecated methods

· /lams_contentrepository/src/java/org/.../contentrepository/dao/hibernate/CredentialDAO.java

(-8, +8)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoAnswerDAOHibernate.java

(-0, +1)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoDAOHibernate.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoSessionDAOHibernate.java

(-4, +5)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/dao/hibernate/DacoUserDAOHibernate.java

(-7, +5)

| History

| Source

| Diff

· /lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/controller/MonitoringController.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_daco/web/pages/learning/questionSummaries.jsp

(-1, +1)

| History

| Source

| Diff

· /lams_tool_doku/src/java/org/.../dokumaran/dao/hibernate/DokumaranConfigItemDAOHibernate.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/ForumUserDao.java

(-4, +4)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageDao.java

(-5, +3)

| History

| Source

| Diff

· /lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/dao/hibernate/MessageSeqDao.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_images/src/java/org/.../imageGallery/dao/hibernate/ImageGalleryConfigItemDAOHibernate.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/.../dao/hibernate/CommonCartridgeConfigItemDAOHibernate.java

(-1, +1)

| History

| Source

| Diff

· /lams_tool_imscc/src/java/org/.../commonCartridge/dao/hibernate/CommonCartridgeItemVisitDAOHibernate.java

(-3, +3)

| History

| Source

| Diff

· /lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/dao/IMcQueContentDAO.java

(-1, +1)

| History

| Source

| Diff

… 25 more files in changeset.

lams-github (v4.7): LDEV-4696 Content Repository converted to annotations

Mon, 29 Oct 2018 14:51:40 +0100

Fiona Malikoff committed 809352b on branch v4.7, v4.8 in lams-github

LDEV-4696 Content Repository converted to annotations

· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-0, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lams/contentrepository/CrCredential.hbm.xml	(-78, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lamsfoundation/lams/contentrepository/CrNode.hbm.xml	(-122, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lams/contentrepository/CrNodeVersion.hbm.xml	(-102, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lams/contentrepository/CrNodeVersionProperty.hbm.xml	(-82, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lams/contentrepository/CrWorkspace.hbm.xml	(-87, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/conf/hibernate/mappings/.../lams/contentrepository/CrWorkspaceCredential.hbm.xml	(-64, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrCredential.java	(-49, +23)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNode.java	(-94, +39)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java	(-70, +29)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java	(-50, +22)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspace.java	(-53, +28)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrWorkspaceCredential.java	(-34, +20)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../contentrepository/dao/hibernate/CredentialDAO.java	(-7, +8)	\| History	\| Source	\| Diff

lams-github (v4.7): Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration...

Marcin Cieslak — Sat, 15 Sep 2018 07:22:02 +0200

Marcin Cieslak committed 62aaf16 on branch v4.7, v4.8 in lams-github

Major merge of LAMS 3.1 into LDEV-4440 branch after Struts migration

Conflicts:

lams_admin/.classpath

lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/CloneLessonsAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ConfigAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrgSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/OrganisationAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/ServerSaveAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SignupManagementAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/SysAdminStartAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserAction.java

lams_admin/src/java/org/lamsfoundation/lams/admin/web/action/UserSaveAction.java

lams_admin/web/WEB-INF/struts-config.xml

lams_admin/web/WEB-INF/tiles-defs.xml

lams_admin/web/config/items.jsp

lams_admin/web/css/admin.scss

lams_admin/web/organisation/courseAdminEdit.jsp

lams_admin/web/organisation/createOrEdit.jsp

lams_admin/web/organisation/list.jsp

lams_admin/web/servermaintain.jsp

lams_admin/web/signupmanagement/add.jsp

lams_admin/web/signupmanagement/list.jsp

lams_admin/web/timezoneServerManagement.jsp

lams_admin/web/user.jsp

lams_admin/web/usersearchlist.jsp

lams_build/lib/lams/lams-admin.jar

lams_build/lib/lams/lams-central.jar

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

lams_build/lib/lams/lams-monitoring.jar

lams_build/lib/lams/lams.jar

lams_central/.classpath

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/LdTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/template/web/TBLTemplateAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/AuthoringAction.java

lams_central/src/java/org/lamsfoundation/lams/authoring/web/LamsAuthoringFinishAction.java

lams_central/src/java/org/lamsfoundation/lams/web/DisplayGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java

lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/PortraitSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java

lams_central/src/java/org/lamsfoundation/lams/web/ProfileSaveAction.java

lams_central/src/java/org/lamsfoundation/lams/web/TextSearchActionForm.java

lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

lams_central/src/java/org/lamsfoundation/lams/web/action/SignupAction.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerActivityForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerGroupingForm.java

lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerSequenceNodeForm.java

lams_central/web/WEB-INF/struts-config.xml

lams_central/web/editprofile.jsp

lams_central/web/includes/javascript/pedagogicalPlanner.js

lams_central/web/lessons.jsp

lams_central/web/main.jsp

lams_central/web/portrait.jsp

lams_central/web/profile.jsp

lams_central/web/signup/singupTab.jsp

lams_central/web/tutorialVideo.jsp

lams_common/src/java/org/lamsfoundation/lams/commonContext.xml

lams_common/src/java/org/lamsfoundation/lams/dbupdates/patch20180821.sql

lams_common/src/java/org/lamsfoundation/lams/learningdesign/TextSearchCondition.java

lams_gradebook/.classpath

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/util/GradebookConstants.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookMonitoringAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/kumalive/KumaliveAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/BranchingActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/ChooseActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/CompleteActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayOptionsActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayParallelActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/DisplayToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GateAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/GroupingAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LearnerAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/LoadToolActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/NotebookAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/action/SequenceActivityAction.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/form/ActivityForm.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/ActivityMapping.java

lams_learning/src/java/org/lamsfoundation/lams/learning/web/util/LearningWebUtil.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/BranchingAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/ComplexLearnerProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailNotificationsAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/EmailProgressAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GateAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupBasedBranchingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/GroupingUploadAJAXAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/MonitoringAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/SequenceAction.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/web/TblMonitoringAction.java

lams_monitoring/web/gate/scheduleGateContent.jsp

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/web/action/ClearSessionAction.java

lams_tool_bbb/src/java/org/lamsfoundation/lams/tool/bbb/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/AuthoringAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/ClearSessionAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/actions/LearningAction.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatConditionForm.java

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/web/forms/ChatPedagogicalPlannerForm.java

lams_tool_daco/.classpath

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/service/IDacoService.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/AuthoringAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/ClearSessionAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/LearningAction.java

lams_tool_daco/src/java/org/lamsfoundation/lams/tool/daco/web/action/MonitoringAction.java

lams_tool_dimdim/.classpath

lams_tool_dimdim/src/java/org/lamsfoundation/lams/tool/dimdim/web/actions/LearningAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/AuthoringAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/ClearSessionAction.java

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/web/action/LearningAction.java

lams_tool_eadventure/.classpath

lams_tool_eadventure/src/java/org/eucm/lams/tool/eadventure/web/action/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/AuthoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/ClearSessionAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/LearningAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/actions/MonitoringAction.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumConditionForm.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/web/forms/ForumPedagogicalPlannerForm.java

lams_tool_forum/web/jsps/learning/viewtopic.jsp

lams_tool_forum/web/jsps/monitoring/summary.jsp

lams_tool_forum/web/jsps/monitoring/viewmarks.jsp

lams_tool_gmap/src/java/org/lamsfoundation/lams/tool/gmap/web/actions/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/service/ImageGalleryServiceImpl.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/AuthoringAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/ClearSessionAction.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/service/ICommonCartridgeService.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/AuthoringAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/ClearSessionAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/action/LearningAction.java

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/web/form/CommonCartridgePedagogicalPlannerForm.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/AuthoringAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/ClearSessionAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/actions/LearningAction.java

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/web/forms/KalturaPedagogicalPlannerForm.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/ClearSessionAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/action/McLearningAction.java

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/web/form/McPedagogicalPlannerForm.java

lams_tool_lamc/web/authoring/AdvancedContent.jsp

lams_tool_lamc/web/authoring/pedagogicalPlannerForm.jsp

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/ClearSessionAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/action/QaLearningStarterAction.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaConditionForm.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/web/form/QaPedagogicalPlannerForm.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/service/IResourceService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/AuthoringAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/ClearSessionAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/action/LearningAction.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/web/form/ResourcePedagogicalPlannerForm.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/AuthoringAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/ClearSessionAction.java

lams_tool_leader/src/java/org/lamsfoundation/lams/tool/leaderselection/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/AuthoringAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/ClearSessionAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/actions/LearningAction.java

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/web/forms/MindmapPedagogicalPlannerForm.java

lams_tool_mindmap/web/pages/authoring/authoring.jsp

lams_tool_mindmap/web/pages/learning/mindmap.jsp

lams_tool_mindmap/web/pages/monitoring/mindmapDisplay.jsp

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/ClearSessionAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbAuthoringAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbLearnerStarterAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/action/NbPedagogicalPlannerAction.java

lams_tool_nb/src/java/org/lamsfoundation/lams/tool/noticeboard/web/form/NbPedagogicalPlannerForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/AuthoringAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/ClearSessionAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/actions/LearningAction.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookConditionForm.java

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/web/forms/NotebookPedagogicalPlannerForm.java

lams_tool_pixlr/.classpath

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/AuthoringAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/ClearSessionAction.java

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/web/actions/LearningAction.java

lams_tool_preview/.classpath

lams_tool_preview/src/java/org/lamsfoundation/lams/tool/peerreview/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/service/ISubmitFilesService.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/AuthoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ClearSessionAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/LearnerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MarkAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/MonitoringAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/ReflectAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/action/SubmitFilesPedagogicalPlannerAction.java

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/web/form/SubmitFilesPedagogicalPlannerForm.java

lams_tool_sbmt/web/authoring/advance.jsp

lams_tool_sbmt/web/monitoring/mark/mark.jsp

lams_tool_sbmt/web/monitoring/parts/summary.jsp

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/ClearSessionAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/action/TblMonitorAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/web/form/ScratchiePedagogicalPlannerForm.java

lams_tool_scribe/.classpath

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/AuthoringAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/ClearSessionAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/actions/LearningAction.java

lams_tool_scribe/src/java/org/lamsfoundation/lams/tool/scribe/web/forms/ScribePedagogicalPlannerForm.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/AuthoringAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/ClearSessionAction.java

lams_tool_spreadsheet/src/java/org/lamsfoundation/lams/tool/spreadsheet/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/AuthoringAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/ClearSessionAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/action/LearningAction.java

lams_tool_survey/src/java/org/lamsfoundation/lams/tool/survey/web/form/SurveyConditionForm.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/AuthoringAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/ClearSessionAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/action/LearningAction.java

lams_tool_task/src/java/org/lamsfoundation/lams/tool/taskList/web/form/TaskListPedagogicalPlannerForm.java

lams_tool_videorecorder/.classpath

lams_tool_videorecorder/src/java/org/lamsfoundation/lams/tool/videoRecorder/web/actions/LearningAction.java

lams_tool_vote/.classpath

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/AuthoringAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/ClearSessionAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/action/LearningAction.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/web/form/VotePedagogicalPlannerForm.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/AuthoringAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/ClearSessionAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/actions/LearningAction.java

lams_tool_wiki/src/java/org/lamsfoundation/lams/tool/wiki/web/forms/WikiPedagogicalPlannerForm.java

lams_tool_wookie/.classpath

lams_tool_wookie/src/java/org/lamsfoundation/lams/tool/wookie/web/actions/LearningAction.java

· /3rdParty_sources/versions.txt

(-0, +2)

| History

| Source

| Diff

· /lams_admin/.classpath

(-1, +0)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources.properties

(-2, +54)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_el_GR.properties

(-2, +47)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_en_AU.properties

(-2, +48)

| History

| Source

| Diff

· /lams_admin/conf/language/lams/ApplicationResources_es_ES.properties

(-7, +53)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/adminApplicationContext.xml

(-1, +4)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/service/ImportService.java

(-51, +38)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/CloneLessonsController.java

(-8, +0)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/ConfigController.java

(-4, +10)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrgSaveController.java

(-43, +7)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/OrganisationController.java

(-12, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/PolicyManagementController.java

(-0, +264)

| History

| Source

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/SysAdminStartController.java

(-1, +1)

| History

| Source

| Diff

· /lams_admin/src/java/org/lamsfoundation/lams/admin/web/controller/UserController.java

(-2, +7)

| History

| Source

| Diff

… 634 more files in changeset.

lams-github (v4.7): LDEV-4407 Move contentrepository specific code to lams_contentrepository...

Andrey Balan — Tue, 28 Aug 2018 14:38:22 +0200

Andrey Balan committed 9d01768 on branch v4.7, v4.8 in lams-github

LDEV-4407 Move contentrepository specific code to lams_contentrepository

Split IToolContentHandler into IToolContentFullHandler and

IToolContentHandler interfaces

1. IToolContentFullHandler is going to be used by lams_contentrepository

only

2. IToolContentHandler - by all other modules

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java	(-52, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java	(-49, +5)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java	(-396, +0)	\| History	\| Source	\| Diff
· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java	(-488, +0)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java	(-0, +52)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/IToolContentFullHandler.java	(-0, +69)	\| History	\| Source
· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/ToolContentHandler.java	(-0, +417)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/ToolDownload.java	(-22, +8)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/service/IRepositoryService.java	(-0, +488)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4619 Encode properly inline files...

Andrey Balan — Fri, 06 Jul 2018 12:57:28 +0200

Andrey Balan committed dc74323 on branch v4.7, v4.8 in lams-github

LDEV-4619 Encode properly inline files

It seems, setting charset=UTF-8 makes sense only for txt files.

However, we will set it for files of all mime types.

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-1, +1)

| History

| Source

| Diff

lams-github (v4.7): LDEV-4407 Move shared contentrepository classes to lams_common...

Andrey Balan — Fri, 26 Jan 2018 00:12:03 +0100

Andrey Balan committed 46fe95e on branch v4.7, v4.8 in lams-github

LDEV-4407 Move shared contentrepository classes to lams_common

This is done in order to eliminate the need for other projects to

be dependent on lams_contentrepository.

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java

(-0, +52)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java

(-0, +85)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/IToolContentHandler.java

(-0, +199)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/client/ToolContentHandler.java

(-0, +396)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/FileException.java

(-0, +74)

| History

| Source

· /lams_common/src/java/org/.../lams/contentrepository/exception/InvalidParameterException.java

(-0, +73)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/exception/ItemNotFoundException.java

(-0, +74)

| History

| Source

· /lams_common/src/java/org/.../lams/contentrepository/exception/RepositoryCheckedException.java

(-0, +93)

| History

| Source

· /lams_common/src/java/org/lamsfoundation/lams/contentrepository/service/IRepositoryService.java

(-0, +488)

| History

| Source

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/ITicket.java

(-52, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/NodeKey.java

(-85, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/IToolContentHandler.java

(-223, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/ToolContentHandler.java

(-418, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/exception/FileException.java

(-74, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/exception/InvalidParameterException.java

(-73, +0)

| History

| Source

| Diff

… 3 more files in changeset.

lams-github (v4.7): LDEV-4483 Make secure content cacheable...

Marcin Cieslak — Fri, 01 Dec 2017 09:56:15 +0100

Marcin Cieslak committed 713c85b on branch v4.7, v4.8 in lams-github

LDEV-4483 Make secure content cacheable

WildFly makes in non-cacheable by default.

Also we put an explicit header in LAMS content repository.

· /lams_build/conf/domain.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_build/conf/slim/standalone.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_build/conf/standalone.xml	(-1, +1)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java	(-2, +1)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4407 Move lams_contentrepository exceptions to the proper package...

Andrey Balan — Thu, 17 Aug 2017 21:46:17 +0200

Andrey Balan committed b67c428 on branch v4.7, v4.8 in lams-github

LDEV-4407 Move lams_contentrepository exceptions to the proper package

lams_contentrepository's exception classes were moved to

contentrepository.exception package.

(To access exceptions' earlier history use Eclipse's Show in History

feature or run 'git log --follow ./path/to/file')

· /lams_build/lib/lams/lams-contentrepository.jar

(binary)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/HomeAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/OrganisationGroupAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/action/LtiAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/web/planner/PedagogicalPlannerAction.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/webservice/xml/LearningDesignRepositoryServlet.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/IWorkspaceManagementService.java

(-1, +1)

| History

| Source

| Diff

· /lams_central/src/java/org/lamsfoundation/lams/workspace/service/WorkspaceManagementService.java

(-1, +1)

| History

| Source

| Diff

· /lams_common/src/java/org/lamsfoundation/lams/learningdesign/service/ExportToolContentService.java

(-2, +2)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/AccessDeniedException.java

(-73, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/.../lams/contentrepository/CheckCredentialTicketBeforeAdvice.java

(-0, +2)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersion.java

(-0, +1)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/CrNodeVersionProperty.java

(-0, +1)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/FileException.java

(-74, +0)

| History

| Source

| Diff

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/IValue.java

(-0, +2)

| History

| Source

| Diff

… 52 more files in changeset.

lams-github (v4.7): LDEV-4380 expose updateFile() method from ToolContentHandler.java...

Andrey Balan — Thu, 27 Jul 2017 21:03:17 +0200

Andrey Balan committed f56236d on branch v4.7, v4.8 in lams-github

LDEV-4380 expose updateFile() method from ToolContentHandler.java

It will be required for storing several versions of user's portrait

images.

· /lams_build/lib/lams/lams-contentrepository.jar	(binary)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/IToolContentHandler.java	(-0, +24)	\| History	\| Source	\| Diff
· /lams_contentrepository/src/java/org/.../lams/contentrepository/client/ToolContentHandler.java	(-0, +22)	\| History	\| Source	\| Diff

lams-github (v4.7): LDEV-4101 Removed additional filename quotes as it gets one in FileUtil.encodeFilenameForDownload

Andrey Balan — Tue, 29 Nov 2016 10:42:40 +0100

Andrey Balan committed 651ce2e on branch v4.7, v4.8 in lams-github

LDEV-4101 Removed additional filename quotes as it gets one in FileUtil.encodeFilenameForDownload

· /lams_contentrepository/src/java/org/lamsfoundation/lams/contentrepository/client/Download.java

(-2, +2)

| History

| Source

| Diff