lams-github

Clone Tools
  • last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-3332: fix tiles-config.dtd version used.

LAMS is shipped with tiles 1.1 version (included in struts). Fix tiles configuration to use tiles-config-1_1.dtd. This was another resource, that was loaded from internet during Wildfly startup (since used dtd version was not present in struts.jar).

It should be now possible to start Wildfly with LAMS without internet connection.

    • -2
    • +2
    /lams_admin/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_central/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_learning/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_bbb/web/WEB-INF/tiles-defs.xml
    • -2
    • +2
    /lams_tool_nb/web/WEB-INF/tiles-defs.xml
  1. … 4 more files in changeset.
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. … 62 more files in changeset.
LDEV-3322: adding id attributes to facilitate functional testing

    • -5
    • +5
    /lams_central/web/authoring/authoring.jsp
LDEV-3322: committing missing FLA label

LDEV-3322: adding id attributes to facilitate functional testing

    • -5
    • +5
    /lams_central/web/authoring/authoring.jsp
LDEV-3322: committing missing FLA label

LDEV-3328: including the following Authoring Gate tests:

- Creates a design with a gate

- Adds title to gate

- Adds description to gate

- Sets gate type:

- permission

- synchronization

- condition

- schedule

LDEV-3330: Check if an attribute key is not NULL beforing looking it up in the session.

WildFly is more restrictive when it comes to session attributes management. It does not allow looking up NULL keys, while JBoss 5 returned NULL value in this case.

LDEV-3296 remove translations of the languages we don't support

    • -5
    • +0
    /lams_central/web/ckeditor/lang/en-ca.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/en-gb.js
    • -5
    • +0
    /lams_central/web/ckeditor/lang/fr-ca.js
  1. … 24 more files in changeset.
LDEV-3328: including the following Authoring tests:

- opening FLA

- create a design with 4 activities

- name and save design

- clear canvas

- reopen design

- arrange activities

- re-save design

- saveAs design

- change activity titles

- save (one click)

- Create group

- Assign group to activity

- Modify group settings

- Add design description

- Add design license

- Copy/paste activities

- Arrange design

- Save invalid design

LDEV-3275: Add missing library dependencies.

    • -1
    • +12
    /lams_build/lib/batik/batik.module.xml
    • -0
    • +112
    /lams_build/lib/jdk/jdk.module.xml
    • -1
    • +2
    /lams_build/lib/struts/struts.module.xml
    • -2
    • +11
    /lams_build/lib/wddx/wddx.module.xml
LDEV-3328: adding tests for LAMS Authoring (FLA) using Page object model and pagefactory pattern

    • -0
    • +227
    /lams_tests/tests/org/lamsfoundation/lams/author/AuthorTests.java
LDEV-3327: delay first execution of ResendMessagesJob

Start first ResendMessagesJob execution 2 minutes after class is loaded. EventNotificationService is usually initialized together with Wildfly environment and 2 minutes are given to WIldfly to initialize properly.

LDEV-3322: adding tags to facilitate functional testing

    • -24
    • +25
    /lams_central/web/authoring/authoring.jsp
LDEV-3322: adding tags to facilitate functional testing

    • -24
    • +25
    /lams_central/web/authoring/authoring.jsp
LDEV-3275: Set default log level to DEBUG for LAMS classes.

LDEV-3293: fix hibernate dtd declarations. Change 'hibernate.org' to 'www.hibernate.org'.

In order for hibernate DTDEntityResolver not to load hibernate-mapping-3.0.dtd from internet (and use local one), namespace declaration of dtd must exactly match the namespace declared in DTDEntityResolver class.

    • -1
    • +1
    /lams_build/conf/xdoclet-hibernate-template.xml
  1. … 79 more files in changeset.
LDEV-3275: Remove duplicate error log.

LDEV-3325: fixing missing label

LDEV-2975: updating translations

LDEV-3324: general refactoring

    • -0
    • +42
    /lams_tests/tests/org/lamsfoundation/lams/util/LamsUtil.java
LDEV-3275: Add SsoConsumer in LAMS Central as requests (index.jsp, index.do) immediate after j_security_check are also being authenticated. They also are considered an authentication attempt, but they bypass shared session creation in SsoProducer and it causes errors. This was addressed by a simple check - no shared session in UniversalLoginModule, no authentication attempt.

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.

LDEV-3319: update create_lams_11_tables.sql to create 'patches' table with compound primary key.

    • -1
    • +1
    /lams_common/db/sql/create_lams_11_tables.sql
LDEV-3319: update 'autopatch' and 'discovery' libraries in LAMS components.

Replace jar libraries. Update 3rdParty.userlibraries to use autopatch-1.4.2-lams and discovery-1.0.5-lams. Update build.xml to deploy correct libs to wildfly.

    • binary
    /lams_build/lib/autopatch/autopatch-1.4.2-lams.jar
    • binary
    /lams_build/lib/autopatch/discovery-1.0.5-lams.jar
LDEV-3319: automatically perform 'patches' table upgrade if invalid primary key found.

There is a difference in 'patches' table structure in legacy autopatch and autopatch-1.4.2 version. In new version, primary key is compound and built from 'system_name' and 'patch_level' columns. There was however no validation and upgrade process present to alter primary key. Introduce such mechanism with this commit. If 'patches' table is present, but connection metadata reports single column primary key - 'alter table' query is executed (for MySQL: ALTER TABLE patches DROP PRIMARY KEY, ADD PRIMARY KEY(system_name, patch_level);)

JUnit tests of autopatch component were updated.

LDEV-3319: update .cvsignore for 'autopatch' and 'discovery' 3rd party projects. add eclipse-specific configuration files and build paths to ignores.

LDEV-3319: catch and ignore SQLException thrown when isClosed() condition is checked on Statement. Exemplary stacktrace below.

2014-10-10 20:21:35,092 ERROR [com.tacitknowledge.util.migration.jdbc.util.SqlUtil] (MSC service thread 1-6) Error closing Statement: java.sql.SQLException: The statement is closed.

at org.jboss.jca.adapters.jdbc.WrappedStatement.checkState(WrappedStatement.java:1324)

at org.jboss.jca.adapters.jdbc.WrappedStatement.getUnderlyingStatement(WrappedStatement.java:1239)

at org.jboss.jca.adapters.jdbc.WrappedStatement.getWrappedObject(WrappedStatement.java:1255)

at org.jboss.jca.adapters.jdbc.WrappedStatement.isClosed(WrappedStatement.java:1159)

at com.tacitknowledge.util.migration.jdbc.util.SqlUtil.close(SqlUtil.java:89)

LDEV-3319: Record changes made by jliew (http://code.lamsfoundation.org/fisheye/browse/otherlams/autopatch) on top of autopatch-1.4.2-lams version.