From 2e69f0379b63b0166302f0a9c8e01ad634f4ef50 Mon Sep 17 00:00:00 2001
From: j2blake
Date: Tue, 5 Jun 2012 19:31:08 +0000
Subject: [PATCH] NIHVIVO-3772 NIHVIVO-3721 Incorporate the OpenSocial
integration from Eric Meeks at CTSI, UCSF. Add instructions on how to install
and configure ORNG Shindig.
---
doc/css/doc.css | 2 +-
doc/images/VIVO-logo.png | Bin 9599 -> 6780 bytes
doc/install.html | 29 +-
doc/setting_up_orng.html | 410 ++++++++++++++++++
doc/upgrade-1.5.html | 7 +
example.deploy.properties | 21 +
productMods/WEB-INF/web.xml | 14 +
.../individual/individual--foaf-person.ftl | 14 +
themes/wilma/css/openSocial/gadgets.css | 113 +++++
.../images/openSocial/icon_squareArrow.gif | Bin 0 -> 114 bytes
.../openSocial/icon_squareDownArrow.gif | Bin 0 -> 105 bytes
themes/wilma/templates/gadgetDetails.ftl | 12 +
themes/wilma/templates/gadgetLogin.ftl | 47 ++
themes/wilma/templates/head.ftl | 11 +
themes/wilma/templates/page-home.ftl | 2 +-
themes/wilma/templates/page.ftl | 9 +-
16 files changed, 684 insertions(+), 7 deletions(-)
create mode 100644 doc/setting_up_orng.html
create mode 100644 themes/wilma/css/openSocial/gadgets.css
create mode 100644 themes/wilma/images/openSocial/icon_squareArrow.gif
create mode 100644 themes/wilma/images/openSocial/icon_squareDownArrow.gif
create mode 100644 themes/wilma/templates/gadgetDetails.ftl
create mode 100644 themes/wilma/templates/gadgetLogin.ftl
diff --git a/doc/css/doc.css b/doc/css/doc.css
index bb575f4c..9939bc6d 100644
--- a/doc/css/doc.css
+++ b/doc/css/doc.css
@@ -100,7 +100,7 @@ blockquote {
/* BRANDING ------> */
h1.vivo-logo {
position: absolute;
- width: 386px;
+ width: 442px;
height: 59px;
top: 28px;
left: 0;
diff --git a/doc/images/VIVO-logo.png b/doc/images/VIVO-logo.png
index ebfb645805f99db21d7f58665644de4ee4a87ce1..9f8f29376f34f01dcb8343ab50682ee200af4d93 100644
GIT binary patch
literal 6780
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
U&g|0P?<9b#vX)Y%g8AG30p9!r-2eap
literal 9599
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
iogqXy+@R-2xk^|N
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
This is created when you unpack the VIVO distribution file (see Step III, below). This is where you will
create your deploy.properties file (see Step
- V, below), and where you will make any modifications to the VIVO
+ IV, below), and where you will make any modifications to the VIVO
theme or code. You can create this wherever you choose.
+ VIVO now supports an extension of the OpenSocial API,
+ known as Open Research Networking Gadgets, or ORNG (pronounced "ORNG")
+ (see http://www.opengadgets.org/index.html).
+
+
+ Configuring VIVO to support ORNG requires several steps, including
+ additions to the VIVO properties, modifications to Tomcat configuration
+ creation of an ORNG-compatible version of Apache Shindig, and use of a
+ security certificate for safe network operations.
+
+
If you have completed the previous steps, you have good indications
that the installation was successful.
diff --git a/doc/setting_up_orng.html b/doc/setting_up_orng.html
new file mode 100644
index 00000000..88080587
--- /dev/null
+++ b/doc/setting_up_orng.html
@@ -0,0 +1,410 @@
+
+
+
+
+
Setting up VIVO to use OpenSocial Gadgets
+
+ Instructions for connecting VIVO and Open Research Networking Gadgets
+
+
+ This document contains instructions on how to configure your VIVO
+ installation to use OpenSocial gadgets.
+
+
+ VIVO uses an extension of the OpenSocial protocols called
+ Open Research Networking Gadgets, or ORNG.
+ ORNG is a project of the Clinical & Translational Science Institute at the
+ University of California, San Francisco.
+ You can find out more about the ORNG project at their web site,
+ http://www.opengadgets.org/index.html
+
+
+ ORNG supports gadgets using a modified version of Apache Shindig.
+ These instructions tell you how to install the ORNG Shindig web application,
+ and how to configure it to work with VIVO.
+
+
+
+
Table of Contents
+
+
+ - Create configuration files
+ - Create database tables and procedures
+ - Modify Tomcat settings
+ - Deploy the web application
+ - Configure VIVO
+ - Does it work?
+
+
+
+
I. Create configuration files
+
+ In your VIVO home directory, create a directory called shindig.
+ Under that, create directories called conf and openssl.
+ Your VIVO home directory will look something like this:
+
[VIVO home directory]
+ |
+ |--shindig
+ | |
+ | |--conf
+ | |
+ | |--openssl
+ |
+ |--solr
+ |
+ |--uploads
+
+
+
A. Create a secure key file
+
+ Shindig uses an encryption key to insure that the communication
+ between the gadget and the server is secure.
+ You should create a file that contains the encryption key,
+ and store that file in the shindig/openssl directory that you created.
+
+
+ On Unix-based systems (like Linux or Mac OS X), this command will create
+ an encryption key from a random seed:
+
dd if=/dev/random bs=32 count=1 | openssl base64 > [key-file]
+ For example, if your VIVO home directory is
/usr/local/vivo/data,
+ you might use the command this way:
+
dd if=/dev/random bs=32 count=1 | openssl base64 > /usr/local/vivo/data/shindig/openssl/securitytokenkey.txt
+
+
+ If your VIVO installation is installed on a machine that runs Microsoft Windows,
+ you will need to find another way to create an encryption key.
+ The easiest way might be to find a Unix-based machine,
+ issue the command above, and copy the resulting file to your Windows machine.
+
+
+
B. Create the Create configuration files
+
+ In your VIVO distribution directory, find the file called
+
vitro-core/opensocial/shindig.orng.properties
and copy it to the
+
shindig/conf directory that you created.
+
+
+ Set these values in the shindig.orng.properties file
+
+
+
+
+
+ Property Name
+ |
+
+ Example Value
+ |
+
+
+
+ Specify the location of the encryption key file.
+ |
+
+
+
+ shindig.signing.key-file
+ |
+
+ /usr/local/vivo/data/shindig/openssl/securitytokenkey.txt
+ |
+
+
+
+ Specify the JDBC URL of your database. Change
+ the end of the URL to reflect your database name (if it is not "vivo").
+ |
+
+
+
+ orng.dbURL
+ |
+
+ jdbc:mysql://localhost/vivo
+ |
+
+
+
+ Change the username to match the authorized user
+ you created in MySQL when installing VIVO.
+ |
+
+
+
+ orng.dbUser
+ |
+
+ username
+ |
+
+
+
+ Change the password to match the password you
+ created in MySQL when installing VIVO.
+ |
+
+
+
+ orng.dbPassword
+ |
+
+ password
+ |
+
+
+
+
+
II. Create database tables and procedures
+
+ Shindig uses several database tables in MySQL to store its data:
+ which gadgets appear on which pages, what size are the gadgets,
+ what information applies to each individual, and more.
+ Shindig also creates stored procedures in MySQL. These are small
+ pieces of code that simplify the use of the database tables.
+
+
+ In the VIVO distribution directory, a file called
+ vitro-core/opensocial/shindig_orng_tables.sql
+ contains SQL commands that create the tables and
+ stored procedures for Shindig to use.
+
+
+ Tell MySQL to process this file with a command like this:
+
mysql -u username -p database < sql_file
+ So, if your current directory is the VIVO distibution directory, and your
+ VIVO database is
vivoDb and your MySQL user account is
vivoUser,
+ then you might use the command this way:
+
mysql -u vivoUser -p vivoDb < vitro-core/opensocial/shindig_orng_tables.sql
+ MySQL will prompt you for the password for your MySQL user account, and then
+ process the file.
+
+
+ You may want to start your gadget collection with some example gadgets
+ that have been developed by the ORNG group. The file called
+ vitro-core/opensocial/shindig_example_gadgets.sql
+ contains SQL commands that will add these gadgets to your system's configuration.
+
+
+ If you want to load these example gadgets, you can use a command similar to the previous one:
+
mysql -u vivoUser -p vivoDb < vitro-core/opensocial/shindig_example_gadgets.sql
+ As before, MySQL will prompt you for the password for your MySQL user account, and then
+ process the file.
+
+
+
III. Modify Tomcat settings
+
+ The Shindig application must know where to find the configuration file that you created in
+ Step I.
+ It must also know its own URL, so that URL can be inserted into the gadgets.
+
+
+ This information is provided through startup parameters in Tomcat.
+ With most installations of Tomcat, the "setenv.sh" or
+ "setenv.bat" file in Tomcat's bin directory is a convenient place to
+ set these parameters.
+ If this file does not exist in Tomcat's bin directory, you can create it.
+
+
+ Here is an example of the setenv file, showing only the Shindig requirements:
+
export CLASSPATH=/usr/local/vivo/data/shindig/conf
+export CATALINA_OPTS='-Dshindig.host=localhost -Dshindig.port=8080'
+ This assumes that your setenv file was empty before starting this process,
+ and that you used the default location for the Shindig configuration file in Step I.
+ In fact, it's more common for the setenv file to contain other parameters besides
+ those used for Shindig. In that case, it might look more like this:
+
export CLASSPATH=/usr/local/vivo/data/shindig/conf
+export CATALINA_OPTS='-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headless=true -Xms1024m -Xmx1024m -XX:MaxPermSize=128m'
+
+
+
IV. Deploy the web application
+
+ In the VIVO distribution directory, a file called vitro-core/opensocial/shindigorng.war
+ contains the ORNG-Shindig web application.
+ Copy this file to the webapps directory of your Tomcat server.
+ For example, if your Tomcat server is located at /usr/local/tomcat,
+ then you should copy this file to /usr/local/tomcat/webapps/shindigorng.war
+
+
+
V. Configure VIVO
+
+ In the VIVO distribution directory, the file called deploy.properties
+ contains configuration options for the VIVO application.
+ You must set some additional parameters so VIVO will be able to communicate with Shindig.
+
+
+
+
+
+ Property Name
+ |
+
+ Example Value
+ |
+
+
+
+ The base URL that VIVO will use when contacting the ORNG Shindig application.
+ Usually, this is the same host and port number as VIVO itself,
+ with a context path of shindigorng
+ |
+
+
+ OpenSocial.shindigURL |
+ http://localhost:8080/shindigorng |
+
+
+
+ The host name and port number of the Token Service that ORNG shindig creates.
+ For now, a value of localhost or 127.0.0.1 will not work.
+ You must provide the actual host name of your machine, followed by :8777
+ |
+
+
+ OpenSocial.tokenService |
+ myhost.mydomain.edu:8777 |
+
+
+
+
+
VI. Does it work?
+
+ Start VIVO. Enter a search term in the search box, and view the results. Check the gadgets there.
+ Navigate to a person's profile page. Again, check for the expected gadgets.
+
+
+ If the gadgets do not appear as you expect, look for these symptoms,
+ and check for the corresponding possible causes.
+
+
+
+ Symptoms |
+ Possible causes |
+
+
+
+
+ |
+
+
+ - Configuration file is not correctly named.
+ - Tomcat's setenv file does not specify the correct CLASSPATH
+
+ |
+
+ |
+
+
+
+ |
+
+
+ -
+ Configuration file contains incorrect value for one or more of these:
+
+ - orng.dbURL
+ - orng.dbUser
+ - orng.dbPassword
+
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+ -
+ What's up?
+ This is a result of not setting key-file, or pointing it to a file that doesn't exist.
+ Is there no better diagnostic?
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+ -
+ MySQL does not contain the shindig tables.
+
shindig_orng_tables.sql was not processed.
+
+
+ |
+
+ |
+
+
+
+ |
+
+
+ -
+ In deploy.properties, OpenSocial.tokenService is not set correctly.
+
+
+ |
+
+ |
+
+
+
+
+
\ No newline at end of file
diff --git a/doc/upgrade-1.5.html b/doc/upgrade-1.5.html
index 41ccdc42..be97bd6f 100644
--- a/doc/upgrade-1.5.html
+++ b/doc/upgrade-1.5.html
@@ -103,6 +103,13 @@
See J.Blake for details.
+