[zanata/zanata-server] 4b2477: Move TMX DTD

[GitHub]

  Branch: refs/heads/tm-import
  Home:   https://github.com/zanata/zanata-server
  Commit: 4b2477e793797b3cc7676b88b6ae5e486f26df57
      https://github.com/zanata/zanata-server/commit/4b2477e793797b3cc7676b88b6ae5e486f26df57
  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: a522cc858b60b56d1ad9be3845ebb39d763f9366
      https://github.com/zanata/zanata-server/commit/a522cc858b60b56d1ad9be3845ebb39d763f9366
  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: 4ba9c9e10ac35b6833c40f05c48d73449611cbcf
      https://github.com/zanata/zanata-server/commit/4ba9c9e10ac35b6833c40f05c48d73449611cbcf
  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: ea8891a181e56378bb087ee3f0345ce69df717eb
      https://github.com/zanata/zanata-server/commit/ea8891a181e56378bb087ee3f0345ce69df717eb
  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: 03d24e3f0f755e605e8290f668892d9a3d7cbd53
      https://github.com/zanata/zanata-server/commit/03d24e3f0f755e605e8290f668892d9a3d7cbd53
  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


Compare: https://github.com/zanata/zanata-server/compare/db97c39ad5f2...03d24e3f0f75