svn commit: r641684 - /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java

[et...@apache.org]

Author: etnu
Date: Wed Mar 26 18:34:39 2008
New Revision: 641684

URL: http://svn.apache.org/viewvc?rev=641684&view=rev
Log:
Limited recursive file loading to only load files ending with .js or .json so as to not conflict with temporary files created by svn or other tools.


Modified:
    incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java

Modified: incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java
URL: http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java?rev=641684&r1=641683&r2=641684&view=diff
==============================================================================
--- incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java (original)
+++ incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/SyndicatorConfig.java Wed Mar 26 18:34:39 2008
@@ -138,15 +138,20 @@
 
   /**
    * Loads syndicators from directories recursively.
+   *
+   * Only files with a .js or .json extension will be loaded.
+   *
    * @param files The files to examine.
    * @throws GadgetException
    */
   private void loadFiles(File[] files) throws GadgetException {
     try {
       for (File file : files) {
+        logger.info("Reading syndicator config: " + file.getName());
         if (file.isDirectory()) {
           loadFiles(file.listFiles());
-        } else {
+        } else if (file.getName().endsWith(".js") ||
+                   file.getName().endsWith(".json")) {
           loadFromString(ResourceLoader.getContent(file));
         }
       }
@@ -154,7 +159,7 @@
       throw new GadgetException(GadgetException.Code.INVALID_PATH, e);
     }
   }
-
+ 
   /**
    * Loads resources recursively.
    * @param files The base paths to look for syndicator.xml