svn commit: r1126603 - in /myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config: TobagoConfigImpl.java TobagoConfigSorter.java

[lo...@apache.org]

Author: lofwyr
Date: Mon May 23 17:19:27 2011
New Revision: 1126603

URL: http://svn.apache.org/viewvc?rev=1126603&view=rev
Log:
TOBAGO-990 Refactor Tobago configuration
 - logging

Modified:
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
    myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java?rev=1126603&r1=1126602&r2=1126603&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigImpl.java Mon May 23 17:19:27 2011
@@ -32,8 +32,10 @@ import javax.servlet.ServletContext;
 import java.net.URL;
 import java.util.ArrayList;
 import java.util.Collections;
+import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
+import java.util.Set;
 
 public class TobagoConfigImpl extends TobagoConfig {
 
@@ -243,16 +245,31 @@ public class TobagoConfigImpl extends To
 
   @Override
   public String toString() {
-    return "TobagoConfigImpl{"
-        + "\nsupportedThemes=" + supportedThemes
-        + ", \ndefaultTheme=" + defaultTheme
-        + ", \nresourceDirs=" + resourceDirs
-        + ", \navailableThemes=" + availableThemes
-        + ", \nrenderersConfig=" + renderersConfig
-        + ", \nprojectStage=" + projectStage
-        + ", \ncreateSessionSecret=" + createSessionSecret
-        + ", \ncheckSessionSecret=" + checkSessionSecret
-        + ", \nurl=" + url
-        + '}';
+    final StringBuilder builder = new StringBuilder();
+    builder.append("TobagoConfigImpl{");
+    builder.append("\nsupportedThemes=[");
+    for (Theme supportedTheme : supportedThemes) {
+      builder.append(supportedTheme.getName());
+      builder.append(", ");
+    }
+    builder.append("], \ndefaultTheme=");
+    builder.append(defaultTheme.getName());
+    builder.append(", \nresourceDirs=");
+    builder.append(resourceDirs);
+    builder.append(", \navailableThemes=");
+    builder.append(availableThemes.keySet());
+    builder.append(", \nprojectStage=");
+    builder.append(projectStage);
+    builder.append(", \ncreateSessionSecret=");
+    builder.append(createSessionSecret);
+    builder.append(", \ncheckSessionSecret=");
+    builder.append(checkSessionSecret);
+    builder.append(", \nurl=");
+    builder.append(url);
+    builder.append(", \nthemes=");
+    Set<Theme> all = new HashSet<Theme>(availableThemes.values());
+    builder.append(all);
+    builder.append('}');
+    return builder.toString();
   }
 }

Modified: myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java
URL: http://svn.apache.org/viewvc/myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java?rev=1126603&r1=1126602&r2=1126603&view=diff
==============================================================================
--- myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java (original)
+++ myfaces/tobago/trunk/tobago-core/src/main/java/org/apache/myfaces/tobago/internal/config/TobagoConfigSorter.java Mon May 23 17:19:27 2011
@@ -17,6 +17,9 @@ package org.apache.myfaces.tobago.intern
  * limitations under the License.
  */
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import java.util.ArrayList;
 import java.util.Collections;
 import java.util.Comparator;
@@ -24,6 +27,8 @@ import java.util.List;
 
 public class TobagoConfigSorter implements Comparator<TobagoConfigFragment> {
 
+  private static final Logger LOG = LoggerFactory.getLogger(TobagoConfigSorter.class);
+
   private List<TobagoConfigFragment> list;
   private List<Pair> pairs;
 
@@ -43,6 +48,19 @@ public class TobagoConfigSorter implemen
 
     sort0();
 
+    if (LOG.isInfoEnabled()) {
+      LOG.info("Order of the Tobago config files:");
+      for (TobagoConfigFragment fragment : list) {
+        String name = fragment.getName();
+        if (name == null) {
+          name = "<unnamed>";
+        } else {
+          name = "'" + name + "'";
+        }
+        LOG.info("name=" + name + " url='" + fragment.getUrl() + "'");
+      }
+    }
+
   }
 
   protected void makeTransitive() {