Activity lams/lams_tool_scratchie/src/java

7:51 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150213235106
changed 25 files
lams2_head_wildfly

LDEV-3431 Ability to raise burning questions

- -2
- +12
./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./org/.../ScratchieConstants.java
- -0
- +9
./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./org/.../scratchieApplicationContext.xml
- -0
- +38
./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAO.java
- -0
- +61
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAOHibernate.java
- -0
- +26
./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
- History
- Source
- Diff
./org/lamsfoundation/.../patch20150206.sql
- -0
- +51
./org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
- History
- Source
- Diff
./org/.../BurningQuestionDTO.java
- -3
- +17
./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./org/lamsfoundation/.../model/Scratchie.java
- -0
- +104
./org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestion.java
- -1
- +10
./org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
- History
- Source
- Diff
./org/lamsfoundation/.../ScratchieItem.java
- -3
- +33
./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./org/.../IScratchieService.java
- -1
- +8
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
- Diff
./org/.../ScratchieImportContentVersionFilter.java
- -3
- +84
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./org/.../ScratchieServiceImpl.java
- -5
- +153
./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
- -1
- +8
./org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../MonitoringAction.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
- History
- Source
- Diff
./org/lamsfoundation/.../ScratchieForm.java
… 10 more files in changeset.

7:14 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150212231436
deleted 1 file
lams2_head_wildfly

file ScratchieBurningQuestionDAO.java was added on branch lams2_head_wildfly on 2015-02-13 23:51:07 +0000

- -0
- +0
./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAO.java

7:14 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150212231436:2
deleted 1 file
lams2_head_wildfly

file BurningQuestionDTO.java was added on branch lams2_head_wildfly on 2015-02-13 23:51:07 +0000

- -0
- +0
./org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
- History
- Source
- Diff
./org/.../BurningQuestionDTO.java

7:14 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150212231436:1
deleted 1 file
lams2_head_wildfly

file ScratchieBurningQuestionDAOHibernate.java was added on branch lams2_head_wildfly on 2015-02-13 23:51:07 +0000

- -0
- +0
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAOHibernate.java

7:14 am

Andrey Balan

More
MAIN:andreyb:20150212231435
changed 16 files
MAIN

LDEV-3431 Ability to raise burning questions

- -1
- +3
./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./org/.../ScratchieConstants.java
- -4
- +2
./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAO.java
- -19
- +5
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestionDAOHibernate.java
- -0
- +51
./org/lamsfoundation/lams/tool/scratchie/dto/BurningQuestionDTO.java
- History
- Source
./org/lamsfoundation/.../BurningQuestionDTO.java
- -3
- +3
./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./org/lamsfoundation/.../model/Scratchie.java
- -3
- +21
./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./org/.../IScratchieService.java
- -3
- +53
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./org/.../ScratchieServiceImpl.java
- -10
- +24
./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
- -1
- +8
./org/lamsfoundation/lams/tool/scratchie/web/action/MonitoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../MonitoringAction.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
- History
- Source
- Diff
./org/lamsfoundation/.../ScratchieForm.java
- -2
- +3
./org/lamsfoundation/lams/tool/scratchie/web/servlet/ExportServlet.java
- History
- Source
- Diff
./org/lamsfoundation/.../ExportServlet.java
… 5 more files in changeset.

7:00 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150211230052
deleted 1 file
lams2_head_wildfly

file patch20150206.sql was added on branch lams2_head_wildfly on 2015-02-13 23:51:06 +0000

- -0
- +0
./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
- History
- Source
- Diff
./org/lamsfoundation/.../patch20150206.sql

7:00 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20150211230052:1
deleted 1 file
lams2_head_wildfly

file ScratchieBurningQuestion.java was added on branch lams2_head_wildfly on 2015-02-13 23:51:06 +0000

- -0
- +0
./org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
- History
- Source
- Diff
./org/.../ScratchieBurningQuestion.java

7:00 am

Andrey Balan

More
MAIN:andreyb:20150211230052
changed 21 files
MAIN

LDEV-3431 Ability to raise burning questions

- -2
- +10
./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./org/.../ScratchieConstants.java
- -0
- +8
./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./org/.../scratchieApplicationContext.xml
- -0
- +40
./org/lamsfoundation/lams/tool/scratchie/dao/ScratchieBurningQuestionDAO.java
- History
- Source
./org/.../ScratchieBurningQuestionDAO.java
- -0
- +74
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieBurningQuestionDAOHibernate.java
- History
- Source
./org/.../ScratchieBurningQuestionDAOHibernate.java
- -0
- +26
./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20150206.sql
- History
- Source
./org/lamsfoundation/.../patch20150206.sql
- -1
- +15
./org/lamsfoundation/lams/tool/scratchie/model/Scratchie.java
- History
- Source
- Diff
./org/lamsfoundation/.../model/Scratchie.java
- -0
- +104
./org/lamsfoundation/lams/tool/scratchie/model/ScratchieBurningQuestion.java
- History
- Source
./org/.../ScratchieBurningQuestion.java
- -1
- +10
./org/lamsfoundation/lams/tool/scratchie/model/ScratchieItem.java
- History
- Source
- Diff
./org/lamsfoundation/.../ScratchieItem.java
- -1
- +13
./org/lamsfoundation/lams/tool/scratchie/service/IScratchieService.java
- History
- Source
- Diff
./org/.../IScratchieService.java
- -1
- +8
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieImportContentVersionFilter.java
- History
- Source
- Diff
./org/.../ScratchieImportContentVersionFilter.java
- -1
- +32
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./org/.../ScratchieServiceImpl.java
- -3
- +137
./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/web/form/ScratchieForm.java
- History
- Source
- Diff
./org/lamsfoundation/.../ScratchieForm.java
… 8 more files in changeset.

