From 6940771720a08f2532c066a20ac37234ac188824 Mon Sep 17 00:00:00 2001 From: j2blake Date: Tue, 5 Nov 2013 17:51:09 -0500 Subject: [PATCH] VIVO-448 Correct the installation instructions for ORNG. The change from deploy.properties to build/runtime.properties wasn't handled correctly. --- doc/install.html | 39 +++++++++++++++++++-------------------- doc/setting_up_orng.html | 16 ++++++++-------- 2 files changed, 27 insertions(+), 28 deletions(-) diff --git a/doc/install.html b/doc/install.html index 00c033cd..c30b768e 100644 --- a/doc/install.html +++ b/doc/install.html @@ -339,6 +339,25 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com es_MX + + + These values are used when deploying VIVO as an OpenSocial container + and integrating with OpenSocial gadgets + (see Step 13, below). If you are creating + a VIVO installation that does not use OpenSocial gadgets, these values are omitted. + + + + + OpenSocial.shindigURL
+ OpenSocial.tokenService
+ OpenSocial.tokenKeyFile
+ OpenSocial.sandbox + + +   + + @@ -938,26 +957,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com - - - These values are used when deploying VIVO as an OpenSocial container - and integrating with OpenSocial gadgets - (see Step 13, below). If you are creating - a VIVO installation that does not use OpenSocial gadgets, these values are omitted. - - - - - OpenSocial.shindigURL
- OpenSocial.tokenService
- OpenSocial.tokenKeyFile
- OpenSocial.sandbox - - -   - - - diff --git a/doc/setting_up_orng.html b/doc/setting_up_orng.html index 9f7e59a6..9eb99459 100644 --- a/doc/setting_up_orng.html +++ b/doc/setting_up_orng.html @@ -188,7 +188,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle

I.iv Configure VIVO

- In the VIVO home directory, the file called runtime.properties + In the VIVO distribution directory, the file called build.properties contains configuration options for the VIVO application. You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG.

@@ -333,7 +333,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle @@ -405,7 +405,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle @@ -449,7 +449,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle @@ -692,11 +692,11 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle

III.i. Re-running the deployment script

- The OpenSocial framework relies on several of the settings in the runtime.properties file, + The OpenSocial framework relies on several of the settings in the build.properties and runtime.properties files, in addition to the ones that are explicitly linked to it.

- Each time you change the settings in runtime.properties, you should re-deploy + Each time you change the settings in build.properties or runtime.properties, you should re-deploy the framework with 

          ant orng

@@ -750,12 +750,12 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle Disabling the gadgets, as above, will remove essentially all of the OpenSocial processing within VIVO. To remove the remainder of it, you can disable the connection between VIVO and the OpenSocial service. Do this by removing or commenting - the OpenSocial properties in runtime.properties + the OpenSocial properties in build.properties (see section I.iv. Configure VIVO).

- Restart Tomcat to make this change take effect. + To make this change take effect, re-deploy VIVO and restart Tomcat.

Remove the OpenSocial webapp from Tomcat