Activity lams-github/lams_tool_eadventure/src/java/org

7:23 pm

Marcin Cieslak

More
a789c13
changed 11 files

LDEV-3507: Remove error message when Tool Content was not found. A simple getter method should not report errors.

- -3
- +0
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 10 more files in changeset.

4:40 am

Andrey Balan

More
a0bce79
changed 34 files
v4.7, v4.8

LDEV-3486 Assign marks to learner in leader aware tools when he gets force completed

- -20
- +18
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 33 more files in changeset.

9:58 pm

Andrey Balan

More
a207bde
changed 33 files

LDEV-3486 Assign marks to learner in leader aware tools when he gets force completed

- -20
- +18
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 32 more files in changeset.

5:27 am

marek

More
c70338a
changed 9 files
v4.7, v4.8

LDEV-3316: Get rid of HibernateTemplate and HibernateDaoSupport usage in set of LAMS DAO types from lams_tool_eadventure

- -72
- +0
./eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./eucm/lams/.../BaseDAOHibernate.java
- -1
- +4
./eucm/lams/tool/eadventure/dao/hibernate/EadventureConditionDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureConditionDAOHibernate.java
- -3
- +6
./eucm/lams/tool/eadventure/dao/hibernate/EadventureDAOHibernate.java
- History
- Source
- Diff
./eucm/lams/.../EadventureDAOHibernate.java
- -1
- +4
./eucm/lams/tool/eadventure/dao/hibernate/EadventureExpressionDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureExpressionDAOHibernate.java
- -8
- +8
./eucm/lams/tool/eadventure/dao/hibernate/EadventureItemVisitDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureItemVisitDAOHibernate.java
- -5
- +7
./eucm/lams/tool/eadventure/dao/hibernate/EadventureParamDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureParamDAOHibernate.java
- -5
- +7
./eucm/lams/tool/eadventure/dao/hibernate/EadventureSessionDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureSessionDAOHibernate.java
- -5
- +7
./eucm/lams/tool/eadventure/dao/hibernate/EadventureUserDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureUserDAOHibernate.java
- -3
- +5
./eucm/lams/tool/eadventure/dao/hibernate/EadventureVarsDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureVarsDAOHibernate.java

4:35 pm

marek

More
f3fbbb8
changed 78 files
v4.7, v4.8

LDEV-3332: revert spring-beans schema declaration in application context xml files. export spring meta-inf in jboss-deployment-structure.xml

It is way more elegant approach to fix an issue with spring-beans.xsd loading from internet.

- -1
- +1
./eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./eucm/lams/.../dbupdates/autopatchContext.xml
- -1
- +1
./eucm/lams/tool/eadventure/eadventureApplicationContext.xml
- History
- Source
- Diff
./eucm/.../eadventureApplicationContext.xml
… 76 more files in changeset.

4:29 am

marek

More
0c933b2
changed 77 files
v4.7, v4.8

LDEV-3332: fix spring contexts declaration to find spring-beans-4.0.xsd locally at classpath.

Having spring module defined as a set of spring jars (as we do have in Wildfly), it is impossible for spring to resolve xsd schema mapping file 'spring.schemas' correctly. With set of jars, we have 5 instances of this file (with different content) under the same path 'META-INF/spring.schemas'. This ended up in spring not beeing able to map spring-beans-4.0.xsd URL path to local resource location. Finally, this xsd was loaded from internet - and that significantly slowed Wildfly startup.

With this fix LAMS is way (depends on internet connection) faster to start.

- -1
- +1
./eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./eucm/lams/.../dbupdates/autopatchContext.xml
- -1
- +1
./eucm/lams/tool/eadventure/eadventureApplicationContext.xml
- History
- Source
- Diff
./eucm/.../eadventureApplicationContext.xml
… 75 more files in changeset.

5:55 pm

Marcin Cieslak

More
a57c1dd
changed 33 files
v4.7, v4.8

