[zanata/zanata-server] da42b4: define functional test index and stats directory t...

GitHub noreply at github.com
Mon May 12 05:29:59 UTC 2014


  Branch: refs/heads/rhbz882770-search
  Home:   https://github.com/zanata/zanata-server
  Commit: da42b4d342560fce7b2655cb94afd282167247bc
      https://github.com/zanata/zanata-server/commit/da42b4d342560fce7b2655cb94afd282167247bc
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-09 (Wed, 09 Apr 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  define functional test index and stats directory to under target


  Commit: f5d8262664a4ee2610d0d77d5e1a8a15e9104a99
      https://github.com/zanata/zanata-server/commit/f5d8262664a4ee2610d0d77d5e1a8a15e9104a99
  Author: Patrick Huang <patrick.zh.huang at gmail.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java

  Log Message:
  -----------
  rhbz1062508 - bdd key shortcut to switch between editor for current row


  Commit: 6014973be3c8d3a0ee155bbc8fd40f54e3fd1237
      https://github.com/zanata/zanata-server/commit/6014973be3c8d3a0ee155bbc8fd40f54e3fd1237
  Author: Patrick Huang <patrick.zh.huang at gmail.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java

  Log Message:
  -----------
  rhbz1062508 - add attention key to editor switch


  Commit: 8b337d95f12ac0bfc98707f788c47c0fe88c79b6
      https://github.com/zanata/zanata-server/commit/8b337d95f12ac0bfc98707f788c47c0fe88c79b6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-24 (Thu, 24 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  rhbz1062508 - remove spellcheck option


  Commit: d2b5000477fa82d8c7195f6a9d5b665b39016cb1
      https://github.com/zanata/zanata-server/commit/d2b5000477fa82d8c7195f6a9d5b665b39016cb1
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java

  Log Message:
  -----------
  rewrite test to make better use of matcher


  Commit: bb7d74bb1f0dd717eadb79efb6176d888bc8751d
      https://github.com/zanata/zanata-server/commit/bb7d74bb1f0dd717eadb79efb6176d888bc8751d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-04-29 (Tue, 29 Apr 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java

  Log Message:
  -----------
  rename method and wording of messages


  Commit: 46e9575fe9d142b22a25e892977c00b50ace0cf1
      https://github.com/zanata/zanata-server/commit/46e9575fe9d142b22a25e892977c00b50ace0cf1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
    R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
    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/java/org/zanata/model/TestFixture.java
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml

  Log Message:
  -----------
  - Refactor copy trans: https://bugzilla.redhat.com/show_bug.cgi?id=1077439

Squashed commit of the following:

commit 007569c1341c209146bc48396bdfbd23c52904c4
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 07:49:02 2014 +1000

    Refactor code

commit 8a2e21f01f490b8809505565d5fd540725af1907
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 30 16:00:29 2014 +1000

    Refactor code based on review

commit f7cbd787d8bf617a87d5b5401e7d0032f3b1f4e7
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 29 15:57:28 2014 +1000

    Add TranslationFinder impl to TranslationFinderTest Execution

commit f2141732f32721bc95052f841e324caedaa31e43
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 29 16:13:25 2014 +1000

    refactor maxresult and sort checker

commit 5dd9aedc15a29b6db297f288c7e822c3029f914d
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 29 15:56:07 2014 +1000

    Use of database query for copyTrans, fix sorting for tm search to use score

commit 7584ef4e13d82b7806c6f02317c0966be4084f52
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Apr 23 17:49:52 2014 +1000

    Move and simplify tests from CopyTransServiceImplTest to TranslationFinderTest

    Remove CopyTransServiceImplTest combinations which are tested by
    TranslationFinderTest

commit 475fde4bf79f52ebea726e4808f2fe8a8952a009
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Wed Apr 23 17:46:13 2014 +1000

    Remove need to pass in a persistent HTextFlow

commit 64f2b569f4de1f88ebd9b2175c24a847fdb14b4f
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 22 14:50:35 2014 +1000

    Reduce number of executions to keep test time manageable

commit 52347cffff8b55db25b1ea97ae2fc75bf3c60882
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 22 14:49:10 2014 +1000

    Fix broken unit test

commit 3a1d349de389ecbf72cc3aebc62f3a95a8215f85
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 15 17:53:34 2014 +1000

    Move searchBestMatchTargetTest to TranslationFinderTest

commit 164c674c47ce52051fd3e26d9e47802c8bd0ce43
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 17 09:16:00 2014 +1000

    Implement lucene sort using lastChanged

commit 890c48d8c412a2cf858fdab0c95ce5d7014e19d2
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 16 14:54:41 2014 +1000

    revert naming of the test method.

commit 6db712fae02c16328f4caf4774c55034e77c73de
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 16 12:15:22 2014 +1000

    Fix unit test with new documentDAO param

commit 1f5f5adc50db5d4f476c42d60b5e599fda10080c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 16 11:26:29 2014 +1000

    Remove lastChanged override in target

commit f7b408c97441b0d05901fbeb82dd2d41974b68ed
Merge: 997dd5b 1db4c3e
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 15:54:38 2014 +1000

    Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

commit 997dd5b599c782413e003f38d99b7aaeb9a8595c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 15:54:22 2014 +1000

    Use text flow id index for excluding option in tm search

commit 1db4c3ef9835fac3bc2fbf9af3319f2a6375ab40
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 15 15:11:44 2014 +1000

    Remove redundant test

    Requirement is covered by TranslationMemoryServiceImplTest.searchBestMatchTargetTest.

commit 05197b47957c08241eca1a3c3f81eaced093a3b3
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 15 14:40:56 2014 +1000

    Annotate ZanataJpaTest with @Test again (to fix REST tests)

commit 3f6d381f308e2ad23a7f907519b8a778574317ce
Merge: 3b90ea2 c7a9df7
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 14:29:21 2014 +1000

    Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

commit c7a9df7459a2f6861ee88523d4017d6bb8790bf9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 15 14:22:12 2014 +1000

    Update CopyTransServiceUnitTest

commit 3b90ea2e5fe0e836bf7fd5764e50b3571b3bf8d1
Merge: d4bd248 c02a26b
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 14:06:11 2014 +1000

    Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

commit d4bd2482e3a123aeb87696e34c7bee6b5d14b187
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 14:05:56 2014 +1000

    Add tf_id as index

commit c02a26bceb4a2c60003d3390ff30a741b14ad1af
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Tue Apr 15 13:49:36 2014 +1000

    Change TranslationMemoryServiceImplTest to load the DB once only

commit 034c81de5d177cb7f7161dacc9fa5770304b79ec
Merge: 26290c0 bb3d19c
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 10:23:02 2014 +1000

    Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

    Conflicts:
    	zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

commit 26290c0b222d37cf4a03058477d29733ae66aad3
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 15 10:15:19 2014 +1000

    improve filtering of tm list

commit bb3d19cb0382d16b2607665f405eeb74a16a9356
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Apr 14 17:31:18 2014 +1000

    Extract CopyTransWorkFactory; add basic unit test for CopyTransService

commit c3c1344e3ccba413409af5b06af0693b5a38742a
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Mon Apr 14 15:09:50 2014 +1000

    Extract CopyTransWork from CopyTransServiceImpl, along with tests

commit 559ddd1b2e889c436b4f0e2777d8a6e4a7013123
Merge: 86fec53 0a1b1d4
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 14 13:45:19 2014 +1000

    Merge branch 'integration/master' into rhbz1077439

commit 86fec5396e5dfefdc02bd5c9181d5dea8eb50f8b
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 14 13:44:19 2014 +1000

    Merge copyTrans to use lucene index for search

commit 85b6076b8a3b827f4f507bd04d273004d588ecb9
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Thu Apr 3 11:16:50 2014 +1000

    Create TranslationFinder interface

commit 5f656f2c9231649fcb7b0935d7f526b6a9caca1f
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Apr 11 15:53:35 2014 +1000

    WIP: generating unit test for tm service

commit 9459a43583df97fd194f37a80786772b1c50117b
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 10 15:44:50 2014 +1000

    WIP: refactor copy trans

commit 27a49fe2e35fb004943325264db113dd27cf0e93
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 9 15:55:07 2014 +1000

    WIP: test for TM search

commit c3ded2b8398c8735872230394c480a1be50deb19
Merge: 628badd 907ce45
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 9 15:06:58 2014 +1000

    Merge branch 'integration/master' into rhbz1077439

    Conflicts:
    	zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

commit 628badd7f3f711b1b3e9f7c1909acf2019db068c
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 9 15:02:25 2014 +1000

    WIP: integration test for TM service

commit f461e6ea492bdeb08e8e134d17da300f8e26cfce
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 8 15:59:33 2014 +1000

    Move test to TM merge handler test to ServiceImpl

commit 80d9f18198fad419f9788adecfa4fa0e4c0284b2
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Apr 7 15:38:51 2014 +1000

    Fix unit test to use lucene index

commit 81afeb074023673c49e9cb3d590db3cab4842c7e
Merge: 2d61836 ea1069b
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 4 13:00:01 2014 +1000

    Merge remote branch 'origin/rhbz1077439' into rhbz1077439

    Conflicts:
    	zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    	zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

commit 2d6183641e739b00e3d25c54d0d35f4d5cd95d3e
Author: Sean Flanigan <sflaniga at redhat.com>
Date:   Fri Apr 4 10:52:56 2014 +1000

    Ensure Lucene indexing in CopyTransServiceImplTest

commit ea1069b752b3873d121ea5a4872052ce8995e517
Author: Alex Eng <aeng at redhat.com>
Date:   Fri Apr 4 08:30:54 2014 +1000

    WIP: copytrans

commit 790c9426102d730a47103fec8c9c3ac9aa224c0c
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 3 16:19:47 2014 +1000

    WIP: copytrans

commit ea1b06681070e3fc964ccb6cc12b0d6b9bab0403
Merge: 6230240 1f3f7bf
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 3 14:01:03 2014 +1000

    Merge branch 'integration/master' into rhbz1077439

    Conflicts:
    	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

commit 623024015a89def4df0117170be9205d67239832
Author: Alex Eng <aeng at redhat.com>
Date:   Thu Apr 3 14:00:33 2014 +1000

    WIP: include project, document and resId condition in TM query

commit 27194111bb9564df41db570a8d69395ec8313618
Author: Alex Eng <aeng at redhat.com>
Date:   Wed Apr 2 15:55:31 2014 +1000

    WIP: refactoring copytrans and get translation memory service

commit 3cc1e79c58a56967332b94e2340aa5d54bc50202
Author: Alex Eng <aeng at redhat.com>
Date:   Tue Apr 1 16:00:44 2014 +1000

    WIP: integrating copytrans query to use lucene

commit 5f12a1a6b8008513dcf25abc420c87570d6df70d
Author: Alex Eng <aeng at redhat.com>
Date:   Mon Mar 31 16:02:27 2014 +1000

    WIP: refactoring copy trans and TM merge


  Commit: f3757ceeb888d11e134f8a4b3f991137a71992e7
      https://github.com/zanata/zanata-server/commit/f3757ceeb888d11e134f8a4b3f991137a71992e7
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-01 (Thu, 01 May 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt

  Log Message:
  -----------
  RHBZ1025645 Added the required documents


  Commit: 3431d9bc2b6f779f4c92cd78a3c57b9984b2c5c9
      https://github.com/zanata/zanata-server/commit/3431d9bc2b6f779f4c92cd78a3c57b9984b2c5c9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-02 (Fri, 02 May 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt

  Log Message:
  -----------
  Merge pull request #427 from zanata/add_gpl_documents

RHBZ1025645 Added the required documents


  Commit: 182154383a9968cb21d50d0d2956e6e98f3afd4b
      https://github.com/zanata/zanata-server/commit/182154383a9968cb21d50d0d2956e6e98f3afd4b
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/test/resources/conf/standalone.xml

  Log Message:
  -----------
  Merge pull request #409 from zanata/fix-functional-test

change functional test lucene index directory under target


  Commit: 2dff787f26ad7aae5c69a5866b5bdf9bcc151b51
      https://github.com/zanata/zanata-server/commit/2dff787f26ad7aae5c69a5866b5bdf9bcc151b51
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties

  Log Message:
  -----------
  fix copy trans message


  Commit: 96d1b55af8a9e2a88fe6ce0a61abcfa0618fcdc0
      https://github.com/zanata/zanata-server/commit/96d1b55af8a9e2a88fe6ce0a61abcfa0618fcdc0
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

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

  Log Message:
  -----------
  rhbz1062508 - add attention key hint for toggle syntax highlighting


  Commit: 1211e6ed493a39c98a4379117f462818a4b0f7b2
      https://github.com/zanata/zanata-server/commit/1211e6ed493a39c98a4379117f462818a4b0f7b2
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

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

  Log Message:
  -----------
  externalize text to WebTransMessages for easy localization


  Commit: 11cfcb7c2626f5186f536994fbe5a386b399f352
      https://github.com/zanata/zanata-server/commit/11cfcb7c2626f5186f536994fbe5a386b399f352
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt
    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
    R functional-test/src/main/java/org/zanata/page/account/ChangePasswordPage.java
    M functional-test/src/main/java/org/zanata/page/account/EditProfilePage.java
    R functional-test/src/main/java/org/zanata/page/account/MyAccountPage.java
    M functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    A functional-test/src/main/java/org/zanata/page/administration/ServerConfigurationPage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardActivityTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    A functional-test/src/main/java/org/zanata/page/dashboard/DashboardProjectsTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardAccountTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardClientTab.java
    A functional-test/src/main/java/org/zanata/page/dashboard/dashboardsettings/DashboardProfileTab.java
    R functional-test/src/main/java/org/zanata/page/utility/DashboardPage.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    M functional-test/src/main/java/org/zanata/rest/SampleProjectResourceImpl.java
    M functional-test/src/main/java/org/zanata/util/SampleProjectProfile.java
    M functional-test/src/main/java/org/zanata/util/WebElementUtil.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    A functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    M functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    A functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    M functional-test/src/test/java/org/zanata/util/GoogleSignIn.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectClient.java
    M functional-test/src/test/java/org/zanata/util/SampleProjectRule.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/dashboard/Dashboard.html
    M functional-test/src/test/resources/conf/standalone.xml
    M functional-test/src/test/resources/setup.properties
    M zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ActivityAction.java
    A zanata-war/src/main/java/org/zanata/action/AuthenticatedAccountHome.java
    R zanata-war/src/main/java/org/zanata/action/CredentialsAction.java
    M zanata-war/src/main/java/org/zanata/action/DashboardAction.java
    A zanata-war/src/main/java/org/zanata/action/DashboardUserStats.java
    R zanata-war/src/main/java/org/zanata/action/PersonHome.java
    M zanata-war/src/main/java/org/zanata/action/ProfileAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/QueryProjectPagedListDataModel.java
    M zanata-war/src/main/java/org/zanata/action/ServerConfigurationBean.java
    M zanata-war/src/main/java/org/zanata/action/SortingType.java
    A zanata-war/src/main/java/org/zanata/action/UserSettingsAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupHomeAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ActivityDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    A zanata-war/src/main/java/org/zanata/limits/LeakyBucket.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitManager.java
    A zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    A zanata-war/src/main/java/org/zanata/limits/RestCallLimiter.java
    M zanata-war/src/main/java/org/zanata/rest/AuthorizationExceptionMapper.java
    A zanata-war/src/main/java/org/zanata/rest/HeaderHelper.java
    A zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataRestSecurityInterceptor.java
    M zanata-war/src/main/java/org/zanata/rest/ZanataResteasyBootstrap.java
    A zanata-war/src/main/java/org/zanata/rest/dto/Configuration.java
    A zanata-war/src/main/java/org/zanata/rest/service/IntrospectableObjectMonitorService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
    A zanata-war/src/main/java/org/zanata/rest/service/ServerConfigurationService.java
    M zanata-war/src/main/java/org/zanata/security/AuthenticationManager.java
    M zanata-war/src/main/java/org/zanata/service/ActivityService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/impl/ActivityServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/ui/AbstractListFilter.java
    M zanata-war/src/main/java/org/zanata/ui/FilterUtil.java
    A zanata-war/src/main/java/org/zanata/ui/InMemoryListFilter.java
    M zanata-war/src/main/java/org/zanata/util/ComparatorUtil.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    A zanata-war/src/main/java/org/zanata/util/Introspectable.java
    M zanata-war/src/main/java/org/zanata/util/ServiceLocator.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/AttentionKeyShortcutView.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-3.4.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/activity.xhtml
    R zanata-war/src/main/webapp/WEB-INF/layout/dashboard/maintained-project.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/projects.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/dashboard/stats.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/versions-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/groups-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-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
    M zanata-war/src/main/webapp/admin/server_configuration.xhtml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    R zanata-war/src/main/webapp/profile/add_identity.xhtml
    R zanata-war/src/main/webapp/profile/edit.xhtml
    R zanata-war/src/main/webapp/profile/identities.xhtml
    R zanata-war/src/main/webapp/profile/view.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/list-filter.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/sortlist.xhtml
    M zanata-war/src/test/java/org/zanata/RestTest.java
    M zanata-war/src/test/java/org/zanata/ZanataRestTest.java
    A zanata-war/src/test/java/org/zanata/limits/LeakyBucketTest.java
    A zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    A zanata-war/src/test/java/org/zanata/limits/RestCallLimiterTest.java
    M zanata-war/src/test/java/org/zanata/rest/ResourceRequestEnvironment.java
    A zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationServiceRestTest.java
    M zanata-war/src/test/java/org/zanata/seam/SeamAutowire.java
    A zanata-war/src/test/java/org/zanata/ui/InMemoryListFilterTest.java
    A zanata-war/src/test/java/org/zanata/ui/autocomplete/AutocompleteTest.java
    A zanata-war/src/test/java/org/zanata/util/ComparatorUtilTest.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  Merge branch 'attention-key-hint' into editor-switch

Conflicts:
	zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java


  Commit: 93d08eba7aded2732f8b3b934d6f60ac353c999d
      https://github.com/zanata/zanata-server/commit/93d08eba7aded2732f8b3b934d6f60ac353c999d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M functional-test/pom.xml

  Log Message:
  -----------
  Remove redundant dependency


  Commit: d6db767f46f9bc85fe9328553e6f4765cf0cfb1d
      https://github.com/zanata/zanata-server/commit/d6db767f46f9bc85fe9328553e6f4765cf0cfb1d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Remove commons-httpclient


  Commit: 9025ac086199c7b9a72bcfc5c55c4793b56350a1
      https://github.com/zanata/zanata-server/commit/9025ac086199c7b9a72bcfc5c55c4793b56350a1
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
    R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M zanata-war/src/main/resources/messages.properties
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
    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/java/org/zanata/model/TestFixture.java
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml

  Log Message:
  -----------
  Merge pull request #418 from zanata/rhbz1077439

rhbz1077439 Refactor copyTrans to use lucene search for matching text flow target


  Commit: 678c630802c02070f2983dff9b84bb767539b0a8
      https://github.com/zanata/zanata-server/commit/678c630802c02070f2983dff9b84bb767539b0a8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  Reinstate copytrans option selection in version page

Squashed commit of the following:

commit 7d5477e46dc21776f8fbb785dd4497be6d5a184e
Merge: 085ac03 9025ac0
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 5 14:43:21 2014 +1000

    Merge branch 'integration/master' into copy-trans-ui

    Conflicts:
    	zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    	zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    	zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    	zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    	zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java

commit 085ac037fce5df94fdac52d2a7f6f3deb55bd7f1
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 5 09:59:07 2014 +1000

    fix html markup

commit 214a0037d4c94e0d935fc3df022e70ba8c781597
Merge: 760eb9d 1821543
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 5 08:53:06 2014 +1000

    Merge branch 'integration/master' into copy-trans-ui

commit 760eb9db0b9b136398a4cdb85517e71a4c82fd04
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 19:57:03 2014 +1000

    fix display of copy trans modal, remove activity panel if there's no activity

    Squashed commit of the following:

    commit e325d9018b5495fca85bdcee60d58b2d333cac93
    Merge: 9fdeab4 4ec8ed7
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu May 1 19:54:46 2014 +1000
   Merge branch 'integration/master' into copy-trans-ui

    commit 9fdeab42b643dfa7a0afb287a821cdaa05300ae5
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu May 1 19:53:39 2014 +1000
   fix display of copy trans modal, remove activity panel if there's no activity

    commit bddb5a844a6c41ece782a2817838c98f914b91fa
    Merge: 8e548a8 4072799
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 30 14:32:12 2014 +1000
   Merge branch 'integration/master' into copy-trans-ui

    commit 8e548a8c270ee9350f2f80f93de7949db77f1aa9
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 30 14:31:33 2014 +1000
   implement modal window for copytrans option in version page

    commit 2b316891b2ecb0903555233ea9b0f311b18ccb06
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 29 15:45:06 2014 +1000
   WIP: new copy trans ui in version page

    commit 24f2cec9ad045f7768f9964f913c0b544b8621bf
    Merge: 1c03d88 427f128
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 29 10:41:13 2014 +1000
   Merge branch 'integration/master' into rhbz1077439

    commit 1c03d88bbdc46e8c14082f9fabc1deb82d2228f2
    Merge: e33a56c c7ca62a
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 29 10:04:08 2014 +1000
   Merge branch 'integration/master' into rhbz1077439

    commit e33a56c12654d86332fb3cc4fb5b47b6f499d97b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 29 10:03:22 2014 +1000
   Have copyTrans options in version page

    commit 7c09cda3c4d0007155e49844fd0b77b501ea2a29
    Merge: 7584ef4 0323f24
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Apr 28 10:43:35 2014 +1000
   Merge branch 'integration/master' into rhbz1077439

    commit 7584ef4e13d82b7806c6f02317c0966be4084f52
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Wed Apr 23 17:49:52 2014 +1000
   Move and simplify tests from CopyTransServiceImplTest to TranslationFinderTest
   Remove CopyTransServiceImplTest combinations which are tested by
  TranslationFinderTest

    commit 475fde4bf79f52ebea726e4808f2fe8a8952a009
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Wed Apr 23 17:46:13 2014 +1000
   Remove need to pass in a persistent HTextFlow

    commit 64f2b569f4de1f88ebd9b2175c24a847fdb14b4f
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 22 14:50:35 2014 +1000
   Reduce number of executions to keep test time manageable

    commit 52347cffff8b55db25b1ea97ae2fc75bf3c60882
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 22 14:49:10 2014 +1000
   Fix broken unit test

    commit 3a1d349de389ecbf72cc3aebc62f3a95a8215f85
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 15 17:53:34 2014 +1000
   Move searchBestMatchTargetTest to TranslationFinderTest

    commit 164c674c47ce52051fd3e26d9e47802c8bd0ce43
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Apr 17 09:16:00 2014 +1000
   Implement lucene sort using lastChanged

    commit 890c48d8c412a2cf858fdab0c95ce5d7014e19d2
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 16 14:54:41 2014 +1000
   revert naming of the test method.

    commit 6db712fae02c16328f4caf4774c55034e77c73de
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 16 12:15:22 2014 +1000
   Fix unit test with new documentDAO param

    commit 1f5f5adc50db5d4f476c42d60b5e599fda10080c
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 16 11:26:29 2014 +1000
   Remove lastChanged override in target

    commit f7b408c97441b0d05901fbeb82dd2d41974b68ed
    Merge: 997dd5b 1db4c3e
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 15:54:38 2014 +1000
   Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

    commit 997dd5b599c782413e003f38d99b7aaeb9a8595c
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 15:54:22 2014 +1000
   Use text flow id index for excluding option in tm search

    commit 1db4c3ef9835fac3bc2fbf9af3319f2a6375ab40
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 15 15:11:44 2014 +1000
   Remove redundant test
   Requirement is covered by TranslationMemoryServiceImplTest.searchBestMatchTargetTest.

    commit 05197b47957c08241eca1a3c3f81eaced093a3b3
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 15 14:40:56 2014 +1000
   Annotate ZanataJpaTest with @Test again (to fix REST tests)

    commit 3f6d381f308e2ad23a7f907519b8a778574317ce
    Merge: 3b90ea2 c7a9df7
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 14:29:21 2014 +1000
   Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

    commit c7a9df7459a2f6861ee88523d4017d6bb8790bf9
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 15 14:22:12 2014 +1000
   Update CopyTransServiceUnitTest

    commit 3b90ea2e5fe0e836bf7fd5764e50b3571b3bf8d1
    Merge: d4bd248 c02a26b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 14:06:11 2014 +1000
   Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439

    commit d4bd2482e3a123aeb87696e34c7bee6b5d14b187
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 14:05:56 2014 +1000
   Add tf_id as index

    commit c02a26bceb4a2c60003d3390ff30a741b14ad1af
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Tue Apr 15 13:49:36 2014 +1000
   Change TranslationMemoryServiceImplTest to load the DB once only

    commit 034c81de5d177cb7f7161dacc9fa5770304b79ec
    Merge: 26290c0 bb3d19c
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 10:23:02 2014 +1000
   Merge branch 'rhbz1077439' of github.com:zanata/zanata-server into rhbz1077439
   Conflicts:
  	zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

    commit 26290c0b222d37cf4a03058477d29733ae66aad3
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 15 10:15:19 2014 +1000
   improve filtering of tm list

    commit bb3d19cb0382d16b2607665f405eeb74a16a9356
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Mon Apr 14 17:31:18 2014 +1000
   Extract CopyTransWorkFactory; add basic unit test for CopyTransService

    commit c3c1344e3ccba413409af5b06af0693b5a38742a
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Mon Apr 14 15:09:50 2014 +1000
   Extract CopyTransWork from CopyTransServiceImpl, along with tests

    commit 559ddd1b2e889c436b4f0e2777d8a6e4a7013123
    Merge: 86fec53 0a1b1d4
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Apr 14 13:45:19 2014 +1000
   Merge branch 'integration/master' into rhbz1077439

    commit 86fec5396e5dfefdc02bd5c9181d5dea8eb50f8b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Apr 14 13:44:19 2014 +1000
   Merge copyTrans to use lucene index for search

    commit 85b6076b8a3b827f4f507bd04d273004d588ecb9
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Thu Apr 3 11:16:50 2014 +1000
   Create TranslationFinder interface

    commit 5f656f2c9231649fcb7b0935d7f526b6a9caca1f
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Apr 11 15:53:35 2014 +1000
   WIP: generating unit test for tm service

    commit 9459a43583df97fd194f37a80786772b1c50117b
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Apr 10 15:44:50 2014 +1000
   WIP: refactor copy trans

    commit 27a49fe2e35fb004943325264db113dd27cf0e93
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 9 15:55:07 2014 +1000
   WIP: test for TM search

    commit c3ded2b8398c8735872230394c480a1be50deb19
    Merge: 628badd 907ce45
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 9 15:06:58 2014 +1000
   Merge branch 'integration/master' into rhbz1077439
   Conflicts:
  	zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java

    commit 628badd7f3f711b1b3e9f7c1909acf2019db068c
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 9 15:02:25 2014 +1000
   WIP: integration test for TM service

    commit f461e6ea492bdeb08e8e134d17da300f8e26cfce
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 8 15:59:33 2014 +1000
   Move test to TM merge handler test to ServiceImpl

    commit 80d9f18198fad419f9788adecfa4fa0e4c0284b2
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Apr 7 15:38:51 2014 +1000
   Fix unit test to use lucene index

    commit 81afeb074023673c49e9cb3d590db3cab4842c7e
    Merge: 2d61836 ea1069b
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Fri Apr 4 13:00:01 2014 +1000
   Merge remote branch 'origin/rhbz1077439' into rhbz1077439
   Conflicts:
  	zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
  	zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
  	zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java

    commit 2d6183641e739b00e3d25c54d0d35f4d5cd95d3e
    Author: Sean Flanigan <sflaniga at redhat.com>
    Date:   Fri Apr 4 10:52:56 2014 +1000
   Ensure Lucene indexing in CopyTransServiceImplTest

    commit ea1069b752b3873d121ea5a4872052ce8995e517
    Author: Alex Eng <aeng at redhat.com>
    Date:   Fri Apr 4 08:30:54 2014 +1000
   WIP: copytrans

    commit 790c9426102d730a47103fec8c9c3ac9aa224c0c
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Apr 3 16:19:47 2014 +1000
   WIP: copytrans

    commit ea1b06681070e3fc964ccb6cc12b0d6b9bab0403
    Merge: 6230240 1f3f7bf
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Apr 3 14:01:03 2014 +1000
   Merge branch 'integration/master' into rhbz1077439
   Conflicts:
  	zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java

    commit 623024015a89def4df0117170be9205d67239832
    Author: Alex Eng <aeng at redhat.com>
    Date:   Thu Apr 3 14:00:33 2014 +1000
   WIP: include project, document and resId condition in TM query

    commit 27194111bb9564df41db570a8d69395ec8313618
    Author: Alex Eng <aeng at redhat.com>
    Date:   Wed Apr 2 15:55:31 2014 +1000
   WIP: refactoring copytrans and get translation memory service

    commit 3cc1e79c58a56967332b94e2340aa5d54bc50202
    Author: Alex Eng <aeng at redhat.com>
    Date:   Tue Apr 1 16:00:44 2014 +1000
   WIP: integrating copytrans query to use lucene

    commit 5f12a1a6b8008513dcf25abc420c87570d6df70d
    Author: Alex Eng <aeng at redhat.com>
    Date:   Mon Mar 31 16:02:27 2014 +1000
   WIP: refactoring copy trans and TM merge


  Commit: 4ca14d512f8fa62cf8c33865579b875d7a7d3af0
      https://github.com/zanata/zanata-server/commit/4ca14d512f8fa62cf8c33865579b875d7a7d3af0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java

  Log Message:
  -----------
  Remove unused index


  Commit: 12ecb5539c9f309b7515491354c1621429342cc7
      https://github.com/zanata/zanata-server/commit/12ecb5539c9f309b7515491354c1621429342cc7
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java

  Log Message:
  -----------
  Merge pull request #379 from zanata/editor-switch

rhbz1062508 - disable spellcheck in codemirror and add key shortcut to switch between editor for current row


  Commit: 29c2dc35dc2f1f70eef5706b832e85ce73270ffe
      https://github.com/zanata/zanata-server/commit/29c2dc35dc2f1f70eef5706b832e85ce73270ffe
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Implement bookmarkable url for version and project page
Squashed commit of the following:

commit 30d7509f5f414324b80f02d622c685c27946713a
Author: Alex Eng <aeng at redhat.com>
Date:   Mon May 5 12:18:50 2014 +1000

    Update functional test

commit f0c91140ff73cc28b23c973cb8ea1afbcf225cab
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 2 14:37:23 2014 +1000

    bookmarkable url for project and version page

commit 08514186d65dd1dcd5ba06a772709f4c840db22c
Author: Alex Eng <aeng at redhat.com>
Date:   Fri May 2 12:51:09 2014 +1000

    WIP: version - document tab

commit 08daff86947c993042cda26a733ca8ec1d329f9a
Merge: c1b0eac 4ec8ed7
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 15:59:06 2014 +1000

    Merge branch 'integration/master' into version-bookmark

commit c1b0eac85f2a1eaffee216dbc5891631833d6387
Author: Alex Eng <aeng at redhat.com>
Date:   Thu May 1 15:57:56 2014 +1000

    WIP: refactoring bookmark on project and group page


  Commit: f07519c2f9ff83e223d27a1bda6c3c2a19ade7bb
      https://github.com/zanata/zanata-server/commit/f07519c2f9ff83e223d27a1bda6c3c2a19ade7bb
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java

  Log Message:
  -----------
  fix functional test


  Commit: d41254000a2845583b391ad6889d8e0286479991
      https://github.com/zanata/zanata-server/commit/d41254000a2845583b391ad6889d8e0286479991
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml

  Log Message:
  -----------
  Merge pull request #428 from zanata/copy-trans-ui

Copy trans UI


  Commit: c24ef6e88398826e258b8758bbb7fa061572562c
      https://github.com/zanata/zanata-server/commit/c24ef6e88398826e258b8758bbb7fa061572562c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-05 (Mon, 05 May 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Replace groovy-eclipse-compiler with gmavenplus


  Commit: 97f2d1db882d86aca74abc0aef2d25e373a7eb79
      https://github.com/zanata/zanata-server/commit/97f2d1db882d86aca74abc0aef2d25e373a7eb79
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  rhbz1094090 - open access to authenticated browser user in rate limiting dispatcher


  Commit: 116daac0f957014907a863e0fe099ad2becf94ca
      https://github.com/zanata/zanata-server/commit/116daac0f957014907a863e0fe099ad2becf94ca
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java

  Log Message:
  -----------
  rhbz1094090 - use authenticated user's apiKey for rate limiting


  Commit: b196625e5e0f4558c75e8db553b3ae0b45ce63c9
      https://github.com/zanata/zanata-server/commit/b196625e5e0f4558c75e8db553b3ae0b45ce63c9
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Rhbz981085 Use a more human readable instruction for usernames

Underscores were missing from the error, and nobody reads regexes to
understand what and how many characters should be in a username.
Nobody.


  Commit: 555839f51e12711c8581842d4aadf595bb28566f
      https://github.com/zanata/zanata-server/commit/555839f51e12711c8581842d4aadf595bb28566f
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java

  Log Message:
  -----------
  Rhbz981085 update functional tests


  Commit: a1bc59bb98d85bac271d7f93e02be51b4b114e2b
      https://github.com/zanata/zanata-server/commit/a1bc59bb98d85bac271d7f93e02be51b4b114e2b
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  rhbz1094090 - fallback to username if authenticated user don't have apiKey


  Commit: f2e858e7745eb554aa7c42fc3d4ee2ad2faa0ef8
      https://github.com/zanata/zanata-server/commit/f2e858e7745eb554aa7c42fc3d4ee2ad2faa0ef8
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M zanata-war/src/main/resources/ValidationMessages.properties

  Log Message:
  -----------
  Merge pull request #392 from zanata/rhbz981085-username-input

Rhbz981085 Use a more human readable instruction for usernames


  Commit: a1bf10404cd9b3725f04e227dd67da1e40f2e6ef
      https://github.com/zanata/zanata-server/commit/a1bf10404cd9b3725f04e227dd67da1e40f2e6ef
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-05-06 (Tue, 06 May 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  Update RESTEasy


  Commit: 1bc181c54299e7b618e9afb3f6c35eb856e2cfad
      https://github.com/zanata/zanata-server/commit/1bc181c54299e7b618e9afb3f6c35eb856e2cfad
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  rhbz1080770 - Fix url handling in version group page.

Make sure 'Add Project' buttons redirect to the settings page.
Move 'is-active' css classes in accordance with the new asset component scripts.


  Commit: 222381bbaef1236fb9a85055e8664b94276bd967
      https://github.com/zanata/zanata-server/commit/222381bbaef1236fb9a85055e8664b94276bd967
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  Clean up the test framework

- Designate a "test plan"
- Convert/remove Concordion tests (some still used in zanata-war)
- Remove many superfluous suite files (flat list)
Also,
- Fix broken version group test
- Move the test structure to its own package


  Commit: d56a6c250001e8cb1f7b5da904ef6bcecf3a2a16
      https://github.com/zanata/zanata-server/commit/d56a6c250001e8cb1f7b5da904ef6bcecf3a2a16
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  Merge pull request #433 from zanata/rhbz1094090-rest-fix

rhbz1094090 - open access to authenticated browser user in rate limiting dispatcher


  Commit: 1e11159110df5cbc2ba737f553a60001e28f6339
      https://github.com/zanata/zanata-server/commit/1e11159110df5cbc2ba737f553a60001e28f6339
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge pull request #434 from zanata/resteasy237

RESTEasy 2.3.7


  Commit: b3f7d8fd8af81eed91b5e67668635a899893e809
      https://github.com/zanata/zanata-server/commit/b3f7d8fd8af81eed91b5e67668635a899893e809
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #435 from zanata/rhbz1080770

rhbz1080770 - Fix url handling in version group page.


  Commit: 1ad99797f46354df088469b0ecf46d3de1784302
      https://github.com/zanata/zanata-server/commit/1ad99797f46354df088469b0ecf46d3de1784302
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  fix random test failure


  Commit: 1d0bb029e92e62c29a198a59d7273389a85e83df
      https://github.com/zanata/zanata-server/commit/1d0bb029e92e62c29a198a59d7273389a85e83df
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-07 (Wed, 07 May 2014)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java

  Log Message:
  -----------
  Merge pull request #436 from zanata/fix-test

fix random test failure


  Commit: ac971be1301b5bcd9207ed837909e5278f2569ee
      https://github.com/zanata/zanata-server/commit/ac971be1301b5bcd9207ed837909e5278f2569ee
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-05-08 (Thu, 08 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html

  Log Message:
  -----------
  Merge pull request #429 from zanata/teststructure-upgrade

Clean up the test framework


  Commit: 8312344f46768dfbc389c18433f98f64f9670131
      https://github.com/zanata/zanata-server/commit/8312344f46768dfbc389c18433f98f64f9670131
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    M zanata-war/src/test/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into version-bookmark

Conflicts:
	zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
	zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
	zanata-war/src/main/webapp/iteration/view.xhtml
	zanata-war/src/main/webapp/project/project.xhtml
	zanata-war/src/main/webapp/version-group/version_group.xhtml


  Commit: f608a04c1b929a72f863356c30f6f271545119c8
      https://github.com/zanata/zanata-server/commit/f608a04c1b929a72f863356c30f6f271545119c8
  Author: Alex Eng <aeng at redhat.com>
  Date:   2014-05-09 (Fri, 09 May 2014)

  Changed paths:
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/create_project.xhtml
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Update a tag with new markup


  Commit: b1b4ed98575189d78ac8a041dffcc2be3e596e50
      https://github.com/zanata/zanata-server/commit/b1b4ed98575189d78ac8a041dffcc2be3e596e50
  Author: Damian Jansen <djansen at redhat.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge pull request #431 from zanata/version-bookmark

Implement bookmarkable url for version and project page


  Commit: 50edbbc2faea860eca1caf72e1e61998002aceff
      https://github.com/zanata/zanata-server/commit/50edbbc2faea860eca1caf72e1e61998002aceff
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    A LICENSE.LESSER.txt
    M LICENSE.txt
    M functional-test/pom.xml
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/dashboard/DashboardBasePage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectBasePage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectMaintainersPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionsPage.java
    M functional-test/src/main/java/org/zanata/page/projectversion/VersionBasePage.java
    R functional-test/src/test/java/org/zanata/concordion/CustomResourceExtension.java
    R functional-test/src/test/java/org/zanata/concordion/GeneratedIndexSource.java
    R functional-test/src/test/java/org/zanata/concordion/IndexPageBuilderExtension.java
    R functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    R functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    R functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    R functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/FeatureTest.java
    M functional-test/src/test/java/org/zanata/feature/TransMemoryTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTest.java
    R functional-test/src/test/java/org/zanata/feature/UnstableTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/account/AccountTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/account/ChangePasswordTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InactiveUserLoginTest.java
    M functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ProfileTest.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterTest.java
    M functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    R functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/EditTranslationMemoryTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageSearchTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    R functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/GettextPluralSupportTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/PropertiesRoundTripTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    R functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTest.java
    R functional-test/src/test/java/org/zanata/feature/dashboard/DashboardTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/document/DocumentTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/document/HTMLDocumentTypeTest.java
    M functional-test/src/test/java/org/zanata/feature/document/UploadTest.java
    R functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateHTMLTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateIdmlTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOdsTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateOpenOfficeTest.java
    M functional-test/src/test/java/org/zanata/feature/editor/TranslateTextTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryAdminTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryDeleteTest.java
    R functional-test/src/test/java/org/zanata/feature/glossary/UnauthorizedGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTest.java
    R functional-test/src/test/java/org/zanata/feature/googleopenid/GoogleOpenIDTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/infrastructure/InfrastructureTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/infrastructure/RetryRuleTest.java
    M functional-test/src/test/java/org/zanata/feature/language/AddLanguageTest.java
    A functional-test/src/test/java/org/zanata/feature/language/JoinLanguageTeamTest.java
    R functional-test/src/test/java/org/zanata/feature/language/LanguageTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ContactAdminTest.java
    R functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/misc/ObsoleteTextTest.java
    M functional-test/src/test/java/org/zanata/feature/misc/RateLimitRestAndUITest.java
    M functional-test/src/test/java/org/zanata/feature/project/CreateProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditPermissionsTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectAboutTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectGeneralTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/project/EditProjectValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/project/ProjectTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/CreateProjectVersionTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionLanguagesTest.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/EditVersionValidationsTest.java
    R functional-test/src/test/java/org/zanata/feature/projectversion/ProjectVersionTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/projectversion/VersionFilteringTest.java
    M functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    R functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    R functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateSampleProjectTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    R functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    A functional-test/src/test/java/org/zanata/feature/testharness/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/TestPlan.java
    A functional-test/src/test/java/org/zanata/feature/testharness/UnstableTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/testharness/ZanataTestCase.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupUrlTest.java
    R functional-test/src/test/resources/concordion/org/zanata/feature/Feature.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/GlossaryPushCSV.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/InvalidGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryDelete.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/glossary/UnauthorizedGlossaryPush.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/jquery-1.8.3.min.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.css
    R functional-test/src/test/resources/concordion/org/zanata/feature/spec.js
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/AddLanguage.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateSampleProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/CreateVersionAndAddToProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/DocumentListInWebTrans.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/PushPodirPluralProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/StartNewProject.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeam.html
    R functional-test/src/test/resources/concordion/org/zanata/feature/versionGroup/VersionGroupBasic.html
    M functional-test/src/test/resources/conf/standalone.xml
    M pom.xml
    A zanata-model/src/main/java/org/zanata/hibernate/search/DateBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/IndexFieldLabels.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlow.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransOptionsModel.java
    M zanata-war/src/main/java/org/zanata/action/VersionHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionHomeAction.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/limits/RateLimitingProcessor.java
    M zanata-war/src/main/java/org/zanata/rest/RestLimitingSynchronousDispatcher.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslatedDocResourceService.java
    M zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
    M zanata-war/src/main/java/org/zanata/service/CopyTransService.java
    M zanata-war/src/main/java/org/zanata/service/SearchIndexManager.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    A zanata-war/src/main/java/org/zanata/service/TransMemoryMergeService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationFinder.java
    R zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    A zanata-war/src/main/java/org/zanata/service/TranslationMemoryService.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransOptionFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    A zanata-war/src/main/java/org/zanata/service/impl/CopyTransWorkFactory.java
    M zanata-war/src/main/java/org/zanata/service/impl/SecurityServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TransMemoryMergeServiceImpl.java
    R zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    A zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SourcePanel.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ToggleEditor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AttentionKeyShortcutView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/EditorOptionsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryQuery.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
    M zanata-war/src/main/resources/ValidationMessages.properties
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline.xhtml
    A zanata-war/src/main/webapp/WEB-INF/layout/copy_trans_inline_modal.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/dashboard/settings.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/projects-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version-group/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/documents-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/languages-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version/settings-tab.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/dashboard/home.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/project/home.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/script/components-script.js
    M zanata-war/src/main/webapp/resources/zanata/maintainers-tab.xhtml
    M zanata-war/src/main/webapp/resources/zanata/progressBar.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceServerNullTest.groovy
    R zanata-war/src/test/groovy/org/zanata/service/impl/TranslationMergeServiceTest.groovy
    A zanata-war/src/test/java/org/zanata/ImmutableDbunitJpaTest.java
    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/java/org/zanata/limits/RateLimitingProcessorTest.java
    M zanata-war/src/test/java/org/zanata/model/TestFixture.java
    M zanata-war/src/test/java/org/zanata/rest/RestLimitingSynchronousDispatcherTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
    R zanata-war/src/test/java/org/zanata/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/ExecutionHelper.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TransMemoryMergeServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationFinderTest.java
    A zanata-war/src/test/java/org/zanata/service/impl/TranslationMemoryServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandlerTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    A zanata-war/src/test/resources/org/zanata/test/model/TranslationMemoryData.dbunit.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz882770-search

Conflicts:
	functional-test/src/test/java/org/zanata/feature/editor/EditorTestSuite.java
  deleted
	functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
  used version from master
	functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
  used version from master


  Commit: f8a8c0ae243a5d9b87a893a0ff5d045813adb1b1
      https://github.com/zanata/zanata-server/commit/f8a8c0ae243a5d9b87a893a0ff5d045813adb1b1
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2014-05-12 (Mon, 12 May 2014)

  Changed paths:
    M functional-test/src/test/java/org/zanata/feature/editor/EditorFilterMessagesTest.java

  Log Message:
  -----------
  fix compile errors in functional test


Compare: https://github.com/zanata/zanata-server/compare/94b03c126d44...f8a8c0ae243a


More information about the zanata-commits mailing list