Skip to content

Commit 2ba2b3f

Browse files
authored
Merge pull request #390 from ec-jrc/develop
2.5.3 pre-release
2 parents fe8d69f + 7d74b53 commit 2ba2b3f

File tree

181 files changed

+31121
-489
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

181 files changed

+31121
-489
lines changed

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

Lines changed: 5 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,19 +30,20 @@
3030
<class>eu.europa.ec.re3gistry2.model.RegUserRegGroupMapping</class>
3131
<class>eu.europa.ec.re3gistry2.model.RegItemproposedRegGroupRegRoleMapping</class>
3232
<class>eu.europa.ec.re3gistry2.model.RegItemhistoryRegGroupRegRoleMapping</class>
33+
<class>eu.europa.ec.re3gistry2.model.RegUserCodes</class>
3334

3435
<exclude-unlisted-classes>false</exclude-unlisted-classes>
3536

3637
<properties>
37-
<property name="javax.persistence.jdbc.url" value="jdbc:postgresql://DB_ADDRESS:5432/re3gistry2_srv"/>
38-
<property name="javax.persistence.jdbc.password" value="DB_PASSWORD"/>
38+
<property name="javax.persistence.jdbc.url" value="${persistence.jdbc.url}"/>
39+
<property name="javax.persistence.jdbc.password" value="${persistence.jdbc.password}"/>
3940
<property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
40-
<property name="javax.persistence.jdbc.user" value="DB_USERNAME"/>
41+
<property name="javax.persistence.jdbc.user" value="${persistence.jdbc.username}"/>
4142
<property name="eclipselink.ddl-generation" value="none"/>
4243
<property name="eclipselink.logging.level" value="CONFIG"/>
4344
<property name="eclipselink.logging.level.sql" value="CONFIG"/>
4445
<property name="eclipselink.logging.parameters" value="false"/>
45-
<property name="eclipselink.logging.file" value="path/to/catalina/base/logs/eclipselink.log"/>
46+
<property name="eclipselink.logging.file" value="${persistence.eclipselink.logging.file}"/>
4647
</properties>
4748
</persistence-unit>
4849
</persistence>

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

Lines changed: 48 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -33,20 +33,30 @@
3333
application.persistenceunitname=Re3gistry2
3434

3535
# Application version
36-
application.version=Version: 2.4.0
36+
application.version=Version: 2.5.2
3737

3838
# Localization
39-
application.language.available=en
40-
#application.language.available=en-it
39+
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
40+
#application.language.available=it
41+
#application.language.available=es
4142
application.language.label.en=English (en)
42-
#application.language.label.it=Italiano (it)
43+
application.language.label.en=Bulgarian (bg)
44+
application.language.label.it=Italiano (it)
45+
application.language.label.es=Espanol (es)
46+
application.language.label.cs=Czech (cs)
47+
application.language.label.cs=Greek (el)
48+
#application.language.defaultLocale=it
4349
application.language.defaultLocale=en
50+
#application.language.defaultLocale=es
51+
52+
application.default.name = Re3gistry2
53+
application.default.frontend.link = http://host.docker.internal/registry
4454

4555
# ECAS base URL (authetication method)
4656
application.ecas.baseurl = https://webgate.ec.europa.eu
4757

4858
# Cache
49-
application.cache.disk.path=/path/to/cache
59+
application.cache.disk.path=${application.cache.disk.path}
5060

5161
# Login type - ECAS | SHIRO
5262
application.login.type=SHIRO
@@ -75,17 +85,17 @@ application.systemregisters.show=false
7585
application.dateformat=yyyy-MM-dd
7686

7787
# RSS release-note
78-
application.releasenote.rss.path=/path/to/rss
88+
application.releasenote.rss.path=${application.releasenote.rss.path}
7989

8090
# Optional heading message
81-
application.headingmessage.class=alert-warning
82-
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>
91+
application.headingmessage.class=
92+
application.headingmessage.text=
8393

8494
# Application root taken from pom
85-
application.rooturl=https://registry-test.eu/re3gistry2
95+
application.rooturl=http://localhost:8080/registry/
8696

8797
# Solr configurations
88-
application.solr.isactive=false
98+
application.solr.isactive=true
8999
application.solr.url=http://localhost:8983/solr/
90100
application.solr.core=re3gistry2
91101
application.solr.connectiontimeout=10000
@@ -147,29 +157,48 @@ role.permissions.submittingOrganization=ManageItemProposal,SubmitProposal
147157
#### End Roles and permissions section #########################################
148158

149159
### Mail ###
150-
mail.smtp.host=example-smtp.eu
151-
mail.smtp.port=25
152-
mail.smtp.auth=false
153-
mail.smtp.starttls.enable=true
154-
mail.user=
155-
mail.password=
156-
mail.sender=sender@example.eu
157-
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>
160+
mail.smtp.host=${mail.smtp.host}
161+
mail.smtp.port=${mail.smtp.port}
162+
mail.smtp.auth=${mail.smtp.auth}
163+
mail.smtp.starttls.enable=${mail.smtp.starttls.enable}
164+
mail.user=${mail.user}
165+
mail.password=${mail.password}
166+
mail.sender=${mail.sender}
167+
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>
158168

