[zanata/zanata-server] f0eaed: Merge pull request #387 from zanata/seam-scope-fix

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata-server
  Commit: f0eaed2d95704a0fe6d460fb047602407b16e9f8
      https://github.com/zanata/zanata-server/commit/f0eaed2d95704a0fe6d460fb047602407b16e9f8
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2014-02-28 (Fri, 28 Feb 2014)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/BasePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageSearchPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/clientserver/ClientServerTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentAccessTest.java
    A functional-test/src/test/java/org/zanata/feature/concurrentedit/ConcurrentEditTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/misc/MiscTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/search/ProjectSearchTest.java
    A functional-test/src/test/java/org/zanata/feature/search/SearchTestSuite.java
    M functional-test/src/test/java/org/zanata/util/ZanataRestCaller.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
    M zanata-war/src/main/java/org/zanata/service/impl/VersionStateCacheImpl.java
    A zanata-war/src/main/java/org/zanata/util/ServiceLocator.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationUpdateListener.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitUpdateHelper.java

  Log Message:
  -----------
  Merge pull request #387 from zanata/seam-scope-fix

rhbz1069428 - Seam scope fix


  Commit: 94f4d3a6454f62578ac6788d00e17c2bcdbef671
      https://github.com/zanata/zanata-server/commit/94f4d3a6454f62578ac6788d00e17c2bcdbef671
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-02-28 (Fri, 28 Feb 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.3.2


  Commit: 06ec1fd1243e0137f35b865d5a18ed929d8ceacd
      https://github.com/zanata/zanata-server/commit/06ec1fd1243e0137f35b865d5a18ed929d8ceacd
  Author: Zanata Build Server <jenkins at zanata.org>
  Date:   2014-02-28 (Fri, 28 Feb 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: 3dcb52d0c99dc991119e61040e567b45f124922b
      https://github.com/zanata/zanata-server/commit/3dcb52d0c99dc991119e61040e567b45f124922b
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

  Changed paths:
    M zanata-war/pom.xml

  Log Message:
  -----------
  Fix line breaks on pom.xml


  Commit: 22d8e7bf42aec56ce20e15f3b5b7887ab376d110
      https://github.com/zanata/zanata-server/commit/22d8e7bf42aec56ce20e15f3b5b7887ab376d110
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2014-05-13 (Tue, 13 May 2014)

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

Conflicts:
	functional-test/pom.xml
	pom.xml
	zanata-model/pom.xml
	zanata-war/pom.xml


Compare: https://github.com/zanata/zanata-server/compare/a1c4d8ce3490...22d8e7bf42ae