Author: mhermanto
Date: Thu May 19 22:45:50 2011
New Revision: 1125152
URL: http://svn.apache.org/viewvc?rev=1125152&view=rev
Log:
Fix breakage due to r1125110.
http://codereview.appspot.com/4523085/
Modified:
shindig/trunk/features/pom.xml
shindig/trunk/features/src/main/javascript/features/osapi/feature.xml
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
shindig/trunk/features/src/test/javascript/features/alltests.js
Modified: shindig/trunk/features/pom.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/pom.xml?rev=1125152&r1=1125151&r2=1125152&view=diff
==============================================================================
--- shindig/trunk/features/pom.xml (original)
+++ shindig/trunk/features/pom.xml Thu May 19 22:45:50 2011
@@ -108,8 +108,6 @@
<source>globals/globals.js</source>
<source>cloo/cloo.js</source>
<source>core.config.base/config.js</source>
- <source>core.config.base/configcontainer.js</source>
- <source>core.config.base/configgadget.js</source>
<source>core.config/validators.js</source>
<source>core.json/json-native.js</source>
<source>core.json/json-jsimpl.js</source>
Modified: shindig/trunk/features/src/main/javascript/features/osapi/feature.xml
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/feature.xml?rev=1125152&r1=1125151&r2=1125152&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/osapi/feature.xml
(original)
+++ shindig/trunk/features/src/main/javascript/features/osapi/feature.xml Thu
May 19 22:45:50 2011
@@ -29,10 +29,15 @@
<dependency>osapi.base</dependency>
<dependency>rpc</dependency>
<dependency>security-token</dependency>
- <all>
+ <container>
+ <script src="jsonrpctransport.js"></script>
+ <script src="peoplehelpers.js"></script>
+ <script src="taming.js" caja="1"></script>
+ </container>
+ <gadget>
<script src="jsonrpctransport.js"></script>
<script src="gadgetsrpctransport.js"></script>
<script src="peoplehelpers.js"></script>
<script src="taming.js" caja="1"></script>
- </all>
+ </gadget>
</feature>
Modified:
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js?rev=1125152&r1=1125151&r2=1125152&view=diff
==============================================================================
---
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
(original)
+++
shindig/trunk/features/src/main/javascript/features/osapi/gadgetsrpctransport.js
Thu May 19 22:45:50 2011
@@ -115,7 +115,7 @@ if (gadgets && gadgets.rpc) { //Dont bin
}
// Do not run this in container mode.
- if (gadgets.config && window !== window.top) {
+ if (gadgets.config) {
gadgets.config.register('osapi.services', null, init);
}
})();
Modified: shindig/trunk/features/src/test/javascript/features/alltests.js
URL:
http://svn.apache.org/viewvc/shindig/trunk/features/src/test/javascript/features/alltests.js?rev=1125152&r1=1125151&r2=1125152&view=diff
==============================================================================
--- shindig/trunk/features/src/test/javascript/features/alltests.js (original)
+++ shindig/trunk/features/src/test/javascript/features/alltests.js Thu May 19
22:45:50 2011
@@ -39,8 +39,6 @@ if (!this.JsUtil) {
eval(JsUtil.prototype.include(srcDir + '/globals/globals.js'));
eval(JsUtil.prototype.include(srcDir + '/cloo/cloo.js'));
eval(JsUtil.prototype.include(srcDir + '/core.config.base/config.js'));
- eval(JsUtil.prototype.include(srcDir +
'/core.config.base/configcontainer.js'));
- eval(JsUtil.prototype.include(srcDir + '/core.config.base/configgadget.js'));
eval(JsUtil.prototype.include(srcDir + '/core.config/validators.js'));
eval(JsUtil.prototype.include(srcDir + '/core.json/json-native.js'));
eval(JsUtil.prototype.include(srcDir + '/core.json/json-jsimpl.js'));
