lams-github / lams_common / src / java

org

Clone Tools

Stats

Commits this week: 0
Total Committers: 32
Last Commit:
Commits this week: 0

Lines of code count not available

Commit Activity

Commits By Day In Week
52 week commits volume
Commits By Day In Week
Commits by day
Commits By Day In Week
Commits by hour
Commits By Hour In Day
Commit calendar
 

Most active committers (90 days)

loading
loading
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Thursday 08 Nov 2018
11:47 am

Marcin Cieslak

LDEV-4649 Make import work with files with header or with pure data

Options
    • -90
    • +104
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
11:23 am

Marcin Cieslak

LDEV-4649 Fix outcome and scale import

Fixed paths for import and outcome/scale removal.

Description is now an optional field when importing.

Options
    • -2
    • +2
    ./lamsfoundation/lams/outcome/service/OutcomeService.java
  2. … 4 more files in changeset.
Wednesday 07 Nov 2018
1:04 pm

Andrey Balan

LDEV-4696 Add generics to common methods

Options
    • -1
    • +1
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -2
    • +1
    ./lamsfoundation/lams/tool/ToolSessionManager.java
    • -4
    • +4
    ./lamsfoundation/lams/tool/service/LamsCoreToolService.java
5:52 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Fixing bugs with new single activity lesson, notifications

Options
    • -1
    • +1
    ./lamsfoundation/lams/events/Subscription.java
    • -4
    • +10
    ./lamsfoundation/lams/learningdesign/LearningDesign.java
Tuesday 06 Nov 2018
12:47 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

Merge branch 'LDEV-4696' of https://github.com/lamsfoundation/lams into LDEV-4696

Options
    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
11:50 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Comments, Ratings, Peer Review use Annotations, removed proxy

Options
    • -0
    • +50
    ./lamsfoundation/lams/comments/Comment.java
    • -0
    • +21
    ./lamsfoundation/lams/comments/CommentLike.java
    • -0
    • +20
    ./lamsfoundation/lams/comments/CommentSession.java
    • -30
    • +30
    ./lamsfoundation/lams/comments/dao/hibernate/CommentDAO.java
    • -1
    • +1
    ./lamsfoundation/lams/comments/dao/hibernate/CommentLikeDAO.java
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -9
    • +9
    ./lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -8
    • +8
    ./lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
    • -5
    • +6
    ./lamsfoundation/lams/rating/dao/hibernate/RatingCommentDAO.java
    • -13
    • +14
    ./lamsfoundation/lams/rating/dao/hibernate/RatingDAO.java
    • -0
    • +8
    ./lamsfoundation/lams/rating/model/AuthoredItemRatingCriteria.java
    • -0
    • +6
    ./lamsfoundation/lams/rating/model/LearnerItemRatingCriteria.java
    • -0
    • +11
    ./lamsfoundation/lams/rating/model/LessonRatingCriteria.java
    • -10
    • +22
    ./lamsfoundation/lams/rating/model/Rating.java
    • -1
    • +24
    ./lamsfoundation/lams/rating/model/RatingComment.java
  16. … 20 more files in changeset.
9:03 am

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +3
    ./lamsfoundation/lams/commonContext.xml
    • -1
    • +30
    ./lamsfoundation/lams/events/EmailNotificationArchive.java
    • -43
    • +28
    ./lamsfoundation/lams/events/Event.java
    • -25
    • +21
    ./lamsfoundation/lams/events/Subscription.java
    • -15
    • +20
    ./lamsfoundation/lams/integration/ExtCourseClassMap.java
    • -28
    • +48
    ./lamsfoundation/lams/integration/ExtServer.java
    • -19
    • +23
    ./lamsfoundation/lams/integration/ExtServerLessonMap.java
    • -23
    • +21
    ./lamsfoundation/lams/integration/ExtServerToolAdapterMap.java
    • -19
    • +23
    ./lamsfoundation/lams/integration/ExtUserUseridMap.java
    • -0
    • +34
    ./lamsfoundation/lams/outcome/Outcome.java
    • -1
    • +23
    ./lamsfoundation/lams/outcome/OutcomeMapping.java
    • -0
    • +27
    ./lamsfoundation/lams/outcome/OutcomeResult.java
    • -0
    • +36
    ./lamsfoundation/lams/outcome/OutcomeScale.java
    • -1
    • +21
    ./lamsfoundation/lams/outcome/OutcomeScaleItem.java
  15. … 13 more files in changeset.
