Return-Path: X-Original-To: apmail-commons-commits-archive@minotaur.apache.org Delivered-To: apmail-commons-commits-archive@minotaur.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id DFBED10456 for ; Wed, 2 Oct 2013 06:50:23 +0000 (UTC) Received: (qmail 34987 invoked by uid 500); 2 Oct 2013 06:48:22 -0000 Delivered-To: apmail-commons-commits-archive@commons.apache.org Received: (qmail 34744 invoked by uid 500); 2 Oct 2013 06:47:41 -0000 Mailing-List: contact commits-help@commons.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: dev@commons.apache.org Delivered-To: mailing list commits@commons.apache.org Received: (qmail 34693 invoked by uid 99); 2 Oct 2013 06:47:29 -0000 Received: from athena.apache.org (HELO athena.apache.org) (140.211.11.136) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Oct 2013 06:47:29 +0000 X-ASF-Spam-Status: No, hits=-2000.0 required=5.0 tests=ALL_TRUSTED X-Spam-Check-By: apache.org Received: from [140.211.11.4] (HELO eris.apache.org) (140.211.11.4) by apache.org (qpsmtpd/0.29) with ESMTP; Wed, 02 Oct 2013 06:47:28 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 2204623888E4; Wed, 2 Oct 2013 06:47:08 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1528316 - /commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java Date: Wed, 02 Oct 2013 06:47:08 -0000 To: commits@commons.apache.org From: rmannibucau@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20131002064708.2204623888E4@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: rmannibucau Date: Wed Oct 2 06:47:07 2013 New Revision: 1528316 URL: http://svn.apache.org/r1528316 Log: allowing to customize gui resources Modified: commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java Modified: commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java URL: http://svn.apache.org/viewvc/commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java?rev=1528316&r1=1528315&r2=1528316&view=diff ============================================================================== --- commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java (original) +++ commons/sandbox/monitoring/trunk/reporting/src/main/java/org/apache/commons/monitoring/reporting/web/template/Templates.java Wed Oct 2 06:47:07 2013 @@ -16,6 +16,7 @@ */ package org.apache.commons.monitoring.reporting.web.template; +import org.apache.commons.monitoring.configuration.Configuration; import org.apache.commons.monitoring.reporting.web.plugin.PluginRepository; import org.apache.velocity.Template; import org.apache.velocity.VelocityContext; @@ -41,7 +42,7 @@ public final class Templates { velocityConfiguration.setProperty(RuntimeConstants.RUNTIME_REFERENCES_STRICT_ESCAPE, Boolean.TRUE.toString()); velocityConfiguration.setProperty(RuntimeConstants.RESOURCE_LOADER, "monitoring"); velocityConfiguration.setProperty(RuntimeConstants.VM_LIBRARY, "/templates/macro.vm"); - velocityConfiguration.setProperty("monitoring." + RuntimeConstants.RESOURCE_LOADER + ".class", ClasspathResourceLoader.class.getName()); + velocityConfiguration.setProperty("monitoring." + RuntimeConstants.RESOURCE_LOADER + ".class", Configuration.getProperty(Configuration.COMMONS_MONITORING_PREFIX + "reporting.resource-loader", ClasspathResourceLoader.class.getName())); Velocity.init(velocityConfiguration); if (filterMapping.isEmpty()) {