svn commit: r789677 - in /incubator/shindig/trunk: features/src/main/javascript/features/rpc/feature.xml java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java

[lindner]

Author: lindner
Date: Tue Jun 30 11:03:10 2009
New Revision: 789677

URL: http://svn.apache.org/viewvc?rev=789677&view=rev
Log:
SHINDIG-1102 | further debug jslibrary fixes, now handles missing scripts 
better, also remove reference to dpm.transport.js

Modified:
    
incubator/shindig/trunk/features/src/main/javascript/features/rpc/feature.xml
    
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java

Modified: 
incubator/shindig/trunk/features/src/main/javascript/features/rpc/feature.xml
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/features/src/main/javascript/features/rpc/feature.xml?rev=789677&r1=789676&r2=789677&view=diff
==============================================================================
--- 
incubator/shindig/trunk/features/src/main/javascript/features/rpc/feature.xml 
(original)
+++ 
incubator/shindig/trunk/features/src/main/javascript/features/rpc/feature.xml 
Tue Jun 30 11:03:10 2009
@@ -30,7 +30,6 @@
   <name>rpc</name>
   <gadget>
     <script src="wpm.transport.js"/>
-    <script src="dpm.transport.js"/>
     <script src="fe.transport.js"/>
     <script src="nix.transport.js"/>
     <script src="rmr.transport.js"/>
@@ -39,7 +38,6 @@
   </gadget>
   <container>
     <script src="wpm.transport.js"/>
-    <script src="dpm.transport.js"/>
     <script src="fe.transport.js"/>
     <script src="nix.transport.js"/>
     <script src="rmr.transport.js"/>

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java?rev=789677&r1=789676&r2=789677&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/JsLibrary.java
 Tue Jun 30 11:03:10 2009
@@ -152,14 +152,22 @@
    */
   protected static void loadOptimizedAndDebugData(String content, Type type, 
StringBuffer opt,
       StringBuffer dbg) {
+    String opt_data = null;
+
     if (content.endsWith(".js")) {
-      opt.append(loadData(
-          content.substring(0, content.length() - 3) + ".opt.js", type));
+      opt_data =loadData(content.substring(0, content.length() - 3) + 
".opt.js", type);
     }
-    dbg.append(loadData(content, type));
-    if (opt.length() == 0) {
-      opt.append(dbg.toString());
+    String dbg_data = loadData(content, type);
+
+    if (dbg_data == null && opt_data == null) {
+      throw new IllegalArgumentException("Problems reading resource " + 
content);
+    } else if (dbg_data == null) {
+      dbg_data = opt_data;
+    } else if (opt_data == null) {
+      opt_data = dbg_data;
     }
+    dbg.append(dbg_data);
+    opt.append(opt_data);
   }
 
   /**
@@ -279,8 +287,7 @@
       String debugContent) {
 
     // Validate that we have something here.
-    if ((content == null && debugContent == null) || 
-        ("null".equals(content) && "null".equals(debugContent))) {
+    if (content == null && debugContent == null) {
       throw new IllegalArgumentException("no content for feature " + feature);
     }