[zanata/zanata-server] e1a11a: Finish TM persistence from an imported file.

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: e1a11a3eb07e227cbcb8f3e5cc0db57393767fad
      https://github.com/zanata/zanata-server/commit/e1a11a3eb07e227cbcb8f3e5cc0db57393767fad
  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: acad1696f2727f71a61262c3411fa8dd4fcb61d1
      https://github.com/zanata/zanata-server/commit/acad1696f2727f71a61262c3411fa8dd4fcb61d1
  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


Compare: https://github.com/zanata/zanata-server/compare/3819347d0112...acad1696f272