[zanata/zanata] 070b42: Rename 'Current' to 'Active', 'Retired' to 'ReadOn...

[GitHub]

  Branch: refs/heads/master
  Home:   https://github.com/zanata/zanata
  Commit: 070b421e89b8562b18b396cf2f82f6042d4df39d
      https://github.com/zanata/zanata/commit/070b421e89b8562b18b396cf2f82f6042d4df39d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    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/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/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.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/TranslationWorkspaceManager.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
  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/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

  Log Message:
  -----------
  Rename 'Current' to 'Active', 'Retired' to 'ReadOnly' for project status


  Commit: 49f2dca07a889d6e2d701dbe9592d694757ad01f
      https://github.com/zanata/zanata/commit/49f2dca07a889d6e2d701dbe9592d694757ad01f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-02-06 (Mon, 06 Feb 2012)

  Changed paths:
    M server/zanata-war/src/main/java/org/zanata/rest/service/ResourceUtils.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManager.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
  M server/zanata-war/src/main/resources/pluralforms.properties
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.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
Fix: Unit test on changes in status

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


Compare: https://github.com/zanata/zanata/compare/b91743d...49f2dca