• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

    • -2
    • +21
    /lams_common/db/sql/create_lams_11_tables.sql
  1. … 71 more files in changeset.
Putting back missing config files.

    • -0
    • +6
    /lams_build/conf/unix/jboss/jbossweb/server.xml
file context.xml was added on branch lams2_3 on 2009-07-03 02:24:28 +0000

file jbossweb-2.1.3.GA.zip was added on branch lams2_3 on 2009-07-03 02:24:30 +0000

    • binary
    /lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip
file jgroups-2.6.10-src.zip was added on branch lams2_3 on 2009-07-03 02:24:28 +0000

file jbosscache-core-3.1.0-src.zip was added on branch lams2_3 on 2009-07-03 02:24:29 +0000

file war-deployers-jboss-beans.xml was added on branch lams2_3 on 2009-07-03 02:24:28 +0000

file server.xml was added on branch lams2_3 on 2009-07-03 02:24:28 +0000

    • -0
    • +0
    /lams_build/conf/unix/jboss/jbossweb/server.xml
file context.xml was added on branch lams2_3 on 2009-07-03 02:24:27 +0000

file war-deployers-jboss-beans.xml was added on branch lams2_3 on 2009-07-03 02:24:27 +0000

file server.xml was added on branch lams2_3 on 2009-07-03 02:24:27 +0000

more merging (lams2_3_jboss5 new files into head)

    • -0
    • +173
    /lams_build/conf/unix/jboss/jbossweb/server.xml
    • binary
    /lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip
more merging lams2_3 into head

    • binary
    /lams_build/lib/lams/lams-learning.jar
  1. … 25 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)

    • -0
    • +0
    /lams_build/conf/unix/jboss/bootstrap.slim.xml
    • -0
    • +0
    /lams_build/conf/unix/jboss/jboss-log4j.xml
    • -0
    • +0
    /lams_build/conf/unix/jboss/jboss-service.xml
    • binary
    /lams_build/lib/lams/lams-monitoring.jar
  1. … 200 more files in changeset.
remove merge conflict flags

file jbossweb.jar was added on branch lams2_3 on 2009-07-03 02:24:31 +0000

    • binary
    /lams_build/lib/jbossweb/jbossweb.jar
Added missing library and fixed classpaths - changes needed after code merge.

    • binary
    /lams_build/lib/jbossweb/jbossweb.jar
  1. … 3 more files in changeset.
file quartz.jar was added on branch lams2_head_wildfly on 2014-07-31 10:07:31 +0000

Merge lams2_3 into head

    • -0
    • +1
    /lams_admin/conf/xdoclet/struts-forms.xml
    • -1
    • +6
    /lams_admin/conf/xdoclet/web-settings.xml
    • -116
    • +106
    /lams_build/3rdParty.userlibraries
  1. … 148 more files in changeset.
LDEV-2184 Fixed encoding issue for characters, using xml dictionary rather than flashvar param.

    • binary
    /lams_monitoring/web/CloudWizard.swf
Remove some old conflict markers

Merge lams2_3_jboss5 changes into lams2_3

    • -22
    • +27
    /lams_tool_assessment/web/WEB-INF/web.xml
  1. … 43 more files in changeset.
Resolve conflicts from previous merge

Merge lams2_3_jboss5 changes into lams2_3

    • -1
    • +6
    /lams_admin/conf/xdoclet/web-settings.xml
    • -116
    • +106
    /lams_build/3rdParty.userlibraries
    • -271
    • +0
    /lams_build/conf/j2ee/application_1_3.dtd
    • -0
    • +341
    /lams_build/conf/j2ee/application_5.xsd
    • -218
    • +50
    /lams_build/conf/j2ee/lams.application.xml
    • -222
    • +54
    /lams_build/conf/j2ee/rams.application.xml
    • -0
    • +18
    /lams_build/conf/unix/jboss/bootstrap.slim.xml
    • -0
    • +411
    /lams_build/conf/unix/jboss/jboss-log4j.xml
  1. … 85 more files in changeset.
Committing the lams.jar and moving the 2.3.1 tag to ensure all the required classes are present

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)

    • binary
    /lams_tool_notebook/lib/flash-selenium.jar
    • binary
    /lams_tool_notebook/lib/flex-ui-selenium-0.1.1.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-test-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver-tests.jar
    • binary
    /lams_tool_notebook/lib/selenium-java-client-driver.jar
    • binary
    /lams_tool_notebook/lib/selenium-server-sources.jar
    • binary
    /lams_tool_notebook/lib/selenium-server.jar
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)

file localCommonContext.xml was initially added on branch lams2_3.

Undo-ing some changes to return to 2.3 branch

    • -102
    • +0
    /lams_central/web/tutorialVideo.jsp
    • -0
    • +163
    /lams_tool_images/web/includes/css/thickbox.css
Committing final changes for the 2.3.1 windows patch

    • binary
    /win_installer/patch/assembly/lams-tool-lavidr10.jar
    • binary
    /win_installer/patch/assembly/lams-tool-lavidr10.war