Merge pull request #390 from ec-jrc/develop

2.5.3 pre-release

dist/app/re3gistry2/WEB-INF/classes/META-INF/persistence.xml

@@ -30,19 +30,20 @@
         <class>eu.europa.ec.re3gistry2.model.RegUserRegGroupMapping</class>       
         <class>eu.europa.ec.re3gistry2.model.RegItemproposedRegGroupRegRoleMapping</class>
         <class>eu.europa.ec.re3gistry2.model.RegItemhistoryRegGroupRegRoleMapping</class>
+        <class>eu.europa.ec.re3gistry2.model.RegUserCodes</class>
 
         <exclude-unlisted-classes>false</exclude-unlisted-classes>
 
         <properties>      
-            <property name="javax.persistence.jdbc.url" value="jdbc:postgresql://DB_ADDRESS:5432/re3gistry2_srv"/>
-            <property name="javax.persistence.jdbc.password" value="DB_PASSWORD"/>
+            <property name="javax.persistence.jdbc.url" value="${persistence.jdbc.url}"/>
+            <property name="javax.persistence.jdbc.password" value="${persistence.jdbc.password}"/>
             <property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
-            <property name="javax.persistence.jdbc.user" value="DB_USERNAME"/>
+            <property name="javax.persistence.jdbc.user" value="${persistence.jdbc.username}"/>
             <property name="eclipselink.ddl-generation" value="none"/>
             <property name="eclipselink.logging.level" value="CONFIG"/>
             <property name="eclipselink.logging.level.sql" value="CONFIG"/>
             <property name="eclipselink.logging.parameters" value="false"/>
-            <property name="eclipselink.logging.file" value="path/to/catalina/base/logs/eclipselink.log"/>
+            <property name="eclipselink.logging.file" value="${persistence.eclipselink.logging.file}"/>
         </properties>
     </persistence-unit>
 </persistence>

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

@@ -33,20 +33,30 @@
 application.persistenceunitname=Re3gistry2
 
 # Application version
-application.version=Version: 2.4.0
+application.version=Version: 2.5.2
 
 # Localization
-application.language.available=en
-#application.language.available=en-it
+application.language.available=en-it-es-cs-bg-el-da-de-et-fi-fr-hr-hu-lt-mt-nl-pl-pt-ro-sk-sl-sv
+#application.language.available=it
+#application.language.available=es
 application.language.label.en=English (en)
-#application.language.label.it=Italiano (it)
+application.language.label.en=Bulgarian (bg)
+application.language.label.it=Italiano (it)
+application.language.label.es=Espanol (es)
+application.language.label.cs=Czech (cs)
+application.language.label.cs=Greek (el)
+#application.language.defaultLocale=it
 application.language.defaultLocale=en
+#application.language.defaultLocale=es
+
+application.default.name = Re3gistry2
+application.default.frontend.link = http://host.docker.internal/registry
 
 # ECAS base URL (authetication method)
 application.ecas.baseurl = https://webgate.ec.europa.eu
 
 # Cache
-application.cache.disk.path=/path/to/cache
+application.cache.disk.path=${application.cache.disk.path}
 
 # Login type - ECAS | SHIRO
 application.login.type=SHIRO
@@ -75,17 +85,17 @@ application.systemregisters.show=false
 application.dateformat=yyyy-MM-dd
 
 # RSS release-note
-application.releasenote.rss.path=/path/to/rss
+application.releasenote.rss.path=${application.releasenote.rss.path}
 
 # Optional heading message
-application.headingmessage.class=alert-warning
-application.headingmessage.text=This is the <strong>production environment</strong> of the Re3gistry 2 software <br/> <br/> Link to the <a class="ecl-link" href="https://localhost/registry">Re3gistry - localhost Instance - frontend view</a>
+application.headingmessage.class=
+application.headingmessage.text=
 
 # Application root taken from pom
-application.rooturl=https://registry-test.eu/re3gistry2
+application.rooturl=http://localhost:8080/registry/
 
 # Solr configurations
-application.solr.isactive=false
+application.solr.isactive=true
 application.solr.url=http://localhost:8983/solr/
 application.solr.core=re3gistry2
 application.solr.connectiontimeout=10000
@@ -147,29 +157,48 @@ role.permissions.submittingOrganization=ManageItemProposal,SubmitProposal
 #### End Roles and permissions section #########################################
 
 ### Mail ###
