• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2372 fixes to testing framework

* closes all windows at the end of each test.

So there is no more need in paying attention to this thing

* solved problem with IE: ability to re-login

* solved problem with timeouts in learning

* new method waitForLearning() introduced

* TestFrameworkException renamed to SeleniumException

TestFrameworkConstants renamed to SeleniumConstants

added several new constants

    • -0
    • +53
    ./lamsfoundation/lams/selenium/SeleniumConstants.java
    • -0
    • +68
    ./lamsfoundation/lams/selenium/SeleniumException.java
post 2.3.1 patch files - planner.lamscommunity.org is at patch level 18

    • -0
    • +8
    ./lamsfoundation/lams/dbupdates/patch0019_updateFrom231.sql
LDEV-2374: Added outputs for Data Flow for:

* Image gallery (URL to the images uploaded by the students),

* Forum (text for the postings for a student in the forum)

* Chat (all text postings for a student in the chat)

* Pixlr (URL to the image)

* Share resources (URL to file/urls uploaded)

* Notebook (Text entered by the student)

* Submit Files (URL to files uploaded)

    • -0
    • +56
    ./lamsfoundation/lams/tool/SimpleURL.java
  1. … 32 more files in changeset.
Changing webutil to always log requests to external servers

    • -2
    • +2
    ./lamsfoundation/lams/util/WebUtil.java
moving/creating post-2.3.1 db modification statements into new patch file

    • -0
    • +55
    ./lamsfoundation/lams/dbupdates/patch0018_updateFrom231.sql
LDEV-2372

moving all Selenium core classes from lams_common/test/java --> lams_common/src/java.

as these classes are aimed for importing from other projects

    • -0
    • +592
    ./lamsfoundation/lams/selenium/AbstractSeleniumTestCase.java
    • -0
    • +182
    ./lamsfoundation/lams/selenium/DefaultSeleniumFlex.java
    • -0
    • +69
    ./lamsfoundation/lams/selenium/SeleniumTestSuite.java
    • -0
    • +46
    ./lamsfoundation/lams/selenium/TestFrameworkConstants.java
    • -0
    • +68
    ./lamsfoundation/lams/selenium/TestFrameworkException.java
  1. … 5 more files in changeset.
LDEV-2374:

- Vote now accepts nominations created by Teacher as well as ones derived from input.

- Teacher can now limit number of Learners contributing to Vote's nomination pool.

- Each tool now declares which DataOutputDefinitions it can accept for Data Flow.

    • -16
    • +34
    ./lamsfoundation/lams/tool/OutputFactory.java
  1. … 45 more files in changeset.
file shouldn't have been merged (was deleted on branch)

LDEV-2372 testing framework

*there is no more need in removing .hbm.xml files

    • -177
    • +1
    ./lamsfoundation/lams/localCommonContext.xml
LDEV-2380: Added some code comments.

  1. … 1 more file in changeset.
LDEV-2380: Added recently edited LDs list on the first Ped Planner page.

  1. … 6 more files in changeset.
change to ascii

  1. … 22 more files in changeset.
LDEV-2375: Added "Back" button in Planner Template editor.

  1. … 4 more files in changeset.
LDEV-2202: Added a workaround for imported Hibernate collections. The way extra fields in XML document are located was altered - the class name does not have to be a tag name anymore, attribute "class" is also supported now.

LDEV-2374: Fixed a small bug occuring when importing LD.

Recreated/updated several resources removed by previous merge.

  1. … 5 more files in changeset.
LDEV-2372 Lams Testing framework works with JBoss 5 now

    • -44
    • +229
    ./lamsfoundation/lams/localCommonContext.xml
  1. … 1 more file in changeset.
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -1
    • +7
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +143
    ./lamsfoundation/lams/learningdesign/DataFlowObject.java
    • -0
    • +74
    ./lamsfoundation/lams/learningdesign/DataTransition.java
    • -0
    • +55
    ./lamsfoundation/lams/learningdesign/dao/IDataFlowDAO.java
    • -0
    • +101
    ./lamsfoundation/lams/learningdesign/dto/DataFlowObjectDTO.java
    • -126
    • +86
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -88
    • +99
    ./lamsfoundation/lams/tool/ToolContentManager.java
    • -45
    • +45
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
  1. … 71 more files in changeset.
more merging lams2_3 into head

    • -0
    • +1
    ./lamsfoundation/lams/beanRefContext.xml
  1. … 37 more files in changeset.
Merge lams2_3 to head (including things not merged last time due to eclipse's merge wizard not handling the lams2_3 start point as expected)

    • -1
    • +1
    ./lamsfoundation/lams/commonContext.xml
    • -2
    • +2
    ./lamsfoundation/lams/events/Event.java
    • -1
    • +2
    ./lamsfoundation/lams/lesson/Lesson.java
    • -256
    • +355
    ./lamsfoundation/lams/tool/OutputFactory.java
    • -130
    • +156
    ./lamsfoundation/lams/tool/ToolOutputDefinition.java
    • -1
    • +29
    ./lamsfoundation/lams/util/DateUtil.java
    • -99
    • +104
    ./lamsfoundation/lams/util/WebUtil.java
  1. … 200 more files in changeset.
Merge lams2_3 into head

    • -10
    • +24
    ./lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./lamsfoundation/lams/beanRefContext.xml
    • -7
    • +184
    ./lamsfoundation/lams/commonContext.xml
    • -0
    • +462
    ./lamsfoundation/lams/localCommonContext.xml
    • -3
    • +4
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -197
    • +237
    ./lamsfoundation/lams/cache/CacheManager.java
    • -149
    • +126
    ./lamsfoundation/lams/integration/ExtServerOrgMap.java
  1. … 148 more files in changeset.
Resolve conflicts from previous merge

  1. … 1 more file in changeset.
Merge lams2_3_jboss5 changes into lams2_3

    • -10
    • +24
    ./lamsfoundation/lams/applicationContext.xml
    • -2
    • +34
    ./lamsfoundation/lams/beanRefContext.xml
    • -37
    • +212
    ./lamsfoundation/lams/commonContext.xml
    • -3
    • +4
    ./lamsfoundation/lams/toolApplicationContext.xml
    • -197
    • +237
    ./lamsfoundation/lams/cache/CacheManager.java
    • -421
    • +465
    ./lamsfoundation/lams/web/session/SessionManager.java
  1. … 86 more files in changeset.
LDEV-2372 Testing framework for LAMS

First draft of testing framework.

includes testcases for all phases(authoring, learning, monitor)

except for the one that creates new lessons (cloudWizzard.swf)

    • -0
    • +462
    ./lamsfoundation/lams/localCommonContext.xml
file localCommonContext.xml was initially added on branch lams2_3.

    • -0
    • +0
    ./lamsfoundation/lams/localCommonContext.xml
Undo-ing some changes to return to 2.3 branch

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 8 more files in changeset.
LDEV-2369: Added tutorial video functionality to HEAD (previously removed from 2.3 branch).

Fixed IE > 6 bug preventing Thickbox to be centered on the screen.

  1. … 16 more files in changeset.
Undoing some changes not meant for 2.3.1 particularly for LDEV-2389

  1. … 12 more files in changeset.
file patch0017_updateFrom23-231.sql was initially added on branch lams2_3.

    • -0
    • +0
    ./lamsfoundation/lams/dbupdates/patch0017_updateFrom23-231.sql