VIVO-448 Correct the installation instructions for ORNG.
The change from deploy.properties to build/runtime.properties wasn't handled correctly.
This commit is contained in:
parent
4e4459a42a
commit
6940771720
2 changed files with 27 additions and 28 deletions
|
@ -339,6 +339,25 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
|
||||||
es_MX
|
es_MX
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
<tr>
|
||||||
|
<td colspan="2">
|
||||||
|
These values are used when deploying VIVO as an OpenSocial container
|
||||||
|
and integrating with OpenSocial gadgets
|
||||||
|
(see <a href="#opensocial">Step 13</a>, below). If you are creating
|
||||||
|
a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
|
<tr class="odd_row">
|
||||||
|
<td>
|
||||||
|
OpenSocial.shindigURL<br>
|
||||||
|
OpenSocial.tokenService<br>
|
||||||
|
OpenSocial.tokenKeyFile<br>
|
||||||
|
OpenSocial.sandbox
|
||||||
|
</td>
|
||||||
|
<td>
|
||||||
|
|
||||||
|
</td>
|
||||||
|
</tr>
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
@ -938,26 +957,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
|
||||||
</td>
|
</td>
|
||||||
</tr>
|
</tr>
|
||||||
|
|
||||||
<tr>
|
|
||||||
<td colspan="2">
|
|
||||||
These values are used when deploying VIVO as an OpenSocial container
|
|
||||||
and integrating with OpenSocial gadgets
|
|
||||||
(see <a href="#opensocial">Step 13</a>, below). If you are creating
|
|
||||||
a VIVO installation that does not use OpenSocial gadgets, these values are omitted.
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
<tr class="odd_row">
|
|
||||||
<td>
|
|
||||||
OpenSocial.shindigURL<br>
|
|
||||||
OpenSocial.tokenService<br>
|
|
||||||
OpenSocial.tokenKeyFile<br>
|
|
||||||
OpenSocial.sandbox
|
|
||||||
</td>
|
|
||||||
<td>
|
|
||||||
|
|
||||||
</td>
|
|
||||||
</tr>
|
|
||||||
|
|
||||||
</tbody>
|
</tbody>
|
||||||
</table>
|
</table>
|
||||||
|
|
||||||
|
|
|
@ -188,7 +188,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
|
||||||
|
|
||||||
<h3 id="vivo_settings">I.iv Configure VIVO</h3>
|
<h3 id="vivo_settings">I.iv Configure VIVO</h3>
|
||||||
<p>
|
<p>
|
||||||
In the VIVO home directory, the file called <em>runtime.properties</em>
|
In the VIVO distribution directory, the file called <em>build.properties</em>
|
||||||
contains configuration options for the VIVO application.
|
contains configuration options for the VIVO application.
|
||||||
You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG.
|
You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG.
|
||||||
</p>
|
</p>
|
||||||
|
@ -333,7 +333,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
VIVO was not re-deployed with <tt>ant deploy</tt> after the OpenSocial
|
VIVO was not re-deployed with <tt>ant deploy</tt> after the OpenSocial
|
||||||
values were set in <em>runtime.properties</em>
|
values were set in <em>build.properties</em>
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
|
@ -405,7 +405,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
<em>OpenSocial.tokenKeyFile</em> is not set in <em>runtime.properties</em>,
|
<em>OpenSocial.tokenKeyFile</em> is not set in <em>build.properties</em>,
|
||||||
or the file does not exist at the specified location.
|
or the file does not exist at the specified location.
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
|
@ -449,7 +449,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
|
||||||
<td>
|
<td>
|
||||||
<ul>
|
<ul>
|
||||||
<li>
|
<li>
|
||||||
In <em>runtime.properties</em>, <em>OpenSocial.tokenService</em> is not set correctly.
|
In <em>build.properties</em>, <em>OpenSocial.tokenService</em> is not set correctly.
|
||||||
</li>
|
</li>
|
||||||
</ul>
|
</ul>
|
||||||
</td>
|
</td>
|
||||||
|
@ -692,11 +692,11 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
|
||||||
<h3 id="redeploying">III.i. Re-running the deployment script</h2>
|
<h3 id="redeploying">III.i. Re-running the deployment script</h2>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
The OpenSocial framework relies on several of the settings in the <em>runtime.properties</em> file,
|
The OpenSocial framework relies on several of the settings in the <em>build.properties</em> and <em>runtime.properties</em> files,
|
||||||
in addition to the ones that are explicitly linked to it.
|
in addition to the ones that are explicitly linked to it.
|
||||||
</p>
|
</p>
|
||||||
<p>
|
<p>
|
||||||
Each time you change the settings in <em>runtime.properties</em>, you should re-deploy
|
Each time you change the settings in <em>build.properties</em> or <em>runtime.properties</em>, you should re-deploy
|
||||||
the framework with
|
the framework with
|
||||||
<pre> ant orng</pre>
|
<pre> ant orng</pre>
|
||||||
</p>
|
</p>
|
||||||
|
@ -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
|
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
|
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
|
VIVO and the OpenSocial service. Do this by removing or commenting
|
||||||
the <em>OpenSocial</em> properties in <em>runtime.properties</em>
|
the <em>OpenSocial</em> properties in <em>build.properties</em>
|
||||||
(see <a href="#vivo_settings">section I.iv. Configure VIVO</a>).
|
(see <a href="#vivo_settings">section I.iv. Configure VIVO</a>).
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<p>
|
<p>
|
||||||
Restart Tomcat to make this change take effect.
|
To make this change take effect, re-deploy VIVO and restart Tomcat.
|
||||||
</p>
|
</p>
|
||||||
|
|
||||||
<h4>Remove the OpenSocial webapp from Tomcat</h4>
|
<h4>Remove the OpenSocial webapp from Tomcat</h4>
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue