diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java index 67511a575..ae21af42d 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/VitroVocabulary.java @@ -24,9 +24,7 @@ public class VitroVocabulary { public static final String RDF = "http://www.w3.org/1999/02/22-rdf-syntax-ns#"; public static final String RDFS = "http://www.w3.org/2000/01/rdf-schema#"; public static final String RDF_TYPE = RDF+"type"; - public static final String LABEL = RDFS + "label"; - - public static final String SUBCLASS_OF = RDFS+"subClassOf"; + public static final String LABEL = RDFS + "label"; public static final String OWL = "http://www.w3.org/2002/07/owl#"; public static final String OWL_ONTOLOGY = OWL+"Ontology"; @@ -123,23 +121,14 @@ public class VitroVocabulary { // ================== Vitro Portal vocabulary =========================== public static final String PORTAL = vitroURI+"Portal"; - public static final String PORTAL_THEMEDIR = vitroURI+"themeDir"; - public static final String PORTAL_BANNERIMAGE = vitroURI+"bannerImage"; + public static final String PORTAL_THEMEDIR = vitroURI+"themeDir"; public static final String PORTAL_CONTACTMAIL = vitroURI+"contactMail"; - public static final String PORTAL_CORRECTIONMAIL = vitroURI+"correctionMail"; - public static final String PORTAL_SHORTHAND = vitroURI+"shortHand"; + public static final String PORTAL_CORRECTIONMAIL = vitroURI+"correctionMail"; public static final String PORTAL_ABOUTTEXT = vitroURI+"aboutText"; - public static final String PORTAL_ACKNOWLEGETEXT = vitroURI+"acknowledgeText"; - public static final String PORTAL_BANNERWIDTH = vitroURI+"bannerWidth"; - public static final String PORTAL_BANNERHEIGHT = vitroURI+"bannerHeight"; + public static final String PORTAL_ACKNOWLEGETEXT = vitroURI+"acknowledgeText"; public static final String PORTAL_COPYRIGHTURL = vitroURI+"copyrightURL"; public static final String PORTAL_COPYRIGHTANCHOR = vitroURI+"copyrightAnchor"; - public static final String PORTAL_ROOTBREADCRUMBURL = vitroURI+"rootBreadCrumbURL"; - public static final String PORTAL_ROOTBREADCRUMBANCHOR = vitroURI+"rootBreadCrumbAnchor"; - public static final String PORTAL_LOGOTYPEIMAGE = vitroURI+"logotypeImage"; - public static final String PORTAL_LOGOTYPEHEIGHT = vitroURI+"logotypeHeight"; - public static final String PORTAL_LOGOTYPEWIDTH = vitroURI+"logotypeWidth"; - public static final String PORTAL_IMAGETHUMBWIDTH = vitroURI+"imageThumbWidth"; + // reusing displayRank property above public static final String PORTAL_URLPREFIX = vitroURI + "urlPrefix"; diff --git a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java index 4a4b4185e..c315b4856 100644 --- a/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java +++ b/webapp/src/edu/cornell/mannlib/vitro/webapp/dao/jena/JenaBaseDaoCon.java @@ -88,39 +88,18 @@ public class JenaBaseDaoCon { protected OntClass PORTAL = _constModel.createClass(VitroVocabulary.PORTAL); protected DatatypeProperty APPLICATION_THEMEDIR = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_THEMEDIR); - protected DatatypeProperty PORTAL_BANNERIMAGE = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_BANNERIMAGE); protected DatatypeProperty APPLICATION_CONTACTMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CONTACTMAIL); - protected DatatypeProperty APPLICATION_CORRECTIONMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CORRECTIONMAIL); - protected DatatypeProperty PORTAL_SHORTHAND = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_SHORTHAND); + protected DatatypeProperty APPLICATION_CORRECTIONMAIL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_CORRECTIONMAIL); protected DatatypeProperty APPLICATION_ABOUTTEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ABOUTTEXT); - protected DatatypeProperty APPLICATION_ACKNOWLEGETEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ACKNOWLEGETEXT); - protected DatatypeProperty PORTAL_BANNERWIDTH = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_BANNERWIDTH); - protected DatatypeProperty PORTAL_BANNERHEIGHT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_BANNERHEIGHT); + protected DatatypeProperty APPLICATION_ACKNOWLEGETEXT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ACKNOWLEGETEXT); protected DatatypeProperty APPLICATION_COPYRIGHTURL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_COPYRIGHTURL); protected DatatypeProperty APPLICATION_COPYRIGHTANCHOR = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_COPYRIGHTANCHOR); - protected DatatypeProperty PORTAL_ROOTBREADCRUMBURL = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ROOTBREADCRUMBURL); - protected DatatypeProperty PORTAL_ROOTBREADCRUMBANCHOR = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_ROOTBREADCRUMBANCHOR); - protected DatatypeProperty PORTAL_LOGOTYPEIMAGE = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_LOGOTYPEIMAGE); - protected DatatypeProperty PORTAL_LOGOTYPEHEIGHT = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_LOGOTYPEHEIGHT); - protected DatatypeProperty PORTAL_LOGOTYPEWIDTH = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_LOGOTYPEWIDTH); - protected DatatypeProperty PORTAL_IMAGETHUMBWIDTH = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_IMAGETHUMBWIDTH); - protected DatatypeProperty PORTAL_URLPREFIX = _constModel.createDatatypeProperty(VitroVocabulary.PORTAL_URLPREFIX); - + protected AnnotationProperty ONTOLOGY_PREFIX_ANNOT = _constModel.createAnnotationProperty(VitroVocabulary.ONTOLOGY_PREFIX_ANNOT); protected Ontology VITRO_PUBLIC_ONTOLOGY = _constModel.createOntology(VitroVocabulary.VITRO_PUBLIC_ONTOLOGY); - protected OntClass FS_FILE = _constModel.createClass(VitroVocabulary.FS_FILE_CLASS); - protected OntClass FS_BYTESTREAM = _constModel.createClass(VitroVocabulary.FS_BYTESTREAM_CLASS); - protected ObjectProperty FS_DOWNLOAD_LOCATION = _constModel.createObjectProperty(VitroVocabulary.FS_DOWNLOAD_LOCATION); - protected ObjectProperty FS_THUMBNAIL_IMAGE = _constModel.createObjectProperty(VitroVocabulary.FS_THUMBNAIL_IMAGE); - protected DatatypeProperty FS_FILENAME = _constModel.createDatatypeProperty(VitroVocabulary.FS_FILENAME); - protected DatatypeProperty FS_MIME_TYPE = _constModel.createDatatypeProperty(VitroVocabulary.FS_MIME_TYPE); - protected DatatypeProperty FS_ATTRIBUTION = _constModel.createDatatypeProperty(VitroVocabulary.FS_ATTRIBUTION); - protected DatatypeProperty FS_ALIAS_URL = _constModel.createDatatypeProperty(VitroVocabulary.FS_ALIAS_URL); - protected ObjectProperty IND_MAIN_IMAGE = _constModel.createObjectProperty(VitroVocabulary.IND_MAIN_IMAGE); - protected ObjectProperty IND_IMAGE = _constModel.createObjectProperty(VitroVocabulary.IND_IMAGE); /* ***************** User Account Model constants ***************** */