-
- Java (SE) 1.6.x http://java.sun.com
+ Java (SE) 1.7.x http://java.sun.com
-
-
- VIVO does not work with OpenJDK -
- VIVO does not work with Java 1.7 +
- VIVO has not been tested with OpenJDK
-
@@ -245,8 +244,8 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com
These properties are used in compilation and deployment. They will be incorporated into VIVO when it is compiled in - Step 6. If you want to change these properties at - a later date, you will need to stop Tomcat, repeat Step 6, + Step 5. If you want to change these properties at + a later date, you will need to stop Tomcat, repeat Step 5, and restart Tomcat.
@@ -343,22 +342,62 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com -
5. Specify runtime properties
+5. Compile and deploy
In Step 4, you defined the location of the VIVO home directory, by specifying
vitro.homein thebuild.propertiesfile. Create that directory now.- At the top level of the VIVO distribution directory, you will find a file called -
example.runtime.properties. Copy this to the VIVO home directory you have created, - renaming the copy toruntime.properties. - Edit the file to suit your installation, as described in the following table. + At the command line, from the top level of the VIVO distribution + directory, type: +ant all
+ to build VIVO and deploy to Tomcat's webapps directory. + ++ The build script may run for as much as five minutes, + and creates more than 100 lines of output. + The process comprises several steps: +
-
+
- collecting the source files from the distribution directory, +
- compiling the Java source code, +
- compiling and running unit tests, +
- preparing the Solr search engine, +
- deploying VIVO and Solr to Tomcat. +
+ The output of the build may include a variety of warning messages. + The Java compiler may warn of code that is outdated. + Unit tests may produce warning messages, + and some tests may be ignored if they do not produce consistent results. +
+
++ BUILD SUCCESSFUL
Total time: 1 minute 49 seconds ++ If the output ends with a success message, the build was successful. + Proceed to the next step. +
+
++ BUILD FAILED
Total time: 35 seconds ++ If the output ends with a failure message, the build has failed. + Find the cause of the failure, fix the problem, and run the script again. +
+ +6. Specify runtime properties
++ The build process in Step 5 created a file called
example.runtime.properties+ in your VIVO home directory (vitro.homein thebuild.propertiesfile). + Rename this file toruntime.properties, and + edit the file to suit your installation, as described in the following table.These properties are loaded when VIVO starts up. If you want to change these properties at a later date, you will need to restart Tomcat for them to take - effect. You will not need to repeat Step 6. + effect. You will not need to repeat Step 5.
Windows: @@ -921,45 +960,6 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com -
6. Compile and deploy
-- At the command line, from the top level of the VIVO distribution - directory, type: -
ant all
- to build VIVO and deploy to Tomcat's webapps directory. - -- The build script may run for as much as five minutes, - and creates more than 100 lines of output. - The process comprises several steps: -
-
-
- collecting the source files from the distribution directory, -
- compiling the Java source code, -
- compiling and running unit tests, -
- preparing the Solr search engine, -
- deploying VIVO and Solr to Tomcat. -
- The output of the build may include a variety of warning messages. - The Java compiler may warn of code that is outdated. - Unit tests may produce warning messages, - and some tests may be ignored if they do not produce consistent results. -
-
-- BUILD SUCCESSFUL
Total time: 1 minute 49 seconds -- If the output ends with a success message, the build was successful. - Proceed to the next step. -
-
-- BUILD FAILED
Total time: 35 seconds -- If the output ends with a failure message, the build has failed. - Find the cause of the failure, fix the problem, and run the script again. -
7. Configure Tomcat
Set JVM parameters
@@ -1049,8 +1049,8 @@ issuing SPARQL queries that read data, and its URI for issuing SPARQL UPDATE com problem is detected the normal VIVO pages will redirect to a startup status page describing the problem. You can stop tomcat, attempt to fix the problem and - proceeded from Step 6. The - startup status page may offer a continue link which + proceed from Step 5. If the problem is not serious, the + startup status page may offer acontinuelink which will allow you to use VIVO in spite of the problems.diff --git a/doc/upgrade-1.6.html b/doc/upgrade-1.6.html index 3b7b9b58..6fdd5356 100644 --- a/doc/upgrade-1.6.html +++ b/doc/upgrade-1.6.html @@ -243,97 +243,59 @@ the new locations accordingly.
-Old locations of RDF files
-/WEB-INF/ontologies/app/application.owl -/WEB-INF/ontologies/app/aboutPage.n3 -/WEB-INF/ontologies/app/menu.n3 -/WEB-INF/ontologies/app/profilePageType.n3 -/WEB-INF/ontologies/app/loadedAtStartup/displayModelListViews.rdf -/WEB-INF/ontologies/app/loadedAtStartup/homePageDataGetters.n3 -/WEB-INF/ontologies/app/loadedAtStartup/localeSelectionGUI.n3 -/WEB-INF/ontologies/app/loadedAtStartup/vivoListViewConfig.rdf -/WEB-INF/ontologies/app/loadedAtStartup/vivoOrganizationDataGetters.n3 -/WEB-INF/ontologies/app/loadedAtStartup/vivoSearchProhibited.n3 -/WEB-INF/ontologies/app/menuload/displayTBOX.n3 -/WEB-INF/ontologies/app/menuload/displayDisplay.n3 -/WEB-INF/init-data/initialSiteConfig.rdf -/WEB-INF/ontologies/user/abox/geopolitical.ver1.1-11-18-11-individual-labels.rdf -/WEB-INF/ontologies/user/abox/vocabularySource-labels.n3 -/WEB-INF/ontologies/user/tbox/vitro-0.7-annotations.rdf -/WEB-INF/ontologies/user/tbox/geopolitical-ver1.1-11-18-11-annotations.rdf -/WEB-INF/ontologies/user/tbox/scires-1.5-annotations.rdf -/WEB-INF/ontologies/user/tbox/vivo-core-1.5-annotations.rdf -/WEB-INF/ontologies/user/tbox/isDefinedBy-1.5-annotations.rdf -/WEB-INF/ontologies/user/applicationMetadata/propertygroups.rdf -/WEB-INF/ontologies/user/applicationMetadata/classgroups.rdf -/WEB-INF/filegraph/abox/us-states.rdf -/WEB-INF/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl -/WEB-INF/filegraph/abox/academicDegree.rdf -/WEB-INF/filegraph/abox/documentStatus.owl -/WEB-INF/filegraph/abox/continents.n3 -/WEB-INF/filegraph/abox/vocabularySource.n3 -/WEB-INF/filegraph/abox/dateTimeValuePrecision.owl -/WEB-INF/filegraph/tbox/vitroPublic.owl -/WEB-INF/filegraph/tbox/vivo-dcterms-1.5.owl -/WEB-INF/filegraph/tbox/scires-1.5.owl -/WEB-INF/filegraph/tbox/vivo-core-1.5.owl -/WEB-INF/filegraph/tbox/vivo-c4o-1.5.owl -/WEB-INF/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl -/WEB-INF/filegraph/tbox/vivo-fabio-1.5.owl -/WEB-INF/filegraph/tbox/vivo-skos-1.5.owl -/WEB-INF/filegraph/tbox/vivo-event-1.5.owl -/WEB-INF/filegraph/tbox/vivo-foaf-1.5.owl -/WEB-INF/filegraph/tbox/vitro-0.7.owl -/WEB-INF/filegraph/tbox/vivo-pws-1.5.owl -/WEB-INF/filegraph/tbox/isDefinedBy-1.5.owl -/WEB-INF/filegraph/tbox/vivo-dcelements-1.5.owl -/WEB-INF/filegraph/tbox/vivo-bibo-1.5.owl
++
-+ +Old locations of RDF files +
under [Vitro]/webapp/web or [VIVO]/productModsNew locations of RDF files +
under [Vitro]/webapp/rdf or [VIVO]/rdfComments ++ +WEB-INF/ontologies/app/ +rdf/display/firsttime/ ++ + +WEB-INF/ontologies/app/loadedAtStartup/ +rdf/display/everytime/ ++ + +WEB-INF/ontologies/app/menuload/displayTBOX.n3 +rdf/displayTbox/everytime/ +Was one file, now a directory ++ +/WEB-INF/ontologies/app/menuload/displayDisplay.n3 +rdf/displayDisplay/everytime/ +Was one file, now a directory ++ +WEB-INF/ontologies/user/applicationMetadata/ +
WEB-INF/init-data/rdf/applicationMetadata/firsttime/ +Merged directories ++ +WEB-INF/ontologies/user/abox/ +rdf/abox/firsttime/ ++ + +WEB-INF/filegraph/abox/ +rdf/abox/filegraph/ ++ + +WEB-INF/ontologies/user/tbox/ +rdf/tbox/firsttime/ ++ + +WEB-INF/filegraph/tbox/ +rdf/tbox/filegraph/ ++ New locations of RDF files
-rdf/display/firsttime/aboutPage.n3 -rdf/display/firsttime/application.owl -rdf/display/firsttime/menu.n3 -rdf/display/firsttime/profilePageType.n3 -rdf/display/everytime/displayModelListViews.rdf -rdf/display/everytime/homePageDataGetters.n3 -rdf/display/everytime/localeSelectionGUI.n3 -rdf/display/everytime/vivoListViewConfig.rdf -rdf/display/everytime/vivoOrganizationDataGetters.n3 -rdf/display/everytime/vivoSearchProhibited.n3 -rdf/displayTbox/everytime/displayTBOX.n3 -rdf/displayDisplay/everytime/displayDisplay.n3 -rdf/applicationMetadata/firsttime/classgroups.rdf -rdf/applicationMetadata/firsttime/initialSiteConfig.rdf -rdf/applicationMetadata/firsttime/propertygroups.rdf -rdf/abox/firsttime/geopolitical.ver1.1-11-18-11-individual-labels.rdf -rdf/abox/firsttime/vocabularySource-labels.n3 -rdf/abox/filegraph/abox/academicDegree.rdf -rdf/abox/filegraph/abox/continents.n3 -rdf/abox/filegraph/abox/dateTimeValuePrecision.owl -rdf/abox/filegraph/abox/documentStatus.owl -rdf/abox/filegraph/abox/geopolitical.abox.ver1.1-11-18-11.owl -rdf/abox/filegraph/abox/us-states.rdf -rdf/abox/filegraph/abox/vocabularySource.n3 -rdf/tbox/firsttime/geopolitical-ver1.1-11-18-11-annotations.rdf -rdf/tbox/firsttime/isDefinedBy-1.5-annotations.rdf -rdf/tbox/firsttime/scires-1.5-annotations.rdf -rdf/tbox/firsttime/vitro-0.7-annotations.rdf -rdf/tbox/firsttime/vivo-core-1.5-annotations.rdf -rdf/tbox/filegraph/tbox/geopolitical.tbox.ver1.1-11-18-11.owl -rdf/tbox/filegraph/tbox/isDefinedBy-1.5.owl -rdf/tbox/filegraph/tbox/scires-1.5.owl -rdf/tbox/filegraph/tbox/vitro-0.7.owl -rdf/tbox/filegraph/tbox/vitroPublic.owl -rdf/tbox/filegraph/tbox/vivo-bibo-1.5.owl -rdf/tbox/filegraph/tbox/vivo-c4o-1.5.owl -rdf/tbox/filegraph/tbox/vivo-core-1.5.owl -rdf/tbox/filegraph/tbox/vivo-dcelements-1.5.owl -rdf/tbox/filegraph/tbox/vivo-dcterms-1.5.owl -rdf/tbox/filegraph/tbox/vivo-event-1.5.owl -rdf/tbox/filegraph/tbox/vivo-fabio-1.5.owl -rdf/tbox/filegraph/tbox/vivo-foaf-1.5.owl -rdf/tbox/filegraph/tbox/vivo-pws-1.5.owl -rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl
If you are using a three-tier build process, you will need to add two lines to the build script to accomodate the RDF files, and the language support (see below) @@ -353,8 +315,8 @@ rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl
<patternset id="appbase.patterns"> <include name="src/**/*" /> <include name="lib/**/*" /> -<include name="rdf/**/*" /> -<include name="languages/**/*" /> +<include name="rdf/**/*" /> +<include name="languages/**/*" /> <include name="test/**/*" /> <include name="themes/**/*" /> <include name="config/*.properties" /> @@ -436,24 +398,26 @@ rdf/tbox/filegraph/tbox/vivo-skos-1.5.owl
For this release, the following browsers are supported.
-- Mac: -
--
-
- Chrome 30.0.1599.69 and above -
- FireFox 3.6.28, 10.0.12, 24 -
- Opera 12.02 -
- Safari 5.0.3 -
- -
- PC:
-
-
-
- Chrome 25.1364.2 and above -
- FireFox 10.0.12, 24 -
- Internet Explorer 8, 9, 10 -
- Opera 12.02 -
-
+
-
+ Mac:
+
-
+
- Chrome 30.0.1599.69 and above +
- FireFox 3.6.28, 10.0.12, 24 +
- Opera 12.02 +
- Safari 5.0.3 +
+ -
+ PC:
+
-
+
- Chrome 25.1364.2 and above +
- FireFox 10.0.12, 24 +
- Internet Explorer 8, 9, 10 +
- Opera 12.02 +
+
- ${userAccount.firstName} ${userAccount.lastName} -
- -- ${i18n().congratulations} -
- -- ${i18n().we_have_created_your_account(siteName,userAccount.emailAddress)} -
- -- ${i18n().did_not_request_text} -
- -- ${i18n().click_to_create_password} -
- -- ${passwordLink} -
- -- ${i18n().if_link_failed} -
- -- ${i18n().thanks} -
- - - - -<#assign text> -${userAccount.firstName} ${userAccount.lastName} - -${i18n().congratulations} - -${i18n().we_have_created_your_account(siteName,userAccount.emailAddress)} - -${i18n().did_not_request_text} - -${i18n().paste_the_link} - -${passwordLink} - -${i18n().thanks} - - -<@email subject=subject html=html text=text /> \ No newline at end of file diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl new file mode 100644 index 00000000..08cd3d98 --- /dev/null +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-grantAdministeredBy.ftl @@ -0,0 +1,26 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- + + This template must be self-contained and not rely on other variables set for the individual page, because it + is also used to generate the property statement during a deletion. + --> +<#import "lib-sequence.ftl" as s> +<#import "lib-datetime.ftl" as dt> +<@showAdministrator statement /> + +<#-- Use a macro to keep variable assignments local; otherwise the values carry over to the + next statement --> +<#macro showAdministrator statement> + + <#local linkedIndividual> + <#if statement.organization??> + ${statement.organizationLabel!""} + <#else> + ${i18n().missing_organization} + + + + ${linkedIndividual!} + + diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl index 0c19e9b4..bfc1e92d 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-hasPresenterRole.ftl @@ -16,7 +16,7 @@ <#macro showRole statement> <#local linkedIndividual> <#if statement.presentation??> - ${statement.presentationLabel!statement.presentationName} + ${statement.presentationLabel!statement.presentationName!""} <#else> <#-- This shouldn't happen, but we must provide for it --> ${i18n().missing_presentation} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl index 1b12358a..0f3c9398 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-issuedCredential.ftl @@ -17,7 +17,7 @@ <#if statement.credential??> ${statement.credentialLabel!statement.issuedCredentialLabel!statement.credentialLocal!} <#else> - ${statement.issuedCredentialLabel!"missing credential"} + ${statement.issuedCredentialLabel!"${i18n().missing_credential}"} diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl index f5a45eec..5b18d090 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-mailingAddress.ftl @@ -13,9 +13,17 @@ <#macro showAddress statement> <#if statement.street?has_content> -- ${statement.street} -
+ <#if statement.street?contains(";") > + <#list statement.street?split("; ") as lines> ++ ${lines} +
+ + <#else> ++ ${statement.street} +
+ <#if ( statement.country?has_content && (statement.country == "US" || statement.country?contains("United States") || statement.country?contains("U.S.") || statement.country?contains("U.S.A.") || statement.country?contains("USA")))> @@ -23,7 +31,7 @@ <#local cityStateZip><@s.join [ cityState!, statement.postalCode!], " " /> <#if cityStateZip?has_content>${cityStateZip}
-${statement.country!}
+${statement.country!}
<#else> <#if statement.locality?has_content> @@ -42,7 +50,7 @@ <#if statement.country?has_content> -+
${statement.country}
diff --git a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl index 2dbf53ed..9e589c10 100644 --- a/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl +++ b/productMods/templates/freemarker/body/partials/individual/propStatement-researchAreaOf.ftl @@ -13,13 +13,18 @@ next statement --> <#macro showResearchers statement> <#local linkedIndividual> - ${statement.personName} + ${statement.personName!} <#if statement.title?has_content > <#local posnTitle = statement.title> - <#else> - <#local posnTitle = statement.posnLabel!statement.personType> + <#elseif statement.posnLabel?has_content> + <#local posnTitle = statement.posnLabel> + + <#if statement.org??> + <#local orgString> + ${statement.orgLabel!""} + - <@s.join [ linkedIndividual, posnTitle, statement.orgLabel!"" ] /> ${statement.type!} + <@s.join [ linkedIndividual, posnTitle!, orgString! ] /> diff --git a/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl b/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl index 3956993c..23a3f0ea 100644 --- a/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl +++ b/productMods/templates/freemarker/edit/forms/addFullNameToPerson.ftl @@ -65,13 +65,13 @@ +${stylesheets.add('', + '')} + +${scripts.add('', + '')} \ No newline at end of file diff --git a/productMods/templates/freemarker/edit/forms/grantAdministeredBy.ftl b/productMods/templates/freemarker/edit/forms/grantAdministeredBy.ftl new file mode 100644 index 00000000..dfba927f --- /dev/null +++ b/productMods/templates/freemarker/edit/forms/grantAdministeredBy.ftl @@ -0,0 +1,136 @@ +<#-- $This file is distributed under the terms of the license in /doc/license.txt$ --> + +<#-- this is in request.subject.name --> + +<#-- leaving this edit/add mode code in for reference in case we decide we need it --> + +<#import "lib-vivo-form.ftl" as lvf> + +<#--Retrieve certain edit configuration information--> +<#if editConfiguration.objectUri?has_content> + <#assign editMode = "edit"> +<#else> + <#assign editMode = "add"> + + +<#--The blank sentinel indicates what value should be put in a URI when no autocomplete result has been selected. +If the blank value is non-null or non-empty, n3 editing for an existing object will remove the original relationship +if nothing is selected for that object--> +<#assign blankSentinel = "" /> +<#if editConfigurationConstants?has_content && editConfigurationConstants?keys?seq_contains("BLANK_SENTINEL")> + <#assign blankSentinel = editConfigurationConstants["BLANK_SENTINEL"] /> + + +<#--This flag is for clearing the label field on submission for an existing object being selected from autocomplete. +Set this flag on the input acUriReceiver where you would like this behavior to occur. --> +<#assign flagClearLabelForExisting = "flagClearLabelForExisting" /> + +<#assign htmlForElements = editConfiguration.pageData.htmlForElements /> + +<#--Retrieve variables needed--> +<#assign existingOrgValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "existingOrganization") /> +<#assign orgLabelValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgLabel") /> +<#assign orgLabelDisplayValue = lvf.getFormFieldValue(editSubmission, editConfiguration, "orgLabelDisplay") /> + +<#--If edit submission exists, then retrieve validation errors if they exist--> +<#if editSubmission?has_content && editSubmission.submissionExists = true && editSubmission.validationErrors?has_content> + <#assign submissionErrors = editSubmission.validationErrors/> + + +<#if editMode == "edit"> + <#assign titleVerb="${i18n().edit_capitalized}"> + <#assign submitButtonText="${i18n().save_changes}"> + <#assign disabledVal="disabled"> +<#else> +<#assign titleVerb="${i18n().create_capitalized}"> +<#assign submitButtonText="${i18n().create_entry}"> + <#assign disabledVal=""/> + + +<#assign requiredHint = " *" /> + +${titleVerb} ${i18n().administering_organization_for} ${editConfiguration.subjectName}
+ +<#--Display error messages if any--> +<#if submissionErrors?has_content> + <#if orgLabelDisplayValue?has_content > + <#assign orgLabelValue = orgLabelDisplayValue /> + + +
+ + <#--Checking if any required fields are empty--> + <#if lvf.submissionErrorExists(editSubmission, "orgLabel")> + ${i18n().select_or_create_organization} + +
+
+
diff --git a/productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl b/productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
index d542fd2d..b921ebcf 100644
--- a/productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
+++ b/productMods/templates/freemarker/edit/forms/personHasIssuedCredential.ftl
@@ -53,7 +53,7 @@ Set this flag on the input acUriReceiver where you would like this behavior to o
<#assign requiredHint = " *" />
<#assign yearHint = "(${i18n().year_hint_format})" />
-