Author: scottbw
Date: Fri May 6 21:04:39 2011
New Revision: 1100374
URL: http://svn.apache.org/viewvc?rev=1100374&view=rev
Log:
Updated Shindig connector to work with Shindig 2.0.0 (see WOOKIE-170). I've
also modified the Ivy configuration so that only the very small subset of
dependencies from Shindig actually required by Wookie are explicitly named and
included in the deployment, as some of the downstream dependencies that we
don't use can cause conflicts with the servlet container, and a lot of other
jars simply aren't needed. I've tested this with Shinding 2.0.0 on Tomcat
6.0.20.
Added:
incubator/wookie/trunk/shindig/dist/shindig-features-2.0.0.jar (with
props)
Modified:
incubator/wookie/trunk/ivy.xml
incubator/wookie/trunk/shindig/features/core.prefs/feature.xml
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetUtils.java
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
Modified: incubator/wookie/trunk/ivy.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/ivy.xml?rev=1100374&r1=1100373&r2=1100374&view=diff
==============================================================================
--- incubator/wookie/trunk/ivy.xml (original)
+++ incubator/wookie/trunk/ivy.xml Fri May 6 21:04:39 2011
@@ -41,7 +41,7 @@
</dependency>
<dependency org="commons-configuration" name="commons-configuration"
rev="1.4" conf="deploy->default">
</dependency>
- <dependency org="commons-fileupload" name="commons-fileupload"
rev="1.0" conf="deploy->default">
+ <dependency org="commons-fileupload" name="commons-fileupload"
rev="1.2.1" conf="deploy->default">
</dependency>
<dependency org="commons-httpclient" name="commons-httpclient"
rev="3.0.1" conf="deploy->default">
</dependency>
@@ -59,8 +59,22 @@
</dependency>
<dependency org="org.slf4j" name="slf4j-log4j12" rev="1.5.2"
conf="deploy->default">
</dependency>
- <dependency org="org.apache.shindig" name="shindig-common"
rev="1.1-BETA5-incubating" conf="deploy->default">
+
+ <!-- Note that we only require the "BlobCrypterToken" part of Shindig
in order to create valid tokens, so
+ we don't need to include the whole of Shindig common's
dependencies as well, hence transitive is
+ marked "false" and we include the two modules that the token
creation depends on.
+
+ While it may be simpler to just include the whole of Shindig,
not only does it bloat the application, it
+ also can cause deployment conflicts with servlet containers.
+ -->
+ <dependency org="org.apache.shindig" name="shindig-common"
transitive="false" rev="2.0.0" conf="deploy->default">
+ </dependency>
+ <dependency org="com.google.collections" name="google-collections"
rev="latest.integration" conf="deploy->default">
+ </dependency>
+ <dependency org="commons-codec" name="commons-codec"
rev="latest.integration" conf="deploy->default">
</dependency>
+
+
<dependency org="org.jdom" name="jdom" rev="1.1"
conf="deploy->default">
</dependency>
<dependency org="org.json" name="json" rev="20080701"
conf="deploy->default">
@@ -111,6 +125,7 @@
</dependency>
<exclude module="juel-api"/>
+ <exclude module="juel-impl"/>
<exclude module="spring"/>
<exclude module="struts"/>
<exclude module="webwork"/>
Added: incubator/wookie/trunk/shindig/dist/shindig-features-2.0.0.jar
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/shindig/dist/shindig-features-2.0.0.jar?rev=1100374&view=auto
==============================================================================
Binary file - no diff available.
Propchange: incubator/wookie/trunk/shindig/dist/shindig-features-2.0.0.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/wookie/trunk/shindig/features/core.prefs/feature.xml
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/shindig/features/core.prefs/feature.xml?rev=1100374&r1=1100373&r2=1100374&view=diff
==============================================================================
--- incubator/wookie/trunk/shindig/features/core.prefs/feature.xml (original)
+++ incubator/wookie/trunk/shindig/features/core.prefs/feature.xml Fri May 6
21:04:39 2011
@@ -18,6 +18,7 @@
-->
<feature>
<name>core.prefs</name>
+ <dependency>globals</dependency>
<dependency>core.util</dependency>
<gadget>
<!--- wookie integration js -->
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetUtils.java?rev=1100374&r1=1100373&r2=1100374&view=diff
==============================================================================
--- incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetUtils.java
(original)
+++ incubator/wookie/trunk/src/org/apache/wookie/util/gadgets/GadgetUtils.java
Fri May 6 21:04:39 2011
@@ -55,7 +55,7 @@ public class GadgetUtils {
/**
* The default Container ID
*/
- private static final String CONTAINER_ID = "wookie";
+ private static final String CONTAINER_ID = "default";
/**
* Create a new W3CWidget from the request supplied
Modified:
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java?rev=1100374&r1=1100373&r2=1100374&view=diff
==============================================================================
---
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
(original)
+++
incubator/wookie/trunk/src/org/apache/wookie/util/opensocial/OpenSocialUtils.java
Fri May 6 21:04:39 2011
@@ -35,9 +35,8 @@ public class OpenSocialUtils {
static Logger _logger =
Logger.getLogger(OpenSocialUtils.class.getName());
- private static final String DOMAIN_ID = "wookie"; //$NON-NLS-1$
- // TODO once we have an API Key implementation, we can convey the
actual container id rather than Wookie
- private static final String CONTAINER_ID = "wookie"; //$NON-NLS-1$
+ private static final String DOMAIN_ID = "default"; //$NON-NLS-1$
+ private static final String CONTAINER_ID = "default"; //$NON-NLS-1$
/**
@@ -45,7 +44,7 @@ public class OpenSocialUtils {
*
* VIEWER = who the current user is (ie. Instance.getUserId)
* OWNER = who the page belongs to (assumed to be Instance.getUserId
until we change plugin API)
- * APP_ID = what gadget this is (i.e. Widget.guid)
+ * APP_ID/APP URL = what gadget this is (i.e. Widget URI)
* MOD_ID = which instance of it (i.e. Instance.id/idkey)
*
* Alas, MOD_ID doesn't really map onto instance.IdKey (incompatible
types), so we just have to use instance.id
