svn commit: r820902 - in /incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets: BrowserSpecificRpcJsFeatureLoader.java JsLibrary.java

[johnh]

Author: johnh
Date: Fri Oct  2 06:43:12 2009
New Revision: 820902

URL: http://svn.apache.org/viewvc?rev=820902&view=rev
Log:
Logging/tweaks for browser-specific rpc.js loading.


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

Modified: 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BrowserSpecificRpcJsFeatureLoader.java
URL: 
http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BrowserSpecificRpcJsFeatureLoader.java?rev=820902&r1=820901&r2=820902&view=diff
==============================================================================
--- 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BrowserSpecificRpcJsFeatureLoader.java
 (original)
+++ 
incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/BrowserSpecificRpcJsFeatureLoader.java
 Fri Oct  2 06:43:12 2009
@@ -77,7 +77,6 @@
     
     private static final String RPC_JS_CORE = "rpc.js";
     private static final String WPM_TX = "wpm.transport.js";
-    private static final String DPM_TX = "dpm.transport.js";
     private static final String NIX_TX = "nix.transport.js";
     private static final String FE_TX = "fe.transport.js";
     private static final String RMR_TX = "rmr.transport.js";
@@ -103,10 +102,10 @@
       StringBuilder allDbg = new StringBuilder();
       StringBuilder allOpt = new StringBuilder();
       for (String rpcPart :
-           ImmutableList.of(RPC_JS_CORE, WPM_TX, DPM_TX, NIX_TX, FE_TX, 
RMR_TX, IFPC_TX)) {
+           ImmutableList.of(RPC_JS_CORE, WPM_TX, NIX_TX, FE_TX, RMR_TX, 
IFPC_TX)) {
         StringBuilder opt = new StringBuilder();
         StringBuilder dbg = new StringBuilder();
-        loadOptimizedAndDebugData(rpcPart, type, opt, dbg);
+        loadOptimizedAndDebugData(filePath + rpcPart, type, opt, dbg);
         rpcJsCode.put(rpcPart + OPTIMIZED_SUFFIX, opt.toString());
         rpcJsCode.put(rpcPart + DEBUG_SUFFIX, dbg.toString());
         if (!rpcPart.equals(RPC_JS_CORE)) {
@@ -176,8 +175,6 @@
           case OPERA:
             if (version >= 9) {
               txKey = WPM_TX;
-            } else if (version >= 8) {
-              txKey = DPM_TX;
             }
             break;
           case WEBKIT:

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=820902&r1=820901&r2=820902&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
 Fri Oct  2 06:43:12 2009
@@ -167,7 +167,7 @@
     String dbg_data = loadData(content, type);
 
     if (dbg_data == null && opt_data == null) {
-      throw new IllegalArgumentException("Problems reading resource " + 
content);
+      throw new IllegalArgumentException("Problems reading resource " + 
content + ", type: " + type);
     } else if (dbg_data == null) {
       dbg_data = opt_data;
     } else if (opt_data == null) {