[zanata/zanata-server] 20b8d7: Initial revision of a TMX parser.

GitHub noreply at github.com
Fri Jul 26 08:04:25 UTC 2013


  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: 20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
      https://github.com/zanata/zanata-server/commit/20b8d7afe2a7d09561d79f24cd19fef3a1c60ec0
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-07 (Sun, 07 Jul 2013)

  Changed paths:
    A zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    A zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Initial revision of a TMX parser.


  Commit: d54d12d821b3d00600fae6d542927ef4fc5cb177
      https://github.com/zanata/zanata-server/commit/d54d12d821b3d00600fae6d542927ef4fc5cb177
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-08 (Mon, 08 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Add metadata to the Translation Memory entities.


  Commit: 5317a11c0465fa365a88fb103824311142d5bc45
      https://github.com/zanata/zanata-server/commit/5317a11c0465fa365a88fb103824311142d5bc45
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Log Message:
  -----------
  Fix SlugEntityBaseTest


  Commit: 02bbea7391b2188ae1ad9749671ffeb97f09c441
      https://github.com/zanata/zanata-server/commit/02bbea7391b2188ae1ad9749671ffeb97f09c441
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

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


  Commit: 102325c4cb24b8189a728376a6abfc28036726fd
      https://github.com/zanata/zanata-server/commit/102325c4cb24b8189a728376a6abfc28036726fd
  Author: Carlos Munoz <camunoz at redhat.com>
  Date:   2013-07-09 (Tue, 09 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Add plain text content field to Trans unit variants/

This is to make sure we can store and index a plain text version of the possibly formatted tmx segment string.


  Commit: 4313e1ebd607ee59897f8ea16d57ea332fb905ba
      https://github.com/zanata/zanata-server/commit/4313e1ebd607ee59897f8ea16d57ea332fb905ba
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-10 (Wed, 10 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd

  Log Message:
  -----------
  Move TMX DTD


  Commit: 452292d588b55dba6f66e8b80e8604c44337f6df
      https://github.com/zanata/zanata-server/commit/452292d588b55dba6f66e8b80e8604c44337f6df
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-11 (Thu, 11 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-war/pom.xml

  Log Message:
  -----------
  Update to latest parent pom and add xom dependency


  Commit: 08e23c34622bcee76dec10313663e9fc3cabcd89
      https://github.com/zanata/zanata-server/commit/08e23c34622bcee76dec10313663e9fc3cabcd89
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

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

  Log Message:
  -----------
  Allow creationDate and lastChanged to be set explicitly


  Commit: 0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
      https://github.com/zanata/zanata-server/commit/0da99d6b5e7aa80c1f3ecddaf5eadb4ee780982c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add Rest service and draft web pages to upload translation memories.


  Commit: 8e2de9642b527fe60829a40f7a861e77dcd1ed48
      https://github.com/zanata/zanata-server/commit/8e2de9642b527fe60829a40f7a861e77dcd1ed48
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/SlugEntityBase.java
    M zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java

  Log Message:
  -----------
  Merge remote-tracking branch 'origin/tm-import' into tm-import

Conflicts:
	zanata-model/src/test/java/org/zanata/model/SlugEntityBaseTest.java


  Commit: 4329ae39717748e9de6890ee1b7d508d43baab92
      https://github.com/zanata/zanata-server/commit/4329ae39717748e9de6890ee1b7d508d43baab92
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java

  Log Message:
  -----------
  Use lombok's @Data instead of @Setter and @Getter.

Reduce the size of our entity code even further.


  Commit: 869f0c3630eb7543a033fd654a7feeba1a739a17
      https://github.com/zanata/zanata-server/commit/869f0c3630eb7543a033fd654a7feeba1a739a17
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-14 (Sun, 14 Jul 2013)

  Changed paths:
    M pom.xml
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Switch TMXParser to ElementBuilder; Change TM metadata to use Json


  Commit: cf34ad4c102e9a29f141675880e0af761f41735b
      https://github.com/zanata/zanata-server/commit/cf34ad4c102e9a29f141675880e0af761f41735b
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-model/src/test/java/org/zanata/util/OkapiUtilTest.java
    A zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    A zanata-war/src/main/webapp/WEB-INF/layout/transmemory_edit_form.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    A zanata-war/src/main/webapp/tm/create.xhtml
    A zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

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

Conflicts:
	zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
	zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java


  Commit: 475e13cf75aa9b24c1a5cea83fb87f60f0b09817
      https://github.com/zanata/zanata-server/commit/475e13cf75aa9b24c1a5cea83fb87f60f0b09817
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M pom.xml
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    A zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMMetadataType.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/pom.xml
    A zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXEvent.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
    A zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    R zanata-war/src/test/resources/org/zanata/tmx14.dtd

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

Conflicts:
	zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
	zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
	zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java


  Commit: b91f789236997c759fd88f81c8ee8168ed18f771
      https://github.com/zanata/zanata-server/commit/b91f789236997c759fd88f81c8ee8168ed18f771
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/tm/home.xhtml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java

  Log Message:
  -----------
  Correct tests and change UI messages.


  Commit: d12578e212b8c492405a12c84d538d30da7b43b2
      https://github.com/zanata/zanata-server/commit/d12578e212b8c492405a12c84d538d30da7b43b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java

  Log Message:
  -----------
  Fix compilation error


  Commit: 9760474a27ecec86f6fedacf7b0d425762212c1d
      https://github.com/zanata/zanata-server/commit/9760474a27ecec86f6fedacf7b0d425762212c1d
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-15 (Mon, 15 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java

  Log Message:
  -----------
  Extract TransUnitPersister


  Commit: 63695e26e3ee9d165180817f87ef4b29c7943663
      https://github.com/zanata/zanata-server/commit/63695e26e3ee9d165180817f87ef4b29c7943663
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    A zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    R zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXDummyRestTest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java

  Log Message:
  -----------
  Finish TM persistence from an imported file.

Rename Trans Memory rest service to include the word 'Resource' (in line with our other rest services).


  Commit: 683faa22cb1a4007aae0b43840dc83914f9be776
      https://github.com/zanata/zanata-server/commit/683faa22cb1a4007aae0b43840dc83914f9be776
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-16 (Tue, 16 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    M zanata-war/src/main/java/org/zanata/tmx/TransUnitPersister.java

  Log Message:
  -----------
  Move all knowledge of the storage model for TMX attributes into TMXMetadataHelper


  Commit: 83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
      https://github.com/zanata/zanata-server/commit/83ad8d9a456e71e80d5c015a387adb1ed7dbaa7e
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-model/pom.xml
    A zanata-model/src/main/java/org/zanata/model/HasEntityDates.java
    M zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
    M zanata-model/src/main/java/org/zanata/model/tm/HasTMMetadata.java
    R zanata-model/src/main/java/org/zanata/model/tm/TMMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    A zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    R zanata-war/src/main/java/org/zanata/tmx/TMXAttribute.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    A zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/model/TransMemoryJPATest.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    A zanata-war/src/test/resources/tmx/invalid-tmx-no-discernible-srclang.xml

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

Conflicts:
	zanata-model/src/main/java/org/zanata/model/ModelEntityBase.java
	zanata-war/src/main/java/org/zanata/tmx/TMXParser.java


  Commit: 3c24f9848af4fe836d3d4adc680a1afee6942cf4
      https://github.com/zanata/zanata-server/commit/3c24f9848af4fe836d3d4adc680a1afee6942cf4
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-17 (Wed, 17 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TMXParser.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml

  Log Message:
  -----------
  TMX Upload working from web.

Also refactor the hibernate mappings for some of the TM related entities.


  Commit: cb3811cbd2df35f7897f88bbc9b855509d75eb95
      https://github.com/zanata/zanata-server/commit/cb3811cbd2df35f7897f88bbc9b855509d75eb95
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Refactor TM model.

Trans unit variants are now independent for each Translation unit.
Block the UI while an upload is going on.
Add a "clear" option to clear all the contents of a Translation memory.


  Commit: e134a5f44313f323c267173a7553f7a445166c72
      https://github.com/zanata/zanata-server/commit/e134a5f44313f323c267173a7553f7a445166c72
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-18 (Thu, 18 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/test/java/org/zanata/tmx/TMXParserTest.java
    A zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    A zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx

  Log Message:
  -----------
  Merge existing TUs when importing a TMX file.

This means that existing TUs will be replaced with new ones as long as their unique id is the same. Otherwise, the new TUs will just get appended to the existing ones.
Add smaller tmx test files.


  Commit: 250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
      https://github.com/zanata/zanata-server/commit/250c8c030f65c4cf2ee54cbf0a8c171619a06d2a
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    A zanata-war/src/main/resources/images/crystal_project/_48x48/apps/kcmmemory.png
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/admin/home.xhtml
    M zanata-war/src/main/webapp/tm/home.xhtml

  Log Message:
  -----------
  Add security to new Translation Memory Rest services.

Fix some UI issues.


  Commit: e26a10dbf3de3e541eab304dc2c75b35dfe5a731
      https://github.com/zanata/zanata-server/commit/e26a10dbf3de3e541eab304dc2c75b35dfe5a731
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M pom.xml

  Log Message:
  -----------
  Exclude xml-apis


  Commit: f018dcd8747e749b19b38b925860a523f070b45f
      https://github.com/zanata/zanata-server/commit/f018dcd8747e749b19b38b925860a523f070b45f
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-21 (Sun, 21 Jul 2013)

  Changed paths:
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Fix path for TMX DTD


  Commit: 851f5ee9439ca2ea238b549499690801ad301ba3
      https://github.com/zanata/zanata-server/commit/851f5ee9439ca2ea238b549499690801ad301ba3
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/util/OkapiUtil.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Partially implement getTranslationMemory (WIP)


  Commit: bc60a13a78414aa18be8d2b25f802b25c999fdaf
      https://github.com/zanata/zanata-server/commit/bc60a13a78414aa18be8d2b25f802b25c999fdaf
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/pom.xml
    M functional-test/sample-projects/glossary/pom.xml
    M functional-test/sample-projects/plural/pom.xml
    M functional-test/src/main/java/org/zanata/page/HomePage.java
    M functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/WebDriverFactory.java
    A functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/InvalidEmailAddressRFC2822.java
    A functional-test/src/main/java/org/zanata/util/rfc2822/ValidEmailAddressRFC2822.java
    A functional-test/src/test/java/org/zanata/feature/AggregateTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTest.java
    A functional-test/src/test/java/org/zanata/feature/BasicAcceptanceTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTest.java
    A functional-test/src/test/java/org/zanata/feature/ConcordionTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/DetailedTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/InvalidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    A functional-test/src/test/java/org/zanata/feature/account/RegisterTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/account/UsernameValidationTest.java
    A functional-test/src/test/java/org/zanata/feature/account/ValidEmailAddressTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/AdministrationTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    R functional-test/src/test/java/org/zanata/feature/administration/ManageUsersDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryDeleteTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushCSVTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTest.java
    M functional-test/src/test/java/org/zanata/feature/glossary/GlossaryTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/glossary/InvalidGlossaryPushTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/CreateVersionAndAddToProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/PushPodirPluralProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/StartNewProjectTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    R functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupDetailedTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    A functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M functional-test/src/test/resources/concordion/org/zanata/feature/administration/ManageUsers.html
    M functional-test/src/test/resources/concordion/org/zanata/feature/zanata_with_data.sql
    M functional-test/src/test/resources/create_translator_user.sql
    M functional-test/src/test/resources/setup.properties
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HLocale.java
    M zanata-model/src/main/java/org/zanata/model/HLocaleMember.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    A zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-model/src/main/java/org/zanata/model/SimpleSourceContents.java
    M zanata-model/src/main/java/org/zanata/model/SourceContents.java
    M zanata-war/eclipse/eclipse-code-formatter-profile.xml
    M zanata-war/pom.xml
    R zanata-war/src/etc/jboss-service-snippet.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/CopyTransManager.java
    A zanata-war/src/main/java/org/zanata/action/LanguageJoinUpdateRoleAction.java
    M zanata-war/src/main/java/org/zanata/action/LanguageTeamAction.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/SendEmailAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/config/DatabaseBackedConfig.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/ApplicationConfigurationDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleMemberDAO.java
    M zanata-war/src/main/java/org/zanata/dao/PersonDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TextFlowTargetReviewCommentsDAO.java
    A zanata-war/src/main/java/org/zanata/database/ConnectionWrapper.java
    A zanata-war/src/main/java/org/zanata/database/ProxyUtil.java
    A zanata-war/src/main/java/org/zanata/database/ResultSetWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StatementWrapper.java
    A zanata-war/src/main/java/org/zanata/database/StreamingResultSetSQLException.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDatasourceConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/database/WrappedDriverManagerConnectionProvider.java
    A zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/TranslationDocumentUpload.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    R zanata-war/src/main/java/org/zanata/rest/service/ZanataTMXWriter.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraintToQuery.java
    M zanata-war/src/main/java/org/zanata/search/FilterConstraints.java
    M zanata-war/src/main/java/org/zanata/security/SecurityFunctions.java
    M zanata-war/src/main/java/org/zanata/service/EmailService.java
    M zanata-war/src/main/java/org/zanata/service/LanguageTeamService.java
    M zanata-war/src/main/java/org/zanata/service/SecurityService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LanguageTeamServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ProcessManagerServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/RegisterServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TextFlowSearchServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/ValidationServiceImpl.java
    M zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/util/EssentialDataCreator.java
    A zanata-war/src/main/java/org/zanata/util/NullCloseable.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/events/FilterViewEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/ReviewCommentEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/history/HistoryToken.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ComparingPair.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/DocumentListPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/EditorKeyShortcuts.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/SearchResultsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransFilterPresenter.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryDataProvider.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistorySelectionModel.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparator.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransMemoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/UserConfigHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/EnumMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/TableEditorMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    R zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransStyles.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/GetTransUnitActionContextHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/HistoryEventHandlerService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/ModalNavigationStateHolder.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/NavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/TransUnitSaveService.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/service/UserOptionsService.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ContentStateRenderer.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Editor.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/EditorButtonsWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/FilterViewConfirmationPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ListItemWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/Pager.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/SaveAsApprovedConfirmationPanel.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/TransHistoryItemLine.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/UnorderedListWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransFilterView.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TranslationEditorView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetGlossaryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetProjectTransUnitListsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryDetailsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationService.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTranslatorListHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetValidationRulesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/LoadOptionsHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/ReplaceTextHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RevertTransUnitUpdatesHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/RunDocValidationHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/TransUnitTransformer.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateGlossaryTermHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/UpdateTransUnitHandler.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ComparableByDate.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ContentStateGroup.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewComment.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/model/ReviewCommentId.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransHistoryItem.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransUnit.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserOptions.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/UserWorkspaceContext.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/WorkspaceRestrictions.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentAction.java
    A zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/AddReviewCommentResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitList.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitListResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTransUnitsNavigation.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/GetTranslationHistoryResult.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/rpc/TransUnitUpdated.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/validation/action/TabValidation.java
    R zanata-war/src/main/resources-dev/components.properties
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/resources/messages_ja.properties
    M zanata-war/src/main/resources/messages_uk.properties
    M zanata-war/src/main/resources/messages_zh_TW_Hant.properties
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/resources/security.drl
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_role_language.xhtml
    R zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_group.xhtml
    A zanata-war/src/main/webapp/WEB-INF/facelets/email/email_request_to_join_language.xhtml
    M zanata-war/src/main/webapp/WEB-INF/pages.xml
    M zanata-war/src/main/webapp/WEB-INF/urlrewrite.xml
    M zanata-war/src/main/webapp/account/register.xhtml
    M zanata-war/src/main/webapp/iteration/files.xhtml
    M zanata-war/src/main/webapp/language/language.xhtml
    R zanata-war/src/main/webapp/language/request_to_join.xhtml
    A zanata-war/src/main/webapp/language/request_to_join_update_role.xhtml
    M zanata-war/src/main/webapp/project/project.xhtml
    M zanata-war/src/main/webapp/resources/css/zanata.css
    M zanata-war/src/test/java/org/zanata/dao/LocaleMemberDAOITCase.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowTargetDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TextFlowTargetReviewCommentsDAOJPATest.java
    R zanata-war/src/test/java/org/zanata/dao/WrappedConnectionProvider.java
    A zanata-war/src/test/java/org/zanata/database/WrappedConnectionProviderTest.java
    A zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    R zanata-war/src/test/java/org/zanata/jdbc/ConnectionWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/ResultSetWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StatementWrapper.java
    R zanata-war/src/test/java/org/zanata/jdbc/StreamingResultSetSQLException.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/raw/FileRawRestITCase.java
    M zanata-war/src/test/java/org/zanata/search/FilterConstraintToQueryTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TextFlowSearchServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ComparingPairTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorKeyShortcutsTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/EditorOptionsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/GlossaryDetailsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/SearchResultsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransFilterPresenterTest.java
    R zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransHistoryVersionComparatorTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationEditorPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/GetTransUnitActionContextTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/ModalNavigationStateHolderTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/TransUnitSaveServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/service/UserOptionsServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/ActivateWorkspaceHandlerTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitListHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransUnitsNavigationServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTranslationHistoryHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/LoadOptionsHandlerTest.java
    M zanata-war/src/test/resources/META-INF/persistence.xml
    M zanata-war/src/test/resources/arquillian.xml
    M zanata-war/src/test/resources/arquillian/persistence.xml
    M zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml
    M zanata-war/src/test/resources/org/zanata/test/model/TextFlowTestData.dbunit.xml
    M zanata-war/src/test/resources/performance/GetTransUnitListTest.dbunit.xml

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	pom.xml
	zanata-model/pom.xml
	zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
	zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml
	zanata-war/src/main/webapp/WEB-INF/pages.xml
	zanata-war/src/test/resources/org/zanata/test/model/ClearAllTables.dbunit.xml


  Commit: 4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
      https://github.com/zanata/zanata-server/commit/4a8aaf1ef46e94c306b4a3fb46fb3a4e1171ea18
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

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

  Log Message:
  -----------
  Fix compilation problem


  Commit: 3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
      https://github.com/zanata/zanata-server/commit/3b436b36094f17e8fc676fa9bdacf4ca1e18b0ab
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy


  Commit: 9759967e1d30daa2309b4f587a2c7266113f4333
      https://github.com/zanata/zanata-server/commit/9759967e1d30daa2309b4f587a2c7266113f4333
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java

  Log Message:
  -----------
  Add Search Indexing to Translation Unit variants.

Also fix the removal of TM contents. Have manually remove each TU from the trans memory because the hibernate relationship is being managed on the TU side. This causes orphan removal to effectively not work.


  Commit: 48b730487e662a88101709118c57b23e07d38913
      https://github.com/zanata/zanata-server/commit/48b730487e662a88101709118c57b23e07d38913
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-24 (Wed, 24 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    A zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
    R zanata-war/src/main/java/org/zanata/rest/service/ExportTUStrategy.java
    A zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    A zanata-war/src/test/java/org/zanata/rest/service/ExportSourceContentsTest.java
    A zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

  Log Message:
  -----------
  Split ExportTUStrategy into three classes; implement ExportTransUnitStrategy


  Commit: 213601bb37a96275a92bee4de8e55436d17b9fb9
      https://github.com/zanata/zanata-server/commit/213601bb37a96275a92bee4de8e55436d17b9fb9
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/dao/AbstractDAOImpl.java
    M zanata-war/src/main/java/org/zanata/dao/GenericDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingDAO.java
    A zanata-war/src/main/java/org/zanata/dao/StreamingEntityIterator.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    A zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TextFlowStreamDAOTest.java
    A zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/ExportTransUnitTest.java

  Log Message:
  -----------
  Add TransMemoryStreamingDAO


  Commit: d558c4b2b0bc904ea9921fea99834564690a0a33
      https://github.com/zanata/zanata-server/commit/d558c4b2b0bc904ea9921fea99834564690a0a33
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/TextContainerAnalyzerDiscriminator.java
    A zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTransUnitVariant.java
    M zanata-model/src/main/java/org/zanata/model/tm/TMTranslationUnit.java
    M zanata-model/src/main/java/org/zanata/model/tm/TransMemory.java
    M zanata-war/src/main/java/org/zanata/action/TranslationMemoryAction.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java

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

Conflicts:
	zanata-war/src/main/java/org/zanata/rest/service/AbstractExportTUStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/ExportSourceContentsStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/ExportTransUnitStrategy.java
	zanata-war/src/main/java/org/zanata/rest/service/TMXStreamingOutput.java
	zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
	zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java


  Commit: f67864459769a602f9cbc62d4a09cc947927f263
      https://github.com/zanata/zanata-server/commit/f67864459769a602f9cbc62d4a09cc947927f263
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-25 (Thu, 25 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/TextFlowStreamDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TransMemoryStreamingDAO.java
    M zanata-war/src/main/java/org/zanata/rest/service/TranslationMemoryResourceService.java
    M zanata-war/src/test/java/org/zanata/dao/TransMemoryStreamingDAOTest.java

  Log Message:
  -----------
  Excise lombok.val


  Commit: 89b50be3c49f0a9166711aa8e462f15b6557e146
      https://github.com/zanata/zanata-server/commit/89b50be3c49f0a9166711aa8e462f15b6557e146
  Author: Carlos Munoz <chavo16 at hotmail.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java

  Log Message:
  -----------
  Add TextFlowTarget indexer that eagerly fetches all indexable properties.


  Commit: 2975176136adeb25f63535b9d5f1eafba510fb69
      https://github.com/zanata/zanata-server/commit/2975176136adeb25f63535b9d5f1eafba510fb69
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java
    A zanata-war/src/main/java/org/zanata/search/AbstractIndexingStrategy.java
    M zanata-war/src/main/java/org/zanata/search/ClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
    R zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexer.java
    A zanata-war/src/main/java/org/zanata/search/HTextFlowTargetIndexingStrategy.java
    A zanata-war/src/main/java/org/zanata/search/SimpleClassIndexingStrategy.java

  Log Message:
  -----------
  Refactor Indexing Strategies for better performance.

Create an indexing strategy that performs less database queries and is able to index TextFlow targets faster.


  Commit: 94762fbc0c4f0f4ea06d8b59f3b52ef836950189
      https://github.com/zanata/zanata-server/commit/94762fbc0c4f0f4ea06d8b59f3b52ef836950189
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/TranslationMemoryQueryService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/persistence.xml

  Log Message:
  -----------
  Get rid of Text Flow indexing altogether.

Now using text flow target indexing for TM searches.
Also, a bit of formatting applied to persistence.xml


  Commit: c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
      https://github.com/zanata/zanata-server/commit/c0abe09837ed1bea15bc2cd9030b7e0aebbc2cb7
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java

  Log Message:
  -----------
  Change TM search query to return items in both HTextFlowTarget and TMTranslationUnit.


  Commit: e9b52d6e7471a6eef0ba724a6452746fe98a704d
      https://github.com/zanata/zanata-server/commit/e9b52d6e7471a6eef0ba724a6452746fe98a704d
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/action/ReindexAsyncBean.java

  Log Message:
  -----------
  Add TMTranslationUnits to the indexable entities in the Search admin page.


  Commit: d7172fde3cadab2eccf7deefcbe165ba95abf35c
      https://github.com/zanata/zanata-server/commit/d7172fde3cadab2eccf7deefcbe165ba95abf35c
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/hibernate/search/StringListBridge.java
    M zanata-model/src/main/java/org/zanata/hibernate/search/TransUnitVariantClassBridge.java
    M zanata-model/src/main/java/org/zanata/model/HTextContainer.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTarget.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationMemoryQueryServiceImpl.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TransMemoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/rpc/DummyGetTranslationMemoryCommand.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/TransMemoryMergeHandlerTest.java

  Log Message:
  -----------
  Refactor content state enum into Match type.

This is because the matches can now be classified by their source (internal, imported TM) as well.
Also refactor a few bits of code that are no longer necessary.


  Commit: 4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
      https://github.com/zanata/zanata-server/commit/4eea3ef2029c6ec59c1db8888b7025d8a9bd0baf
  Author: Carlos A. Munoz <camunoz at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/tm/TMXMetadataHelper.java
    M zanata-war/src/main/java/org/zanata/tmx/TransMemoryAdapter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/UiMessages.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TransMemoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/shared/model/TransMemoryResultItem.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.css

  Log Message:
  -----------
  Add UI elements for TM results returned from imported TMs.

Replace the "Info" button with a comma-separated list of TM names.
Do not show a content state color for the target text, since TM translation units don't have such a property.


  Commit: 49a5fcf9d2c4699f96db9866ae7f928b26f44247
      https://github.com/zanata/zanata-server/commit/49a5fcf9d2c4699f96db9866ae7f928b26f44247
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    R zanata-war/src/main/java/org/zanata/xml/tmx14.dtd
    A zanata-war/src/main/resources/org/zanata/xml/tmx14.dtd
    M zanata-war/src/test/java/org/zanata/rest/service/TMXStreamingOutputTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetTransMemoryHandlerTest.java
    M zanata-war/src/test/resources/tmx/default-valid-tm.tmx
    M zanata-war/src/test/resources/tmx/valid-tm-with-tuids.tmx

  Log Message:
  -----------
  Fix broken tests


  Commit: fb364db28717e8550dff1fda6f5e1c1d1bad7271
      https://github.com/zanata/zanata-server/commit/fb364db28717e8550dff1fda6f5e1c1d1bad7271
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M functional-test/src/main/java/org/zanata/page/AbstractPage.java
    A functional-test/src/main/java/org/zanata/page/BasePage.java
    R functional-test/src/main/java/org/zanata/page/HomePage.java
    R functional-test/src/main/java/org/zanata/page/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/account/RegisterPage.java
    A functional-test/src/main/java/org/zanata/page/account/ResetPasswordPage.java
    A functional-test/src/main/java/org/zanata/page/account/SignInPage.java
    M functional-test/src/main/java/org/zanata/page/administration/AddLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/AdministrationPage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeCodePage.java
    A functional-test/src/main/java/org/zanata/page/administration/EditHomeContentPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguagePage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageLanguageTeamMemberPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserAccountPage.java
    M functional-test/src/main/java/org/zanata/page/administration/ManageUserPage.java
    M functional-test/src/main/java/org/zanata/page/groups/CreateVersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupPage.java
    M functional-test/src/main/java/org/zanata/page/groups/VersionGroupsPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/CreateVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectVersionPage.java
    M functional-test/src/main/java/org/zanata/page/projects/ProjectsPage.java
    A functional-test/src/main/java/org/zanata/page/utility/HomePage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/DocumentsViewPage.java
    M functional-test/src/main/java/org/zanata/page/webtrans/EditorPage.java
    M functional-test/src/main/java/org/zanata/workflow/AbstractWebWorkFlow.java
    M functional-test/src/main/java/org/zanata/workflow/LoginWorkFlow.java
    M functional-test/src/test/java/org/zanata/feature/account/RegisterFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/AdministrationTestSuite.java
    A functional-test/src/test/java/org/zanata/feature/administration/EditHomePageTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersFullTest.java
    M functional-test/src/test/java/org/zanata/feature/administration/ManageUsersTest.java
    M functional-test/src/test/java/org/zanata/feature/security/LoginTest.java
    A functional-test/src/test/java/org/zanata/feature/security/SecurityFullTest.java
    M functional-test/src/test/java/org/zanata/feature/security/SecurityTestSuite.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/AddLanguageTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/DocumentListInWebTransTest.java
    M functional-test/src/test/java/org/zanata/feature/startNewProject/TranslatorJoinsLanguageTeamTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupBasicTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupFullTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupIDValidationTest.java
    M functional-test/src/test/java/org/zanata/feature/versionGroup/VersionGroupTestSuite.java
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    M zanata-model/src/main/java/org/zanata/model/HTextFlowTargetReviewComment.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    A zanata-war/src/main/java/org/zanata/file/BlobPersistService.java
    M zanata-war/src/main/java/org/zanata/file/DocumentUploadUtil.java
    A zanata-war/src/main/java/org/zanata/file/FilePersistService.java
    A zanata-war/src/main/java/org/zanata/file/FileSystemPersistService.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    A zanata-war/src/main/java/org/zanata/file/RawDocumentContentAccessException.java
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.java
    A zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
    A zanata-war/src/main/java/org/zanata/liquibase/custom/MigrateRawDocumentsToFileSystem.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationServiceImpl.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEvent.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/events/CommentBeforeSaveEventHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/gin/WebTransClientModule.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TargetContentsPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TransUnitsTablePresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenter.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/resources/WebTransMessages.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/ui/ReviewCommentInputWidget.ui.xml
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/TranslationHistoryView.ui.xml
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentDisplay.java
    A zanata-war/src/main/java/org/zanata/webtrans/client/view/ForceReviewCommentWidget.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsDisplay.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandler.java
    M zanata-war/src/main/java/org/zanata/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/META-INF/components.xml
    M zanata-war/src/main/webapp-jboss/WEB-INF/classes/components.properties
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml
    M zanata-war/src/main/webapp/edit_home_content.xhtml
    M zanata-war/src/main/webapp/edit_home_content_code.xhtml
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/service/impl/TranslationServiceImplTest.java
    A zanata-war/src/test/java/org/zanata/webtrans/client/presenter/ForceReviewCommentPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TargetContentsPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/client/presenter/TranslationHistoryPresenterTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/AddReviewCommentHandlerTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge remote branch 'origin/master' into tm-import

Conflicts:
	zanata-war/src/main/java/org/zanata/file/UploadPartPersistService.java
	zanata-war/src/main/java/org/zanata/search/GenericClassIndexer.java
	zanata-war/src/main/java/org/zanata/xml/TmxDtdResolver.java
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml


Compare: https://github.com/zanata/zanata-server/compare/ea762c786067...fb364db28717


More information about the zanata-commits mailing list