LDEV-3319: Synchronize patch execution with an external monitor. Modules in WildFly can be loaded in parallel. AutoPatch is not ready for this as it uses static methods with unsynchronized collections. Each AutoPatchService instance should be run sequentially.

- -1
- +1
./eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./eucm/lams/.../dbupdates/autopatchContext.xml
… 32 more files in changeset.

7:20 pm

Marcin Cieslak

More
57c6309
changed 79 files
v4.7, v4.8

LDEV-3293: Rewrite Application Context configuration files for Spring 4.

- -2
- +5
./eucm/lams/tool/eadventure/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./eucm/lams/.../dbupdates/autopatchContext.xml
- -13
- +14
./eucm/lams/tool/eadventure/eadventureApplicationContext.xml
- History
- Source
- Diff
./eucm/.../eadventureApplicationContext.xml
… 77 more files in changeset.

5:59 pm

Marcin Cieslak

More
ccfd66f
changed 88 files
v4.7, v4.8

LDEV-3293: Use the new Spring's support for Hibernate 4 instead of Hibernate 3. Switch from using HibernateDaoSupport.getSession() to its getSessionFactory().getSession(). The latter is sure to close the session automatically while a session returned by the first method should be closed manually. Theoritecally we do it in OpenSessionInViewFilter, but it may not be always the case, leading to open Hibernate session being left behind.

- -1
- +1
./eucm/lams/tool/eadventure/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./eucm/lams/.../BaseDAOHibernate.java
… 87 more files in changeset.

5:31 pm

Marcin Cieslak

More
2aaccb9
changed 56 files
v4.7, v4.8

LDEV-3293: Cast DAO methods' results to their return type. Java 8 is more restrictive about generics. Hibernate find() methods returns List<?> and it can not be quietly cast to List<SomeClass>. Each occurence was explicitly casted and warnings about the type being unchecked were supressed.

- -2
- +3
./eucm/lams/tool/eadventure/dao/hibernate/EadventureItemVisitDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureItemVisitDAOHibernate.java
- -1
- +2
./eucm/lams/tool/eadventure/dao/hibernate/EadventureSessionDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureSessionDAOHibernate.java
- -1
- +2
./eucm/lams/tool/eadventure/dao/hibernate/EadventureUserDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureUserDAOHibernate.java
… 53 more files in changeset.

6:28 pm

Marcin Cieslak

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

LDEV-2587: Do not cascade from Condition to Expression as it breaks tool content import.

- -1
- +1
./eucm/lams/tool/eadventure/model/EadventureCondition.java
- History
- Source
- Diff
./eucm/lams/.../model/EadventureCondition.java

12:43 am

Andrey Balan

More
40eb543
changed 64 files
v4.7, v4.8

LDEV-3244 Release define later flag after canceling edit tool in monitor

- -0
- +1
./eucm/lams/tool/eadventure/eadventureApplicationContext.xml
- History
- Source
- Diff
./eucm/.../eadventureApplicationContext.xml
- -0
- +9
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 62 more files in changeset.

8:06 pm

Marcin Cieslak

More
5b6e51b
changed 42 files
v4.7, v4.8

LDEV-3225: Add better contribution management in Monitoring.

- -0
- +4
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 41 more files in changeset.

10:00 pm

Marcin Cieslak

More
567af22
changed 35 files
v4.7, v4.8

LDEV-3171: Remove users from activities. Fix several bugs.

- -3
- +31
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 34 more files in changeset.

1:19 am

Marcin Cieslak

More
15045d0
changed 60 files
v4.7, v4.8

LDEV-3171: Give a Monitor an option to remove learner's content from activities when moving him backwards in a sequence. Implementation of content-removing method for most of tools.

- -0
- +6
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 59 more files in changeset.

5:45 am

Andrey Balan

More
6d674e3
changed 135 files
v4.7, v4.8

LDEV-3147 Simplify tools: get rid of instructions tab, define in monitor and offline activity options

