On Tue, Feb 19, 2008 at 7:21 PM, <[EMAIL PROTECTED]> wrote: > Author: etnu > Date: Tue Feb 19 19:21:23 2008 > New Revision: 629331 > > URL: http://svn.apache.org/viewvc?rev=629331&view=rev > Log: > Small changes to address opensocial compatibility. These changes can be > removed in the future when more existing containers migrate to gadgets.rpc > . > > Modified: > incubator/shindig/trunk/features/opensocial-reference/feature.xml > > > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java > > Modified: > incubator/shindig/trunk/features/opensocial-reference/feature.xml > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/features/opensocial-reference/feature.xml?rev=629331&r1=629330&r2=629331&view=diff > > ============================================================================== > --- incubator/shindig/trunk/features/opensocial-reference/feature.xml > (original) > +++ incubator/shindig/trunk/features/opensocial-reference/feature.xml Tue > Feb 19 19:21:23 2008 > @@ -19,6 +19,8 @@ > --> > <feature> > <name>opensocial-reference</name> > + <!-- all known opensocial implementations assume that ifpc is > present. --> > + <dependency>ifpc</dependency>
This dependency shouldn't go here. Opensocial-reference itself does not depend on either rpc or ifpc. Someone's own implementation of opensocial-0.7can include this dependency, but we don't want to enforce it. There could be perfectly valid implementations that don't use ifpc at all (take the samplecontainer for instance) Unless someone objects I will remove this from the code base. > <gadget> > <script src="opensocial.js"/> > <script src="activity.js"/> > > Modified: > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java > URL: > http://svn.apache.org/viewvc/incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java?rev=629331&r1=629330&r2=629331&view=diff > > ============================================================================== > --- > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java > (original) > +++ > incubator/shindig/trunk/java/gadgets/src/main/java/org/apache/shindig/gadgets/http/GadgetRenderingServlet.java > Tue Feb 19 19:21:23 2008 > @@ -38,7 +38,6 @@ > import java.net.URI; > import java.net.URISyntaxException; > import java.net.URLEncoder; > -import java.util.Collections; > import java.util.Enumeration; > import java.util.HashMap; > import java.util.HashSet; > @@ -380,11 +379,8 @@ > // TODO: this is too much manual work, and we should probably just > // modify the gadget object to keep the list of transitive > dependencies > Set<Entry> found = new HashSet<Entry>(); > - > - // Nothing can ever be missing at this point since that would have > - // thrown an exception already. > - Set<String> empty = Collections.emptySet(); > - serverConfig.getFeatureRegistry().getIncludedFeatures(reqs, found, > empty); > + Set<String> miss = new HashSet<String>(); > + serverConfig.getFeatureRegistry().getIncludedFeatures(reqs, found, > miss); > > Set<String> features = new HashSet<String>(found.size()); > for (Entry entry : found) { > > >