-mail.smtp.host=example-smtp.eu
-mail.smtp.port=25
-mail.smtp.auth=false
-mail.smtp.starttls.enable=true
-mail.user=
-mail.password=
-mail.sender=[email protected]
-mail.template=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>%subject%</title></head><body><table style="width:100%;border-collapse:collapse"><tbody><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:14px;font-family:verdana">%subject%</td></tr><tr><td style="font-size:14px;font-family:verdana;padding:16px 0 16px 0"><p>%mailbody%</p><hr style="border:0;border-top:1px solid #777" /><p style="font-size:12px">This email has been automatically generated, please do not reply to it. For more details please access the <a href=\"%application.rooturl%\">management interface</a>.</p></td></tr><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:12px;font-family:verdana">Best regards, <br/>Signature</td></tr></tbody></table></body></html>
+mail.smtp.host=${mail.smtp.host}
+mail.smtp.port=${mail.smtp.port}
+mail.smtp.auth=${mail.smtp.auth}
+mail.smtp.starttls.enable=${mail.smtp.starttls.enable}
+mail.user=${mail.user}
+mail.password=${mail.password}
+mail.sender=${mail.sender}
+mail.template=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/></head><body><table style="width:100%;border-collapse:collapse"><tbody><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:14px;font-family:verdana">%subject%</td></tr><tr><td style="font-size:14px;font-family:verdana;padding:16px 0 16px 0"><p>%mailbody%</p><hr style="border:0;border-top:1px solid #777" /><p style="font-size:12px"><em>This email has been automatically generated, please do not reply to it.</em></p></td></tr></tbody></table></body></html>
 
 mail.text.subject.success=Re3gistry - installation success
 mail.text.body.success=The Re3gistry software has been properly installed. You can start managing your registry content by signing in.
 mail.text.subject.error=Re3gistry - installation error
 mail.text.body.error=An error has occurred during the Re3gistry installation, please review your settings. 
 mail.text.subject.newregistration=Re3gistry - Your account have been successfully added to the system
 mail.text.error.newregistration=Dear {name}, <br/><br/> Your account has been successfully created and it is now enabled.<br/><br/>You can access the management interface using the following credentials:<br/> Username: {email} <br/>Key: {key}<br/><br/> Please change your key after the first access.<br/>
+mail.text.option.newregistration=Dear {name}, <br/><br/> Your account within Re3gistry has been successfully created.<br/><br/>Use the following credentials to access the management interface and set your password:<br/> Username: {email} <br/> Password: {key}<br/><br/> For security reasons, you will be asked to change the password after first sign in.<br/><br/>Click <a class="nav-link" href="{acceptLink}" role="tab">here</a> to activate your account.<br/>To ignore this invitation, please click <a class="nav-link" href="{deleteLink}" role="tab">here</a>.<br/>This activation code will expire in 24 hours<br/><br/> Re3gistry manager<br/><br/><p><em>This email has been automatically generated, please do not reply to it.</em></p>
 
 mail.text.subject.bulkimport.success=Re3gistry - bulk import {itemclass} success
 mail.text.subject.bulkimport.error=Re3gistry - bulk import {itemclass} error
 mail.text.body.bulkimport.success=Dear {name}, <br/><br/> The bulk import has been completed with success. 
 mail.text.body.bulkimport.error=Dear {name}, <br/><br/> The bulk import has been completed with some error(s) when importing the file. <br/>{errors} Than retry to load the file. 
 
+mail.text.subject.groupschanged=Changes to {contact} user groups
+mail.text.body.groupschanged=<br/> Dear {user}, <br/><br/> The group(s) associated with your user {id} have changed. <br/> 
+mail.text.body.groupschanged.add=You have been added to the group(s): 
+mail.text.body.groupschanged.remove=You are no longer in the group(s):  
+mail.text.body.groupschanged.ending=<br/><br/> Access your user profile page details in the management interface for more information: <br/><br/> <a href="{page}">{name}</a> <br/><br/> {contact} manager.
+mail.text.body.groupschanged.ending.contact=Registry software
+mail.text.body.groupschanged.ending.contact.webpage=https://github.com/ec-jrc/re3gistry
+
+mail.text.body.itemaction.basebody=The following item(s) were changed: <br/>
+mail.text.body.itemaction.acceptedwithchanges=accepted with changes
+mail.text.body.itemaction.notaccepted=not accepted
+mail.text.body.itemaction.rejected=rejected
+mail.text.body.itemaction.basebody.controlbody=Actions on the Control Body were made 
+mail.text.body.itemaction.basebody.submitting=Actions on the Submitting Organizations were made 
+mail.text.body.itemaction.proposedby= proposed by 
+mail.text.body.itemaction.was= was 
+mail.text.body.itemaction.actionmadeby=. The action was made by 
+
 ### Webapp properties ####
-web.application_root_url=https://registry-test.eu/re3gistry2
+web.application_root_url=http://localhost:8080/registry/
 web.cdn_url=https://inspire.ec.europa.eu/cdn/1.0/
 web.default_locale=en
 web.default_title=Re3gistry 2 - Reference codes management system

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

@@ -37,9 +37,9 @@ application.version=Version: 2.0.0
 
 # Localization
 application.language.available=en
-#application.language.available=en-it
+application.language.available=it
 application.language.label.en=English (en)
-#application.language.label.it=Italiano (it)
+application.language.label.it=Italiano (it)
 application.language.defaultLocale=en
 
 # ECAS base URL (authetication method)
@@ -145,6 +145,8 @@ role.permissions.registerOwner=ManageUser,ManageGroup,MapUserToGroup
 role.permissions.controlBody=ApproveProposal
 role.permissions.submittingOrganization=ManageItemProposal,SubmitProposal
 
