Merged 5.2.N (5.2.2) to HEAD (5.2)

137104 skopf: Merged REPO-2054 (5.2.1) to 5.2.N (5.2.1)
      136918 anechifor: pdf-renderer licence


git-svn-id: https://svn.alfresco.com/repos/alfresco-enterprise/alfresco/HEAD/root@137619 c4b6b30b-aa2e-2d43-bbcb-ca4b014f7261

src/main/resources/licenses/3rd-party/alfresco-pdf-renderer.txt

@@ -0,0 +1,27 @@
+// Copyright 2014 PDFium Authors. All rights reserved.
+//
+// Redistribution and use in source and binary forms, with or without
+// modification, are permitted provided that the following conditions are
+// met:
+//
+//    * Redistributions of source code must retain the above copyright
+// notice, this list of conditions and the following disclaimer.
+//    * Redistributions in binary form must reproduce the above
+// copyright notice, this list of conditions and the following disclaimer
+// in the documentation and/or other materials provided with the
+// distribution.
+//    * Neither the name of Google Inc. nor the names of its
+// contributors may be used to endorse or promote products derived from
+// this software without specific prior written permission.
+//
+// THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS
+// "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT
+// LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR
+// A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT
+// OWNER OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+// SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT
+// LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; LOSS OF USE,
+// DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON ANY
+// THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT
+// (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE
+// OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.

src/main/resources/licenses/notice.txt

@@ -297,6 +297,7 @@ xercesImpl  http://xerces.apache.org/xerces2-j
 
 === BSD-like License ===
 FreeMarker  http://freemarker.sourceforge.net/ 
+Pdfium https://pdfium.googlesource.com/pdfium/
 
 === Eclipse Public License 1.0 ===
 TrueLicense     http://truelicense.java.net/
@@ -312,3 +313,6 @@ Jut.jar http://www.openoffice.org/licenses/lgpl_license.html
 
 === Mozilla Public License 2.0 ===
 rhino-js    http://www.mozilla.org/rhino/
+
+
+