litvinovg/vivo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Merge branch 'maint-rel-1.6' of https://github.com/vivo-project/VIVO into maint-rel-1.6

Browse source
This commit is contained in:
brianjlowe 2013-11-06 09:11:09 -05:00
commit 2704258977
4 changed files with 69 additions and 68 deletions
Download patch file Download diff file Expand all files Collapse all files

39
doc/install.html
View file

@ -339,6 +339,25 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
es_MX
</td>
</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>
&nbsp;
</td>
</tr>
</tbody>
</table>
@ -938,26 +957,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
</td>
</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>
&nbsp;
</td>
</tr>
</tbody>
</table>

16
doc/setting_up_orng.html
View file

@ -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>
<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.
You must set some additional parameters so VIVO will be able to communicate with Shindig-ORNG.
</p>
@ -333,7 +333,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
<ul>
<li>
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>
</ul>
</td>
@ -405,7 +405,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
<td>
<ul>
<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.
</li>
</ul>
@ -449,7 +449,7 @@ set CATALINA_OPTS=-Dshindig.host=localhost -Dshindig.port=8080 -Djava.awt.headle
<td>
<ul>
<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>
</ul>
</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>
<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.
</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
<pre> ant orng</pre>
</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
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 <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>).
</p>
<p>
Restart Tomcat to make this change take effect.
To make this change take effect, re-deploy VIVO and restart Tomcat.
</p>
<h4>Remove the OpenSocial webapp from Tomcat</h4>

78
productMods/counter.jsp
View file

@ -5,6 +5,8 @@
<%@ taglib uri="http://djpowell.net/tmp/sparql-tag/0.1/" prefix="sparql" %>
<%@ taglib uri="http://jakarta.apache.org/taglibs/string-1.1" prefix="str" %>
<%@ page import="java.net.URLDecoder" %>
<%@ page import="edu.cornell.mannlib.vitro.webapp.dao.ModelAccess"%>
<% request.setAttribute("jenaOntModel", ModelAccess.on(getServletContext()).getJenaOntModel()); %>
<div id="content">
@ -13,9 +15,9 @@
<!--
Author-Resource
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="inforauthorships">
<sparql:select model="${jenaOntModel}" var="inforauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -34,9 +36,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="inforauthors">
<sparql:select model="${jenaOntModel}" var="inforauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -58,9 +60,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="infors">
<sparql:select model="${jenaOntModel}" var="infors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -84,9 +86,9 @@
<!--
Author-Conference_Paper
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="confauthorships">
<sparql:select model="${jenaOntModel}" var="confauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -104,9 +106,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="confauthors">
<sparql:select model="${jenaOntModel}" var="confauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -127,9 +129,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="confs">
<sparql:select model="${jenaOntModel}" var="confs">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -152,9 +154,9 @@
<!--
Author-Academic_Article
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="acaauthorships">
<sparql:select model="${jenaOntModel}" var="acaauthorships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -172,9 +174,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="acaauthors">
<sparql:select model="${jenaOntModel}" var="acaauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -195,9 +197,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="acas">
<sparql:select model="${jenaOntModel}" var="acas">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -220,9 +222,9 @@
<!--
Investigator-Grant
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="piships">
<sparql:select model="${jenaOntModel}" var="piships">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -240,9 +242,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="pis">
<sparql:select model="${jenaOntModel}" var="pis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -260,9 +262,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="grants">
<sparql:select model="${jenaOntModel}" var="grants">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -284,9 +286,9 @@
<!--
Teacher-Course
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="teachings">
<sparql:select model="${jenaOntModel}" var="teachings">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -304,9 +306,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="teachers">
<sparql:select model="${jenaOntModel}" var="teachers">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -325,9 +327,9 @@
</sparql:sparql>
</sparql:lock>
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="courses">
<sparql:select model="${jenaOntModel}" var="courses">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -349,9 +351,9 @@
<!--
Co-Author Linkage
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="coauthors">
<sparql:select model="${jenaOntModel}" var="coauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -376,9 +378,9 @@
<!--
Distinct Co-Author Linkage
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="discoauthors">
<sparql:select model="${jenaOntModel}" var="discoauthors">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -404,9 +406,9 @@
<!--
Co-Investigator Linkage
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="copis">
<sparql:select model="${jenaOntModel}" var="copis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>
@ -429,9 +431,9 @@
<!--
Distinct Co-Investigator Linkage
-->
<sparql:lock model="${applicationScope.jenaOntModel }">
<sparql:lock model="${jenaOntModel }">
<sparql:sparql>
<sparql:select model="${applicationScope.jenaOntModel}" var="discopis">
<sparql:select model="${jenaOntModel}" var="discopis">
PREFIX rdfs: <http://www.w3.org/2000/01/rdf-schema#>
PREFIX rdf: <http://www.w3.org/1999/02/22-rdf-syntax-ns#>
PREFIX akt: <http://www.aktors.org/ontology/portal#>

4
rdf/display/everytime/PropertyConfig.n3
View file

@ -220,8 +220,8 @@ local:hasResearcherRoleContext a :ConfigContext ;
local:hasResearcherRoleConfig a :ObjectPropertyDisplayConfig ;
:listViewConfigFile "listViewConfig-researchActivities.xml"^^xsd:string ;
:displayName "research activities" ;
vitro:displayRankAnnot 15;
:displayName "other research activities" ;
vitro:displayRankAnnot 35;
vitro:hiddenFromDisplayBelowRoleLevelAnnot role:public ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot role:public ;
vitro:customEntryFormAnnot "edu.cornell.mannlib.vitro.webapp.edit.n3editing.configuration.generators.AddResearcherRoleToPersonGenerator"^^<http://www.w3.org/2001/XMLSchema#string> ;