Merge branch 'develop' of git://github.com/vivo-project/Vitro into develop

dependencies/pom.xml

@@ -134,7 +134,7 @@
         <dependency>
             <groupId>mysql</groupId>
             <artifactId>mysql-connector-java</artifactId>
-            <version>5.1.36</version>
+            <version>5.1.42</version>
         </dependency>
         <dependency>
             <groupId>net.sf.jga</groupId>

pom.xml

@@ -100,6 +100,33 @@
                 <javadoc.opts>-Xdoclint:none</javadoc.opts>
             </properties>
         </profile>
+        <profile>
+            <id>dependency-check</id>
+            <activation>
+                <property>
+                    <name>dependency-check</name>
+                </property>
+            </activation>
+            <build>
+                <plugins>
+                    <plugin>
+                        <groupId>org.owasp</groupId>
+                        <artifactId>dependency-check-maven</artifactId>
+                        <configuration>
+                            <skipProvidedScope>true</skipProvidedScope>
+                            <skipRuntimeScope>true</skipRuntimeScope>
+                        </configuration>
+                        <executions>
+                            <execution>
+                                <goals>
+                                    <goal>check</goal>
+                                </goals>
+                            </execution>
+                        </executions>
+                    </plugin>
+                </plugins>
+            </build>
+        </profile>
         <profile>
             <id>release</id>
             <build>
@@ -192,6 +219,11 @@
         </plugins>
         <pluginManagement>
             <plugins>
+                <plugin>
+                    <groupId>org.owasp</groupId>
+                    <artifactId>dependency-check-maven</artifactId>
+                    <version>2.0.1</version>
+                </plugin>
                 <plugin>
                     <artifactId>maven-assembly-plugin</artifactId>
                     <version>2.5.5</version>

webapp/src/main/webapp/WEB-INF/web.xml

@@ -424,6 +424,15 @@
     <url-pattern>/jenaAdmin</url-pattern>
   </servlet-mapping>
 
+  <servlet>
+    <servlet-name>DumpRestoreController</servlet-name>
+    <servlet-class>edu.cornell.mannlib.vitro.webapp.controller.datatools.dumprestore.DumpRestoreController</servlet-class>
+  </servlet>
+  <servlet-mapping>
+    <servlet-name>DumpRestoreController</servlet-name>
+    <url-pattern>/dumpRestore/*</url-pattern>
+  </servlet-mapping>
+
   <servlet>
     <servlet-name>EditFrontController</servlet-name>
     <servlet-class>edu.cornell.mannlib.vedit.controller.EditFrontController</servlet-class>

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);

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">
 <section id="individual-intro" class="vcard" role="region" <@mf.sectionSchema individual/>>
+
     <section id="share-contact" role="region">
         <#-- Image -->
         <#assign individualImage>
@@ -34,7 +36,6 @@
     </section>
     <!-- start section individual-info -->
     <section id="individual-info" ${infoClass!} role="region">
-        <#include "individual-adminPanel.ftl">
 
         <#if individualProductExtensionPreHeader??>
             ${individualProductExtensionPreHeader}