You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@shindig.apache.org by rb...@apache.org on 2012/08/30 15:39:34 UTC

svn commit: r1378937 - in /shindig/trunk/features/src/main/javascript/features: core.json/feature.xml exportjs/feature.xml gadgets.json.ext/feature.xml shindig.uri.ext/feature.xml

Author: rbaxter85
Date: Thu Aug 30 13:39:34 2012
New Revision: 1378937

URL: http://svn.apache.org/viewvc?rev=1378937&view=rev
Log:
SHINDIG-1861

Modified:
    shindig/trunk/features/src/main/javascript/features/core.json/feature.xml
    shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml
    shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml
    shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml

Modified: shindig/trunk/features/src/main/javascript/features/core.json/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/core.json/feature.xml?rev=1378937&r1=1378936&r2=1378937&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/core.json/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/core.json/feature.xml Thu Aug 30 13:39:34 2012
@@ -20,7 +20,7 @@
   <name>core.json</name>
   <dependency>globals</dependency>
   <dependency>taming</dependency>
-  <gadget>
+  <all>
     <script src="json-native.js"/>
     <script src="json-jsimpl.js"/>
     <script src="json-flatten.js"/>
@@ -30,15 +30,5 @@
       <exports type="js">gadgets.json.parse</exports>
       <exports type="js">gadgets.json.stringify</exports>
     </api>
-  </gadget>
-  <container>
-    <script src="json-native.js"/>
-    <script src="json-jsimpl.js"/>
-    <script src="json-flatten.js"/>
-    <api>
-      <exports type="js">gadgets.json.flatten</exports>
-      <exports type="js">gadgets.json.parse</exports>
-      <exports type="js">gadgets.json.stringify</exports>
-    </api>
-  </container>
+  </all>
 </feature>

Modified: shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml?rev=1378937&r1=1378936&r2=1378937&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/exportjs/feature.xml Thu Aug 30 13:39:34 2012
@@ -18,12 +18,8 @@ specific language governing permissions 
 -->
 <feature>
   <name>exportjs</name>
-  <gadget>
+  <all>
     <script src="exportjs.js"/>
     <!-- do not api+export exportJs -->
-  </gadget>
-  <container>
-    <script src="exportjs.js"/>
-    <!-- do not api+export exportJs -->
-  </container>
+  </all>
 </feature>

Modified: shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml?rev=1378937&r1=1378936&r2=1378937&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/gadgets.json.ext/feature.xml Thu Aug 30 13:39:34 2012
@@ -20,17 +20,11 @@
   <name>gadgets.json.ext</name>
   <dependency>globals</dependency>
   <dependency>taming</dependency>
-  <gadget>
+  <all>
     <script src="json-xmltojson.js"/>
     <script src="taming.js" caja="1"/>
     <api>
       <exports type="js">gadgets.json.xml.convertXmlToJson</exports>
     </api>
-  </gadget>
-  <container>
-    <script src="json-xmltojson.js"/>
-    <api>
-      <exports type="js">gadgets.json.xml.convertXmlToJson</exports>
-    </api>
-  </container>
+  </all>
 </feature>

Modified: shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml
URL: http://svn.apache.org/viewvc/shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml?rev=1378937&r1=1378936&r2=1378937&view=diff
==============================================================================
--- shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml (original)
+++ shindig/trunk/features/src/main/javascript/features/shindig.uri.ext/feature.xml Thu Aug 30 13:39:34 2012
@@ -23,10 +23,7 @@ specific language governing permissions 
   <name>shindig.uri.ext</name>
   <dependency>globals</dependency>
   <dependency>shindig.uri</dependency>
-  <gadget>
+  <all>
     <script src="util.js"/>
-  </gadget>
-  <container>
-    <script src="util.js"/>
-  </container>
+  </all>
 </feature>