You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@myfaces.apache.org by lo...@apache.org on 2013/08/23 10:24:56 UTC
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
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<String, ThemeImpl> map = new HashMap<String, ThemeImpl>();
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) {