+application.default.name
+
 #### End Roles and permissions section #########################################
 
 ### Mail ###
@@ -155,7 +157,7 @@ mail.smtp.starttls.enable=true
 mail.user=name
 mail.password=password
 [email protected]
-mail.template=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/><title>%subject%</title></head><body><table style="width:100%;border-collapse:collapse"><tbody><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:14px;font-family:verdana">%subject%</td></tr><tr><td style="font-size:14px;font-family:verdana;padding:16px 0 16px 0"><p>%mailbody%</p><hr style="border:0;border-top:1px solid #777" /><p style="font-size:12px">This email has been automatically generated, please do not reply to it. For more details please access the <a href=\"%application.rooturl%\">management interface</a>.</p></td></tr><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:12px;font-family:verdana">Best regards, <br/>INSPIRE Re3gistry Team</td></tr></tbody></table></body></html>
+mail.template=<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.0 Transitional//EN" "http://www.w3.org/TR/xhtml1/DTD/xhtml1-transitional.dtd"><html xmlns="http://www.w3.org/1999/xhtml"><head><meta http-equiv="Content-Type" content="text/html; charset=UTF-8"/></head><body><table style="width:100%;border-collapse:collapse"><tbody><tr style="background-color:#0065a2"><td style="padding:8px;color:#fff;font-size:14px;font-family:verdana">%subject%</td></tr><tr><td style="font-size:14px;font-family:verdana;padding:16px 0 16px 0"><p>%mailbody%</p><hr style="border:0;border-top:1px solid #777" /><p style="font-size:12px"><em>This email has been automatically generated, please do not reply to it.</em></p></td></tr></tbody></table></body></html>
 
 mail.text.subject.success=Re3gistry - installation success
 mail.text.body.success=The Re3gistry software has been properly installed. You can start managing your registry content by signing in.
@@ -164,10 +166,31 @@ mail.text.body.error=An error has occurred during the Re3gistry installation, pl
 mail.text.subject.newregistration=Re3gistry - Your account have been successfully added to the system
 mail.text.error.newregistration=Dear {name}, <br/><br/> Your account has been successfully created and it is now enabled.<br/><br/>You can access the management interface using the following credentials:<br/> Username: {email} <br/>Key: {key}<br/><br/> Please change your key after the first access.<br/>
 
+mail.text.subject.groupschanged=Changes to {contact} user groups
+mail.text.body.groupschanged=<br/> Dear {user}, <br/><br/> The group(s) associated with your user {id} have changed. <br/> 
+mail.text.body.groupschanged.add=You have been added to the group(s): 
+mail.text.body.groupschanged.remove=You are no longer in the group(s):  
+mail.text.body.groupschanged.ending=<br/><br/> Access your user profile page details in the management interface for more information: <br/><br/> <a href="{page}">{name}</a> <br/><br/> {contact} manager.
+mail.text.body.groupschanged.ending.contact=Registry software
+mail.text.body.groupschanged.ending.contact.webpage=https://github.com/ec-jrc/re3gistry
+
+mail.text.body.itemaction.basebody=The following item(s) were changed: <br/>
+mail.text.body.itemaction.acceptedwithchanges=accepted with changes
+mail.text.body.itemaction.notaccepted=not accepted
+mail.text.body.itemaction.rejected=rejected
+mail.text.body.itemaction.basebody.controlbody=Actions on the Control Body were made 
+mail.text.body.itemaction.basebody.submitting=Actions on the Submitting Organizations were made 
+mail.text.body.itemaction.proposedby= proposed by 
+mail.text.body.itemaction.was= was 
+mail.text.body.itemaction.actionmadeby=. The action was made by 
+
 mail.text.subject.bulkimport.success=Re3gistry - bulk import {itemclass} success
 mail.text.subject.bulkimport.error=Re3gistry - bulk import {itemclass} error
 mail.text.body.bulkimport.success=Dear {name}, <br/><br/> The bulk import has been completed with success. 
 mail.text.body.bulkimport.error=Dear {name}, <br/><br/> The bulk import has been completed with some error(s) when importing the file. <br/>{errors} Than retry to load the file. 
+
+mail.text.option.newregistration=Dear {name}, <br/><br/> Your account within Re3gistry has been successfully created.<br/><br/>Use the following credentials to access the management interface and set your password:<br/> Username: {email} <br/> Password: {key}<br/><br/> For security reasons, you will be asked to change the password after first sign in.<br/><br/>Click <a class="nav-link" href="{acceptLink}" role="tab">here</a> to activate your account.<br/>To ignore this invitation, please click <a class="nav-link" href="{deleteLink}" role="tab">here</a>.<br/>This activation code will expire in 24 hours<br/><br/> Re3gistry manager<br/><br/><p><em>This email has been automatically generated, please do not reply to it.</em></p>
+
 
 ### Webapp properties ####
 web.application_root_url=applicationrooturl