Monday 05 Nov 2018
8:57 am

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +20
    ./lamsfoundation/lams/learningdesign/ActivityEvaluation.java
    • -20
    • +22
    ./lamsfoundation/lams/learningdesign/Competence.java
    • -31
    • +21
    ./lamsfoundation/lams/learningdesign/CompetenceMapping.java
    • -25
    • +41
    ./lamsfoundation/lams/learningdesign/GroupUser.java
    • -48
    • +44
    ./lamsfoundation/lams/learningdesign/LearningDesignAccess.java
    • -0
    • +31
    ./lamsfoundation/lams/learningdesign/LearningDesignAnnotation.java
    • -27
    • +23
    ./lamsfoundation/lams/learningdesign/LearningLibrary.java
    • -15
    • +23
    ./lamsfoundation/lams/learningdesign/LearningLibraryGroup.java
    • -21
    • +27
    ./lamsfoundation/lams/learningdesign/License.java
    • -6
    • +6
    ./lamsfoundation/lams/learningdesign/dao/hibernate/LearningDesignDAO.java
    • -82
    • +38
    ./lamsfoundation/lams/tool/SystemTool.java
    • -49
    • +20
    ./lamsfoundation/lams/tool/ToolContent.java
    • -35
    • +26
    ./lamsfoundation/lams/usermanagement/AuthenticationMethod.java
    • -23
    • +15
    ./lamsfoundation/lams/usermanagement/AuthenticationMethodType.java
    • -8
    • +22
    ./lamsfoundation/lams/usermanagement/FavoriteOrganisation.java
  16. … 40 more files in changeset.
Sunday 04 Nov 2018
10:48 am

Marcin Cieslak

LDEV-4696 Remove obsolete DTO

Options
    • -479
    • +0
    ./lamsfoundation/lams/tool/BasicToolVO.java
    • -81
    • +0
    ./lamsfoundation/lams/tool/IToolVO.java
    • -8
    • +0
    ./lamsfoundation/lams/tool/Tool.java
    • -17
    • +20
    ./lamsfoundation/lams/tool/service/ILamsToolService.java
    • -20
    • +12
    ./lamsfoundation/lams/tool/service/LamsToolService.java
    • -4
    • +4
    ./lamsfoundation/lams/web/controller/LamsAuthoringFinishController.java
  7. … 9 more files in changeset.
10:41 am

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -43
    • +17
    ./lamsfoundation/lams/config/ConfigurationItem.java
    • -28
    • +30
    ./lamsfoundation/lams/gradebook/GradebookUserActivity.java
    • -20
    • +26
    ./lamsfoundation/lams/gradebook/GradebookUserLesson.java
    • -52
    • +10
    ./lamsfoundation/lams/lesson/CompletedActivityProgress.java
    • -50
    • +10
    ./lamsfoundation/lams/lesson/CompletedActivityProgressArchive.java
    • -96
    • +59
    ./lamsfoundation/lams/lesson/LearnerProgress.java
    • -22
    • +42
    ./lamsfoundation/lams/lesson/LearnerProgressArchive.java
    • -24
    • +21
    ./lamsfoundation/lams/planner/PedagogicalPlannerActivityMetadata.java
    • -19
    • +19
    ./lamsfoundation/lams/themes/Theme.java
    • -132
    • +49
    ./lamsfoundation/lams/tool/Tool.java
    • -3
    • +4
    ./lamsfoundation/lams/usermanagement/User.java
  13. … 14 more files in changeset.
Friday 02 Nov 2018
3:32 pm

Marcin Cieslak

LDEV-4696 Rewrite part of Common entities to Hibernate annotations

