[zanata/zanata] a72c8b: Merge master

noreply at github.com noreply at github.com
Mon Dec 19 01:37:30 UTC 2011


  Branch: refs/heads/rhbz756264
  Home:   https://github.com/zanata/zanata

  Commit: a72c8b540e64e64fdb74468673bd308b42e9a2e6
      https://github.com/zanata/zanata/commit/a72c8b540e64e64fdb74468673bd308b42e9a2e6
  Author: Alex Eng <aeng at redhat.com>
  Date:   2011-12-18 (Sun, 18 Dec 2011)

  Changed paths:
    M CHANGELOG.md
  M client/pom.xml
  M client/zanata-adapter-properties/pom.xml
  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-properties/src/test/java/org/zanata/adapter/properties/PropReaderTests.java
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans.properties
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans_mismatch.properties
  A client/zanata-adapter-properties/src/test/resources/org/zanata/adapter/properties/test_non_trans_nested.properties
  M client/zanata-adapter-xliff/pom.xml
  M client/zanata-adapter-xliff/src/test/java/org/zanata/adapter/xliff/XliffReaderTest.java
  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/ZanataClient.java
  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/ListLocalCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/ListRemoteCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPullCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PublicanPushCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutProjectCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutUserCommand.java
  M client/zanata-client-commands/src/main/java/org/zanata/client/commands/PutVersionCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/delete/GlossaryDeleteOptions.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/AbstractGlossaryPushReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryCSVReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPoReader.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushCommand.java
  A client/zanata-client-commands/src/main/java/org/zanata/client/commands/glossary/push/GlossaryPushOptions.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/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/config/ConfigUtil.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
  M client/zanata-client-commands/src/test/java/org/zanata/client/commands/PublicanPushCommandTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryCSVReaderTest.java
  A client/zanata-client-commands/src/test/java/org/zanata/client/commands/glossary/push/GlossaryPoReaderTest.java
  A client/zanata-client-commands/src/test/resources/glossary/fuel_hi.po
  A client/zanata-client-commands/src/test/resources/glossary/translate1.csv
  A client/zanata-client-commands/src/test/resources/glossary/translate2.csv
  A client/zanata-maven-plugin/demo-glossary/compendium/fr.po
  A client/zanata-maven-plugin/demo-glossary/compendium/pom.xml
  A client/zanata-maven-plugin/demo-glossary/compendium/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/csv/pom.xml
  A client/zanata-maven-plugin/demo-glossary/csv/translate1.csv
  A client/zanata-maven-plugin/demo-glossary/csv/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/delete/pom.xml
  A client/zanata-maven-plugin/demo-glossary/delete/zanata.xml
  A client/zanata-maven-plugin/demo-glossary/fuel/fuel_hi.po
  A client/zanata-maven-plugin/demo-glossary/fuel/pom.xml
  A client/zanata-maven-plugin/demo-glossary/fuel/zanata.xml
  M client/zanata-maven-plugin/demo-props/pom.xml
  M client/zanata-maven-plugin/demo-publican/pom.xml
  M client/zanata-maven-plugin/demo-xliff/pom.xml
  M client/zanata-maven-plugin/demo-xml/pom.xml
  M client/zanata-maven-plugin/pom.xml
  A client/zanata-maven-plugin/sample-scripts/etc/scripts/zanata.sh
  M client/zanata-maven-plugin/sample-scripts/pom.xml
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryDeleteMojo.java
  A client/zanata-maven-plugin/src/main/java/org/zanata/maven/GlossaryPushMojo.java
  M common/pom.xml
  A common/zanata-adapter-po/pom.xml
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoReader2.java
  A common/zanata-adapter-po/src/main/java/org/zanata/adapter/po/PoWriter2.java
  A common/zanata-adapter-po/src/test/java/org/zanata/adapter/po/PoReader2Test.java
  A common/zanata-adapter-po/src/test/resources/ja-JP/RPM.po
  A common/zanata-adapter-po/src/test/resources/pot/RPM.pot
  M common/zanata-common-api/pom.xml
  M common/zanata-common-api/src/main/java/org/zanata/common/LocaleId.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/MediaTypes.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/client/IGlossaryResource.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Account.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/Glossary.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryEntry.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/GlossaryTerm.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Link.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Links.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/Person.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/ProjectList.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/extensions/comment/SimpleComment.java
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/ExtensionSet.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/LocaleList.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/ResourceMetaList.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
  M common/zanata-common-api/src/main/java/org/zanata/rest/dto/resource/TranslationsResource.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/service/FileResource.java
  A common/zanata-common-api/src/main/java/org/zanata/rest/service/GlossaryResource.java
  M common/zanata-common-api/src/test/java/org/zanata/rest/dto/v1/SerializationTests.java
  M common/zanata-common-util/pom.xml
  M common/zanata-rest-client/pom.xml
  M common/zanata-rest-client/src/main/java/org/zanata/rest/client/ZanataProxyFactory.java
  M pom.xml
  M server/pom.xml
  A server/zanata-dist/etc/assembly.xml
  A server/zanata-dist/etc/sql/config_setup.sql
  A server/zanata-dist/pom.xml
  M server/zanata-model/pom.xml
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/DefaultNgramAnalyzer.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/GlossaryFilterFactory.java
  A server/zanata-model/src/main/java/org/zanata/hibernate/search/IdFilter.java
  M server/zanata-model/src/main/java/org/zanata/hibernate/search/TextFlowFilterFactory.java
  M server/zanata-model/src/main/java/org/zanata/model/HApplicationConfiguration.java
  A server/zanata-model/src/main/java/org/zanata/model/HGlossaryEntry.java
  A server/zanata-model/src/main/java/org/zanata/model/HGlossaryTerm.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocale.java
  M server/zanata-model/src/main/java/org/zanata/model/HLocaleMember.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
  A server/zanata-model/src/main/java/org/zanata/model/HTermComment.java
  M server/zanata-model/src/main/java/org/zanata/model/type/ContentTypeType.java
  M server/zanata-model/src/main/java/org/zanata/model/type/LocaleIdType.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataDialectResolver.java
  A server/zanata-model/src/main/java/org/zanata/util/ZanataMySQL5InnoDBDialect.java
  A server/zanata-model/src/main/resources/.gitignore
  A server/zanata-model/src/test/java/org/zanata/model/HGlossaryEntryTest.java
  A server/zanata-model/src/test/resources/.gitignore
  A server/zanata-war/eclipse/launch-external/mvn integration-test -Dmaven.failsafe.debug.launch	
  A server/zanata-war/eclipse/launch-external/mvn verify.launch	
  M server/zanata-war/eclipse/launch/Integration_Tests.launch
  A server/zanata-war/eclipse/launch/debug-jboss-zanata.launch
  A server/zanata-war/eclipse/launch/debug-surefire-zanata (mvn -Dmaven.surefire.debug).launch	
  A server/zanata-war/eclipse/launch/debug-zanata-integration-test.launch
  M server/zanata-war/eclipse/launch/webtrans-dummy.launch
  M server/zanata-war/eclipse/launch/webtrans-jboss.launch
  A server/zanata-war/etc/scripts/is_server_up.sh
  A server/zanata-war/etc/scripts/zanata-deploy.sh
  M server/zanata-war/pom.xml
  A server/zanata-war/src/etc/autotest.properties
  A server/zanata-war/src/etc/fedora.properties
  A server/zanata-war/src/etc/h2.properties
  A server/zanata-war/src/etc/internalauth.properties
  A server/zanata-war/src/etc/jaas.properties
  A server/zanata-war/src/etc/kerberos.properties
  A server/zanata-war/src/etc/mysql.properties
  A server/zanata-war/src/etc/seamtests.properties
  A server/zanata-war/src/etc/zanata-ds.xml
  A server/zanata-war/src/main/.gitignore
  M server/zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
  M server/zanata-war/src/main/java/org/zanata/ZanataInit.java
  M server/zanata-war/src/main/java/org/zanata/action/ConfigurationAction.java
  A server/zanata-war/src/main/java/org/zanata/action/GlossaryStatsAction.java
  M server/zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.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
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
  A server/zanata-war/src/main/java/org/zanata/action/ProjectIterationZipFileAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectMaintainerManageAction.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectPagedListDataModel.java
  M server/zanata-war/src/main/java/org/zanata/action/ProjectSearch.java
  M server/zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
  M server/zanata-war/src/main/java/org/zanata/action/SendEmailAction.java
  M server/zanata-war/src/main/java/org/zanata/action/SlugHome.java
  M server/zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
  A server/zanata-war/src/main/java/org/zanata/dao/GlossaryDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/ProjectDAO.java
  M server/zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
  A server/zanata-war/src/main/java/org/zanata/exception/ZanataInitializationException.java
  A server/zanata-war/src/main/java/org/zanata/job/DownloadFileCleanupJob.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataJobScheduler.java
  A server/zanata-war/src/main/java/org/zanata/job/ZanataSchedulableJob.java
  A server/zanata-war/src/main/java/org/zanata/process/BackgroundProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcess.java
  A server/zanata-war/src/main/java/org/zanata/process/IterationZipFileBuildProcessHandle.java
  A server/zanata-war/src/main/java/org/zanata/process/ProcessHandle.java
  M server/zanata-war/src/main/java/org/zanata/rest/service/ETagUtils.java
  A server/zanata-war/src/main/java/org/zanata/rest/service/FileService.java
  A server/zanata-war/src/main/java/org/zanata/rest/service/GlossaryService.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
  A server/zanata-war/src/main/java/org/zanata/security/AuthenticationType.java
  A server/zanata-war/src/main/java/org/zanata/security/BaseSecurityChecker.java
  A server/zanata-war/src/main/java/org/zanata/security/SecurityChecker.java
  M server/zanata-war/src/main/java/org/zanata/security/ZanataExternalLoginBean.java
  A server/zanata-war/src/main/java/org/zanata/service/ConfigurationService.java
  A server/zanata-war/src/main/java/org/zanata/service/FileSystemService.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/ConfigurationServiceImpl.java
  A server/zanata-war/src/main/java/org/zanata/service/impl/FileSystemServiceImpl.java
  M server/zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.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/CheckKeyImpl.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/editor/filter/TransFilterView.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/ButtonDisplayChangeEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ButtonDisplayChangeEventHandler.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/events/DocumentSelectionEvent.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/events/ProjectStatsRetrievedEvent.java
  A 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/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/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/gin/WebTransGinjector.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/History.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryImpl.java
  A 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/WindowLocation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/history/WindowLocationImpl.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/AppPresenter.java
  A 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/GlossaryPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasDocumentSelectionHandlers.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/HasNavTransUnitHandlers.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SidePanelPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryDetailsPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitNavigationPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
  A 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/UndoRedoPresenter.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ValidationOptionsPresenter.java
  A 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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/NavigationMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/Resources.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/RpcMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/rpc/SeamDispatchAsync.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/ClearableTextBox.ui.xml
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/DocumentListTable.java
  A 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
  M 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/Pager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/SidePanel.java
  A 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/TooltipPopupPanel.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountBar.java
  A 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/TransUnitCountGraph.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransUnitCountGraph.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
  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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/AppView.ui.xml
  A 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/DocumentListView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/GlossaryView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryDetailsView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TransUnitNavigationView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.ui.xml
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationView.java
  A 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/UndoRedoView.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/UndoRedoView.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
  A server/zanata-war/src/main/java/org/zanata/webtrans/client/view/WorkspaceUsersView.java
  A 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/TranslationWorkspaceManager.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/server/rpc/EditTransUnitHandler.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/GetGlossaryHandler.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/NoSuchWorkspaceException.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/auth/SessionId.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/TranslationMemoryGlossaryItem.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetDocumentList.java
  A 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/GetGlossaryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationMemoryResult.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransMemoryDetailsList.java
  M server/zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/WrappedAction.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/action/HtmlXmlTagValidation.java
  A server/zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/ValidationAction.java
  M server/zanata-war/src/main/resources-dev/components.properties
  A server/zanata-war/src/main/resources/db/changelogs/db.changelog-1.5.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/TransMemoryMessages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/WebTransMessages.properties
  M server/zanata-war/src/main/resources/org/zanata/webtrans/client/editor/table/TableEditorMessages.properties
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/apps/alert.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/crystal_project/_16x16/mimetypes/templates.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/bar_background.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_middle_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/cell_top_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/crystal_project/_16x16/mimetypes/templates.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/error.gif
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/favicon.ico
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/footer_background.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/loading.gif
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/logo.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/menu_active_bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgerror.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msginfo.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/msgwarn.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/panel-header-bg.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/photos.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/cross.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/help.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/home.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/photos.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/tick.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/user.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/world.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/wrench.png
  A server/zanata-war/src/main/resources/org/zanata/webtrans/images/public-img/silk/zoom.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
  A server/zanata-war/src/main/resources/pluralforms.properties
  M server/zanata-war/src/main/resources/security.drl
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
  A server/zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
  M server/zanata-war/src/main/webapp-jboss/WEB-INF/web.xml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_admin.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_coordinator.xhtml
  A server/zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
  M server/zanata-war/src/main/webapp/WEB-INF/layout/edit.xhtml
  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/menu.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/statsbar.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/account/register.xhtml
  A server/zanata-war/src/main/webapp/admin/glossary.xhtml
  M server/zanata-war/src/main/webapp/admin/server_configuration.xhtml
  M server/zanata-war/src/main/webapp/admin/userdetail.xhtml
  M server/zanata-war/src/main/webapp/language/language.xhtml
  M server/zanata-war/src/main/webapp/language/request_to_join.xhtml
  M server/zanata-war/src/main/webapp/profile/edit.xhtml
  M server/zanata-war/src/main/webapp/profile/view.xhtml
  M server/zanata-war/src/main/webapp/project/assign_maintainer.xhtml
  M server/zanata-war/src/main/webapp/project/home.xhtml
  A server/zanata-war/src/main/webapp/project/iteration_files.xhtml
  M server/zanata-war/src/main/webapp/project/maintainerdetail.xhtml
  M server/zanata-war/src/main/webapp/project/project.xhtml
  M server/zanata-war/src/main/webapp/rest/index.xrd
  M server/zanata-war/src/main/webapp/stylesheet/tabs.css
  M server/zanata-war/src/main/webapp/stylesheet/theme.css
  A server/zanata-war/src/main/webapp/stylesheet/zanata-theme.css
  M server/zanata-war/src/main/webapp/stylesheet/zanata.css
  A server/zanata-war/src/test/java/org/zanata/dao/GlossaryDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/LocaleDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/ProjectDAOTest.java
  M server/zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
  A server/zanata-war/src/test/java/org/zanata/model/DocumentJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HDocumentHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HGlossaryEntryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HTextFlowHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/model/HTextFlowTargetHistoryJPATest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryRestTest.java
  A server/zanata-war/src/test/java/org/zanata/rest/service/GlossaryServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ProjectIterationRestTest.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/ProjectServiceRawSeamTest.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/ResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTestUtil.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/ResourceTranslationServiceSeamTest.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/TranslationServiceSeamTest.java
  M server/zanata-war/src/test/java/org/zanata/rest/service/TranslationsResourceTestObjectFactory.java
  M server/zanata-war/src/test/java/org/zanata/server/rpc/ActivateWorkspaceActionSeamTest.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/history/HistoryTokenTests.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyDispatchAsync.java
  A server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetGlossaryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
  M server/zanata-war/src/test/java/org/zanata/webtrans/test/GwtTestSample.java
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.properties
  M server/zanata-war/src/test/jboss-embedded-bootstrap/META-INF/persistence.xml
  A server/zanata-war/src/test/jboss-embedded-bootstrap/deploy/zanata-test-ds.xml
  M server/zanata-war/src/test/jboss-embedded-bootstrap/deployers/ejb3-deployers-beans.xml
  M server/zanata-war/src/test/resources/META-INF/persistence.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/AccountData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/DocumentsData.dbunit.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/GlossaryData.dbunit.xml
  A server/zanata-war/src/test/resources/org/zanata/test/model/LocalesData.dbunit.xml
  M server/zanata-war/src/test/resources/org/zanata/test/model/ProjectsData.dbunit.xml
  M zanata-parent/pom.xml

  Log Message:
  -----------
  Merge master





More information about the zanata-commits mailing list