• last updated a few seconds ago
Constraints
Constraints: committers
 
Constraints: files
Constraints: dates
Updating Greek, English, Spanish, French, Italian, Japanese, Maori, Norwegian, Polish, Russian, Turkish, Chinese, Chinese (taiwan)

    • -150
    • +150
    /lams_tool_forum/conf/language/lams/ApplicationResources_tr_TR.properties
Updating Greek, English, Spanish, Maori, Norwegian and Russian, Japanese

Updating Greek, English, Spanish, Norwegian and Russian, Japanese

Updating Greek, English, Spanish, Norwegian and Russian

Updating Japanese

latest jars

    • binary
    /lams_build/lib/lams/lams-learning.jar
rebuilt tool deployer jar - got outdated during all the merging :(

These files seemed to have been added incorrectly to lams2_3_jboss5 branch: adding them here to head (solves compile problem)

    • -10
    • +14
    /lams_tool_forum/web/WEB-INF/web.xml
    • -10
    • +14
    /lams_tool_sbmt/web/WEB-INF/web.xml
Merge lams2_3 to head (continuing...)

    • -18
    • +11
    /lams_central/web/WEB-INF/web.xml
  1. … 36 more files in changeset.
merge lams2_3_jboss5 changes

undoing last checking to these files, doesn't seem to belong on this branch (or is incomplete)

merge lams2_3_jboss5 to lams2_3 (continuing...)

    • -0
    • +179
    /lams_build/conf/unix/jboss/jbossweb/server.xml
    • binary
    /lams_build/lib/jbossweb/jbossweb.jar
    • binary
    /lams_build/lib/jbossweb/src/jbossweb-2.1.3.GA.zip
merge lams2_3_jboss5 to lams2_3 (continuing...)

LDEV-2372 Lams Testing framework works with JBoss 5 now

LDEV-2374: Data flow between tools: framework and example for Q&A -> Vote.

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