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

Merge branch 'maint-rel-1.6' into develop

Browse source 
Conflicts:
	src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
This commit is contained in:
hudajkhan 2013-11-01 11:29:29 -04:00
commit b71fb8045a
6 changed files with 71 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
config/example.runtime.properties
View file

@ -143,7 +143,13 @@ visualization.temporal = enabled
# The format for this property is id, name; id1, name1; id2, name2 etc.
# See Service Metadata from this page http://code.google.com/p/google-refine/wiki/ReconciliationServiceApi
# for more information.
Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; http://purl.org/NET/c4dm/event.owl#Event, event:Event; http://vivoweb.org/ontology/core#Agreement, core:Agreement; http://vivoweb.org/ontology/core#Location, core:Location; http://xmlns.com/foaf/0.1/Organization, foaf:Organization; http://xmlns.com/foaf/0.1/Person, foaf:Person; http://vivoweb.org/ontology/core#InformationResource, core:Information Resource
Vitro.reconcile.defaultTypeList = http://vivoweb.org/ontology/core#Role, core:Role; \
http://vivoweb.org/ontology/core#AcademicDegree, core:Academic Degree; \
http://purl.org/NET/c4dm/event.owl#Event, event:Event; \
http://vivoweb.org/ontology/core#Location, core:Location; \
http://xmlns.com/foaf/0.1/Organization, foaf:Organization; \
http://xmlns.com/foaf/0.1/Person, foaf:Person; \
http://purl.obolibrary.org/obo/IAO_0000030, obo:IAO_0000030
#
# Types of individual for which we can create proxy editors.

32
doc/upgrade-1.6.html
View file

@ -51,6 +51,7 @@
<li><a href="#rdffiles">Auto-loaded RDF files move to the Home directory</a></li>
<li><a href="#language">Support for additional languages</a></li>
<li><a href="#extended_lod">More compact responses to Linked data requests</a></li>
<li><a href="#google_refine">Changes to default types for Google Refine</a></li>
</ol>
</li>
<li><a href="#upgrade_process">Upgrade Instructions</a></li>
@ -143,7 +144,9 @@
<li><code>webapp.name</code></li>
</ul>
</p>
</li>
<li>
<h4 id="solr_insecure">Solr is no longer secured</h4>
<p>
In previous releases, Solr was deployed to Tomcat with a <code>RemoteAddrValve</code>
@ -163,7 +166,9 @@
<p>
Sites that need to secure Solr are now left to their own devices.
</p>
</li>
<li>
<h4 id="log4j_properties">Log4J properties file renamed</h4>
<p>
In previous releases, the properties file for the VIVO logging system
@ -175,7 +180,9 @@
Note that <code>debug.log4j.properties</code>, if present, will still
override the default.
</p>
</li>
<li>
<h4 id="tabMenu">Property groups now displayed in a tab format, including a "View All" tab</h4>
<p>
With release 1.6, the property group menu bar that was used on profile pages has been replaced
@ -183,7 +190,9 @@
within that group while the contents of the previously displayed group will be hidden. The array of
tabs also includes a "View All" tab that, when clicked, displays the contents of all the property groups.
</p>
</li>
<li>
<h4 id="sparqlDataGetters">Class-specific SPARQL Query Data Getters</h4>
<p>
The VIVO software now supports the development of SPARQL query data getters that can be associated
@ -195,7 +204,9 @@
data getters:
<code>https://wiki.duraspace.org/display/VIVO/Enriching+VIVO+Content+Using+SPARQL+Query+Data+Getters</code>.
</p>
</li>
<li>
<h4 id="foafPersonTemplate">The foaf:Person template has been re-located.</h4>
<p>
The template individual--foaf-person.ftl has been moved to the "templates" subdirectory in the wilma
@ -204,7 +215,9 @@
theme directory or, if your installation does not have it's own theme directory, in the
<code>themes/wilma/templates subdirectory</code>.
</p>
</li>
<li>
<h4 id="multiple">Multiple foaf:Person Profile Pages</h4>
<p>
VIVO now supports multiple profile pages for foaf:Persons. This feature, which is optional so installations
@ -218,7 +231,9 @@
Websnapr.) For more information on how to implement multiple profile page views, refer to this wiki page:
<code>https://wiki.duraspace.org/display/VIVO/Multiple+foaf%3APerson+Profile+Pages</code>.
</p>
</li>
<li>
<h4 id="homePage">Home Page Re-design</h4>
<p>
For Release 1.6 the VIVO Home Page has been redesigned. The Search field beneath the "welcome" text now
@ -229,7 +244,9 @@
activities and organizations; and, <a href="#optionalMap">optionally</a> a global map showing researchers'
areas of geographic focus.
</p>
</li>
<li>
<h4 id="rdffiles">Auto-loaded RDF files move to the Home directory</h4>
<p>
The RDF files that initialize the data model have moved, in both the distribution and
@ -326,7 +343,9 @@
&lt;include name="context.xml" /&gt;
&lt;/patternset&gt;</pre>
</p>
</li>
<li>
<h4 id="language">Support for additional languages</h4>
<p>
VIVO 1.6 includes limited support for other languages, in addition to American English.
@ -350,7 +369,9 @@
<a href="https://wiki.duraspace.org/display/VIVO/Adding+a+language+to+VIVO">
Add a new language to VIVO</a>.
</p>
</li>
<li>
<h4 id="extended_lod">More compact responses to Linked data requests</h4>
<p>
In VIVO 1.6, the response to requests for linked data is changed, to be smaller and faster.
@ -391,8 +412,17 @@
VIVO release 1.6 can be configured to produce extended linked data like previous releases.
However, extended linked data will not be supported in future releases.
</p>
</li>
<li>
<h4 id="google_refine">Changes to default types for Google Refine</h4>
<p>
The list of default types for Google Refine has changed, to accomodate changes in the
ontology. If you are using Google Refine, you may need to change your runtime properties
accordingly. The new defaults appear in <code>example.runtime.properties</code>.
</p>
</li>
<li>
<h4 id="browsers">Supported Browsers</h4>
<p>

