svn commit: r685157 - in /incubator/shindig/trunk: features/features.txt java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java

[li...@apache.org]

Author: lindner
Date: Tue Aug 12 07:05:09 2008
New Revision: 685157

URL: http://svn.apache.org/viewvc?rev=685157&view=rev
Log:
SHINDIG-299 - add support for comments/blank lines in features.txt

Modified:
    incubator/shindig/trunk/features/features.txt
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java

Modified: incubator/shindig/trunk/features/features.txt
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/features/features.txt?rev=685157&r1=685156&r2=685157&view=diff
==============================================================================
--- incubator/shindig/trunk/features/features.txt (original)
+++ incubator/shindig/trunk/features/features.txt Tue Aug 12 07:05:09 2008
@@ -1,3 +1,5 @@
+# List each feature you want to support here
+
 features/analytics/feature.xml
 features/caja/feature.xml
 features/core.io/feature.xml

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java?rev=685157&r1=685156&r2=685157&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsFeatureLoader.java Tue Aug 12 07:05:09 2008
@@ -17,6 +17,7 @@
  */
 package org.apache.shindig.gadgets;
 
+import org.apache.commons.lang.StringUtils;
 import org.apache.shindig.common.ContainerConfig;
 import org.apache.shindig.common.util.ResourceLoader;
 import org.apache.shindig.common.xml.XmlException;
@@ -29,6 +30,7 @@
 
 import java.io.File;
 import java.io.IOException;
+import java.util.ArrayList;
 import java.util.EnumMap;
 import java.util.HashMap;
 import java.util.LinkedList;
@@ -80,8 +82,14 @@
           location = location.substring(6);
           logger.info("Loading resources from: " + location);
           if (location.endsWith(".txt")) {
-            loadResources(ResourceLoader.getContent(location).split("[\r\n]+"),
-                features);
+            List<String> resources = new ArrayList<String>();
+            for(String resource : StringUtils.split(ResourceLoader.getContent(location), "[\r\n]+")) {
+              // Skip blank/commented lines
+	      if (StringUtils.trim(resource).length() > 0 && resource.charAt(0) != '#') {
+                resources.add(StringUtils.trim(resource));
+              }
+            }
+            loadResources(resources.toArray(new String [resources.size()]), features);
           } else {
             loadResources(new String[]{location}, features);
           }