[zanata/zanata] b3fc29: rhbz727789 - Fix bug preventing non-admin users fr...

GitHub noreply at github.com
Wed Mar 28 02:14:59 UTC 2012 

  Branch: refs/heads/plural-lists
  Home:   https://github.com/zanata/zanata
  Commit: b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
      https://github.com/zanata/zanata/commit/b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-19 (Mon, 19 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

  Log Message:
  -----------
  rhbz727789 - Fix bug preventing non-admin users from creating projects.

Refactor a security rule causing the issue.


  Commit: a650875363e3ee94dfb9ecba95989b383b499c1f
      https://github.com/zanata/zanata/commit/a650875363e3ee94dfb9ecba95989b383b499c1f
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css

  Log Message:
  -----------
  Apply css into iteration page, rename iteration.xhtml to view.html


  Commit: 86cf39fbc20bd3d108628e9395a217fbdb983d45
      https://github.com/zanata/zanata/commit/86cf39fbc20bd3d108628e9395a217fbdb983d45
  Author: Alex Eng <aeng at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/security.drl

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


  Commit: 27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
      https://github.com/zanata/zanata/commit/27cdcab3f4ec78dde1cb9bd4fbbd1fe35d517b29
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Upgrade to Liquibase 2.0


  Commit: b2b673541cec43948613d9827e7eb2894162978e
      https://github.com/zanata/zanata/commit/b2b673541cec43948613d9827e7eb2894162978e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'liquibase-2.0' into integration


  Commit: f3e347c564d92fbfbe291ce6bbddc253774671e4
      https://github.com/zanata/zanata/commit/f3e347c564d92fbfbe291ce6bbddc253774671e4
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java
  M server/zanata-model/src/main/java/org/zanata/model/HProject.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectHome.java
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java

  Log Message:
  -----------
  rhbz727789 - Implement non-admin project creation in 1.5 branch

This revision is a cherry-pick of the following commits:
e8afa8a65f47aceac35ce2ebd8cc97517badadf0
ad01b3f915e4f776cd6604f20cce3a49bf3489ee
b3fc29cbdd1d25f4a0cc717f131cf9d06635e7c9
a5153d9001e120d7d3fcd15bec4eca7499a7b06a


  Commit: ac4253135252713069ecb2c9fefe174ef9d26d3c
      https://github.com/zanata/zanata/commit/ac4253135252713069ecb2c9fefe174ef9d26d3c
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-20 (Tue, 20 Mar 2012)

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

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


  Commit: 8f955e16f4184526e2d9ed3f2cb704539b30175e
      https://github.com/zanata/zanata/commit/8f955e16f4184526e2d9ed3f2cb704539b30175e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
  A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
  A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
  A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
  M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch	
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  A server/zanata-war/src/main/java/org/zanata/dao/ContentPropertySelector.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.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
  R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Change HTextFlow[Target][History] entities to support up to six plural forms


  Commit: a6a3546b1cdb923147dcd1f434738302af644836
      https://github.com/zanata/zanata/commit/a6a3546b1cdb923147dcd1f434738302af644836
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  M zanata-parent/pom.xml

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


  Commit: c90176a0988a4a6f3b56b4efbbc142b8be63eb00
      https://github.com/zanata/zanata/commit/c90176a0988a4a6f3b56b4efbbc142b8be63eb00
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml

  Log Message:
  -----------
  Force Liquibase 2.0 to install triggers again


  Commit: c1453bb70e6b0d1d0e08802378821eb00f42e391
      https://github.com/zanata/zanata/commit/c1453bb70e6b0d1d0e08802378821eb00f42e391
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-22 (Thu, 22 Mar 2012)

  Changed paths:
    M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml

  Log Message:
  -----------
  Ensure that triggers are created after table changes


  Commit: c4d4d29176c4c3839bd5ac7c2a279def3afd1edd
      https://github.com/zanata/zanata/commit/c4d4d29176c4c3839bd5ac7c2a279def3afd1edd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java

  Log Message:
  -----------
  Re-enable History for HTextFlow.