2
productMods/WEB-INF/ontologies/update/sparqlConstructs/additions/vcard1-3.sparql
View file

@ -7,7 +7,7 @@ PREFIX owl: <http://www.w3.org/2002/07/owl#>
CONSTRUCT {
?s arg:ARG_2000028 _:vcard .
_:vcard arg:ARG_2000029 ?s .
_:vcard a v:Individual .
_:vcard a v:Kind .
} WHERE {
?s vivo:webpage ?webpage
FILTER NOT EXISTS { ?s a foaf:Agent }

10
rdf/tbox/filegraph/object-properties3.owl
View file

@ -448,9 +448,19 @@
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#hasSubjectArea">
<rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#hasAssociatedConcept"/>
<owl:inverseOf rdf:resource="http://vivoweb.org/ontology/core#subjectAreaOf"/>
</owl:ObjectProperty>
<!-- http://vivoweb.org/ontology/core#hasSubjectArea -->
<owl:ObjectProperty rdf:about="http://vivoweb.org/ontology/core#subjectAreaOf">
<rdfs:subPropertyOf rdf:resource="http://vivoweb.org/ontology/core#conceptAssociatedWith"/>
</owl:ObjectProperty>
<!-- http://vivoweb.org/ontology/core#hasSuccessorOrganization -->

17
rdf/tbox/firsttime/initialTBoxAnnotations.n3
View file

@ -583,6 +583,23 @@ vivo:researchAreaOf
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
vivo:subjectAreaOf
rdfs:label "subject area of"@en-US ;
vitro:displayLimitAnnot
"5"^^xsd:int ;
vitro:displayRankAnnot
"10"^^xsd:int ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:inPropertyGroupAnnot
<http://vivoweb.org/ontology#vitroPropertyGroupoverview> ;
vitro:offerCreateNewOptionAnnot
"true"^^xsd:boolean ;
vitro:prohibitedFromUpdateBelowRoleLevelAnnot
<http://vitro.mannlib.cornell.edu/ns/vitro/role#public> ;
vitro:selectFromExistingAnnot
"true"^^xsd:boolean .
geo:populationTotal
rdfs:label "total population"@en-US ;
vitro:hiddenFromDisplayBelowRoleLevelAnnot

7
src/edu/cornell/mannlib/vitro/webapp/edit/n3editing/configuration/generators/AddConceptThroughObjectPropertyGenerator.java
View file

@ -122,8 +122,11 @@ public class AddConceptThroughObjectPropertyGenerator extends DefaultObjectPrope
}
String[] typesArray = types.toArray(new String[types.size()]);
field.setOptions( new IndividualsViaSolrQueryOptions(
vreq.getSession().getServletContext(),
typesArray));
vreq.getSession().getServletContext(),
getSubjectUri(),
predicateUri,
getObjectUri(),
typesArray));
}else{
field.setOptions(null);
}