[zanata-commits] [zanata/zanata] 0763b9: Merge separate components.xml into single file.

[noreply at github.com]

  Branch: refs/heads/rhbz747501
  Home:   https://github.com/zanata/zanata

  Commit: 0763b95faa175b5f51580c165f784c4a978741d8
      https://github.com/zanata/zanata/commit/0763b95faa175b5f51580c165f784c4a978741d8
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-23 (Sun, 23 Oct 2011)

  Changed paths:
    M server/zanata-war/src/main/resources/META-INF/components.xml
  R server/zanata-war/src/main/webapp-jboss/WEB-INF/components.xml

  Log Message:
  -----------
  Merge separate components.xml into single file.


  Commit: 6dbd90603d8ede9c2eaa5f9756cba367a3eb65b2
      https://github.com/zanata/zanata/commit/6dbd90603d8ede9c2eaa5f9756cba367a3eb65b2
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-23 (Sun, 23 Oct 2011)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml

  Log Message:
  -----------
  Fix maven tests on dev environments.

Two changes make this possible:
- The use of a single argLine parameter on the maven failsafe plugin configuration. Having two causes the second one to override the first one, not complement it.
- Adding a set of valid file extensions to be deployed in the jboss-embedded deployment descriptors. (reverse-merged from commit d0908fec860f1f9dac25195e18bbbf66bf85a606)


  Commit: 816c039def51dabbcea73ca3dc7f5427ed735c35
      https://github.com/zanata/zanata/commit/816c039def51dabbcea73ca3dc7f5427ed735c35
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2011-10-24 (Mon, 24 Oct 2011)

  Changed paths:
    M server/zanata-war/eclipse/launch/Integration_Tests.launch
  M server/zanata-war/pom.xml

  Log Message:
  -----------
  Update eclipse / maven test launchers.

Both eclipse and maven Integration test launchers are now running. The eclipse launch configuration needed an extra folder in the classpath, and the maven configuration reorganized the jbosssx dependency so that no conflicts were present when running tests.


Compare: https://github.com/zanata/zanata/compare/0763b95^...816c039