[zanata/zanata-server] 58e9fe: Merge branch 'activityLog' into dashboard

[GitHub]

  Branch: refs/heads/dashboard
  Home:   https://github.com/zanata/zanata-server
  Commit: 58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
      https://github.com/zanata/zanata-server/commit/58e9fedbc0c9ba01990cb3fd2fe9bb941b4e5092
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Log Message:
  -----------
  Merge branch 'activityLog' into dashboard


  Commit: 28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
      https://github.com/zanata/zanata-server/commit/28b17efa48e3f4f93a6e19f8c8bb280e4ff76b5a
  Author: Alex Eng <aeng at redhat.com>
  Date:   2013-07-26 (Fri, 26 Jul 2013)

  Changed paths:
    M zanata-model/src/main/java/org/zanata/model/HRawDocument.java
    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/file/BlobPersistService.java
    M 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
    M zanata-war/src/main/java/org/zanata/file/SourceDocumentUpload.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/webtrans/server/rpc/GetDocumentListHandler.java
    M zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml
    M zanata-war/src/test/java/org/zanata/rest/service/FileServiceTest.java
    M zanata-war/src/test/java/org/zanata/webtrans/server/rpc/GetDocumentListHandlerTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' into dashboard

Conflicts:
	zanata-war/src/main/resources/db/changelogs/db.changelog-3.1.xml


Compare: https://github.com/zanata/zanata-server/compare/58e9fedbc0c9^...28b17efa48e3