Return-Path: X-Original-To: archive-asf-public-internal@cust-asf2.ponee.io Delivered-To: archive-asf-public-internal@cust-asf2.ponee.io Received: from cust-asf.ponee.io (cust-asf.ponee.io [163.172.22.183]) by cust-asf2.ponee.io (Postfix) with ESMTP id 368AB200C21 for ; Mon, 20 Feb 2017 09:57:22 +0100 (CET) Received: by cust-asf.ponee.io (Postfix) id 35184160B73; Mon, 20 Feb 2017 08:57:22 +0000 (UTC) Delivered-To: archive-asf-public@cust-asf.ponee.io Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by cust-asf.ponee.io (Postfix) with SMTP id 7C12F160B62 for ; Mon, 20 Feb 2017 09:57:21 +0100 (CET) Received: (qmail 61142 invoked by uid 500); 20 Feb 2017 08:57:20 -0000 Mailing-List: contact commits-help@velocity.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@velocity.apache.org Delivered-To: mailing list commits@velocity.apache.org Received: (qmail 61133 invoked by uid 99); 20 Feb 2017 08:57:20 -0000 Received: from Unknown (HELO svn01-us-west.apache.org) (209.188.14.144) by apache.org (qpsmtpd/0.29) with ESMTP; Mon, 20 Feb 2017 08:57:20 +0000 Received: from svn01-us-west.apache.org (localhost [127.0.0.1]) by svn01-us-west.apache.org (ASF Mail Server at svn01-us-west.apache.org) with ESMTP id E02EA3A00A3 for ; Mon, 20 Feb 2017 08:57:19 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1783729 - in /velocity/engine/trunk/velocity-engine-core/src: main/java/org/apache/velocity/util/ExtProperties.java main/java/org/apache/velocity/util/StringUtils.java test/java/org/apache/velocity/test/BaseTestCase.java Date: Mon, 20 Feb 2017 08:57:19 -0000 To: commits@velocity.apache.org From: cbrisson@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20170220085719.E02EA3A00A3@svn01-us-west.apache.org> archived-at: Mon, 20 Feb 2017 08:57:22 -0000 Author: cbrisson Date: Mon Feb 20 08:57:19 2017 New Revision: 1783729 URL: http://svn.apache.org/viewvc?rev=1783729&view=rev Log: [engine] fix compilation and tests after last commits Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java?rev=1783729&r1=1783728&r2=1783729&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/ExtProperties.java Mon Feb 20 08:57:19 2017 @@ -26,6 +26,7 @@ import java.io.OutputStream; import java.io.PrintWriter; import java.io.Reader; import java.io.UnsupportedEncodingException; +import java.nio.charset.StandardCharsets; import java.security.AccessController; import java.util.ArrayList; import java.util.Enumeration; Modified: velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java?rev=1783729&r1=1783728&r2=1783729&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/main/java/org/apache/velocity/util/StringUtils.java Mon Feb 20 08:57:19 2017 @@ -23,8 +23,6 @@ import org.apache.velocity.runtime.direc import org.apache.velocity.runtime.parser.node.Node; import org.apache.velocity.util.introspection.Info; -import org.apache.commons.lang3.StringUtils; - /** * This class provides some methods for dynamically * invoking methods in objects, and some string @@ -77,7 +75,7 @@ public class StringUtils public static String formatFileString(String template, int linenum, int colnum) { StringBuilder buffer = new StringBuilder(); - if (StringUtils.isEmpty(template)) + if (org.apache.commons.lang3.StringUtils.isEmpty(template)) { template = ""; } Modified: velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java URL: http://svn.apache.org/viewvc/velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java?rev=1783729&r1=1783728&r2=1783729&view=diff ============================================================================== --- velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java (original) +++ velocity/engine/trunk/velocity-engine-core/src/test/java/org/apache/velocity/test/BaseTestCase.java Mon Feb 20 08:57:19 2017 @@ -34,6 +34,7 @@ import java.io.IOException; import java.io.StringWriter; import java.nio.charset.StandardCharsets; import java.nio.file.Files; +import java.nio.file.Paths; import java.util.Locale; /** @@ -467,11 +468,11 @@ public abstract class BaseTestCase exten protected String getFileContents(String file) { - String contents; + String contents = null; try { - contents = new String(Files.readAllBytes(path), StandardCharsets.UTF_8); + contents = new String(Files.readAllBytes(Paths.get(file)), StandardCharsets.UTF_8); } catch (Exception e) {