Author: thomas.heute(a)jboss.com Date: 2010-10-18 06:00:10 -0400 (Mon, 18 Oct 2010) New Revision: 4704 Modified: components/shindig/trunk/java/gadgets/pom.xml components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java components/shindig/trunk/pom.xml Log: GTNPORTAL-1538: Remove Shindig warnings at startup Also added a dependency that was preventing from building, not sure how it built before... Modified: components/shindig/trunk/java/gadgets/pom.xml =================================================================== --- components/shindig/trunk/java/gadgets/pom.xml 2010-10-18 09:57:48 UTC (rev 4703) +++ components/shindig/trunk/java/gadgets/pom.xml 2010-10-18 10:00:10 UTC (rev 4704) @@ -132,6 +132,10 @@ so we have a single place to change the version --> <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + </dependency> + <dependency> <groupId>org.json</groupId> <artifactId>json</artifactId> </dependency> Modified: components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java =================================================================== --- components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java 2010-10-18 09:57:48 UTC (rev 4703) +++ components/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java 2010-10-18 10:00:10 UTC (rev 4704) @@ -129,6 +129,9 @@ loadOptimizedAndDebugData(content, type, opt, dbg); optimizedContent = opt.toString(); debugContent = dbg.toString(); + if(optimizedContent == null || optimizedContent.equalsIgnoreCase("null") || optimizedContent.length() == 0) { + optimizedContent = debugContent; + } break; case URL: if (fetcher == null) { @@ -255,7 +258,7 @@ try { return ResourceLoader.getContent(name); } catch (IOException e) { - logger.warning("Could not find resource: " + name + '-' + e.getMessage()); + logger.finest("Could not find resource: " + name + '-' + e.getMessage()); return null; } } Modified: components/shindig/trunk/pom.xml =================================================================== --- components/shindig/trunk/pom.xml 2010-10-18 09:57:48 UTC (rev 4703) +++ components/shindig/trunk/pom.xml 2010-10-18 10:00:10 UTC (rev 4704) @@ -1301,6 +1301,11 @@ <!-- external dependencies --> <dependency> + <groupId>org.jdom</groupId> + <artifactId>jdom</artifactId> + <version>1.1</version> + </dependency> + <dependency> <groupId>com.google.code.guice</groupId> <artifactId>guice</artifactId> <version>2.0</version>