Author: scottbw
Date: Tue Mar 9 22:06:46 2010
New Revision: 921157
URL: http://svn.apache.org/viewvc?rev=921157&view=rev
Log:
This is part 1 of 3 updates of the Shindig integration code that brings it up
to date with the other changes to the Wookie core code; while not everything
works as it should, it is now possible to integrate Wookie and Shindig once
more as two cooperating webapps by following the instructions in the README.
Currently only plain tokens can be used and so I've set this as the default in
opensocial.properties; there is a problem creating valid encrypted tokens. See
WOOKIE-52 for more information on wookie-shindig integration.
Added:
incubator/wookie/trunk/shindig/dist/
incubator/wookie/trunk/shindig/dist/shindig-features-1.1-BETA5-incubating.jar
(with props)
Removed:
incubator/wookie/trunk/shindig/WEB-INF/
incubator/wookie/trunk/shindig/features/core/
incubator/wookie/trunk/shindig/features/setprefs/
incubator/wookie/trunk/shindig/shindig-features-1.1-wookie.jar
Modified:
incubator/wookie/trunk/shindig/features/README
incubator/wookie/trunk/shindig/readme_shindig.txt
Added:
incubator/wookie/trunk/shindig/dist/shindig-features-1.1-BETA5-incubating.jar
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/shindig/dist/shindig-features-1.1-BETA5-incubating.jar?rev=921157&view=auto
==============================================================================
Binary file - no diff available.
Propchange:
incubator/wookie/trunk/shindig/dist/shindig-features-1.1-BETA5-incubating.jar
------------------------------------------------------------------------------
svn:mime-type = application/octet-stream
Modified: incubator/wookie/trunk/shindig/features/README
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/shindig/features/README?rev=921157&r1=921156&r2=921157&view=diff
==============================================================================
--- incubator/wookie/trunk/shindig/features/README (original)
+++ incubator/wookie/trunk/shindig/features/README Tue Mar 9 22:06:46 2010
@@ -1,16 +1,28 @@
Shindig Features README
+=======================
-The files in the folders /features/core and /features/setprefs replace the
Shindig preference handling
+The files in the folders /features/core.prefs replace the Shindig preference
handling
stubs with an interface to the Widget.preferences HTML 5 object implemented in
Wookie.
-In Core:
+In core.prefs:
- prefs.js has been altered to make the W3C Widget calls
- - wookie-xxxxx.js has been added
- - features.xml has had the wookie-xxxx.js libs included
-
-In SetPrefs
- - setprefs.js the rpc calls have been removed
+ - features.xml includes links to the wookie core JS injected code. Note
that these are
+ absolute URLs are should be replaced with URLs to your own
Wookie server
+
+Edit the URLs in features.xml, and then replace or merge these files with the
standard Shindig features files to add
+W3C widget persistence. A ready-built shindig-features jar is located in the
dist/ folder which you can use as the basis
+for your own shindig-features.jar file.
-Replace or merge these files with the standard Shindig features files to add
W3C widget persistence
+To enable this functionality to work it is currently necessary to turn off
cross-site session security for DWR, or you
+will get a "Session Error" whenever using Gadgets with Wookie as the two
webapps do not share sessions.
+
+To do this, add the following parameter in web.xml for the dwr-invoker serlvet:
-A ready-built Shindig-features jar accompanies these source files.
\ No newline at end of file
+ <init-param>
+ <param-name>crossDomainSessionSecurity</param-name>
+ <param-value>false</param-value>
+ </init-param>
+
+(You can also avoid this problem by merging the Wookie and Shindig
applications into a single webapp, combining the
+web.xml files into one.)
+
\ No newline at end of file
Modified: incubator/wookie/trunk/shindig/readme_shindig.txt
URL:
http://svn.apache.org/viewvc/incubator/wookie/trunk/shindig/readme_shindig.txt?rev=921157&r1=921156&r2=921157&view=diff
==============================================================================
--- incubator/wookie/trunk/shindig/readme_shindig.txt (original)
+++ incubator/wookie/trunk/shindig/readme_shindig.txt Tue Mar 9 22:06:46 2010
@@ -1,28 +1,13 @@
How to setup Wookie with Shindig
----------------------------------------
-There are two ways to deploy a Wookie+Shindig server. The easiest is to use
the pre-built single integrated service which can be found in the same folder
as this README. If you want to, you can also deploy the two application
separately (e.g. to use a custom Shindig or to make use of a newer Shindig
build).
-
-1. Deploying as a single application
-====================================
-
-To deploy the default single-app configuration, you need to build Wookie using
the additional files located in our CVS repository under shindig/WEB-INF.
-
-Note that the web.xml file located in shindig/WEB-INF replaces the default
Wookie web.xml file.
-
-Once installed, make sure you read the section on Proxy Configuration below.
-
-
-2. Deploying Wookie and Shindig as separate, integrated, applications
-=====================================================================
-
-To deploy Wookie with Shindig separately, you need to build the Shindig.war
and deploy on your Tomcat server alongside Wookie.
+To deploy Wookie with Shindig, you need to deploy the Shindig.war on your
server alongside Wookie.
You can either place the Shindig webapp as ROOT or at another webapp location.
If deploying elsewhere, note you must change
all the URLs in [SHINDIG]/WEB-INF/classes/containers/default.container.js, and
also in shindig.properties, which can be found
inside the shindig-common-1.1. jar file.
-2a Wookie setup
+1 Wookie setup
---------------
Once deployed, you need to setup Wookie as follows:
@@ -31,11 +16,12 @@ this is already set)
In [WOOKIE]/WEB-INF/classes/opensocial.properties, set opensocial.enable to
true to start sending Shindig security tokens with rendered widgets/gadgets.
-2b Shindig/Wookie features
+2 Shindig/Wookie features
--------------------------
You can use Wookie to manage the preferences of your Gadgets; to do this you
must replace the standard
-Shindig Features jar with one with some additional Wookie javascript code. You
can download this jar
-from the Wookie CVS repository.
+Shindig Features jar with one with some additional Wookie javascript code and
make an adjustment to the
+web.xml for Wookie to allow calls between the two applications. More
information on this can be found
+in features/README
3. Proxy configuration
======================
@@ -52,8 +38,19 @@ The most obvious way to safeguard your p
(One day maybe we'll be able to separate out the Proxy service from both
Wookie and Shindig to make it standalone and easier to secure).
-That's it folks
+4. Try it out
+=============
+In Wookie, go to the Admin page and click "Add new Google Gadget/OpenSocial
app".
+
+Enter "http://www.google.com/ig/modules/hello.xml"; and press return.
+
+If all goes well, you should see the message "Successfully created a new entry
for this gadget".
+
+Go to the Wookie widget gallery, and you should see a new widget called "Hello
World Example".
+
+Click "demo" and you should see "Hello, world!" for the gadget.
+
+That's all folks
===============
-Fingers crossed, once you've done these steps you can restart Tomcat and all
will be well!
-Problems - email [email protected]
+Problems - email [email protected]
