[zanata/zanata] 964403: Use ClamAV to scan uploaded files

[GitHub]

  Branch: refs/heads/integration/master
  Home:   https://github.com/zanata/zanata
  Commit: 964403ea3d0751e746a6f6f02499e0a41ebaf044
      https://github.com/zanata/zanata/commit/964403ea3d0751e746a6f6f02499e0a41ebaf044
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/ProjectIterationFilesAction.java
    A zanata-war/src/main/java/org/zanata/exception/VirusDetectedException.java
    M zanata-war/src/main/java/org/zanata/rest/service/FileService.java

  Log Message:
  -----------
  Use ClamAV to scan uploaded files


  Commit: af4405848067b9b78abe7692f5db25d9bafc69b2
      https://github.com/zanata/zanata/commit/af4405848067b9b78abe7692f5db25d9bafc69b2
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M pom.xml
    M zanata-model/pom.xml
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/adapter/FileFormatAdapter.java
    A zanata-war/src/main/java/org/zanata/adapter/IDMLAdapter.java
    M zanata-war/src/main/java/org/zanata/adapter/OpenOfficeAdapter.java
    M zanata-war/src/main/java/org/zanata/service/TranslationFileService.java
    M zanata-war/src/main/java/org/zanata/service/impl/TranslationFileServiceImpl.java

  Log Message:
  -----------
  rhbz901401 Add preliminary support for InDesign IDML documents

Limitation: mysqld's default max_allowed_packet is 1MB, which means
BLOBs must be less than 1MB.  (IDML files tend to be large.) We either
need to split files into multiple BLOBS, or to avoid bloating the
database, perhaps we should store in the file system.


  Commit: 6f71886d6586289a1a0b82ecd4e397332c21e13e
      https://github.com/zanata/zanata/commit/6f71886d6586289a1a0b82ecd4e397332c21e13e
  Author: Sean Flanigan <sflaniga at redhat.com>
  Date:   2013-03-04 (Mon, 04 Mar 2013)

  Changed paths:
    M functional-test/pom.xml
    M pom.xml
    M zanata-model/pom.xml
    M zanata-model/src/main/java/org/zanata/model/HAccountActivationKey.java
    M zanata-war/pom.xml
    M zanata-war/src/main/java/org/zanata/action/InactiveAccountAction.java
    M zanata-war/src/main/java/org/zanata/action/ViewAllStatusAction.java
    M zanata-war/src/main/java/org/zanata/dao/DocumentDAO.java
    M zanata-war/src/main/java/org/zanata/dao/LocaleDAO.java
    M zanata-war/src/main/java/org/zanata/dao/TextFlowTargetDAO.java
    M zanata-war/src/main/java/org/zanata/service/LocaleService.java
    M zanata-war/src/main/java/org/zanata/service/impl/LocaleServiceImpl.java
    M zanata-war/src/main/java/org/zanata/service/impl/StatisticsServiceImpl.java
    A zanata-war/src/main/java/org/zanata/util/DateUtil.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/ui/ValidationMessagePanelView.java
    M zanata-war/src/main/java/org/zanata/webtrans/client/view/TargetContentsView.ui.xml
    M zanata-war/src/main/resources/messages.properties
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/activation.xhtml
    M zanata-war/src/main/webapp/WEB-INF/facelets/email/email_activation.xhtml
    M zanata-war/src/main/webapp/iteration/view.xhtml
    M zanata-war/src/test/java/org/zanata/service/impl/StatisticsServiceImplTest.java

  Log Message:
  -----------
  Merge branch 'integration/master' of github.com:zanata/zanata into integration/master

Conflicts:
	pom.xml


Compare: https://github.com/zanata/zanata/compare/e02be0d6907e...6f71886d6586