- -8
- +0
./eucm/lams/tool/eadventure/EadventureConstants.java
- History
- Source
- Diff
./eucm/lams/.../EadventureConstants.java
- -28
- +0
./eucm/lams/tool/eadventure/dao/EadventureAttachmentDAO.java
- History
- Source
- Diff
./eucm/lams/.../EadventureAttachmentDAO.java
- -30
- +0
./eucm/lams/tool/eadventure/dao/hibernate/EadventureAttachmentDAOHibernate.java
- History
- Source
- Diff
./eucm/.../EadventureAttachmentDAOHibernate.java
- -0
- +19
./eucm/lams/tool/eadventure/dbupdates/patch20140102.sql
- History
- Source
./eucm/lams/tool/.../dbupdates/patch20140102.sql
- -11
- +0
./eucm/lams/tool/eadventure/eadventureApplicationContext.xml
- History
- Source
- Diff
./eucm/.../eadventureApplicationContext.xml
- -150
- +8
./eucm/lams/tool/eadventure/model/Eadventure.java
- History
- Source
- Diff
./eucm/lams/tool/.../model/Eadventure.java
- -163
- +0
./eucm/lams/tool/eadventure/model/EadventureAttachment.java
- History
- Source
- Diff
./eucm/lams/.../EadventureAttachment.java
- -0
- +43
./eucm/lams/tool/eadventure/service/EadventureImportContentVersionFilter.java
- History
- Source
./eucm/.../EadventureImportContentVersionFilter.java
- -125
- +32
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
- -23
- +3
./eucm/lams/tool/eadventure/service/IEadventureService.java
- History
- Source
- Diff
./eucm/lams/.../IEadventureService.java
- -283
- +6
./eucm/lams/tool/eadventure/web/action/AuthoringAction.java
- History
- Source
- Diff
./eucm/lams/.../action/AuthoringAction.java
- -27
- +0
./eucm/lams/tool/eadventure/web/action/LearningAction.java
- History
- Source
- Diff
./eucm/lams/.../action/LearningAction.java
- -1
- +0
./eucm/lams/tool/eadventure/web/action/MonitoringAction.java
- History
- Source
- Diff
./eucm/lams/.../action/MonitoringAction.java
- -30
- +0
./eucm/lams/tool/eadventure/web/form/EadventureForm.java
- History
- Source
- Diff
./eucm/lams/tool/.../form/EadventureForm.java
- -22
- +0
./eucm/lams/tool/eadventure/web/servlet/ExportServlet.java
- History
- Source
- Diff
./eucm/lams/.../servlet/ExportServlet.java
… 120 more files in changeset.

4:42 pm

Marcin Cieslak

More
b33e717
changed 41 files
v4.7, v4.8

LDEV-3163: Make LAMS use ServerURL when providing URLs.

- -1
- +2
./eucm/lams/tool/eadventure/web/servlet/ExportServlet.java
- History
- Source
- Diff
./eucm/lams/.../servlet/ExportServlet.java
… 40 more files in changeset.

11:22 pm

erniegx <ernieg@gmail.com>

More
79a74d2
changed 6 files
v4.7, v4.8

LDEV-3158 change file encoding to iutf8

- -1
- +1
./eucm/lams/tool/eadventure/model/Eadventure.java
- History
- Source
- Diff
./eucm/lams/tool/.../model/Eadventure.java
- -2
- +2
./eucm/lams/tool/eadventure/model/EadventureVars.java
- History
- Source
- Diff
./eucm/lams/tool/.../model/EadventureVars.java
- -1
- +1
./eucm/lams/tool/eadventure/web/action/AuthoringAction.java
- History
- Source
- Diff
./eucm/lams/.../action/AuthoringAction.java
- -6
- +6
./eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java
- History
- Source
- Diff
./eucm/.../AuthoringEadventureConditionAction.java
- -1
- +1
./eucm/lams/tool/eadventure/web/servlet/ExportServlet.java
- History
- Source
- Diff
./eucm/lams/.../servlet/ExportServlet.java
… 1 more file in changeset.