Options
    • -0
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -41
    • +80
    ./lamsfoundation/lams/learningdesign/Activity.java
    • -9
    • +3
    ./lamsfoundation/lams/learningdesign/ActivityOrderComparator.java
    • -12
    • +5
    ./lamsfoundation/lams/learningdesign/ActivityTitleComparator.java
    • -10
    • +40
    ./lamsfoundation/lams/learningdesign/BranchActivityEntry.java
    • -29
    • +22
    ./lamsfoundation/lams/learningdesign/BranchingActivity.java
    • -32
    • +6
    ./lamsfoundation/lams/learningdesign/ChosenBranchingActivity.java
    • -6
    • +11
    ./lamsfoundation/lams/learningdesign/ChosenGrouping.java
    • -36
    • +32
    ./lamsfoundation/lams/learningdesign/ComplexActivity.java
    • -35
    • +11
    ./lamsfoundation/lams/learningdesign/ConditionGateActivity.java
    • -28
    • +22
    ./lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -8
    • +13
    ./lamsfoundation/lams/learningdesign/DataTransition.java
    • -44
    • +15
    ./lamsfoundation/lams/learningdesign/FloatingActivity.java
    • -14
    • +24
    ./lamsfoundation/lams/learningdesign/GateActivity.java
    • -44
    • +53
    ./lamsfoundation/lams/learningdesign/Group.java
  16. … 45 more files in changeset.
Thursday 01 Nov 2018
8:24 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV4696 Removing legacy parameters and deprecated methods

Options
    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
  2. … 29 more files in changeset.
Monday 29 Oct 2018
2:51 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Content Repository converted to annotations

Options
    • -0
    • +1
    ./lamsfoundation/lams/commonContext.xml
  2. … 13 more files in changeset.
7:13 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 TZ, Notebook entry, Log Event, Signup, Policies converted

Options
    • -1
    • +4
    ./lamsfoundation/lams/commonContext.xml
    • -29
    • +23
    ./lamsfoundation/lams/logevent/LogEvent.java
    • -0
    • +16
    ./lamsfoundation/lams/logevent/LogEventType.java
    • -0
    • +25
    ./lamsfoundation/lams/notebook/model/NotebookEntry.java
    • -8
    • +34
    ./lamsfoundation/lams/policies/Policy.java
    • -5
    • +19
    ./lamsfoundation/lams/policies/PolicyConsent.java
    • -1
    • +39
    ./lamsfoundation/lams/signup/model/SignupOrganisation.java
    • -0
    • +14
    ./lamsfoundation/lams/timezone/Timezone.java
  9. … 7 more files in changeset.
Friday 26 Oct 2018
7:55 am

Marcin Cieslak

LDEV-4696 Rewrite Condition inheritance to Hibernate annotations

Options
    • -1
    • +6
    ./lamsfoundation/lams/commonContext.xml
    • -5
    • +35
    ./lamsfoundation/lams/learningdesign/BranchCondition.java
    • -2
    • +16
    ./lamsfoundation/lams/learningdesign/TextSearchCondition.java
  4. … 2 more files in changeset.
Thursday 25 Oct 2018
12:38 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Correct scan path for tool Hibernate objects

Options
    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
9:41 am

Marcin Cieslak

LDEV-4696 Set proper JNDI name for transaction manager

Also get rid of deprecated manager_lookup_class property.

Options
    • -2
    • +2
    ./lamsfoundation/lams/applicationContext.xml
Wednesday 24 Oct 2018
9:32 pm

Marcin Cieslak

LDEV-4696 Rewrite Criteria queries to use new API

Options
    • -20
    • +12
    ./lamsfoundation/lams/dao/IBaseDAO.java
    • -77
    • +35
    ./lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
9:31 pm

Marcin Cieslak

LDEV-4696 Change transaction configuration for Hibernate 5.3

hibernate.transaction.factory_class is deprecated. We need to use

hibernate.transaction.coordinator_class

Options
    • -1
    • +1
    ./lamsfoundation/lams/applicationContext.xml
9:02 am

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4696 Runs Hibernate 5.3 with errors, Noticeboard hbm xml gone.

