From 4602c5ac278a0ddb759a1e22a3ac6a78cb5895ca Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Tue, 6 Jun 2017 23:08:09 +0100 Subject: [PATCH 1/7] Remove faded welcome message --- webapp/src/main/webapp/js/vitroUtils.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/js/vitroUtils.js b/webapp/src/main/webapp/js/vitroUtils.js index 2eae74bb0..2156515a0 100644 --- a/webapp/src/main/webapp/js/vitroUtils.js +++ b/webapp/src/main/webapp/js/vitroUtils.js @@ -7,7 +7,7 @@ $(document).ready(function(){ // fade out welcome-message when user logs in jQuery.extend(this, i18nStrings); - jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500); + jQuery('section#welcome-message').css('display', 'block').delay(2000).fadeOut(1500, function() { jQuery('section#welcome-msg-container').remove(); }); // fade in flash-message when user logs out jQuery('section#flash-message').css('display', 'none').fadeIn(1500); From 40891dbb3aa029198eff1fc620f9e011533aad0e Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 9 Jun 2017 15:53:42 +0100 Subject: [PATCH 2/7] Move admin panel to top of content --- .../templates/freemarker/body/individual/individual-vitro.ftl | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl index 14b24ec11..0ce4bcf98 100644 --- a/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl +++ b/webapp/src/main/webapp/templates/freemarker/body/individual/individual-vitro.ftl @@ -16,7 +16,9 @@ <#-- Default individual profile page template --> <#--@dumpAll /--> +<#include "individual-adminPanel.ftl">
> +
<#-- Image --> <#assign individualImage> @@ -34,7 +36,6 @@
- <#include "individual-adminPanel.ftl"> <#if individualProductExtensionPreHeader??> ${individualProductExtensionPreHeader} From 2fe4d3b3a053b45293b07a3eb5ca1f8745d225ee Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Fri, 9 Jun 2017 15:57:28 +0100 Subject: [PATCH 3/7] Beta version --- api/pom.xml | 6 +++--- dependencies/pom.xml | 4 ++-- home/pom.xml | 4 ++-- installer/home/pom.xml | 4 ++-- installer/pom.xml | 2 +- installer/solr/pom.xml | 4 ++-- installer/webapp/pom.xml | 4 ++-- pom.xml | 2 +- solr/pom.xml | 4 ++-- webapp/pom.xml | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 8d799cc18..170acb66c 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-api - 1.10.0-SNAPSHOT + 1.10.0-beta1 jar org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. @@ -39,7 +39,7 @@ org.vivoweb vitro-dependencies - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 05263e275..dbfe789e2 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/home/pom.xml b/home/pom.xml index e7864cefd..ca0c07057 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/installer/home/pom.xml b/installer/home/pom.xml index 345563376..cb72f50d6 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom org.vivoweb vitro-installer - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/installer/pom.xml b/installer/pom.xml index b21dd3f9f..eb5273926 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-installer - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom Vitro Installer diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml index e374a9b0c..a399128c8 100644 --- a/installer/solr/pom.xml +++ b/installer/solr/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-solr - 1.10.0-SNAPSHOT + 1.10.0-beta1 war org.vivoweb vitro-installer - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 48a72d194..34f95c23f 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.10.0-SNAPSHOT + 1.10.0-beta1 war org.vivoweb vitro-installer - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/pom.xml b/pom.xml index d8de4fed8..3433f7cee 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 pom Vitro diff --git a/solr/pom.xml b/solr/pom.xml index 572d48fcd..f4c16b621 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-solr - 1.10.0-SNAPSHOT + 1.10.0-beta1 war org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. diff --git a/webapp/pom.xml b/webapp/pom.xml index b407d9cbf..51b874708 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.10.0-SNAPSHOT + 1.10.0-beta1 war org.vivoweb vitro-project - 1.10.0-SNAPSHOT + 1.10.0-beta1 .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.10.0-SNAPSHOT + 1.10.0-beta1 From 7a76405ef304716d860c32c92e5f03f95c88142e Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Mon, 12 Jun 2017 21:54:33 +0100 Subject: [PATCH 4/7] Reset develop to SNAPSHOT release --- api/pom.xml | 6 +++--- dependencies/pom.xml | 4 ++-- home/pom.xml | 4 ++-- installer/home/pom.xml | 4 ++-- installer/pom.xml | 2 +- installer/solr/pom.xml | 4 ++-- installer/webapp/pom.xml | 4 ++-- pom.xml | 2 +- solr/pom.xml | 4 ++-- webapp/pom.xml | 6 +++--- 10 files changed, 20 insertions(+), 20 deletions(-) diff --git a/api/pom.xml b/api/pom.xml index 170acb66c..8d799cc18 100644 --- a/api/pom.xml +++ b/api/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-api - 1.10.0-beta1 + 1.10.0-SNAPSHOT jar org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. @@ -39,7 +39,7 @@ org.vivoweb vitro-dependencies - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom diff --git a/dependencies/pom.xml b/dependencies/pom.xml index dbfe789e2..05263e275 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-dependencies - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/home/pom.xml b/home/pom.xml index ca0c07057..e7864cefd 100644 --- a/home/pom.xml +++ b/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-home - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/installer/home/pom.xml b/installer/home/pom.xml index cb72f50d6..345563376 100644 --- a/installer/home/pom.xml +++ b/installer/home/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-home - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom org.vivoweb vitro-installer - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/installer/pom.xml b/installer/pom.xml index eb5273926..b21dd3f9f 100644 --- a/installer/pom.xml +++ b/installer/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-installer - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom Vitro Installer diff --git a/installer/solr/pom.xml b/installer/solr/pom.xml index a399128c8..e374a9b0c 100644 --- a/installer/solr/pom.xml +++ b/installer/solr/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-solr - 1.10.0-beta1 + 1.10.0-SNAPSHOT war org.vivoweb vitro-installer - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/installer/webapp/pom.xml b/installer/webapp/pom.xml index 34f95c23f..48a72d194 100644 --- a/installer/webapp/pom.xml +++ b/installer/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-installer-webapp - 1.10.0-beta1 + 1.10.0-SNAPSHOT war org.vivoweb vitro-installer - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/pom.xml b/pom.xml index 3433f7cee..d8de4fed8 100644 --- a/pom.xml +++ b/pom.xml @@ -7,7 +7,7 @@ org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT pom Vitro diff --git a/solr/pom.xml b/solr/pom.xml index f4c16b621..572d48fcd 100644 --- a/solr/pom.xml +++ b/solr/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-solr - 1.10.0-beta1 + 1.10.0-SNAPSHOT war org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. diff --git a/webapp/pom.xml b/webapp/pom.xml index 51b874708..b407d9cbf 100644 --- a/webapp/pom.xml +++ b/webapp/pom.xml @@ -7,13 +7,13 @@ org.vivoweb vitro-webapp - 1.10.0-beta1 + 1.10.0-SNAPSHOT war org.vivoweb vitro-project - 1.10.0-beta1 + 1.10.0-SNAPSHOT .. @@ -41,7 +41,7 @@ org.vivoweb vitro-api - 1.10.0-beta1 + 1.10.0-SNAPSHOT From 0193701401c64f4c0dad5f6505f062e07a4458d8 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Wed, 12 Jul 2017 20:11:59 +0100 Subject: [PATCH 5/7] [VIVO-1322] Add configuration for dependency check --- pom.xml | 32 ++++++++++++++++++++++++++++++++ 1 file changed, 32 insertions(+) diff --git a/pom.xml b/pom.xml index d8de4fed8..2e13de235 100644 --- a/pom.xml +++ b/pom.xml @@ -100,6 +100,33 @@ -Xdoclint:none + + dependency-check + + + dependency-check + + + + + + org.owasp + dependency-check-maven + + true + true + + + + + check + + + + + + + release @@ -192,6 +219,11 @@ + + org.owasp + dependency-check-maven + 2.0.1 + maven-assembly-plugin 2.5.5 From 4d381ee0584d72b47b93d1375d529f8fa79cf02a Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Thu, 13 Jul 2017 14:02:11 +0100 Subject: [PATCH 6/7] Update to latest MySQL 5.1 connector --- dependencies/pom.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dependencies/pom.xml b/dependencies/pom.xml index 05263e275..268b851a9 100644 --- a/dependencies/pom.xml +++ b/dependencies/pom.xml @@ -134,7 +134,7 @@ mysql mysql-connector-java - 5.1.36 + 5.1.42 net.sf.jga From 67d1e630155e029dff0b92b13f40fa3d23c99b11 Mon Sep 17 00:00:00 2001 From: Graham Triggs Date: Mon, 17 Jul 2017 15:29:39 +0100 Subject: [PATCH 7/7] [VIVO-1060] Add DumpRestoreController to web.xml --- webapp/src/main/webapp/WEB-INF/web.xml | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/webapp/src/main/webapp/WEB-INF/web.xml b/webapp/src/main/webapp/WEB-INF/web.xml index 381295575..d4987ed81 100644 --- a/webapp/src/main/webapp/WEB-INF/web.xml +++ b/webapp/src/main/webapp/WEB-INF/web.xml @@ -424,6 +424,15 @@ /jenaAdmin + + DumpRestoreController + edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpRestoreController + + + DumpRestoreController + /dumpRestore/* + + EditFrontController edu.cornell.mannlib.vedit.controller.EditFrontController