Eureka Streams integration with Shindig pull request on the 2.0.x branch

assembly/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

extras/pom.xml

@@ -22,7 +22,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

features/pom.xml

@@ -23,7 +23,7 @@
   <parent>
     <groupId>org.apache.shindig</groupId>
     <artifactId>shindig-project</artifactId>
-    <version>2.0.1-SNAPSHOT</version>
+    <version>2.0.1.3</version>
     <relativePath>../pom.xml</relativePath>
   </parent>
 

features/src/main/javascript/features/core.json/json.js

@@ -175,7 +175,6 @@ if (window.JSON && window.JSON.parse && window.JSON.stringify) {
         // Join all of the member texts together and wrap them in braces.
         return '{' + a.join(',') + '}';
       }
-      return "undefined";
     }
 
     return {

features/src/main/javascript/features/rpc/blank.transport.js

@@ -0,0 +1,48 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one
+ * or more contributor license agreements. See the NOTICE file
+ * distributed with this work for additional information
+ * regarding copyright ownership. The ASF licenses this file
+ * to you under the Apache License, Version 2.0 (the
+ * "License"); you may not use this file except in compliance
+ * with the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing,
+ * software distributed under the License is distributed on an
+ * "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ * KIND, either express or implied. See the License for the
+ * specific language governing permissions and limitations under the License.
+ */
+
+gadgets.rpctx = gadgets.rpctx || {};
+
+if (!gadgets.rpctx.blank) {  // make lib resilient to double-inclusion
+
+gadgets.rpctx.blank = function() {
+  return {
+    getCode: function() {
+      return 'blank';
+    },
+
+    isParentVerifiable: function() {
+      return true;
+    },
+
+    init: function(processFn, readyFn) {
+      readyFn('..', true);  // Immediately ready to send to parent.
+      return true;
+    },
+
+    setup: function(receiverId, token, forceSecure) {
+      return true;
+    },
+
+    call: function(targetId, from, rpc) {
+        // should never happen
+    }
+  };
+}();
+
+} // !end of double-inclusion guard

features/src/main/javascript/features/rpc/feature.xml

@@ -36,15 +36,15 @@ useLegacyProtocol: Boolean
   <gadget>
     <script src="wpm.transport.js"/>
     <script src="fe.transport.js"/>
-    <script src="nix.transport.js"/>
+    <script src="blank.transport.js"/>
     <script src="rmr.transport.js"/>
     <script src="ifpc.transport.js"/>
     <script src="rpc.js"/>
   </gadget>
   <container>
     <script src="wpm.transport.js"/>
     <script src="fe.transport.js"/>
-    <script src="nix.transport.js"/>
+    <script src="blank.transport.js"/>
     <script src="rmr.transport.js"/>
     <script src="ifpc.transport.js"/>
     <script src="rpc.js"/>