[zanata/zanata-server] 6530c6: Clear HProjectIteration_Locale between tests

GitHub noreply at github.com
Mon Oct 20 23:59:38 UTC 2014


  Branch: refs/heads/gwt260
  Home:   https://github.com/zanata/zanata-server
  Commit: 6530c61b077fd19a6a314466c58b958fe78bfa0a
      https://github.com/zanata/zanata-server/commit/6530c61b077fd19a6a314466c58b958fe78bfa0a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-08-14 (Thu, 14 Aug 2014)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Clear HProjectIteration_Locale between tests


  Commit: 48d12c37ded2ce2d88be01fd3a1281a95f656363
      https://github.com/zanata/zanata-server/commit/48d12c37ded2ce2d88be01fd3a1281a95f656363
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-05 (Fri, 05 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Fix redirect to login page when using single open id provider authentication
Pull request https://github.com/zanata/zanata-server/pull/579

Squashed commit of the following:

commit a9ba559c18b560a12f7884c00c6de0f5d0f53f36
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 16:56:35 2014 +1000

    Rename methods and change comments.

commit 48da2eaefe724702ec28e3a478fbe0f4df8fd03e
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 15:03:47 2014 +1000

    Code review updates.

commit 8a3d8999e10fbf7c4a781843bee1db62782fe625
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Sep 4 12:04:30 2014 +1000

    Fix redirect to login page when using single open id provider authentication.


  Commit: 2ef538cc904ae505624ca4bd148d2d179569719a
      https://github.com/zanata/zanata-server/commit/2ef538cc904ae505624ca4bd148d2d179569719a
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-15 (Mon, 15 Sep 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Disable broken test: EditVersionValidationsTest.verifyValidationsAreErrors


  Commit: e83adb0112ff83cbdeaba25a009fde15c852d482
      https://github.com/zanata/zanata-server/commit/e83adb0112ff83cbdeaba25a009fde15c852d482
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-16 (Tue, 16 Sep 2014)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    A functional-test/src/test/resources/conf/standalone_wildfly.xml

  Log Message:
  -----------
  add profile to functional-test to run against wildfly 8

https://github.com/zanata/zanata-server/pull/560


  Commit: 19ad2f8fb6afef33bbaab71be0ff1e3c00604264
      https://github.com/zanata/zanata-server/commit/19ad2f8fb6afef33bbaab71be0ff1e3c00604264
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-17 (Wed, 17 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Fix the broken validations test

The validation error box function was not searching the right place
for the appropriate component.


  Commit: 4bdcada277473d9bf673f321b94c8ed0560bbe28
      https://github.com/zanata/zanata-server/commit/4bdcada277473d9bf673f321b94c8ed0560bbe28
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-18 (Thu, 18 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java

  Log Message:
  -----------
  Merge pull request #585 from zanata/fix-broken-validation-test

Fix the broken validations test


  Commit: e3403194e268c138b6b63f9c3f2c2c61f1c103bf
      https://github.com/zanata/zanata-server/commit/e3403194e268c138b6b63f9c3f2c2c61f1c103bf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

  Log Message:
  -----------
  Merge pull request #553 from zanata/clear-HProjectIteration_Locale

Clear HProjectIteration_Locale between tests


  Commit: 71d89a14ca5e61f83a0db32dfb52afaa3cb6e838
      https://github.com/zanata/zanata-server/commit/71d89a14ca5e61f83a0db32dfb52afaa3cb6e838
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-19 (Fri, 19 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Fix tests that break on Wildfly

These tests are more generally robust as a result.


  Commit: 9a0b0f73516f704f97dd65688304f3aaca6eaf3d
      https://github.com/zanata/zanata-server/commit/9a0b0f73516f704f97dd65688304f3aaca6eaf3d
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-22 (Mon, 22 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java

  Log Message:
  -----------
  Merge pull request #588 from zanata/fix-ftest-wildfly

Fix tests that break on Wildfly


  Commit: e81b9123e242f2c73e2489e9b2bb515d7926e781
      https://github.com/zanata/zanata-server/commit/e81b9123e242f2c73e2489e9b2bb515d7926e781
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    A build.sh
    A etc/scripts/allocate-jboss-ports
    A etc/scripts/allocate-ports
    M functional-test/pom.xml
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    M pom.xml
    M zanata-test-war/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/etc/zanata-ds.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrapperManager.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    R zanata-war/src/main/webapp/account/logout.xhtml
    R zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/resources/arquillian.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    R zanata-war/src/test/resources/arquillian/standalone.xml

  Log Message:
  -----------
  WildFly fixes, test configuration and dynamic ports

Merge pull request: https://github.com/zanata/zanata-server/pull/567
Squashed commit of the following:

commit aae9a3424d92cb4c58d14516120a0bd22d1bd877
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 19 16:05:10 2014 +1000

    Switch embedded wildfly to managed

commit b688b87926a3e2ae251d59c8dcbb3e84079f9bcd
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Fri Sep 19 13:54:56 2014 +1000

    Correct issue when logging out from certain pages.

commit 991bd93320603a3a7f62b0a43e77d1caddd9b7b1
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 19 12:48:44 2014 +1000

    Activate profiles with -Dappserver=(jbosseap6|wildfly8)

commit 86f1565de2da801aeefbe5613f7a2324ab0447bc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 21:04:11 2014 +1000

    Change allocate-jboss-ports to work in Jenkins

commit 97a2b0494765c01e48b8f9d22f3616a8edf6c0d2
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 16:33:15 2014 +1000

    Fix port

commit 9da422affd7fb2212259736a9b115ed954fa608f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 15:20:57 2014 +1000

    Remove use of tmp war (cont.)

commit 83473570b87e954ad97c9db0d4429a345c3058a5
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 15:11:39 2014 +1000

    Correct management port for wildfly

commit 6d93043245e653c373b02a3ccc6dc8884dcdceb3
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 18 13:40:40 2014 +1000

    Remove misplaced Maven property expression

commit 47957cbe8a594206825d760389fb6d974ee25f5a
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 17 20:48:04 2014 +1000

    Clean up pom for static analysers

    - Update shrinkwrap and transitive test dependencies to satisfy
      RequireUpperBoundDeps
    - Exclude org.jboss.remoting3 (duplicates org.jboss.remoting classes)

commit ddb30e4558fe232dd79508b73f93b7496e77bdcc
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 17 18:18:36 2014 +1000

    Allocate ports separately

commit 5a2dca806c9ffdc9d69792ec778128cc3a17da3b
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 14:11:44 2014 +1000

    Split arquillian config into two profiles: jbosseap6 & wildfly81

commit 82ead14a9a54f73a1134323de0b3880fee8d4d03
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 10:17:56 2014 +1000

    Remove use of tmp war

commit 949b2bb18ba48094d67be3bfa4a78603c9739f55
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 16 10:48:53 2014 +1000

    Fix profile activation on Maven 3.2.2+ (MNG-4565)

commit 21cae282cd0554337c702ec7daa838a794462d1e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 21:02:45 2014 +1000

    Control WildFly ports via environment variables

commit 358c87a335c2d2a602c0e8dbb580568dde0cb377
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 16:16:22 2014 +1000

    Rewrite allocate-ports in Python for faster startup

commit 1f4c2225090413a6c06da55f4495cc9ae3ca3939
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Sep 15 15:59:31 2014 +1000

    Generate unused port numbers for JBoss using Groovy script

commit 529d8eb19973c429bfe1c198259f171546c6193c
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Sep 12 15:39:42 2014 +1000

    Make ports configurable via system properties and env vars

    Also set port-offset=0 and adjust port numbers manually (by adding 100)

commit cacfcef2cf760d11036992ac128d8be33e3fbb14
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 16:35:34 2014 +1000

    Log permission check failure as WARN, success as DEBUG

commit 68823a3482fdad71f8c1c09e2d0b7467cf1fac0b
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 13:29:54 2014 +1000

    Adjust programmatic log config in ZanataInit

commit b7d45cb9fa306c8c83be34dbb8a233764670b9ac
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Sep 9 10:23:01 2014 +1000

    Delete HTextFlowHistory before HTextFlow

commit 5419e0f9cf0dd0b0501e0c3da4537af2e22d70a1
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 4 13:11:48 2014 +1000

    Enhance connection wrapping: logging, configuration, mariadb

    - Log information about database and driver.
    - Check for supported database/version.
    - Add system property 'zanata.connection.use.wrapper' for explicit
      control.
    - Disable connection wrapping for mariadb as well as mysql.
    - Log what WrapperManager does.

commit 1d6a942164a3cf4ec8b1d842861d920097b43026
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Sep 4 12:56:38 2014 +1000

    Enable connection debugging

commit 4fafeeefd215ea25d27b791bcff51cd9d1199b65
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Sep 3 10:53:48 2014 +1000

    Send Velocity log to SLF4J (via Commons Logging)

commit ff71c09d1cd306586f32ae4fcd954ee06fd2a484
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Aug 29 15:16:28 2014 +1000

    Add workarounds for WildFly bugs: WFLY-3617, WFLY-3744

commit 1e3e8894cfbca5cfcda12b69c2f1c1061aa44ff4
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Aug 29 15:13:57 2014 +1000

    Put GWT dependencies last to ensure they don't override Java APIs

commit a80270fd1b6d1c4802710cac34bca3a33e54e8cf
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Aug 28 09:03:48 2014 +1000

    Fix issue when logging out in wildfly.

    An unnecessary logout.xhtml page was being used to be able to capture the request, perform the logout and redirect to the home page again. This is not necesary and might be causing an intermitent problem in wildfly.


  Commit: 67e90d67e2c6b54c68a4ee7206fec3a7812de8a1
      https://github.com/zanata/zanata-server/commit/67e90d67e2c6b54c68a4ee7206fec3a7812de8a1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-23 (Tue, 23 Sep 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    A functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    A zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/test/java/org/zanata/PerformanceProfiling.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  squash merge improve push performance

https://github.com/zanata/zanata-server/pull/571


  Commit: c0b71653056c90389283b5b68541e9829b0e182f
      https://github.com/zanata/zanata-server/commit/c0b71653056c90389283b5b68541e9829b0e182f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Fix some tests as revealed broken by Wildfly

Expect a notification on password change.
Wait for calls to stop before accessing the docs list.


  Commit: 3ba156895eb4081f7e5d94eb85e5eda469aa9048
      https://github.com/zanata/zanata-server/commit/3ba156895eb4081f7e5d94eb85e5eda469aa9048
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  update api version


  Commit: 39e6662486f2678271ce1de31a42c0ad00604442
      https://github.com/zanata/zanata-server/commit/39e6662486f2678271ce1de31a42c0ad00604442
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-09-24 (Wed, 24 Sep 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java

  Log Message:
  -----------
  Merge pull request #590 from zanata/fix-more-wildfly-ftests

Fix some tests as revealed broken by Wildfly


  Commit: ad5e9a51bf2b1e7c6a2af4478e70821d02df6d29
      https://github.com/zanata/zanata-server/commit/ad5e9a51bf2b1e7c6a2af4478e70821d02df6d29
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  rhbz1144234 - fix download config link


  Commit: 645fdd25582cdd3a918b2e1325f3ee538de2a96c
      https://github.com/zanata/zanata-server/commit/645fdd25582cdd3a918b2e1325f3ee538de2a96c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-25 (Thu, 25 Sep 2014)

  Changed paths:
    M zanata-war/src/main/webapp/iteration/view.xhtml

  Log Message:
  -----------
  Merge pull request #591 from zanata/rhbz1144234

rhbz1144234 - fix download config link


  Commit: 18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
      https://github.com/zanata/zanata-server/commit/18385b62fb0bd09f25f1119ba1031c1bdacfe2aa
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-09-26 (Fri, 26 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 28715a96680fa68e71f1f80a7cdaac19b4125131
      https://github.com/zanata/zanata-server/commit/28715a96680fa68e71f1f80a7cdaac19b4125131
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java

  Log Message:
  -----------
  rhbz1147364 - fix concurrent popup


  Commit: e5afd970feacacf3fc7137568dca235cfc4b0d20
      https://github.com/zanata/zanata-server/commit/e5afd970feacacf3fc7137568dca235cfc4b0d20
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-09-30 (Tue, 30 Sep 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java

  Log Message:
  -----------
  Merge pull request #592 from zanata/rhbz1147364-concurrent

rhbz1147364 - fix concurrent popup


  Commit: 678eb907eb7cf5f1efdee8d5a4e8ed8d3f2c8626
      https://github.com/zanata/zanata-server/commit/678eb907eb7cf5f1efdee8d5a4e8ed8d3f2c8626
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    A zanata-war/etc/scripts/enableLanguage.groovy
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy

  Log Message:
  -----------
  with hu, br, pt-BR, it, cs enabled


  Commit: a85e7f8172aea1ea649d70f3499ae481d8ab310e
      https://github.com/zanata/zanata-server/commit/a85e7f8172aea1ea649d70f3499ae481d8ab310e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java

  Log Message:
  -----------
  Fix issue in adding review comments: https://bugzilla.redhat.com/show_bug.cgi?id=1148214


  Commit: 7cad1212a0ae5c299cc4361e7b4796472b3a84c5
      https://github.com/zanata/zanata-server/commit/7cad1212a0ae5c299cc4361e7b4796472b3a84c5
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java

  Log Message:
  -----------
  rhbz1148248 - make chat content visible


  Commit: bea99fd69a8b453320d44cba7f8dbe493e26615d
      https://github.com/zanata/zanata-server/commit/bea99fd69a8b453320d44cba7f8dbe493e26615d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-01 (Wed, 01 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz1148259 - make history popup not autohide


  Commit: 2ca49f50ff44651f80d7ef5a70fbb014d2fb9293
      https://github.com/zanata/zanata-server/commit/2ca49f50ff44651f80d7ef5a70fbb014d2fb9293
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  Merge pull request #597 from zanata/rhbz1148259

rhbz1148259 - make history popup not autohide


  Commit: 8d07ea227b4d7ab45a4ecb8245192c53a54b15b7
      https://github.com/zanata/zanata-server/commit/8d07ea227b4d7ab45a4ecb8245192c53a54b15b7
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java

  Log Message:
  -----------
  Merge pull request #596 from zanata/rhbz1148248

rhbz1148248 - make chat content visible


  Commit: 52d2452022a4bf5f6986cc9ae867b63ba9554773
      https://github.com/zanata/zanata-server/commit/52d2452022a4bf5f6986cc9ae867b63ba9554773
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java

  Log Message:
  -----------
  rhbz1148242 - Clear document/locale stats after a copy

Pull Request: https://github.com/zanata/zanata-server/pull/598

Squashed commit of the following:

commit 3e054b4a903b7967da33a074c0a645b6f7ef699a
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 2 09:07:37 2014 +1000

    rhbz1148242 - Clear document/locale stats after a copy trans.

    When the stats are reloaded, up-to-date stats will be re-calculated.


  Commit: e9aa37c3cd9b363daf199321560ae37a79fdb9ac
      https://github.com/zanata/zanata-server/commit/e9aa37c3cd9b363daf199321560ae37a79fdb9ac
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.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:
  -----------
  Clear document-locale translations stats after a document has been pushed.

This allows Zanata to re-calculate those stats if the document has changed its size or translation state.


  Commit: f91365d7a1497ca6838e0334dafe546e2a75aa8b
      https://github.com/zanata/zanata-server/commit/f91365d7a1497ca6838e0334dafe546e2a75aa8b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  rhbz1148641 - disable comment when history popup is due to concurrent conflict


  Commit: 0fa6d8509ff801dadf9539df3a3023997ac55aad
      https://github.com/zanata/zanata-server/commit/0fa6d8509ff801dadf9539df3a3023997ac55aad
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.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:
  -----------
  Merge pull request #600 from zanata/stats_after_push

Clear document-locale translations stats after a document has been pushed


  Commit: bc173d099f0900eb1d94f500b7a35a7a01b86559
      https://github.com/zanata/zanata-server/commit/bc173d099f0900eb1d94f500b7a35a7a01b86559
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java

  Log Message:
  -----------
  Merge pull request #601 from zanata/rhbz1148641

rhbz1148641 - disable comment when history popup is due to concurrent conflict


  Commit: a022d739a4f9e5b7e50d39586da85c4e23038080
      https://github.com/zanata/zanata-server/commit/a022d739a4f9e5b7e50d39586da85c4e23038080
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  fix issue after selecting different locale on UI


  Commit: 3f89256bee0afc3ec38915678d1f472afc7394eb
      https://github.com/zanata/zanata-server/commit/3f89256bee0afc3ec38915678d1f472afc7394eb
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-02 (Thu, 02 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Fix the display name in the maintainer select box


  Commit: 6b84979ab6a256887bc744662a05737d477d77a9
      https://github.com/zanata/zanata-server/commit/6b84979ab6a256887bc744662a05737d477d77a9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml

  Log Message:
  -----------
  Merge pull request #602 from zanata/fix-group-maintainer-select

Fix the display name in the maintainer select box


  Commit: 5ef3fe8c59f32c84fe76771c16877f2a726b404a
      https://github.com/zanata/zanata-server/commit/5ef3fe8c59f32c84fe76771c16877f2a726b404a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    M zanata-war/src/main/webapp/glossary/view.xhtml

  Log Message:
  -----------
  Fix glossary upload dialog box: https://bugzilla.redhat.com/show_bug.cgi?id=1149033


  Commit: f57a4990f6d7eb59f45a6927e0a9b10c8bff2324
      https://github.com/zanata/zanata-server/commit/f57a4990f6d7eb59f45a6927e0a9b10c8bff2324
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-10-03 (Fri, 03 Oct 2014)

  Changed paths:
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy

  Log Message:
  -----------
  Merge pull request #593 from zanata/localized-zanata

script to enable locale in zanata


  Commit: c39c1141fc60344c4b9fbe2cb06c71a8cbe10e90
      https://github.com/zanata/zanata-server/commit/c39c1141fc60344c4b9fbe2cb06c71a8cbe10e90
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use latest version of zanata-common.


  Commit: 4e5619ab54e1aba1cc0195aba9daea40172abea5
      https://github.com/zanata/zanata-server/commit/4e5619ab54e1aba1cc0195aba9daea40172abea5
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Use released version of zanata-parent.


  Commit: 0f3b10880b7bb6e0d3fd1821fef443d0350e8eec
      https://github.com/zanata/zanata-server/commit/0f3b10880b7bb6e0d3fd1821fef443d0350e8eec
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

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


  Commit: 81989e9b30f6c84ff50af3722d1fe90d71a31885
      https://github.com/zanata/zanata-server/commit/81989e9b30f6c84ff50af3722d1fe90d71a31885
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

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


  Commit: d7d6d229ff2e85e6eb900895fa34cbb2b5b79fcc
      https://github.com/zanata/zanata-server/commit/d7d6d229ff2e85e6eb900895fa34cbb2b5b79fcc
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

  Log Message:
  -----------
  Prepare for next development iteration.

Update versions to 3.6.0-SNAPSHOT.


  Commit: 2b38cddd17c5accd5d9b6b3afbfb7e204a81e142
      https://github.com/zanata/zanata-server/commit/2b38cddd17c5accd5d9b6b3afbfb7e204a81e142
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Merged using -s ours to prevent future merges from release overwriting the
versions in pom.xml.


  Commit: 246bdd3c465ca74c1647b2df11a4beefb4009985
      https://github.com/zanata/zanata-server/commit/246bdd3c465ca74c1647b2df11a4beefb4009985
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  Use latest available translations for the website, turn on fr.

Get the latest available translations, and activate French for the UI
since it is now over 90% translated.


  Commit: d7a5f139cf5e5ceb36f73e4951b36a25509a056d
      https://github.com/zanata/zanata-server/commit/d7a5f139cf5e5ceb36f73e4951b36a25509a056d
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 0586c86caac8f36a703a7da64efe13f0b904b72b
      https://github.com/zanata/zanata-server/commit/0586c86caac8f36a703a7da64efe13f0b904b72b
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties

  Log Message:
  -----------
  Remove trailing spaces in translations.

Trailing spaces cause a checkstyle failure, so they must be removed.


  Commit: c38332cdfa038e4e5bf96cf4c6594577255e9bff
      https://github.com/zanata/zanata-server/commit/c38332cdfa038e4e5bf96cf4c6594577255e9bff
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages_br.properties
    M zanata-war/src/main/resources/messages_cs.properties
    M zanata-war/src/main/resources/messages_fr.properties
    M zanata-war/src/main/resources/messages_hu.properties
    M zanata-war/src/main/resources/messages_it.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_pt_BR.properties
    M zanata-war/src/main/resources/messages_uk.properties

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 92ee6a1c241a56f08fb841ac66c10bc4d3e0c6a6
      https://github.com/zanata/zanata-server/commit/92ee6a1c241a56f08fb841ac66c10bc4d3e0c6a6
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

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


  Commit: fb73969b3e830278fb6071021660b04fe2170a36
      https://github.com/zanata/zanata-server/commit/fb73969b3e830278fb6071021660b04fe2170a36
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-10-07 (Tue, 07 Oct 2014)

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

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


  Commit: d07174403d061b4fc05cca114937af9329ff9152
      https://github.com/zanata/zanata-server/commit/d07174403d061b4fc05cca114937af9329ff9152
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Clean up some strings and files

Fix some incorrect UI strings
Remove unused files and their redirects


  Commit: 6ec5a96be3efb900207775911d5eb55d551ca662
      https://github.com/zanata/zanata-server/commit/6ec5a96be3efb900207775911d5eb55d551ca662
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  Make the timeout period for webdriver waits configurable

Use -Dwebdriver.wait to set the maximum condition waiting period.


  Commit: 0f0fec3d13d054a839e291c1f0b924da4dbbcdd2
      https://github.com/zanata/zanata-server/commit/0f0fec3d13d054a839e291c1f0b924da4dbbcdd2
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/resources/setup.properties

  Log Message:
  -----------
  Merge pull request #589 from zanata/improve-ftest-wait

Make the timeout period for webdriver waits configurable


  Commit: e3a9f8e0b96031a8fe8b11b05d2b671d7cd4b08f
      https://github.com/zanata/zanata-server/commit/e3a9f8e0b96031a8fe8b11b05d2b671d7cd4b08f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-09 (Thu, 09 Oct 2014)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/account/changepassword.xhtml

  Log Message:
  -----------
  Merge pull request #604 from zanata/some-cleanup

Clean up some strings and files


  Commit: d95e8fee11a661149a201ae52f3ce9cf4ef1d544
      https://github.com/zanata/zanata-server/commit/d95e8fee11a661149a201ae52f3ce9cf4ef1d544
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java

  Log Message:
  -----------
  Tests for viewing translation history

Test the translation history view shows
Test two versions can be compared


  Commit: 26a8eab9a75dd8138ad0100787372f4aad1e9cbf
      https://github.com/zanata/zanata-server/commit/26a8eab9a75dd8138ad0100787372f4aad1e9cbf
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Add 'contact language team coordinator' test


  Commit: 7f7bbfa1aa6b3c3549c0a4b3ad7a8f2e31f7d5c8
      https://github.com/zanata/zanata-server/commit/7f7bbfa1aa6b3c3549c0a4b3ad7a8f2e31f7d5c8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-10 (Fri, 10 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml

  Log Message:
  -----------
  Merge pull request #586 from zanata/contact-language-coord-test

Add 'contact language team coordinator' test


  Commit: bf7223d57f874f94caf26351c8cfcd872218181c
      https://github.com/zanata/zanata-server/commit/bf7223d57f874f94caf26351c8cfcd872218181c
  Author: David Mason <drdmason at gmail.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Log Message:
  -----------
  Merge branch 'release' into integration/master

Merged using -s ours to prevent future merges from release overwriting the
versions in pom.xml.


  Commit: c20917456a8346ffa828501f580687e3a26ab231
      https://github.com/zanata/zanata-server/commit/c20917456a8346ffa828501f580687e3a26ab231
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java

  Log Message:
  -----------
  Merge pull request #587 from zanata/editor-compare-versions-test

Tests for viewing translation history


  Commit: 6a54eae248b126dbb64cd6b22668d5d6b661d9e6
      https://github.com/zanata/zanata-server/commit/6a54eae248b126dbb64cd6b22668d5d6b661d9e6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add binary files to .gitignore


  Commit: 9041c84fdb6bbdd1c4fb238c410c69fd7f8b76c6
      https://github.com/zanata/zanata-server/commit/9041c84fdb6bbdd1c4fb238c410c69fd7f8b76c6
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 1a60fc8306972e51b2f0b9ec5692ffebb422b446
      https://github.com/zanata/zanata-server/commit/1a60fc8306972e51b2f0b9ec5692ffebb422b446
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    A zanata-war/src/main/webapp/app/config.json
    A zanata-war/src/main/webapp/app/css/app.css
    A zanata-war/src/main/webapp/app/css/libs.css
    A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
    A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    A zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/app/js/app.js
    A zanata-war/src/main/webapp/app/js/libs.js
    A zanata-war/src/main/webapp/app/js/templates.js
    A zanata-war/src/main/webapp/app/maps/app.js.map
    A zanata-war/src/main/webapp/app/maps/libs.js.map
    A zanata-war/src/main/webapp/app/translations/de.json
    A zanata-war/src/main/webapp/app/translations/fr.json
    A zanata-war/src/main/webapp/app/translations/locales
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java

  Log Message:
  -----------
  Implement Zanata-SPA-0.0.3

Squashed commit of the following:

commit f1d0d6191d9535ea6cf3ca1584317b2de8fceae9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Oct 13 13:20:50 2014 +1000

    Upgrade zanata-spa 0.0.3

commit c4fc387783d44f9fcafe36668f1cd453c3fc44e6
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 10 09:40:47 2014 +1000

    Upgrade to zanata-spa-0.0.2

commit ff58b0cf0b12541d21c032f93b5a920ff6b1368a
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Oct 10 07:06:26 2014 +1000

    Return empty target if no target found

commit 3ff27b5a17706e3ad8974789795c672938da1030
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Oct 9 12:59:08 2014 +1000

    fix left join query for textFlow and target

commit cecda048f0972be79b98da26145c52c924302264
Merge: b9d1c21 c38332c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 8 09:31:56 2014 +1000

    Merge branch 'integration/master' into zanata-spa

    Conflicts:
    	pom.xml

commit b9d1c21d4f077bc3971951c333d5764433fba498
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 8 08:30:55 2014 +1000

    Add zanata-spa-0.0.1

commit c89e9e7a03e894869a9de7462e3afa225edc17a6
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 7 16:34:07 2014 +1000

    Add unit test for editor dto and service

commit 9cb0b5a056ccb716c24aaa2bb35e6e3e3b97659e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 7 14:24:36 2014 +1000

    Rename textFlow to EditorTextFlow, fix n+1 issue in query

commit 1e07dd7288454bf40876642e820cfc280e65f6a9
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Oct 7 11:15:02 2014 +1000

    Add new editor link to existing editor

commit f1fd535acfbb4f7628760d702917f57f3447ab30
Author: Alex Eng <aeng at redhat.com>
Date:   Sat Oct 4 22:22:03 2014 +1000

    Moved zanata-api resource and DTO to server

commit a7b1b73581d99731af51a2ba8d9b87858e8e552b
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 1 21:47:26 2014 +1000

    Add end point for translation update

commit 628e5d8ca215d8023fa274e9c7f96cd26b2d48a2
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 1 15:50:18 2014 +1000

    Add source+trans endpoint

commit 2ebc7b63d57967a328019cee12ac20c7ae3ee3e7
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 1 15:07:04 2014 +1000

    Add translation endpoint

commit 3320719ac436cd642a284fa57412eb1cf9a3f9ff
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Oct 1 11:14:39 2014 +1000

    Add source endpoint

commit 32d7f8126ddf7822b4c9174c303372268fd22010
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 30 15:27:56 2014 +1000

    Create new package for editor to separate rest service

commit 3a08277731c91d0c47018657bb784502a9b3fe07
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Sep 30 11:27:27 2014 +1000

    Handle docId slash

commit 6f784555a96bfb9c84b04f673cb01f8dc716d301
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 19:50:30 2014 +1000

    Add user info end point

commit 120eb90b9ab7e9e3caec091b21ca25c94dfbd075
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 16:01:00 2014 +1000

    Add document statistic endpoint

commit f234f10e30ffee1e268a97bb28282c932dae1c7b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 14:46:40 2014 +1000

    remove p and i from rest url

commit df0bb1ce8b4e4a28f7d047ab189dda3f265f401c
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 14:20:23 2014 +1000

    Add transUnit resource endpoint

commit 960d65c4f17c3b4dab94ef29559a2e35656f79b9
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 13:11:09 2014 +1000

    Add version locale list endpoint

commit 2fc597b18dd3c952365bd0c5e3de274f2106bc04
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Sep 29 11:23:54 2014 +1000

    Add endpoint locales list from zanata server


  Commit: 29895c04f256a4ea22254fa47ade0b01293b267b
      https://github.com/zanata/zanata-server/commit/29895c04f256a4ea22254fa47ade0b01293b267b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Add pdf files to .gitignore


  Commit: 19ee1ddbd4e48b839dc7ecf07beffe917e26256c
      https://github.com/zanata/zanata-server/commit/19ee1ddbd4e48b839dc7ecf07beffe917e26256c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-13 (Mon, 13 Oct 2014)

  Changed paths:
    M .gitignore

  Log Message:
  -----------
  Merge branch 'release' into integration/master


  Commit: 73e7e2c6768e11c84ccb2053da4376c4b411655c
      https://github.com/zanata/zanata-server/commit/73e7e2c6768e11c84ccb2053da4376c4b411655c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-10-17 (Fri, 17 Oct 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/async/Async.java
    A zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskResult.java
    R zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
    R zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    A zanata-war/src/main/java/org/zanata/async/ContainsAsyncMethods.java
    R zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    R zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    R zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    R zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    A zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    A zanata-war/src/main/java/org/zanata/service/TranslationArchiveService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    R zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    A zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java

  Log Message:
  -----------
  Async task framework refactoring

Pull Request: https://github.com/zanata/zanata-server/pull/606
This is the new async framework which lays the ground for the CDI version.

Squashed commit of the following:

commit 9fcd562b329130432949a6fd7d72252ec6acf147
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 16 16:29:29 2014 +1000

    Fix transaction missing error when pushing.

commit de8c56e789862af9afa2dc11f782087fd6067ca8
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Oct 14 16:54:07 2014 +1000

    Fix code styling issues.

    Also add some tests.

commit 57bab714e64449b47d37d4017d6ea34a5e26bb3d
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Oct 14 09:36:16 2014 +1000

    Revert arquillian.xml changes.

commit 664fecfe721ffec657df8de45a13385bd0db913c
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Oct 13 16:47:54 2014 +1000

    Replace async package with async2.

    Removed the old package and renamed async2 to the old name.

commit ae1da24cb3f332af3d99cbd71cb6cda815e0afde
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Oct 13 16:04:19 2014 +1000

    Move source and translated doc push to new async framework.

commit 891ae93b40ef47f9f2d9ac5b94ceb7c29719f29b
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Mon Oct 13 13:56:25 2014 +1000

    Migrate Zip File building to the new async framework.

commit 2256c1abfb8b585d7062420c29376c96b62f0840
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 9 16:06:50 2014 +1000

    Migrate Copy Version to the new async framework.

commit 6772a89a0032faf9ca0c1f61c5a0b1eec38ad7f6
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Thu Oct 9 13:41:46 2014 +1000

    Migrate Copy trans to the new async framework.

commit f7123063ab1d00c694cc21c629c5034e896ecc25
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Oct 7 16:17:30 2014 +1000

    Migrate Reindexing to the new Async service.

commit 112bcc1b5a0910c48e21dcea2cb5d5f1f5933ae4
Author: Carlos A. Munoz <camunoz at redhat.com>
Date:   Tue Oct 7 16:17:09 2014 +1000

    New Asynchronous framework.

    Behaves similarly to what a CDI implementation would.


  Commit: 913fdc81e679cac0acb768db112dd45c000092f8
      https://github.com/zanata/zanata-server/commit/913fdc81e679cac0acb768db112dd45c000092f8
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-10-21 (Tue, 21 Oct 2014)

  Changed paths:
    M .gitignore
    A build.sh
    A etc/scripts/allocate-jboss-ports
    A etc/scripts/allocate-ports
    M functional-test/pom.xml
    A functional-test/src/etc/wildflyModules.groovy
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/CorePage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/administration/TranslationMemoryPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    M functional-test/src/main/java/org/zanata/page/googleaccount/GooglePermissionsPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    A functional-test/src/main/java/org/zanata/page/languages/ContactTeamPage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagePage.java
    A functional-test/src/main/java/org/zanata/page/languages/LanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectAboutPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/projects/projectsettings/ProjectPermissionsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionDocumentsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionLanguagesPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionDocumentsTab.java
    M functional-test/src/main/java/org/zanata/page/projectversion/versionsettings/VersionLanguagesTab.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/util/Constants.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/ExperimentTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    A functional-test/src/test/java/org/zanata/feature/editor/TranslationHistoryTest.java
    A functional-test/src/test/java/org/zanata/feature/language/ContactLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    A functional-test/src/test/java/org/zanata/feature/rest/CopyTransTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/util/CleanDocumentStorageRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M functional-test/src/test/resources/conf/standalone.xml
    A functional-test/src/test/resources/conf/standalone_wildfly.xml
    M functional-test/src/test/resources/datasource/zanata-ds.xml
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    A zanata-model/src/main/java/org/zanata/util/ZanataEntities.java
    M zanata-test-war/pom.xml
    A zanata-war/etc/scripts/enableLanguage.groovy
    M zanata-war/pom.xml
    M zanata-war/src/etc/zanata-ds.xml
    M zanata-war/src/main/java/org/zanata/ZanataInit.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    M zanata-war/src/main/java/org/zanata/action/CopyVersionManager.java
    M zanata-war/src/main/java/org/zanata/action/LoginAction.java
    R zanata-war/src/main/java/org/zanata/action/PasswordChangeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAction.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    A zanata-war/src/main/java/org/zanata/async/Async.java
    A zanata-war/src/main/java/org/zanata/async/AsyncMethodInterceptor.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTask.java
    M zanata-war/src/main/java/org/zanata/async/AsyncTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskHandleManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskManager.java
    A zanata-war/src/main/java/org/zanata/async/AsyncTaskResult.java
    R zanata-war/src/main/java/org/zanata/async/AsyncUtils.java
    R zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    A zanata-war/src/main/java/org/zanata/async/ContainsAsyncMethods.java
    R zanata-war/src/main/java/org/zanata/async/SimpleAsyncTask.java
    R zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    R zanata-war/src/main/java/org/zanata/async/TimedAsyncHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyTransTaskHandle.java
    A zanata-war/src/main/java/org/zanata/async/handle/CopyVersionTaskHandle.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/CopyVersionTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    R zanata-war/src/main/java/org/zanata/async/tasks/ZipFileBuildTask.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    M zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrapperManager.java
    M zanata-war/src/main/java/org/zanata/email/EmailBuilder.java
    M zanata-war/src/main/java/org/zanata/i18n/Messages.java
    A zanata-war/src/main/java/org/zanata/rest/editor/MediaTypes.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/EditorTextFlow.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/Locale.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnit.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnitStatus.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TransUnits.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/TranslationData.java
    A zanata-war/src/main/java/org/zanata/rest/editor/dto/User.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/LocalesService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/ProjectVersionService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/StatisticsService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TextFlowService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TransUnitUtils.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/TranslationService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/UserService.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/LocalesResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/ProjectVersionResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/StatisticResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TextFlowResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TransUnitResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/TranslationResource.java
    A zanata-war/src/main/java/org/zanata/rest/editor/service/resource/UserResource.java
    M zanata-war/src/main/java/org/zanata/rest/service/AsynchronousProcessResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/CopyTransResourceService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    R zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/CopyVersionService.java
    M zanata-war/src/main/java/org/zanata/service/DocumentService.java
    M zanata-war/src/main/java/org/zanata/service/GravatarService.java
    A zanata-war/src/main/java/org/zanata/service/IndexingService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    A zanata-war/src/main/java/org/zanata/service/TranslationArchiveService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationStateCache.java
    R zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/DocumentServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/GravatarServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/IndexingServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationArchiveServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationStateCacheImpl.java
    M zanata-war/src/main/java/org/zanata/servlet/ZanataServletExtension.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/util/ContentStateToStyleUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/DownloadAllFilesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDownloadAllFilesProgressHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/resources/messages_br.properties
    A zanata-war/src/main/resources/messages_cs.properties
    A zanata-war/src/main/resources/messages_fr.properties
    A zanata-war/src/main/resources/messages_hu.properties
    A zanata-war/src/main/resources/messages_it.properties
    A zanata-war/src/main/resources/messages_ja.properties
    A zanata-war/src/main/resources/messages_pt_BR.properties
    A zanata-war/src/main/resources/messages_uk.properties
    A zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/faces-config.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/template/banner.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    R zanata-war/src/main/webapp/account/changepassword.xhtml
    R zanata-war/src/main/webapp/account/logout.xhtml
    A zanata-war/src/main/webapp/app/config.json
    A zanata-war/src/main/webapp/app/css/app.css
    A zanata-war/src/main/webapp/app/css/libs.css
    A zanata-war/src/main/webapp/app/images/logo-loader/loader.svg
    A zanata-war/src/main/webapp/app/images/logo-loader/logo.svg
    A zanata-war/src/main/webapp/app/index.html
    A zanata-war/src/main/webapp/app/js/app.js
    A zanata-war/src/main/webapp/app/js/libs.js
    A zanata-war/src/main/webapp/app/js/templates.js
    A zanata-war/src/main/webapp/app/maps/app.js.map
    A zanata-war/src/main/webapp/app/maps/libs.js.map
    A zanata-war/src/main/webapp/app/translations/de.json
    A zanata-war/src/main/webapp/app/translations/fr.json
    A zanata-war/src/main/webapp/app/translations/locales
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/contact_coordinator.xhtml
    M zanata-war/src/main/webapp/language/home.xhtml
    A zanata-war/src/test/groovy/org/zanata/GroovyScriptFunctionTest.groovy
    R zanata-war/src/test/java/org/jboss/as/arquillian/container/ManagementClient.java
    A zanata-war/src/test/java/org/zanata/PerformanceProfiling.java
    M zanata-war/src/test/java/org/zanata/ZanataJpaTest.java
    A zanata-war/src/test/java/org/zanata/async/AsyncTaskHandleTest.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/EditorTextFlowTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/LocaleTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitStatusTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TransUnitTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/TranslationDataTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/dto/UserTest.java
    A zanata-war/src/test/java/org/zanata/rest/editor/service/LocalesServiceTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ResourceUtilsJpaTest.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
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryJpaTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyVersionServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplJpaTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian-wildfly.xml
    A zanata-war/src/test/resources/arquillian/standalone-arquillian.xml
    R zanata-war/src/test/resources/arquillian/standalone.xml
    M zanata-war/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml

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

Conflicts:
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/service/impl/CopyVersionServiceImpl.java


Compare: https://github.com/zanata/zanata-server/compare/b04292f3c902...913fdc81e679


More information about the zanata-commits mailing list