[zanata/zanata] ac4253: Merge branch '1.5' of github.com:zanata/zanata int...

GitHub noreply at github.com
Tue Apr 3 00:28:04 UTC 2012 

  Branch: refs/heads/1.5
  Home:   https://github.com/zanata/zanata
  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: 8d7c00da89922ce3bd27c1b0354ed1af6aa5355e
      https://github.com/zanata/zanata/commit/8d7c00da89922ce3bd27c1b0354ed1af6aa5355e
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M server/zanata-model/src/main/java/org/zanata/model/HPerson.java

  Log Message:
  -----------
  Rvert to using opposite end of relationship on isMaintainer.

This aligns it with the latest 1.6 branch. Otherwise, a lazy load exception of sorts is thrown when evaluating certain dsecurity rules.


  Commit: d482fa9c7020d1dd001c7507e223fe4f9b3b79dd
      https://github.com/zanata/zanata/commit/d482fa9c7020d1dd001c7507e223fe4f9b3b79dd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-04-02 (Mon, 02 Apr 2012)

  Changed paths:
    M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-commands/pom.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/ConfigUtil.java
  M client/zanata-maven-plugin/pom.xml
  M common/pom.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M pom.xml
  M server/pom.xml
  M server/zanata-model/pom.xml
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilter.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/LocaleFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
  R server/zanata-war/etc/scripts/is_server_up.sh
  R server/zanata-war/etc/scripts/zanata-deploy.sh
  A server/zanata-war/etc/scripts/zanata-server-package.sh
  M server/zanata-war/pom.xml
  M server/zanata-war/src/main/java/org/zanata/action/IterationTranslationAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  M server/zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
  M server/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.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/VersionService.java
  M server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
  M server/zanata-war/src/main/java/org/zanata/security/ZanataIdentity.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/InlineTargetCellEditor.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/CopyDataToEditorHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/InsertStringInEditorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/InsertStringInEditorHandler.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryCopyEvent.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryCopyHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/GlossaryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/ValidationMessages.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/DiffMatchPatchLabel.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/OptionsPanelView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SearchTypeRenderer.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/ClickableImageResourceCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/DiffMatchPatchLabelCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/HighlightingLabelCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/cell/TransUnitCountGraphCell.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/CopyButtonColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DetailsColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DiffMatchPatchLabelColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DirectoryColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/DocumentColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/HighlightingLabelColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/RemainingWordsHoursColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/SimilarityColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/StatisticColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/TranslatedColumn.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/table/column/UntranslatedColumn.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/validation/ValidationService.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/DocumentListView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.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/GetDocumentListHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.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/java/org/zanata/webtrans/shared/model/DocumentInfo.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/GlossaryDetails.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryDetails.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/TranslationMemoryGlossaryItem.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossary.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsAction.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryDetailsResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetGlossaryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransMemoryDetailsAction.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemory.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/HasSearchType.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetails.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/JavaVariablesValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/PrintfVariablesValidation.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.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/resources/messages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  R server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/pages.xml
  M server/zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
  M server/zanata-war/src/main/webapp/admin/languagemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/rolemanager.xhtml
  M server/zanata-war/src/main/webapp/admin/usermanager.xhtml
  M server/zanata-war/src/main/webapp/edit_home_content.xhtml
  A server/zanata-war/src/main/webapp/iteration/edit.xhtml
  A server/zanata-war/src/main/webapp/iteration/files.xhtml
  A server/zanata-war/src/main/webapp/iteration/view.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_edit.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  R server/zanata-war/src/main/webapp/project/iteration_status.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  R server/zanata-war/src/main/webapp/stylesheet/base-min.css
  A server/zanata-war/src/main/webapp/stylesheet/base.css
  R server/zanata-war/src/main/webapp/stylesheet/reset-fonts-grids.css
  R server/zanata-war/src/main/webapp/stylesheet/tabs.css
  R server/zanata-war/src/main/webapp/stylesheet/theme.css
  R server/zanata-war/src/main/webapp/stylesheet/theme.xcss
  R server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationResourceRestTest.java
  M 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
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/OptionsPanelPresenterTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationPresenterTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenterTest.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyEditingTranslationCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetDocsListCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryDetailsCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransMemoryDetailsCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/JavaVariablesValidationTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/PrintfVariablesValidationTest.java
  R server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.java
  M zanata-parent/pom.xml

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


Compare: https://github.com/zanata/zanata/compare/f3e347c...d482fa9

More information about the zanata-commits mailing list