Return-Path: X-Original-To: apmail-myfaces-commits-archive@www.apache.org Delivered-To: apmail-myfaces-commits-archive@www.apache.org Received: from mail.apache.org (hermes.apache.org [140.211.11.3]) by minotaur.apache.org (Postfix) with SMTP id 814A810964 for ; Fri, 23 Aug 2013 08:25:24 +0000 (UTC) Received: (qmail 69690 invoked by uid 500); 23 Aug 2013 08:25:23 -0000 Delivered-To: apmail-myfaces-commits-archive@myfaces.apache.org Received: (qmail 69640 invoked by uid 500); 23 Aug 2013 08:25:22 -0000 Mailing-List: contact commits-help@myfaces.apache.org; run by ezmlm Precedence: bulk List-Help: List-Unsubscribe: List-Post: List-Id: Reply-To: "MyFaces Development" Delivered-To: mailing list commits@myfaces.apache.org Received: (qmail 69625 invoked by uid 99); 23 Aug 2013 08:25:20 -0000 Received: from nike.apache.org (HELO nike.apache.org) (192.87.106.230) by apache.org (qpsmtpd/0.29) with ESMTP; Fri, 23 Aug 2013 08:25:20 +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; Fri, 23 Aug 2013 08:25:18 +0000 Received: from eris.apache.org (localhost [127.0.0.1]) by eris.apache.org (Postfix) with ESMTP id 0C15E23888CD; Fri, 23 Aug 2013 08:24:57 +0000 (UTC) Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit Subject: svn commit: r1516740 - in /myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal: config/TobagoConfigImpl.java context/ThemeBuilder.java Date: Fri, 23 Aug 2013 08:24:56 -0000 To: commits@myfaces.apache.org From: lofwyr@apache.org X-Mailer: svnmailer-1.0.9 Message-Id: <20130823082457.0C15E23888CD@eris.apache.org> X-Virus-Checked: Checked by ClamAV on apache.org Author: lofwyr Date: Fri Aug 23 08:24:56 2013 New Revision: 1516740 URL: http://svn.apache.org/r1516740 Log: better log messages Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1516740&r1=1516739&r2=1516740&view=diff ============================================================================== --- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original) +++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Fri Aug 23 08:24:56 2013 @@ -93,8 +93,9 @@ public class TobagoConfigImpl extends To } if (defaultTheme == null) { String error = "Did not found any theme! " - + "Please ensure you have a tobago-theme.xml file in your " - + "theme jar. Please add a theme jar to your WEB-INF/lib"; + + "Please ensure you have a tobago-config.xml with a theme-definition " + + "or a tobago-theme.xml file (deprecated) in your " + + "theme JAR. Please add a theme JAR to your WEB-INF/lib"; LOG.error(error); throw new RuntimeException(error); } else { @@ -119,7 +120,8 @@ public class TobagoConfigImpl extends To private void checkThemeIsAvailable(String name, Theme theme) { if (theme == null) { String error = "Theme not found! name: '" + name + "'. " - + "Please ensure you have a tobago-theme.xml file in your " + + "Please ensure you have a tobago-config.xml with a theme-definition " + + "or a tobago-theme.xml file (deprecated) in your " + "theme jar. Found the following themes: " + availableThemes.keySet(); LOG.error(error); throw new RuntimeException(error); Modified: myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java URL: http://svn.apache.org/viewvc/myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java?rev=1516740&r1=1516739&r2=1516740&view=diff ============================================================================== --- myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java (original) +++ myfaces/tobago/branches/tobago-1.5.x/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/context/ThemeBuilder.java Fri Aug 23 08:24:56 2013 @@ -45,7 +45,7 @@ class ThemeBuilder { public void resolveThemes() { Map map = new HashMap(); for (ThemeImpl theme : availableThemes) { - LOG.debug("theme from tobago-theme.xml files: {} ", theme.getName()); + LOG.debug("theme from XML files: {} ", theme.getName()); map.put(theme.getName(), theme); } for (ThemeImpl theme : availableThemes) {