[zanata/zanata] : Merge branch 'master' into rhbz748727

GitHub noreply at github.com
Thu Jan 12 06:52:51 UTC 2012


  Branch: refs/heads/rhbz748727
  Home:   https://github.com/zanata/zanata
  Commit: 4348982c5be7488c513ce69af7edd089cb81c746
      https://github.com/zanata/zanata/commit/4348982c5be7488c513ce69af7edd089cb81c746
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2012-01-11 (Wed, 11 Jan 2012)

  Changed paths:
    M CHANGELOG.md
  M client/zanata-adapter-properties/pom.xml
  M client/zanata-adapter-properties/src/main/java/org/zanata/adapter/properties/PropWriter.java
  A client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTest.java
  R client/zanata-adapter-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-client-ant-po/eclipse/DownloadPoTask --help.launch	
  M client/zanata-client-ant-po/eclipse/DownloadPoTask.launch
  M client/zanata-client-ant-po/eclipse/UploadPoTask --help.launch	
  R client/zanata-client-ant-po/eclipse/UploadPoTask hudson.launch	
  M client/zanata-client-ant-po/eclipse/UploadPoTask localhost.launch	
  M client/zanata-client-ant-po/pom.xml
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/ConfigurableProjectTask.java
  M client/zanata-client-ant-po/src/main/java/org/zanata/client/ant/po/DownloadPoTask.java
  M client/zanata-client-ant-po/src/test/java/org/zanata/client/ant/po/LocalTest.java
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/build.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/downloadpo.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/roundtrip.xml
  M client/zanata-client-ant-po/src/test/resources/org/zanata/client/ant/po/uploadpo.xml
  M client/zanata-client-ant-properties/pom.xml
  M client/zanata-client-ant-properties/src/test/java/org/zanata/client/ant/properties/LocalTest.java
  M client/zanata-client-ant-properties/src/test/resources/org/zanata/client/ant/properties/build.xml
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ConfigurableProjectOptionsImpl.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/OptionsUtil.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/PushPullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/pull/PullStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PropertiesStrategy.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/push/PushOptions.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/config/LocaleList.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/DummyResponse.java
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPullCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/push/PushOptionsImpl.java
  M client/zanata-maven-plugin/pom.xml
  M client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
  M client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_draft_build
  M client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_export_translations
  M client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_all
  M client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata_import_source
  M client/zanata-maven-plugin/sample-scripts/pom.xml
  M client/zanata-maven-plugin/sample-scripts/zanata.xml
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ConfigurableProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListLocalMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/ListRemoteMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PublicanPushMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/PushPullMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutProjectMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutUserMojo.java
  M client/zanata-maven-plugin/src/main/java/org/zanata/maven/PutVersionMojo.java
  R client/zanata-maven-plugin/src/test/java/org/zanata/maven/PublicanPushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/PushMojoTest.java
  A client/zanata-maven-plugin/src/test/java/org/zanata/maven/ZanataMojoTest.java
  R client/zanata-maven-plugin/src/test/resources/publican-push-test/plugin-config.xml
  A client/zanata-maven-plugin/src/test/resources/push-test/pom-config.xml
  M common/zanata-adapter-po/pom.xml
  M common/zanata-common-api/pom.xml
  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/Person.java
  A common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTest.java
  R common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-common-util/src/test/java/org/zanata/util/TestShortString.java
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/ApiKeyHeaderDecoratorTest.java
  A common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
  M server/zanata-model/pom.xml
  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/StatusType.java
  A server/zanata-model/src/main/java/org/zanata/model/type/StatusTypeType.java
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  M server/zanata-war/pom.xml
  A server/zanata-war/src/main/.gitignore
  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/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/ProjectIterationAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectIterationHome.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/dao/ProjectIterationDAO.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/webtrans/client/Application.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKey.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.ui.xml
  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/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/TableEditorTableDefinition.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableEditorView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/table/TableResources.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/RunValidationEventHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryShorcutCopyHandler.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/TransMemoryShortcutCopyEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/UpdateValidationErrorEventHandler.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/presenter/AppPresenter.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/client/presenter/TransMemoryPresenter.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitDetailsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/WorkspaceUsersPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/EditorConfigConstants.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.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/ClearableTextBox.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CodeMirror.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsePanel.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/CollapsePanel.ui.xml
  A 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/DocumentNode.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorOptionsPanel.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Highlighting.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/HighlightingLabel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/LoadingPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ShortcutConfigPanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitDetailsPanel.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserConfigConstants.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/UserListItem.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanel.ui.xml
  A 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/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/client/view/TransMemoryView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitDetailsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.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/client/view/TranslationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/ValidationOptionsView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/TranslationWorkspace.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/ActivateWorkspaceHandler.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/shared/auth/Identity.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Permission.java
  R server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/Role.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceContext.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationObject.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/ValidationUtils.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/HtmlXmlTagValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/NewlineLeadTrailValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/VariablesValidation.java
  A 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/org/zanata/webtrans/client/editor/table/TableEditorMessages.properties
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/collapse_closed.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/collapse_open.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/downArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/leftArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/rightArrow.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/actions/upArrow.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/first_page_old.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_entry.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/last_page_old.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/loader.gif
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_page_old.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/next_untranslated.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_approved.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_entry.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_fuzzy.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_mode.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_page_old.png
  R server/zanata-war/src/main/resources/org/zanata/webtrans/images/prev_untranslated.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/validate.png
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
  M server/zanata-war/src/main/resources/org/zanata/webtrans/public/Application.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/COPYING
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/README.txt
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_diff.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_match.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/demos/demo_patch.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.html
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_test.js
  A server/zanata-war/src/main/resources/org/zanata/webtrans/public/diff_match_patch/javascript/diff_match_patch_uncompressed.js
  M server/zanata-war/src/main/resources/security.drl
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/iteration_view_inline.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/login_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/project_edit_form.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
  M server/zanata-war/src/main/webapp/profile/view.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/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/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.java
  R server/zanata-war/src/test/java/org/zanata/rest/service/TestProxyFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java
  A 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/DummyActivateWorkspaceCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTransUnitCommand.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/HtmlXmlTagValidationTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/NewlineLeadTrailValidationTests.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/shared/validation/VariablesValidationTests.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
  M zanata-parent/pom.xml

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

Conflicts:
	common/zanata-rest-client/src/test/java/org/zanata/rest/client/TestProxyFactory.java
	server/zanata-war/src/main/java/org/zanata/rest/service/TranslationResourcesService.java
	server/zanata-war/src/test/java/org/zanata/rest/service/VersionSeamTest.java





More information about the zanata-commits mailing list