merging develop into dev-isf

This commit is contained in:
brianjlowe 2013-09-10 09:08:55 -04:00
parent 2d3295fa2b
commit 6570e3dcc6
6 changed files with 356 additions and 368 deletions

View file

@ -12,7 +12,7 @@
owl:Class a owl:Class .
owl:Ontology a owl:Class .
owl:AnnotationProperty a owl:Class .
owl:DatatypeProperty a owl:
owl:DatatypeProperty a owl:Class .
owl:ObjectProperty a owl:Class .
###Display Model
@ -35,11 +35,11 @@ display:InternalClassesPage a owl:Class .
display:DataGetter a owl:Class .
display:RequiredAction a owl:Class ;
rdfs:comment "Represents a action that may need authorization to perform.".
rdfs:comment "Represents a action that may need authorization to perform." .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SparqlQueryDataGetter>
a owl:Class ;
rdfs:comment "Data getter for running a SPARQL query."
rdfs:comment "Data getter for running a SPARQL query." .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.SolrIndividualsDataGetter>
a owl:Class ;
@ -55,11 +55,11 @@ display:RequiredAction a owl:Class ;
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.ClassGroupPageData>
a owl:Class ;
rdfs:comment "A data getter for a VClassGroup page".
rdfs:comment "A data getter for a VClassGroup page" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.FixedHTMLDataGetter>
a owl:Class ;
rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF".
rdfs:comment "A data getter for a Fixed piece of HTML stored in RDF" .
<java:edu.cornell.mannlib.vitro.webapp.utils.dataGetter.IndividualsForClassesDataGetter>
a owl:Class .