Options
    • -1
    • +2
    ./lamsfoundation/lams/commonContext.xml
    • -11
    • +30
    ./lamsfoundation/lams/dao/hibernate/LAMSBaseDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/events/dao/hibernate/EventDAOHibernate.java
    • -9
    • +9
    ./lamsfoundation/lams/learningdesign/dao/hibernate/ActivityDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceDAO.java
    • -3
    • +3
    ./lamsfoundation/lams/learningdesign/dao/hibernate/CompetenceMappingDAO.java
    • -9
    • +9
    ./lamsfoundation/lams/learningdesign/dao/hibernate/TransitionDAO.java
    • -4
    • +4
    ./lamsfoundation/lams/security/SecurityDAO.java
    • -0
    • +2
    ./lamsfoundation/lams/util/FileUtil.java
    • -3
    • +3
    ./lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
    • -6
    • +3
    ./lamsfoundation/lams/workspace/dao/hibernate/WorkspaceFolderContentDAO.java
  12. … 3448 more files in changeset.
Tuesday 23 Oct 2018
9:50 pm

Andrey Balan

LDEV-4440 Fix author and monitor links requested from integrations

Options
    • -12
    • +16
    ./lamsfoundation/lams/integration/util/LoginRequestDispatcher.java
Friday 19 Oct 2018
11:38 am

Marcin Cieslak

Merge branch 'lams31' into LDEV-4440

Conflicts:

lams_admin/web/sessionmaintain.jsp

lams_build/build.xml

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/web/outcome/OutcomeAction.java

lams_gradebook/src/java/org/lamsfoundation/lams/gradebook/web/action/GradebookAction.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/action/McMonitoringAction.java

Options
    • -3
    • +14
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 17 more files in changeset.
10:20 am

Marcin Cieslak

LDEV-4693 Add name in logged in user list in sysadmin

Options
    • -3
    • +14
    ./lamsfoundation/lams/web/session/SessionManager.java
  2. … 2 more files in changeset.
Thursday 18 Oct 2018
10:59 pm

Marcin Cieslak

Merge remote-tracking branch 'origin/LDEV-4644'

Conflicts:

lams_admin/conf/language/lams/ApplicationResources.properties

lams_build/lib/lams/lams.jar

lams_central/src/java/org/lamsfoundation/lams/authoring/service/AuthoringService.java

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

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

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

lams_gradebook/web/gradebookMonitor.jsp

lams_monitoring/conf/language/lams/ApplicationResources.properties

Options
    • -1
    • +28
    ./lamsfoundation/lams/commonContext.xml
  2. … 14 more files in changeset.
3:34 pm

Marcin Cieslak

LDEV-4691 Adjust classloader switch

Options
    • -7
    • +8
    ./lamsfoundation/lams/util/Configuration.java
2:53 pm

Marcin Cieslak

LDEV-4691 Reset a classloader when refreshing configuration cache

In WildFly 14 the Configuration bean can get created by one of LAMS EAR

modules, for example Image Gallery. This module's classloader does not

have access to java.sql.Connection. It should ask its parent for this

class, but context class loaders are not obliged to do it and apparently

WildFly module classloaders do not do it. We need to manually reset a

classloader for the given thread.

Options
    • -3
    • +10
    ./lamsfoundation/lams/util/Configuration.java
Wednesday 17 Oct 2018
9:58 am

Marcin Cieslak

LDEV-4691 Make Hibernate a part of LAMS libraries

WildFly 14 provides Hibernate 5.3. Migrating LAMS from 5.0.10 will

require some effort. For now we provide our own version of Hibernate to

keep compatible.

Options
    • -1
    • +1
    ./lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
  2. … 44 more files in changeset.
8:58 am

Marcin Cieslak

LDEV-4691 Update libraries provided by WildFly

Options
    • -1
    • +1
    ./lamsfoundation/lams/util/hibernate/TransactionAwareSessionContext.java
  2. … 47 more files in changeset.
Monday 15 Oct 2018
1:23 pm

Fiona Malikoff <Fiona.Malikoff@gmail.com>

LDEV-4689 Live Edit has a contribution entry and button changes colour.

Also fixed the SVG rendering in monitor (did not return 404 properly

when missing) and fixed the path for the monitor chosen grouping page.

Options
    • -11
    • +29
    ./lamsfoundation/lams/lesson/dto/LessonDetailsDTO.java
  2. … 10 more files in changeset.
Friday 12 Oct 2018
11:09 pm

Andrey Balan

LDEV-4670 add maxlength limit to the image title's input

Options
    • -1
    • +1
    ./lamsfoundation/lams/util/imgscalr/ResizePictureUtil.java
  2. … 1 more file in changeset.