[zanata/zanata-server] 0495ae: Hold active tasks in a map, but cache finished tas...

GitHub noreply at github.com
Wed Jul 23 06:32:14 UTC 2014 

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata-server
  Commit: 0495ae121fec6aaa6799a1a3197a5039cbe4ee45
      https://github.com/zanata/zanata-server/commit/0495ae121fec6aaa6799a1a3197a5039cbe4ee45
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-19 (Thu, 19 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Hold active tasks in a map, but cache finished tasks briefly


  Commit: 928ea7aecea8f9d11fa39dfb453287648284befb
      https://github.com/zanata/zanata-server/commit/928ea7aecea8f9d11fa39dfb453287648284befb
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2014-06-20 (Fri, 20 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Allow lookup of finished tasks; test that onComplete is called


  Commit: b35bd04892c066546b4e21b53f3768ef060e7819
      https://github.com/zanata/zanata-server/commit/b35bd04892c066546b4e21b53f3768ef060e7819
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M functional-test/pom.xml
    A functional-test/src/main/java/org/zanata/rest/SampleDataResource.java
    A functional-test/src/main/java/org/zanata/rest/SampleDataResourceImpl.java
    R functional-test/src/main/java/org/zanata/rest/SampleProjectResource.java
    R 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/workflow/ClientWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/clientserver/ProjectMaintainerTest.java
    M functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTest.java
    A functional-test/src/test/java/org/zanata/feature/manual/CopyTransTuningTest.java
    M functional-test/src/test/java/org/zanata/util/AddUsersRule.java
    M functional-test/src/test/java/org/zanata/util/CleanDatabaseRule.java
    A functional-test/src/test/java/org/zanata/util/SampleDataResourceClient.java
    R 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
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/async/tasks/CopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/DocumentCopyTransTask.java
    M zanata-war/src/main/java/org/zanata/async/tasks/IterationCopyTransTask.java
    A zanata-war/src/main/java/org/zanata/dao/NativeQuery.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/CopyTransWork.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/seam/AutowireTransaction.java
    A zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplPerformanceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransServiceUnitTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/CopyTransWorkTest.java

  Log Message:
  -----------
  Merge pull request #484 from zanata/optimize-copytrans

:+1: Verified


  Commit: 6e61a9d703fb8ec4a4c031df72c84b3b23d53a30
      https://github.com/zanata/zanata-server/commit/6e61a9d703fb8ec4a4c031df72c84b3b23d53a30
  Author: Ding-Yi Chen <dingyichen at gmail.com>
  Date:   2014-06-24 (Tue, 24 Jun 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_en_GB.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

  Log Message:
  -----------
  Merge pull request #507 from zanata/async-task-manager

Hold active tasks in a map, but cache finished tasks briefly


  Commit: 6f128e57dffb2eaa374361b57047c824812b6c48
      https://github.com/zanata/zanata-server/commit/6f128e57dffb2eaa374361b57047c824812b6c48
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

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


  Commit: c64b08a14dd38a97affbe82cdc51ca66c61455b3
      https://github.com/zanata/zanata-server/commit/c64b08a14dd38a97affbe82cdc51ca66c61455b3
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-06-25 (Wed, 25 Jun 2014)

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

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


  Commit: be252c9a11b740f0626b714b3608439c23690926
      https://github.com/zanata/zanata-server/commit/be252c9a11b740f0626b714b3608439c23690926
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Make sure csrf tokens match on client and server.


  Commit: 63406f6bb18f119685bb555c137e04ae14be847d
      https://github.com/zanata/zanata-server/commit/63406f6bb18f119685bb555c137e04ae14be847d
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

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

  Log Message:
  -----------
  Fix checkstyle violations.


  Commit: 5ce8d6cb2a20b3bc4fda0a093c20110997c6b6e4
      https://github.com/zanata/zanata-server/commit/5ce8d6cb2a20b3bc4fda0a093c20110997c6b6e4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-07 (Mon, 07 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java

  Log Message:
  -----------
  Refactor some exception handling and extract a method.


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml

  Log Message:
  -----------
  Merge pull request #527 from zanata/gwt-token-mismatch

Make sure csrf tokens match on client and server.


  Commit: 19bd165debf3e4849b141d7deb5b896d24ec7ac6
      https://github.com/zanata/zanata-server/commit/19bd165debf3e4849b141d7deb5b896d24ec7ac6
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-07-23 (Wed, 23 Jul 2014)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ProcessManagerAction.java
    M zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
    M zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
    M zanata-war/src/main/java/org/zanata/service/AsyncTaskManagerService.java
    M zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/Application.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/util/JavascriptUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/SeamDispatch.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/processmanager.xhtml
    M zanata-war/src/test/java/org/zanata/async/AsyncTaskITCase.java

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml
	zanata-war/src/main/java/org/zanata/async/AsynchronousTaskExecutor.java
	zanata-war/src/main/java/org/zanata/async/TaskExecutor.java
	zanata-war/src/main/java/org/zanata/service/impl/AsyncTaskManagerServiceImpl.java
	zanata-war/src/main/resources/messages_en_GB.properties
	zanata-war/src/main/resources/messages_ja.properties
	zanata-war/src/main/resources/messages_uk.properties
	zanata-war/src/main/resources/messages_zh_TW_Hant.properties
	zanata-war/src/main/webapp/WEB-INF/pages.xml
	zanata-war/src/main/webapp/admin/processmanager.xhtml


Compare: https://github.com/zanata/zanata-server/compare/1a10a894259f...19bd165debf3

More information about the zanata-commits mailing list