159169
mail.text.subject.success=Re3gistry - installation success
160170
mail.text.body.success=The Re3gistry software has been properly installed. You can start managing your registry content by signing in.
161171
mail.text.subject.error=Re3gistry - installation error
162172
mail.text.body.error=An error has occurred during the Re3gistry installation, please review your settings.
163173
mail.text.subject.newregistration=Re3gistry - Your account have been successfully added to the system
164174
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/>
175+
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>
165176

166177
mail.text.subject.bulkimport.success=Re3gistry - bulk import {itemclass} success
167178
mail.text.subject.bulkimport.error=Re3gistry - bulk import {itemclass} error
168179
mail.text.body.bulkimport.success=Dear {name}, <br/><br/> The bulk import has been completed with success.
169180
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.
170181

182+
mail.text.subject.groupschanged=Changes to {contact} user groups
183+
mail.text.body.groupschanged=<br/> Dear {user}, <br/><br/> The group(s) associated with your user {id} have changed. <br/>
184+
mail.text.body.groupschanged.add=You have been added to the group(s):
185+
mail.text.body.groupschanged.remove=You are no longer in the group(s):
186+
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.
187+
mail.text.body.groupschanged.ending.contact=Registry software
188+
mail.text.body.groupschanged.ending.contact.webpage=https://github.com/ec-jrc/re3gistry
189+
190+
mail.text.body.itemaction.basebody=The following item(s) were changed: <br/>
191+
mail.text.body.itemaction.acceptedwithchanges=accepted with changes
192+
mail.text.body.itemaction.notaccepted=not accepted
193+
mail.text.body.itemaction.rejected=rejected
194+
mail.text.body.itemaction.basebody.controlbody=Actions on the Control Body were made
195+
mail.text.body.itemaction.basebody.submitting=Actions on the Submitting Organizations were made
196+
mail.text.body.itemaction.proposedby= proposed by
197+
mail.text.body.itemaction.was= was
198+
mail.text.body.itemaction.actionmadeby=. The action was made by
199+
171200
### Webapp properties ####
172-
web.application_root_url=https://registry-test.eu/re3gistry2
201+
web.application_root_url=http://localhost:8080/registry/
173202
web.cdn_url=https://inspire.ec.europa.eu/cdn/1.0/
174203
web.default_locale=en
175204
web.default_title=Re3gistry 2 - Reference codes management system

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

Lines changed: 26 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -37,9 +37,9 @@ application.version=Version: 2.0.0
3737

3838
# Localization
3939
application.language.available=en
40-
#application.language.available=en-it
40+
application.language.available=it
4141
application.language.label.en=English (en)
42-
#application.language.label.it=Italiano (it)
42+
application.language.label.it=Italiano (it)
4343
application.language.defaultLocale=en
4444

4545
# ECAS base URL (authetication method)
@@ -145,6 +145,8 @@ role.permissions.registerOwner=ManageUser,ManageGroup,MapUserToGroup
145145
role.permissions.controlBody=ApproveProposal
146146
role.permissions.submittingOrganization=ManageItemProposal,SubmitProposal
147147

148+
application.default.name
149+
148150
#### End Roles and permissions section #########################################
149151

150152
### Mail ###
@@ -155,7 +157,7 @@ mail.smtp.starttls.enable=true
155157
mail.user=name
156158
mail.password=password
157159
mail.sender=jrc-inspire-support@ec.europa.eu
158-
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>
160+
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>
159161

160162
mail.text.subject.success=Re3gistry - installation success
161163
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
164166
mail.text.subject.newregistration=Re3gistry - Your account have been successfully added to the system
165167
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/>
166168

169+
mail.text.subject.groupschanged=Changes to {contact} user groups
170+
mail.text.body.groupschanged=<br/> Dear {user}, <br/><br/> The group(s) associated with your user {id} have changed. <br/>
171+
mail.text.body.groupschanged.add=You have been added to the group(s):
172+
mail.text.body.groupschanged.remove=You are no longer in the group(s):
173+
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.
174+
mail.text.body.groupschanged.ending.contact=Registry software
175+
mail.text.body.groupschanged.ending.contact.webpage=https://github.com/ec-jrc/re3gistry
176+
177+
mail.text.body.itemaction.basebody=The following item(s) were changed: <br/>
178+
mail.text.body.itemaction.acceptedwithchanges=accepted with changes
179+
mail.text.body.itemaction.notaccepted=not accepted
180+
mail.text.body.itemaction.rejected=rejected
181+
mail.text.body.itemaction.basebody.controlbody=Actions on the Control Body were made
182+
mail.text.body.itemaction.basebody.submitting=Actions on the Submitting Organizations were made
183+
mail.text.body.itemaction.proposedby= proposed by
184+
mail.text.body.itemaction.was= was
185+
mail.text.body.itemaction.actionmadeby=. The action was made by
186+
167187
mail.text.subject.bulkimport.success=Re3gistry - bulk import {itemclass} success
168188
mail.text.subject.bulkimport.error=Re3gistry - bulk import {itemclass} error
169189
mail.text.body.bulkimport.success=Dear {name}, <br/><br/> The bulk import has been completed with success.
170190
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.
191+
192+
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>
193+
171194

172195
### Webapp properties ####
173196
web.application_root_url=applicationrooturl

dist/app/re3gistry2/WEB-INF/classes/configurations_files/system.installed

Whitespace-only changes.

0 commit comments

Comments
 (0)