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

7:00 am

Andrey Balan

More
4f28fc2
changed 21 files

LDEV-3431 Ability to raise burning questions

- -1
- +9
./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieConstants.java
- -0
- +40
./lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
./lamsfoundation/.../ScratchieBurningQuestionDAO.java
- -0
- +74
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
./lamsfoundation/.../ScratchieBurningQuestionDAOHibernate.java
- -0
- +26
./lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
- History
- Source
./lamsfoundation/lams/.../patch20150206.sql
- -0
- +14
./lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./lamsfoundation/lams/.../model/Scratchie.java
- -0
- +104
./lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
- History
- Source
./lamsfoundation/.../ScratchieBurningQuestion.java
- -0
- +9
./lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
- History
- Source
- Diff
./lamsfoundation/lams/.../ScratchieItem.java
- -0
- +8
./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../scratchieApplicationContext.xml
- -0
- +12
./lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./lamsfoundation/.../IScratchieService.java
- -0
- +7
./lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieImportContentVersionFilter.java
- -0
- +31
./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieServiceImpl.java
- -2
- +136
./lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
- -1
- +1
./lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
- History
- Source
- Diff
./lamsfoundation/lams/.../ScratchieForm.java
… 8 more files in changeset.

5:42 am

marek

More
631e0f5
changed 7 files
v4.7, v4.8

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

- -72
- +0
./lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../BaseDAOHibernate.java
- -18
- +13
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieAnswerVisitDAOHibernate.java
- -12
- +7
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieConfigItemDAOHibernate.java
- -3
- +6
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieDAOHibernate.java
- -3
- +6
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieItemDAOHibernate.java
- -4
- +7
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieSessionDAOHibernate.java
- -4
- +7
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieUserDAOHibernate.java

6:48 am

marek

More
dddbf25
changed 4 files
v4.7, v4.8

LDEV-3379: Fix issues regarding 'limit' keyword usage in HQL queries. Reformat source.

- -48
- +60
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieAnswerVisitDAOHibernate.java
… 3 more files in changeset.

1:50 am

Andrey Balan

More
193a418
changed 3 files
v4.7, v4.8

LDEV-3312 Improve security of Scratchie tool. 1) isAnswerCorrect.do to spawn a thread on the backend to record result 2) check user has access to current answer

- -0
- +2
./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieConstants.java
- -32
- +51
./lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
… 1 more file in changeset.

1:50 am

Andrey Balan

More
8985dde
changed 2 files
v4.7, v4.8

LDEV-3314 Scratchie tool to calculate max mark correctly when producing ToolOutputDefinition

- -11
- +30
./lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieOutputFactory.java
- -1
- +1
./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieServiceImpl.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
./lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./lamsfoundation/lams/.../autopatchContext.xml
- -1
- +1
./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../scratchieApplicationContext.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
./lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./lamsfoundation/lams/.../autopatchContext.xml
- -1
- +1
./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../scratchieApplicationContext.xml
… 75 more files in changeset.

2:24 am

marek

More
b92d728
changed 6 files
v4.7, v4.8

LDEV-3319: update dbupdates scripts to use temporary tables for 'temp_select'.

Although the whole db update process is now globally synchronized in LAMS, it is better to use 'temporary' MySQL tables in case of 'temp_select' tables.

- -4
- +3
./lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
- Diff
./lamsfoundation/lams/.../patch20131212.sql
… 5 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
./lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./lamsfoundation/lams/.../autopatchContext.xml
… 32 more files in changeset.

4:53 am

Andrey Balan

More
96f50d0
changed 2 files

LDEV-3314 Scratchie tool to calculate max mark correctly when producing ToolOutputDefinition

- -11
- +30
./lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieOutputFactory.java
- -1
- +1
./lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieServiceImpl.java

9:37 pm

Andrey Balan

More
9aa7a39
changed 3 files

LDEV-3312 Improve security of Scratchie tool. 1) isAnswerCorrect.do to spawn a thread on the backend to record result 2) check user has access to current answer

- -0
- +2
./lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieConstants.java
- -32
- +51
./lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../LearningAction.java
… 1 more file in changeset.

8:43 pm

Marcin Cieslak

More
16c7f5f
changed 1 file
v4.7, v4.8

LDEV-3299: Put Scratchie answers in correct order for QTI export, even if their orderId field is corrupted.

- -6
- +8
./lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../AuthoringAction.java

5:19 pm

Marcin Cieslak

More
b2635ef
changed 1 file

LDEV-3299: Put Scratchie answers in correct order for QTI export, even if their orderId field is corrupted.

- -6
- +8
./lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./lamsfoundation/lams/.../AuthoringAction.java

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
./lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./lamsfoundation/lams/.../autopatchContext.xml
- -11
- +12
./lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./lamsfoundation/.../scratchieApplicationContext.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
./lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../BaseDAOHibernate.java
- -1
- +1
./lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
- History
- Source
- Diff
./lamsfoundation/.../ScratchieConfigItemDAOHibernate.java
… 86 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.