Also update DAO to use Hibernate 5.3 features.

· /lams_gradebook/.classpath	(-1, +0)	| History	| Source	| Diff
· /lams_gradebook/conf/hibernate/mappings/org/.../lams/gradebook/model/GradebookUserActivityArchive.hbm.xml	(-89, +0)	| History	| Source	| Diff
· /lams_gradebook/conf/hibernate/mappings/org/.../lams/gradebook/model/GradebookUserLessonArchive.hbm.xml	(-72, +0)	| History	| Source	| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(-202, +108)	| History	| Source	| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java	(-0, +28)	| History	| Source	| Diff
· /lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java	(-1, +26)	| History	| Source	| Diff

]]> Sat, 18 Aug 2018 19:44:34 +0200 Andrey Balan https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=471b903caa3365758fbdec0a22440b1b0b3f2947 https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=471b903caa3365758fbdec0a22440b1b0b3f2947 Andrey Balan committed 471b903 on branch v4.7, v4.8 in lams-github Merge branch 'master' into LDEV-4407

Conflicts:

lams_build/lib/lams/lams-gradebook.jar

lams_build/lib/lams/lams-learning.jar

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

lams_central/web/css/pedagogicalPlanner.css

lams_central/web/includes/javascript/openUrls.js

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

lams_common/src/java/org/lamsfoundation/lams/web/util/AttributeNames.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/GradebookService.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookFullService.java

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

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

lams_learning/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java

lams_learning/src/java/org/lamsfoundation/lams/learning/service/LearnerService.java

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

lams_learning/src/java/org/lamsfoundation/lams/learning/web/servlet/RepopulateProgressMarksServlet.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/IMonitoringService.java

lams_monitoring/src/java/org/lamsfoundation/lams/monitoring/service/MonitoringService.java

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

lams_tool_assessment/src/java/org/lamsfoundation/lams/tool/assessment/assessmentApplicationContext.xml

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

lams_tool_chat/src/java/org/lamsfoundation/lams/tool/chat/chatApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/dokumaranApplicationContext.xml

lams_tool_doku/src/java/org/lamsfoundation/lams/tool/dokumaran/service/DokumaranService.java

lams_tool_forum/src/java/org/lamsfoundation/lams/tool/forum/service/ForumService.java

lams_tool_images/src/java/org/lamsfoundation/lams/tool/imageGallery/imageGalleryApplicationContext.xml

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

lams_tool_imscc/src/java/org/lamsfoundation/lams/tool/commonCartridge/commonCartridgeApplicationContext.xml

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

lams_tool_kaltura/src/java/org/lamsfoundation/lams/tool/kaltura/kalturaApplicationContext.xml

lams_tool_lamc/src/java/org/lamsfoundation/lams/tool/mc/service/McService.java

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/qaApplicationContext.xml

lams_tool_laqa/src/java/org/lamsfoundation/lams/tool/qa/service/QaService.java

lams_tool_larsrc/src/java/org/lamsfoundation/lams/tool/rsrc/rsrcApplicationContext.xml

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

lams_tool_mindmap/src/java/org/lamsfoundation/lams/tool/mindmap/mindmapApplicationContext.xml

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

lams_tool_notebook/src/java/org/lamsfoundation/lams/tool/notebook/notebookApplicationContext.xml

lams_tool_pixlr/src/java/org/lamsfoundation/lams/tool/pixlr/pixlrApplicationContext.xml

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

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

lams_tool_sbmt/src/java/org/lamsfoundation/lams/tool/sbmt/submitFilesApplicationContext.xml

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/SubmitFilesPedagogicalPlannerAction.java

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml

lams_tool_scratchie/src/java/org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java

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

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/service/VoteService.java

lams_tool_vote/src/java/org/lamsfoundation/lams/tool/vote/voteApplicationContext.xml

· /lams_build/lib/lams/lams-contentrepository.jar	(binary)	| History	| Source	| Diff
· /lams_build/lib/lams/lams.jar	(binary)	| History	| Source	| Diff
· /lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java	(-13, +30)	| History	| Source	| Diff
· /lams_central/src/java/org/lamsfoundation/lams/util/CentralConstants.java	(-0, +7)	| History	| Source	| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/IndexAction.java	(-3, +45)	| History	| Source	| Diff
· /lams_central/src/java/org/lamsfoundation/lams/web/ProfileAction.java	(-0, +41)	| History	| Source	| Diff
· /lams_central/web/WEB-INF/struts-config.xml	(-16, +82)	| History	| Source	| Diff
· /lams_central/web/includes/javascript/openUrls.js	(-245, +216)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/commonContext.xml	(-8, +32)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/IGradebookDAO.java	(-7, +13)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/dao/hibernate/GradebookDAO.java	(-54, +57)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserActivityArchive.java	(-0, +118)	| History	| Source
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/model/GradebookUserLessonArchive.java	(-0, +97)	| History	| Source
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(-1, +19)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/learning/service/ILearnerService.java	(-0, +18)	| History	| Source	| Diff
… 89 more files in changeset.

]]> Fri, 02 Feb 2018 22:16:33 +0100 Andrey Balan https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a https://code.lamsfoundation.org/fisheye/changelog/lams-github?cs=de5cc7dfd68d4a8ef5ebb5702afb4d42a5a9273a Andrey Balan committed de5cc7d on branch v4.7, v4.8 in lams-github LDEV-4407 Other projects stop depending on lams_gradebook

* GradebookService interfaces are redefined now:

- IGradebookService is going to be used by core modules.

- IGradebookFullService is used inside of lams_gradebook only and

nowhere else, as it contains lams_gradebook's internal logic and

classes.

* Introduce CommonContants.java which contains for now common

constants that used to be located in GradebookConstants.java

* Tools stop using gradebookService directly, but rather through

ILamsToolService's method updateGradebookUserActivityMark()

* Move GradebookUserActivityArchive and GradebookUserLessonArchive

to lams_gradebook

· /lams_build/lib/lams/lams-admin.jar	(binary)	| History	| Source	| Diff
· /lams_build/lib/lams/lams-gradebook.jar	(binary)	| History	| Source	| Diff
· /lams_build/lib/lams/lams-learning.jar	(binary)	| History	| Source	| Diff
· /lams_build/lib/lams/lams-monitoring.jar	(binary)	| History	| Source	| Diff
· /lams_central/.classpath	(-1, +0)	| History	| Source	| Diff
· /lams_common/.classpath	(-1, +0)	| History	| Source	| Diff
· /lams_common/conf/hibernate/mappings/.../lams/gradebook/GradebookUserActivityArchive.hbm.xml	(-81, +0)	| History	| Source	| Diff
· /lams_common/conf/hibernate/mappings/.../lamsfoundation/lams/gradebook/GradebookUserLessonArchive.hbm.xml	(-64, +0)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivity.java	(-4, +2)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserActivityArchive.java	(-108, +0)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLesson.java	(-4, +2)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/GradebookUserLessonArchive.java	(-85, +0)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/gradebook/service/IGradebookService.java	(-0, +70)	| History	| Source
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/ILamsToolService.java	(-0, +11)	| History	| Source	| Diff
· /lams_common/src/java/org/lamsfoundation/lams/tool/service/LamsToolService.java	(-0, +6)	| History	| Source	| Diff
… 42 more files in changeset.

]]>