[zanata/zanata] 60557a: rhbz910964 Keep geronimo stax out of zanata.war

Fri Mar 8 06:47:48 UTC 2013

  Branch: refs/heads/seam230final
  Home:   https://github.com/zanata/zanata
  Commit: 60557a1f0ab11ac9bd12621b0b51e64815f36c5a
      https://github.com/zanata/zanata/commit/60557a1f0ab11ac9bd12621b0b51e64815f36c5a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  rhbz910964 Keep geronimo stax out of zanata.war

  Commit: b9ccf95563c1c99f0a0e05a8f02b5f7224226ddb
      https://github.com/zanata/zanata/commit/b9ccf95563c1c99f0a0e05a8f02b5f7224226ddb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Update versions for Zanata modules

  Commit: 869d21319df6cf852c1409ed25a5ab860ec9bf31
      https://github.com/zanata/zanata/commit/869d21319df6cf852c1409ed25a5ab860ec9bf31
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-2.2.0

  Commit: 60d61c6e0471c7241fa323d4124b1b6ab5c70f34
      https://github.com/zanata/zanata/commit/60d61c6e0471c7241fa323d4124b1b6ab5c70f34
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-25 (Mon, 25 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: 20297a17ead6f32adfd83a06bb670368e0df7a9c
      https://github.com/zanata/zanata/commit/20297a17ead6f32adfd83a06bb670368e0df7a9c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update h2

  Commit: 1bdd96492fa41944f08ef805f339e8de974b1ec3
      https://github.com/zanata/zanata/commit/1bdd96492fa41944f08ef805f339e8de974b1ec3
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-26 (Tue, 26 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
    R zanata-war/src/main/java/org/zanata/util/DBUnitImporter.java
    R zanata-war/src/main/resources/META-INF/ehcache.xml
    R zanata-war/src/main/resources/META-INF/ehcache.xsd
    A zanata-war/src/main/resources/ehcache.xml
    A zanata-war/src/main/resources/ehcache.xsd
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Start getting the tests to work.

Change memory settings for unit tests.
Remove use of some deprecated APIs.
Change named queries using ordinal parameters.

  Commit: 8cc443c18bc4724e6b576b533fccfd4b4205d165
      https://github.com/zanata/zanata/commit/8cc443c18bc4724e6b576b533fccfd4b4205d165
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
    M zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/StatisticsResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java

  Log Message:
  -----------
  Change Autowire management in Rest tests.

Also changed some lombok annotations that were causing problems.

  Commit: e8ace011399afc3a58df38d7a572b5feca8b0d3d
      https://github.com/zanata/zanata/commit/e8ace011399afc3a58df38d7a572b5feca8b0d3d
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Use hibernate test cache when running tests.

  Commit: 26a7d95ddd4f458d8c7c4d4fe889a2d462f08f94
      https://github.com/zanata/zanata/commit/26a7d95ddd4f458d8c7c4d4fe889a2d462f08f94
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-27 (Wed, 27 Feb 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java

  Log Message:
  -----------
  Fix unit tests for Seam 2.3

  Commit: a745867498a008215e24c2dc2997650199192292
      https://github.com/zanata/zanata/commit/a745867498a008215e24c2dc2997650199192292
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java

  Log Message:
  -----------
  Fix expiry activation email: https://bugzilla.redhat.com/show_bug.cgi?id=916812

  Commit: 25b8907e51f564ea597cd359a84649c1e54cc4ef
      https://github.com/zanata/zanata/commit/25b8907e51f564ea597cd359a84649c1e54cc4ef
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml

  Log Message:
  -----------
  Fix on email template

  Commit: a7e68f23cec3822017eff645df2b20b384a47c25
      https://github.com/zanata/zanata/commit/a7e68f23cec3822017eff645df2b20b384a47c25
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare release server-2.2.1

  Commit: 15e75893f7608da65c084f500216a1d92316656f
      https://github.com/zanata/zanata/commit/15e75893f7608da65c084f500216a1d92316656f
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  [maven-release-plugin] prepare for next development iteration

  Commit: f05e9c7a06827c663ca61802a0ba40a63a33c66b
      https://github.com/zanata/zanata/commit/f05e9c7a06827c663ca61802a0ba40a63a33c66b
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-02-28 (Thu, 28 Feb 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into seam230final

Conflicts:
	pom.xml
	zanata-war/pom.xml

  Commit: e49058c50a8a68b818d572d3ae4b9ab5ad286bfc
      https://github.com/zanata/zanata/commit/e49058c50a8a68b818d572d3ae4b9ab5ad286bfc
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-03-06 (Wed, 06 Mar 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/ZanataDbunitJpaTest.java
    A zanata-war/src/test/java/org/zanata/arquillian/GreeterTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    A zanata-war/src/test/resources/arquillian.xml
    A zanata-war/src/test/resources/arquillian/jboss-deployment-structure.xml
    A zanata-war/src/test/resources/arquillian/standalone.xml
    A zanata-war/src/test/resources/arquillian/test-web.xml
    A zanata-war/src/test/resources/arquillian/zanata.properties

  Log Message:
  -----------
  Arquillian Rest tests.

Deployment successfully occurs in this release, but there is a JMX error when quering the status of the deployment and the test fails.
See:
https://community.jboss.org/message/800925

  Commit: e844cb36516b7a79d26a4c90b7a7883276fec55e
      https://github.com/zanata/zanata/commit/e844cb36516b7a79d26a4c90b7a7883276fec55e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    A zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/arquillian/GreeterTest.java
    A zanata-war/src/test/java/org/zanata/rest/ResourceRequest.java
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/test-web.xml

  Log Message:
  -----------
  First working Arquillian rest test.

Forcefully Overriding the ManagementClient class from arquillian to work with EAP 6.

  Commit: 1af7f952b09437b10f451d5ee1726e8d7aa4b9c1
      https://github.com/zanata/zanata/commit/1af7f952b09437b10f451d5ee1726e8d7aa4b9c1
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-03-07 (Thu, 07 Mar 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/test/java/org/zanata/arquillian/GreeterTest.java

  Log Message:
  -----------
  Smaller deployment for first Arquillian Rest test.

Compare: https://github.com/zanata/zanata/compare/6890c0d44b77...1af7f952b094