The new history mechanism is JPA-based and doesn't make use of database triggers.


  Commit: 7a48e769638e3c95be20b26cedb92ea71ace2986
      https://github.com/zanata/zanata/commit/7a48e769638e3c95be20b26cedb92ea71ace2986
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-25 (Sun, 25 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/ITextFlowHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
  M server/zanata-war/src/main/java/org/zanata/service/impl/CopyTransServiceImpl.java
  M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java

  Log Message:
  -----------
  Copy plurals in copyTrans


  Commit: 52b726d4e9fc282880292d89588ca2652d512d7d
      https://github.com/zanata/zanata/commit/52b726d4e9fc282880292d89588ca2652d512d7d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore

  Log Message:
  -----------
  Update .gitignore


  Commit: 166a871427f06d9075c08af7d65a04a454683c8c
      https://github.com/zanata/zanata/commit/166a871427f06d9075c08af7d65a04a454683c8c
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml

  Log Message:
  -----------
  Add plural boolean to TextFlow/HTextFlow


  Commit: 44928ab6024737777f6db4fa901252165be1fb24
      https://github.com/zanata/zanata/commit/44928ab6024737777f6db4fa901252165be1fb24
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-26 (Mon, 26 Mar 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/ITextFlowTargetHistory.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java

  Log Message:
  -----------
  Add list-based plural support for Text Flow targets.


  Commit: cd2b7039462e69d3a67bf3255a54a363ccf0089a
      https://github.com/zanata/zanata/commit/cd2b7039462e69d3a67bf3255a54a363ccf0089a
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-03-27 (Tue, 27 Mar 2012)

  Changed paths:
    M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropReader.java
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffReader.java
  M client/zanata-adapter-xliff/src/main/java/org/zanata/adapter/xliff/XliffWriter.java
  M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
  M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffWriterTest.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/pull/PullPropertiesStrategyTest.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushPropertiesStrategyTest.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  M common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  M common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
  A common/zanata-common-api/src/main/java/org/zanata/common/HasContents.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/DTOUtil.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextContainer.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlow.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TextFlowTarget.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTargetTest.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/resource/TextFlowTest.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  A common/zanata-common-util/src/main/java/org/zanata/util/StringUtil.java
  A server/zanata-model/src/main/java/org/zanata/model/HTextContainer.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
  M server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
  A server/zanata-model/src/main/java/org/zanata/util/ListUtil.java
  M server/zanata-war/eclipse/launch/Liquibase updateSQL.launch	
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/H2TextFlowTargetHistoryTrigger.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetHistoryDAO.java
  M server/zanata-war/src/main/java/org/zanata/liquibase/custom/CountWordsInHTextFlow.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/MergeType.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/service/impl/CopyTransServiceImpl.java
  R server/zanata-war/src/main/java/org/zanata/util/StringUtil.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.java
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.0.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.2.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.3.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.4.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6.xml
  M server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-triggers.xml
  M server/zanata-war/src/main/resources/db/db.changelog.xml
  M server/zanata-war/src/main/resources/db/mysql/create_trigger.sql
  M server/zanata-war/src/main/resources/messages.properties
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  R server/zanata-war/src/main/webapp/iteration/iteration.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  M server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
  M server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  A server/zanata-war/src/test/jboss-embedded-bootstrap/.gitignore
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge branch 'plurals' into plural-lists

Also made some non-conflict resolution changes to get plural lists working.

Conflicts:
	server/zanata-model/src/main/java/org/zanata/model/HTextFlow.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowHistory.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
	server/zanata-model/src/main/java/org/zanata/model/HTextFlowTargetHistory.java
	server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.6a.xml
	server/zanata-war/src/main/resources/db/db.changelog.xml
	server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
	server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
	server/zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml


Compare: https://github.com/zanata/zanata/compare/57a811a...cd2b703

More information about the zanata-commits mailing list