[zanata/zanata] 148009: Merge branch 'master' of github.com:zanata/zanata

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 14800939a7b9eabe7976bb389c13b4d2eea86675
      https://github.com/zanata/zanata/commit/14800939a7b9eabe7976bb389c13b4d2eea86675
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-02-07 (Tue, 07 Feb 2012)

  Changed paths:
    M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/XliffStrategy.java
  M common/zanata-common-api/src/main/java/org/zanata/common/EntityStatus.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Project.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/NoSuchEntityException.java
  A server/zanata-war/src/main/java/org/zanata/rest/ReadOnlyEntityException.java
  A server/zanata-war/src/main/java/org/zanata/rest/ReadOnlyEntityExceptionMapper.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/EventProcessor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectIterationUpdateEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectIterationUpdateEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectUpdateEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectUpdateEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/WorkspaceContextUpdateEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasProjectIterationUpdateData.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasProjectUpdateData.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasWorkspaceContextUpdateData.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ProjectIterationUpdate.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/ProjectUpdate.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WorkspaceContextUpdate.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  M server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectsServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectIterationRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
  M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml

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


  Commit: 0b57c4fc1017252f1dc02f50cc380e63ab659d2c
      https://github.com/zanata/zanata/commit/0b57c4fc1017252f1dc02f50cc380e63ab659d2c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-02-07 (Tue, 07 Feb 2012)

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

  Log Message:
  -----------
  Fix web editor translator test.

Due to the latest changes regarding Read-Only mode in the web editor, the tests that simulate web editing started failing.


Compare: https://github.com/zanata/zanata/compare/f5f7885...0b57c4f