[zanata/zanata] 9ba0af: Update zanata-parent (and jackson and resteasy)

Mon Feb 4 03:00:37 UTC 2013

  Branch: refs/heads/seam230final
  Home:   https://github.com/zanata/zanata
  Commit: 9ba0af63308013d4782e13f9e5e58ce75266bbc3
      https://github.com/zanata/zanata/commit/9ba0af63308013d4782e13f9e5e58ce75266bbc3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

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

  Log Message:
  -----------
  Update zanata-parent (and jackson and resteasy)


  Commit: fc93e45f987c393686a5f746e3c81ab2681c0b22
      https://github.com/zanata/zanata/commit/fc93e45f987c393686a5f746e3c81ab2681c0b22
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  transfer source control URLs between HProject and Project DTO


  Commit: 42c7dd69ef2fa90714aa2704a0eb3171d764bafb
      https://github.com/zanata/zanata/commit/42c7dd69ef2fa90714aa2704a0eb3171d764bafb
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-01-24 (Thu, 24 Jan 2013)

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

  Log Message:
  -----------
  fix junit dep error after parent update


  Commit: f4dc01753226c56006b1e370594ff88e0619c518
      https://github.com/zanata/zanata/commit/f4dc01753226c56006b1e370594ff88e0619c518
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java

  Log Message:
  -----------
  Fix breadcrumb in workspace


  Commit: d9f1c7910a3659bec3adb456606c7153e3b4a8df
      https://github.com/zanata/zanata/commit/d9f1c7910a3659bec3adb456606c7153e3b4a8df
  Author: Alex Eng <loones1595 at gmail.com>
  Date:   2013-01-28 (Mon, 28 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TooltipColumn.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Fix document list layout issue, include tooltip for path and name column


  Commit: a76ddc66f2aa8344d326f148cf3899b1f3274ce9
      https://github.com/zanata/zanata/commit/a76ddc66f2aa8344d326f148cf3899b1f3274ce9
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml

  Log Message:
  -----------
  rhbz896299 make labels consistent for input and display of source control URLs


  Commit: 722c0a42328b6e812405a03c17b013687c2b31cf
      https://github.com/zanata/zanata/commit/722c0a42328b6e812405a03c17b013687c2b31cf
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

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

  Log Message:
  -----------
  rhbz896299 change source checkout url label to include download


  Commit: 1aef3f008af8da4c5f1f7a81e50d9fc96035bee6
      https://github.com/zanata/zanata/commit/1aef3f008af8da4c5f1f7a81e50d9fc96035bee6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-01-29 (Tue, 29 Jan 2013)

  Changed paths:
    M pom.xml
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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


  Commit: 34f06cb9dd8bbd813c71a23f375196b5894f9bbc
      https://github.com/zanata/zanata/commit/34f06cb9dd8bbd813c71a23f375196b5894f9bbc
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java

  Log Message:
  -----------
  prevent project source control URLs being overwritten by null values from clients


  Commit: 400a31ac1dd915db43eabd987a0db61799fc990f
      https://github.com/zanata/zanata/commit/400a31ac1dd915db43eabd987a0db61799fc990f
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/test/resources/log4j.xml

  Log Message:
  -----------
  change HQL so that it will work in H2


  Commit: d6090585dcf928681fbc8449810454aa474c1228
      https://github.com/zanata/zanata/commit/d6090585dcf928681fbc8449810454aa474c1228
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-01-30 (Wed, 30 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  rhbz896356 use stream size when creating blob for document upload


  Commit: 0ff4591edbba960e55c5c386c2269a2148c77c9d
      https://github.com/zanata/zanata/commit/0ff4591edbba960e55c5c386c2269a2148c77c9d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-01-31 (Thu, 31 Jan 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Fix LUCENE_CURRENT warning (HSEARCH000075)


  Commit: 0a7a3fdac7f8590138335af4a0f21d9761a2aae1
      https://github.com/zanata/zanata/commit/0a7a3fdac7f8590138335af4a0f21d9761a2aae1
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Fix restEasy version to 2.3.3.Final


  Commit: 9189a921646a75e80461511a1e34df97703725db
      https://github.com/zanata/zanata/commit/9189a921646a75e80461511a1e34df97703725db
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
    M zanata-war/pom.xml

  Log Message:
  -----------
  Tidy up dependency management


  Commit: 6f0174a9931601d20ecd98d79adfa5509661df6c
      https://github.com/zanata/zanata/commit/6f0174a9931601d20ecd98d79adfa5509661df6c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/AccountSearchAction.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/action/validator/EmailList.java
    M zanata-war/src/main/java/org/zanata/action/validator/NotDuplicateEmail.java
    M zanata-war/src/main/java/org/zanata/seam/scope/FlashScopeBean.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/jboss-web.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/add_maintainer_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/language_detail.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/login_provider.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/menu.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/role_rule_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/version_group_join.xhtml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/admin/stats.xhtml
    M zanata-war/src/main/webapp/admin/usermanager.xhtml
    M zanata-war/src/main/webapp/glossary/view.xhtml
    M zanata-war/src/main/webapp/help/edit_help_content.xhtml
    M zanata-war/src/main/webapp/iteration/copy_trans.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/iteration/source_files.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    M zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/openid.xhtml
    M zanata-war/src/main/webapp/profile/edit.xhtml
    M zanata-war/src/main/webapp/profile/identities.xhtml
    M zanata-war/src/main/webapp/project/add_iteration.xhtml
    M zanata-war/src/main/webapp/project/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/version-group/assign_maintainer.xhtml
    M zanata-war/src/main/webapp/version-group/home.xhtml
    M zanata-war/src/main/webapp/version-group/version_group.xhtml

  Log Message:
  -----------
  Merge branch 'seam230final' of github.com:zanata/zanata into seam230final


  Commit: 1b7fee1aad700803dd8b8d3cb212d5c010baa8de
      https://github.com/zanata/zanata/commit/1b7fee1aad700803dd8b8d3cb212d5c010baa8de
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/Breadcrumb.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/TooltipTextColumn.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/ui/Tooltips.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TooltipColumn.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/CopyTransRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/StatisticsRestTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
    M zanata-war/src/test/resources/log4j.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

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

Conflicts:
	pom.xml
	zanata-war/src/main/java/org/zanata/rest/service/FileService.java
	zanata-war/src/test/java/org/zanata/rest/service/RestUtilsTest.java


  Commit: 6a2931283e7b2c08ccbaf468737521e25ed0027d
      https://github.com/zanata/zanata/commit/6a2931283e7b2c08ccbaf468737521e25ed0027d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-02-03 (Sun, 03 Feb 2013)

  Changed paths:
    M zanata-war/src/main/webapp-jboss/WEB-INF/web.xml

  Log Message:
  -----------
  Fix facelets warning


Compare: https://github.com/zanata/zanata/compare/85e05160a256...6a2931283e7b