Merge pull request #439 from ec-jrc/develop

2.6.0 release

dist/app/re3gistry2/WEB-INF/classes/configurations_files/configuration.properties

@@ -89,16 +89,16 @@ application.dateformat=yyyy-MM-dd
 application.releasenote.rss.path=${application.releasenote.rss.path}
 
 # Optional heading message
-application.headingmessage.class=
-application.headingmessage.text=
+application.headingmessage.class=${header.message.class}
+application.headingmessage.text=${header.message.text}
 
 # Application root taken from pom
-application.rooturl=http://localhost:8080/registry/
+application.rooturl=${application.rooturl}
 
 # Solr configurations
-application.solr.isactive=true
-application.solr.url=http://localhost:8983/solr/
-application.solr.core=re3gistry2
+application.solr.isactive=${application.solr.isactive}
+application.solr.url=${application.solr.url}
+application.solr.core=${application.solr.core}
 application.solr.connectiontimeout=10000
 application.solr.sockettimeout=60000
 application.solr.fieldtoindex.localid=label,description,definition
@@ -199,7 +199,7 @@ mail.text.body.itemaction.was= was
 mail.text.body.itemaction.actionmadeby=. The action was made by 
 
 ### Webapp properties ####
-web.application_root_url=http://localhost:8080/registry/
+web.application_root_url=${application.rooturl}
 web.cdn_url=https://inspire.ec.europa.eu/cdn/1.0/
 web.default_locale=en
 web.default_title=Re3gistry 2 - Reference codes management system
@@ -226,5 +226,5 @@ web.link_inspire=https://inspire.ec.europa.eu
 web.link_social_tw=https://twitter.com/INSPIRE_EU
 web.link_social_li=https://www.linkedin.com/groups/1066897
 web.link_social_fb=https://www.facebook.com/groups/inspiredirective/
-web.analytics.id=
-web.analytics.url=
+web.analytics.id=${analytics.id}
+web.analytics.url=${analytics.url}