[zanata/zanata-server] bae497: add equals and hashcode to GlobalDocumentId

Wed Jul 24 03:25:37 UTC 2013

  Branch: refs/heads/isolate-file-storage
  Home:   https://github.com/zanata/zanata-server
  Commit: bae49776b0661310807eb92f1367b366dc234173
      https://github.com/zanata/zanata-server/commit/bae49776b0661310807eb92f1367b366dc234173
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  add equals and hashcode to GlobalDocumentId


  Commit: 9fec98006ad6a90f926ea0203f01e8d77c37a992
      https://github.com/zanata/zanata-server/commit/9fec98006ad6a90f926ea0203f01e8d77c37a992
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store web asset url in jndi


  Commit: c9b1878fd488db600c79873a1b2a281686f2adb6
      https://github.com/zanata/zanata-server/commit/c9b1878fd488db600c79873a1b2a281686f2adb6
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java

  Log Message:
  -----------
  wording change


  Commit: c1fb7262373812c22599a601e36828b40d936a3c
      https://github.com/zanata/zanata-server/commit/c1fb7262373812c22599a601e36828b40d936a3c
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/resources/org/zanata/webtrans/public/Application.xhtml
    M zanata-war/src/main/webapp/WEB-INF/layout/template.xhtml

  Log Message:
  -----------
  store only url base in jndi and externalize web asset version into pom.xml


  Commit: e96107bcca34ff09f8dd1107e9d95ca9c601ddee
      https://github.com/zanata/zanata-server/commit/e96107bcca34ff09f8dd1107e9d95ca9c601ddee
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M functional-test/src/test/resources/conf/standalone.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    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

  Log Message:
  -----------
  move zanata assets version to componenet.properties


  Commit: 9e18ad6c9cee8710f6e20c66adb34d6e7084302d
      https://github.com/zanata/zanata-server/commit/9e18ad6c9cee8710f6e20c66adb34d6e7084302d
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-22 (Mon, 22 Jul 2013)

  Changed paths:
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  fix IT test


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

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Add workaround for empty ResultSet


  Commit: 902e80b5e839d7b81c6fb1600bc821acb53f29ed
      https://github.com/zanata/zanata-server/commit/902e80b5e839d7b81c6fb1600bc821acb53f29ed
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    M zanata-war/src/test/java/org/zanata/file/GlobalDocumentIdTest.java

  Log Message:
  -----------
  Merge pull request #66 from zanata/globalid-equals

Add equals and hashcode to GlobalDocumentId


  Commit: 17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
      https://github.com/zanata/zanata-server/commit/17b49d2c4a0630a1bfea2bdb8c3545b5cc0cc9de
  Author: Patrick Huang <pahuang at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java

  Log Message:
  -----------
  Merge pull request #70 from zanata/rhbz980271

Add workaround for empty ResultSet


  Commit: 6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
      https://github.com/zanata/zanata-server/commit/6cd9947b11cad6cdd5cc2253f365b4924ab82c3d
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    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/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge pull request #67 from zanata/web-assets-url

store web asset url in jndi


  Commit: dbcf19a12fcbb03e1781d660d04c6c84b65becbd
      https://github.com/zanata/zanata-server/commit/dbcf19a12fcbb03e1781d660d04c6c84b65becbd
  Author: David Mason <dr.d.mason at gmail.com>
  Date:   2013-07-23 (Tue, 23 Jul 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/ApplicationConfiguration.java
    M zanata-war/src/main/java/org/zanata/config/JndiBackedConfig.java
    M zanata-war/src/main/java/org/zanata/dao/ScrollableResultsIterator.java
    M zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
    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/test/java/org/zanata/file/GlobalDocumentIdTest.java
    M zanata-war/src/test/resources/arquillian/components.properties

  Log Message:
  -----------
  Merge branch 'master' into isolate-file-storage

Conflicts:
	zanata-war/src/main/java/org/zanata/file/GlobalDocumentId.java
  lombok annotations added in remote, toString added in local.
  kept changes from remote + toString method.


Compare: https://github.com/zanata/zanata-server/compare/bea5282b4b22...dbcf19a12fcb