7:12 am

Marcin Cieslak

More
33da76d
changed 36 files
v4.7, v4.8

LDEV-3070: Use tool content title as lesson name instead of showing prompt pop up. Skip "Reedit"/"Cancel" page.

- -0
- +4
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 35 more files in changeset.

1:56 pm

Marcin Cieslak

More
dfe9ef3
changed 23 files
v4.7, v4.8

LDEV-3070: Fix few minor errors in Tools. Pass notifyCloseURL to proper authoring page in some Tools. Make generation of Tool content a non read-only operation as it starts a database transaction which is later used for writing.

- -0
- +2
./eucm/lams/tool/eadventure/web/action/AuthoringAction.java
- History
- Source
- Diff
./eucm/lams/.../action/AuthoringAction.java
… 22 more files in changeset.

10:26 pm

Andrey Balan

More
f27a61f
changed 8 files
v4.7, v4.8

LDEV-3031 Solved a problem with false positive error messages in LAMS tools: Could not find the content by given ID

- -7
- +7
./eucm/lams/tool/eadventure/service/EadventureServiceImpl.java
- History
- Source
- Diff
./eucm/lams/.../EadventureServiceImpl.java
… 7 more files in changeset.

8:47 pm

Marcin Cieslak

More
8aded0b
changed 183 files
v4.7, v4.8

LDEV-3026: Add utilities for getting activity position. Make Tools position-aware and display different label if they are last in LD.

- -1
- +6
./eucm/lams/tool/eadventure/web/action/LearningAction.java
- History
- Source
- Diff
./eucm/lams/.../action/LearningAction.java
… 182 more files in changeset.

2:55 am

Marcin Cieslak

More
d56929f
changed 1314 files
v4.7, v4.8

LDEV-2847: Major changes to build.xml files. See JIRA comment for full explanation.

- -275
- +0
./eucm/lams/tool/eadventure/model/Eadventure.hbm.xml
- History
- Source
- Diff
./eucm/lams/tool/.../model/Eadventure.hbm.xml
- -76
- +0
./eucm/lams/tool/eadventure/model/EadventureAttachment.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../EadventureAttachment.hbm.xml
- -80
- +0
./eucm/lams/tool/eadventure/model/EadventureCondition.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../EadventureCondition.hbm.xml
- -98
- +0
./eucm/lams/tool/eadventure/model/EadventureExpression.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../EadventureExpression.hbm.xml
- -100
- +0
./eucm/lams/tool/eadventure/model/EadventureItemVisitLog.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../EadventureItemVisitLog.hbm.xml
- -68
- +0
./eucm/lams/tool/eadventure/model/EadventureParam.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../model/EadventureParam.hbm.xml
- -87
- +0
./eucm/lams/tool/eadventure/model/EadventureSession.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../EadventureSession.hbm.xml
- -99
- +0
./eucm/lams/tool/eadventure/model/EadventureUser.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../model/EadventureUser.hbm.xml
- -70
- +0
./eucm/lams/tool/eadventure/model/EadventureVars.hbm.xml
- History
- Source
- Diff
./eucm/lams/.../model/EadventureVars.hbm.xml
… 1305 more files in changeset.

3:25 am

Andrey Balan

More
d52979b
changed 46 files
v4.7, v4.8

LDEV-2874 Move Reload libraris into lams_build/lib/reload (they have been previously stored as tools' internal libs)

- -7
- +0
./eucm/lams/tool/eadventure/web/action/AuthoringEadventureConditionAction.java
- History
- Source
- Diff
./eucm/.../AuthoringEadventureConditionAction.java
… 45 more files in changeset.

5:21 pm

Marcin Cieslak

More
6ea6b66
changed 12 files
v4.7, v4.8

LDEV-2737: Change Eadventure web.xml file to comply with LAMS 2.4 Tool Application Context discovery mechanism. Add missing abstract methods implementation. Remove several libraries as they interfere with endorsed XML libraries on JBoss 5.