[zanata/zanata] 6dde9a: Work in progress: persist project type: https://bu...

GitHub noreply at github.com
Tue Jan 22 22:37:30 UTC 2013


  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 6dde9a7c89edde2a2ab7353f40c6dab1443a3a1c
      https://github.com/zanata/zanata/commit/6dde9a7c89edde2a2ab7353f40c6dab1443a3a1c
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-15 (Tue, 15 Jan 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/GroupSearchBridge.java
    R zanata-model/src/main/java/org/zanata/model/HIterationProject.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/test/groovy/org/zanata/GroovyTest.groovy
    M zanata-war/src/test/groovy/org/zanata/test/data/ProjectData.groovy
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml

  Log Message:
  -----------
  Work in progress: persist project type: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: 55333189dee35dcf3496699b0be146910be4c7c7
      https://github.com/zanata/zanata/commit/55333189dee35dcf3496699b0be146910be4c7c7
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

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

  Log Message:
  -----------
  Work in progress: update put version to include projectType: https://bugzilla.redhat.com/show_bug.cgi?id=895881


  Commit: 55f1b3821d7b09f6686a4fa52c65db5aeded0e48
      https://github.com/zanata/zanata/commit/55f1b3821d7b09f6686a4fa52c65db5aeded0e48
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-16 (Wed, 16 Jan 2013)

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

  Log Message:
  -----------
  work in progress: https://bugzilla.redhat.com/show_bug.cgi?id=895280


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

  Log Message:
  -----------
  Implement projectType for put-version: https://bugzilla.redhat.com/show_bug.cgi?id=895280


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Work in progress: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: b2f7e99985a652392db1f4c1ebabeaad9b3d9af0
      https://github.com/zanata/zanata/commit/b2f7e99985a652392db1f4c1ebabeaad9b3d9af0
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java

  Log Message:
  -----------
  Implement projecttype when generating config file: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: 6d55d9cb530f2aee0e1b4517827a184ed886902e
      https://github.com/zanata/zanata/commit/6d55d9cb530f2aee0e1b4517827a184ed886902e
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-21 (Mon, 21 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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

Conflicts:
	zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
	zanata-war/src/main/webapp/iteration/view.xhtml


  Commit: 3b3716e1794b85c8d5ae0209c8cb592db27d8452
      https://github.com/zanata/zanata/commit/3b3716e1794b85c8d5ae0209c8cb592db27d8452
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Implement projectType in zanata: https://bugzilla.redhat.com/show_bug.cgi?id=895280


  Commit: 9fb29c87c06482456b5aa18d5b9f4df353b8a254
      https://github.com/zanata/zanata/commit/9fb29c87c06482456b5aa18d5b9f4df353b8a254
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-01-22 (Tue, 22 Jan 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/hibernate/search/ContainingWorkspaceBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/GroupSearchBridge.java
    R zanata-model/src/main/java/org/zanata/model/HIterationProject.java
    M zanata-model/src/main/java/org/zanata/model/HProject.java
    M zanata-model/src/main/java/org/zanata/model/HProjectIteration.java
    M zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectHome.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.java
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    M zanata-war/src/main/java/org/zanata/action/SlugHome.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupAction.java
    M zanata-war/src/main/java/org/zanata/action/VersionGroupJoinAction.java
    M zanata-war/src/main/java/org/zanata/dao/ProjectIterationDAO.java
    M zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
    M zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectIterationService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectService.java
    M zanata-war/src/main/java/org/zanata/rest/service/ProjectsService.java
    M zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
    M zanata-war/src/main/java/org/zanata/service/VersionGroupService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImpl.java
    A zanata-war/src/main/resources/db/changelogs/db.changelog-2.2.xml
    M zanata-war/src/main/resources/db/db.changelog.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    M zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/groovy/org/zanata/GroovyTest.groovy
    M zanata-war/src/test/groovy/org/zanata/test/data/ProjectData.groovy
    M zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/ProjectRestTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/TranslationWorkspaceManagerImplTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeStatusResolverTest.java
    M zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/CopyTransTestData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

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


Compare: https://github.com/zanata/zanata/compare/819455d9028e...9fb29c87c064


More information about the zanata-commits mailing list