5:42 am

marek

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

- -72
- +0
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./org/lamsfoundation/.../BaseDAOHibernate.java
- -19
- +14
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieAnswerVisitDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieAnswerVisitDAOHibernate.java
- -13
- +8
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieConfigItemDAOHibernate.java
- -4
- +7
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieDAOHibernate.java
- -4
- +7
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieItemDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieItemDAOHibernate.java
- -5
- +8
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieSessionDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieSessionDAOHibernate.java
- -5
- +8
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieUserDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieUserDAOHibernate.java

6:48 am

marek

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

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

1:50 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20141030175040
changed 3 files
lams2_head_wildfly

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

- -1
- +3
./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./org/.../ScratchieConstants.java
- -33
- +52
./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
… 1 more file in changeset.

1:50 am

Andrey Balan

More
lams2_head_wildfly:andreyb:20141030175010
changed 2 files
lams2_head_wildfly

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

- -12
- +31
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./org/.../ScratchieOutputFactory.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./org/.../ScratchieServiceImpl.java

4:35 pm

marek

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
./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./org/.../scratchieApplicationContext.xml
- -1
- +1
./org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../autopatchContext.xml
… 76 more files in changeset.

4:28 am

marek

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

2:23 am

marek

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
./org/lamsfoundation/lams/tool/scratchie/dbupdates/patch20131212.sql
- History
- Source
- Diff
./org/lamsfoundation/.../patch20131212.sql
… 5 more files in changeset.

5:55 pm

Marcin Cieslak

More
lams2_head_wildfly:marcin:20141009095511
changed 33 files
lams2_head_wildfly

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
./org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../autopatchContext.xml
… 32 more files in changeset.

4:53 am

Andrey Balan

More
MAIN:andreyb:20140922205344
changed 2 files
MAIN

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

- -12
- +31
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieOutputFactory.java
- History
- Source
- Diff
./org/.../ScratchieOutputFactory.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/service/ScratchieServiceImpl.java
- History
- Source
- Diff
./org/.../ScratchieServiceImpl.java

9:37 pm

Andrey Balan

More
MAIN:andreyb:20140919133741
changed 3 files
MAIN

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

- -1
- +3
./org/lamsfoundation/lams/tool/scratchie/ScratchieConstants.java
- History
- Source
- Diff
./org/.../ScratchieConstants.java
- -33
- +52
./org/lamsfoundation/lams/tool/scratchie/web/action/LearningAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../LearningAction.java
… 1 more file in changeset.

8:43 pm

Marcin Cieslak

More
lams2_head_wildfly:marcin:20140822124349
changed 1 file
lams2_head_wildfly

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

- -7
- +9
./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../AuthoringAction.java

5:19 pm

Marcin Cieslak

More
MAIN:marcin:20140822091911
changed 1 file
MAIN

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

- -7
- +9
./org/lamsfoundation/lams/tool/scratchie/web/action/AuthoringAction.java
- History
- Source
- Diff
./org/lamsfoundation/.../AuthoringAction.java

7:20 pm

Marcin Cieslak

More
lams2_head_wildfly:marcin:20140816112016
changed 79 files
lams2_head_wildfly

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

- -11
- +12
./org/lamsfoundation/lams/tool/scratchie/scratchieApplicationContext.xml
- History
- Source
- Diff
./org/.../scratchieApplicationContext.xml
- -2
- +5
./org/lamsfoundation/lams/tool/scratchie/dbupdates/autopatchContext.xml
- History
- Source
- Diff
./org/lamsfoundation/.../autopatchContext.xml
… 77 more files in changeset.

5:57 pm

Marcin Cieslak

More
lams2_head_wildfly:marcin:20140815095758
changed 88 files
lams2_head_wildfly

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.

- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/BaseDAOHibernate.java
- History
- Source
- Diff
./org/lamsfoundation/.../BaseDAOHibernate.java
- -2
- +2
./org/lamsfoundation/lams/tool/scratchie/dao/hibernate/ScratchieConfigItemDAOHibernate.java
- History
- Source
- Diff
./org/.../ScratchieConfigItemDAOHibernate.java
… 86 more files in changeset.

5:30 pm

Marcin Cieslak

More
lams2_head_wildfly:marcin:20140815093046
changed 56 files
lams2_head_wildfly

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.