You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by dd...@apache.org on 2012/08/15 16:41:09 UTC
svn commit: r1373434 - in /shindig/branches/Move OAH from 2.0.5 to
2.0.7/extras/src/main/javascript/features-extras:
org.openajax.hub-2.0.5/OpenAjax-mashup.js
org.openajax.hub-2.0.5/feature.xml org.openajax.hub-2.0.5/iframe.js
pubsub-2/feature.xml
Author: ddumont
Date: Wed Aug 15 14:41:08 2012
New Revision: 1373434
URL: http://svn.apache.org/viewvc?rev=1373434&view=rev
Log:
SHINDIG-1836 - upgrade OpenAjax Hub from 2.0.5 to 2.0.7
Committed for Marshall Shi
Modified:
shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/OpenAjax-mashup.js
shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/feature.xml
shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
Modified: shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/OpenAjax-mashup.js
URL: http://svn.apache.org/viewvc/shindig/branches/Move%20OAH%20from%202.0.5%20to%202.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/OpenAjax-mashup.js?rev=1373434&r1=1373433&r2=1373434&view=diff
==============================================================================
--- shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/OpenAjax-mashup.js (original)
+++ shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/OpenAjax-mashup.js Wed Aug 15 14:41:08 2012
@@ -28,7 +28,7 @@ OpenAjax.hub = function() {
return /** @scope OpenAjax.hub */ {
implementer: "http://openajax.org",
- implVersion: "2.0.5",
+ implVersion: "2.0.7",
specVersion: "2.0",
implExtraData: {},
libraries: libs,
Modified: shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/feature.xml
URL: http://svn.apache.org/viewvc/shindig/branches/Move%20OAH%20from%202.0.5%20to%202.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/feature.xml?rev=1373434&r1=1373433&r2=1373434&view=diff
==============================================================================
--- shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/feature.xml (original)
+++ shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/feature.xml Wed Aug 15 14:41:08 2012
@@ -17,7 +17,7 @@ KIND, either express or implied. See the
specific language governing permissions and limitations under the License.
-->
<feature>
- <name>org.openajax.hub-2.0.5</name>
+ <name>org.openajax.hub-2.0.7</name>
<dependency>rpc</dependency>
<gadget>
<script src="OpenAjax-mashup.js"/>
Modified: shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js
URL: http://svn.apache.org/viewvc/shindig/branches/Move%20OAH%20from%202.0.5%20to%202.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js?rev=1373434&r1=1373433&r2=1373434&view=diff
==============================================================================
--- shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js (original)
+++ shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/org.openajax.hub-2.0.5/iframe.js Wed Aug 15 14:41:08 2012
@@ -119,6 +119,11 @@ if (!OpenAjax.hub.IframeContainer) {
* DOM element that is to be parent of iframe
* @param {String} params.IframeContainer.uri
* Initial Iframe URI (Container will add parameters to this URI)
+ * @param {String} [params.IframeContainer.clientRelay]
+ * URI of the relay file used by the client. Must be from the same origin
+ * as params.IframeContainer.uri. This value is only used by the IFPC
+ * transport layer, which is primarily used by IE 6 & 7. This value isn't
+ * required if you don't need to support those browsers.
* @param {String} [params.IframeContainer.tunnelURI]
* URI of the tunnel iframe. Must be from the same origin as the page which
* instantiates the IframeContainer. If not specified, connection will not
@@ -184,15 +189,15 @@ OpenAjax.hub.IframeContainer = function(
internalID = OpenAjax.hub.IframeContainer._rpcRouter.add( clientID, this );
securityToken = generateSecurityToken( params, scope, log );
- var relay = null;
+ var relay = params.IframeContainer.clientRelay;
var transportName = OpenAjax.gadgets.rpc.getRelayChannel();
if ( params.IframeContainer.tunnelURI ) {
- if ( transportName !== "wpm" && transportName !== "nix" ) {
+ if ( transportName !== "wpm" && transportName !== "ifpc" ) {
throw new Error( OpenAjax.hub.Error.IncompatBrowser );
}
} else {
log( "WARNING: Parameter 'IframeContaienr.tunnelURI' not specified. Connection will not be fully secure." );
- if ( transportName === "rmr" ) {
+ if ( transportName === "rmr" && !relay ) {
relay = OpenAjax.gadgets.rpc.getOrigin( params.IframeContainer.uri ) + "/robots.txt";
}
}
Modified: shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/pubsub-2/feature.xml
URL: http://svn.apache.org/viewvc/shindig/branches/Move%20OAH%20from%202.0.5%20to%202.0.7/extras/src/main/javascript/features-extras/pubsub-2/feature.xml?rev=1373434&r1=1373433&r2=1373434&view=diff
==============================================================================
--- shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/pubsub-2/feature.xml (original)
+++ shindig/branches/Move OAH from 2.0.5 to 2.0.7/extras/src/main/javascript/features-extras/pubsub-2/feature.xml Wed Aug 15 14:41:08 2012
@@ -20,7 +20,7 @@ specific language governing permissions
<name>pubsub-2</name>
<dependency>globals</dependency>
<dependency>taming</dependency>
- <dependency>org.openajax.hub-2.0.5</dependency>
+ <dependency>org.openajax.hub-2.0.7</dependency>
<gadget>
<script src="pubsub-2.js"/>
<script src="taming.js" caja="1"/>