[zanata/zanata] 326e25: Refactor Xml Dtos so they are still compatible wit...

GitHub noreply at github.com
Wed Jan 18 23:44:46 UTC 2012


  Branch: refs/heads/rhbz750673
  Home:   https://github.com/zanata/zanata
  Commit: 326e25ea2f300a58a27f54050ae2bf0c0a1e7c1a
      https://github.com/zanata/zanata/commit/326e25ea2f300a58a27f54050ae2bf0c0a1e7c1a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationsRestTest.java
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
  A server/zanata-war/src/test/resources/rest/account/get.json
  A server/zanata-war/src/test/resources/rest/account/get.xml
  A server/zanata-war/src/test/resources/rest/translations/getTranslations.xml
  M server/zanata-war/src/test/resources/rest/translations/putResource-1.4-expected.xml
  M server/zanata-war/src/test/resources/rest/translations/putResource-1.4.xml

  Log Message:
  -----------
  Refactor Xml Dtos so they are still compatible with 1.4 API.

(rhbz781270)
- Refactored Xml Dtos so that they are not root elements yet are still compatible with the 1.4 clients.
- Added raw Rest tests to make sure that 1.4 valid requests are still served by the subsequent versions of the API. Failure of one of these tests does not necessarily mean an API incompatibility, but should at least raise a red flag.


  Commit: 409df15a7c3ab05370e8a60268245d772fca9422
      https://github.com/zanata/zanata/commit/409df15a7c3ab05370e8a60268245d772fca9422
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-16 (Mon, 16 Jan 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  A common/zanata-common-api/src/main/java/org/zanata/common/AbstractTranslationCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java
  A common/zanata-common-api/src/test/java/org/zanata/common/TranslationStatsTest.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.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/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.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/editor/table/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowImpl.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  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/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java

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


  Commit: 1420910b414abef6b10dad6a9972193fca668689
      https://github.com/zanata/zanata/commit/1420910b414abef6b10dad6a9972193fca668689
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  A common/zanata-common-api/src/main/java/org/zanata/common/AbstractTranslationCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitCount.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TransUnitWords.java
  M common/zanata-common-api/src/main/java/org/zanata/common/TranslationStats.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Glossary.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/gettext/PoHeader.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/Resource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  A common/zanata-common-api/src/test/java/org/zanata/common/TranslationStatsTest.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  M server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.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/TranslationResourcesService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/SourcePanel.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/editor/table/TableEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentStatsUpdatedEventHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsUpdatedEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/Window.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowImpl.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocation.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/MainView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentNode.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  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/GetTransUnitListHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/UpdateTransUnit.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/AccountRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/raw/FileRestTest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/raw/TranslationsRestTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/AppPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/DocumentListPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  M server/zanata-war/src/test/resources/AllIntegrationTests.tng.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
  A server/zanata-war/src/test/resources/rest/account/get.json
  A server/zanata-war/src/test/resources/rest/account/get.xml
  A server/zanata-war/src/test/resources/rest/translations/getTranslations.xml
  A server/zanata-war/src/test/resources/rest/translations/putResource-1.4-expected.xml
  A server/zanata-war/src/test/resources/rest/translations/putResource-1.4.xml

  Log Message:
  -----------
  Merge branch 'master' into rhbz750673

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java


  Commit: b7976ce5d0aa81fb089feabdf74fe7a4e5a82815
      https://github.com/zanata/zanata/commit/b7976ce5d0aa81fb089feabdf74fe7a4e5a82815
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-17 (Tue, 17 Jan 2012)

  Changed paths:
    M common/zanata-common-api/src/main/java/org/zanata/rest/client/IProjectResource.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusType.java
  M server/zanata-model/src/main/java/org/zanata/util/ZanataUtil.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/test/java/org/zanata/rest/service/ProjectRestTest.java

  Log Message:
  -----------
  Add Rest API restrictions to Project Iterations.

(rhbz750673)


  Commit: 4d57eb79ac88f6e720a83fd77bb793ace7380293
      https://github.com/zanata/zanata/commit/4d57eb79ac88f6e720a83fd77bb793ace7380293
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-18 (Wed, 18 Jan 2012)

  Changed paths:
    A 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 common/zanata-common-api/src/main/java/org/zanata/rest/dto/ProjectIteration.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
  M server/zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
  A server/zanata-model/src/main/java/org/zanata/model/type/EntityStatusTypeType.java
  R server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.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/server/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
  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/ProjectsData.dbunit.xml
  M server/zanata-war/src/test/resources/rest/iteration/get.json
  M server/zanata-war/src/test/resources/rest/iteration/get.xml
  M server/zanata-war/src/test/resources/rest/project/get.json
  M server/zanata-war/src/test/resources/rest/project/get.xml

  Log Message:
  -----------
  Add EntityStatus enumeration.

(rhbz750673)
This new enumeration will server as both a JPA and REST status indicator for Slug entities.
On the REST api, this new field will be included in both projects and iterations when exposing these objects via the API.


Compare: https://github.com/zanata/zanata/compare/ded9248...4d57eb7


More information about the zanata-commits mailing list