Skip to content

Commit

Permalink
Merge pull request #163 from ec-jrc/develop
Browse files Browse the repository at this point in the history
Preparation release v2.3.2 review and approved everything seems fine
  • Loading branch information
juanpelegrina authored Jun 30, 2022
2 parents d87a0e7 + 4f597a6 commit 39d85bf
Show file tree
Hide file tree
Showing 1,457 changed files with 135,276 additions and 94 deletions.
Binary file removed dist/app/re3gistry2.war
Binary file not shown.
2 changes: 2 additions & 0 deletions dist/app/re3gistry2/META-INF/context.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
<?xml version="1.0" encoding="UTF-8"?>
<Context path="/re3gistry2"/>
48 changes: 48 additions & 0 deletions dist/app/re3gistry2/WEB-INF/classes/META-INF/persistence.xml
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="Re3gistry2" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>

<class>eu.europa.ec.re3gistry2.model.RegAction</class>
<class>eu.europa.ec.re3gistry2.model.RegField</class>
<class>eu.europa.ec.re3gistry2.model.RegFieldmapping</class>
<class>eu.europa.ec.re3gistry2.model.RegFieldtype</class>
<class>eu.europa.ec.re3gistry2.model.RegGroup</class>
<class>eu.europa.ec.re3gistry2.model.RegItemRegGroupRegRoleMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItem</class>
<class>eu.europa.ec.re3gistry2.model.RegItemclass</class>
<class>eu.europa.ec.re3gistry2.model.RegItemclasstype</class>
<class>eu.europa.ec.re3gistry2.model.RegItemhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegItemproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegLanguagecode</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalization</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalizationhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalizationproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegRelation</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationpredicate</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegRole</class>
<class>eu.europa.ec.re3gistry2.model.RegStatus</class>
<class>eu.europa.ec.re3gistry2.model.RegStatusgroup</class>
<class>eu.europa.ec.re3gistry2.model.RegStatuslocalization</class>
<class>eu.europa.ec.re3gistry2.model.RegUser</class>
<class>eu.europa.ec.re3gistry2.model.RegUserRegGroupMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItemproposedRegGroupRegRoleMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItemhistoryRegGroupRegRoleMapping</class>

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

<properties>
<property name="javax.persistence.jdbc.url" value="jdbc:postgresql://DB_ADDRESS:5432/re3gistry2_dev"/>
<property name="javax.persistence.jdbc.password" value="DB_PASSWORD"/>
<property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
<property name="javax.persistence.jdbc.user" value="DB_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"/>
</properties>
</persistence-unit>
</persistence>
48 changes: 48 additions & 0 deletions dist/app/re3gistry2/WEB-INF/classes/META-INF/persistence.xml.orig
Original file line number Diff line number Diff line change
@@ -0,0 +1,48 @@
<?xml version="1.0" encoding="UTF-8"?>
<persistence version="2.1" xmlns="http://xmlns.jcp.org/xml/ns/persistence" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://xmlns.jcp.org/xml/ns/persistence http://xmlns.jcp.org/xml/ns/persistence/persistence_2_1.xsd">
<persistence-unit name="Re3gistry2" transaction-type="RESOURCE_LOCAL">
<provider>org.eclipse.persistence.jpa.PersistenceProvider</provider>

<class>eu.europa.ec.re3gistry2.model.RegAction</class>
<class>eu.europa.ec.re3gistry2.model.RegField</class>
<class>eu.europa.ec.re3gistry2.model.RegFieldmapping</class>
<class>eu.europa.ec.re3gistry2.model.RegFieldtype</class>
<class>eu.europa.ec.re3gistry2.model.RegGroup</class>
<class>eu.europa.ec.re3gistry2.model.RegItemRegGroupRegRoleMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItem</class>
<class>eu.europa.ec.re3gistry2.model.RegItemclass</class>
<class>eu.europa.ec.re3gistry2.model.RegItemclasstype</class>
<class>eu.europa.ec.re3gistry2.model.RegItemhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegItemproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegLanguagecode</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalization</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalizationhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegLocalizationproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegRelation</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationhistory</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationpredicate</class>
<class>eu.europa.ec.re3gistry2.model.RegRelationproposed</class>
<class>eu.europa.ec.re3gistry2.model.RegRole</class>
<class>eu.europa.ec.re3gistry2.model.RegStatus</class>
<class>eu.europa.ec.re3gistry2.model.RegStatusgroup</class>
<class>eu.europa.ec.re3gistry2.model.RegStatuslocalization</class>
<class>eu.europa.ec.re3gistry2.model.RegUser</class>
<class>eu.europa.ec.re3gistry2.model.RegUserRegGroupMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItemproposedRegGroupRegRoleMapping</class>
<class>eu.europa.ec.re3gistry2.model.RegItemhistoryRegGroupRegRoleMapping</class>

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

<properties>
<property name="javax.persistence.jdbc.url" value="jdbc:postgresql://dbhost:dbport/dbname"/>
<property name="javax.persistence.jdbc.password" value="dbpassword"/>
<property name="javax.persistence.jdbc.driver" value="org.postgresql.Driver"/>
<property name="javax.persistence.jdbc.user" value="dbuser"/>
<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"/>
</properties>
</persistence-unit>
</persistence>
Original file line number Diff line number Diff line change
@@ -0,0 +1,197 @@
#
# Copyright 2007,2016 EUROPEAN UNION
# Licensed under the EUPL, Version 1.2 or - as soon they will be approved by
# the European Commission - subsequent versions of the EUPL (the "Licence");
# You may not use this work except in compliance with the Licence.
# You may obtain a copy of the Licence at:
#
# https://ec.europa.eu/isa2/solutions/european-union-public-licence-eupl_en
#
# Unless required by applicable law or agreed to in writing, software
# distributed under the Licence is distributed on an "AS IS" basis,
# WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
# See the Licence for the specific language governing permissions and
# limitations under the Licence.
#
# Date: 2020/05/11
# Authors:
# European Commission, Joint Research Centre - [email protected]
#
# This work was supported by the Interoperability solutions for public
# administrations, businesses and citizens programme (http://ec.europa.eu/isa2)
# through Action 2016.10: European Location Interoperability Solutions for e-Government (ELISE)
# for e-Government (ELISE)
#

#####################################
### Re3gistry2 Configuration file ###
#####################################

#### Application properties ####

# Persistence unit (DB connection reference specifyed in the persistence.xml file)
application.persistenceunitname=Re3gistry2

# Application version
application.version=Version: 2.0.0

# Localization
application.language.available=en
#application.language.available=en-it
application.language.label.en=English (en)
#application.language.label.it=Italiano (it)
application.language.defaultLocale=en

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

# Login type - ECAS | SHIRO
application.login.type=SHIRO

# Status base URI
application.status.maingroup=1

# Input max length in characters (textatea have no limits)
application.input.maxlength=1024

# Input sanitizer level (powered by Jsoup)
# Allowed values: simpleText, basic, basicWithImages, relaxed
# Documentation: https://jsoup.org/apidocs/org/jsoup/safety/Whitelist.html
application.input.sanitizer.level=relaxed

# Option to allow multi registry
# Note that this functionality is not yet fully implemented: leave false#
application.multiregistry.allow=false
application.multiregistry.mainregistryitemclasslocalid=
application.multiregistry.mainregistrylocalid=

# Option to show/hide system registers
application.systemregisters.show=false

# Date format
application.dateformat=yyyy-MM-dd

# RSS release-note
application.releasenote.rss.path=/path/to/rss

# Optional heading message
application.headingmessage.class=
application.headingmessage.text=

# Application root taken from pom
application.rooturl=https://localhost/re3gistry2

# Solr configurations
application.solr.isactive=true
application.solr.url=http://localhost:8983/solr/
application.solr.core=re3gistry2
application.solr.connectiontimeout=10000
application.solr.sockettimeout=60000
application.solr.fieldtoindex.localid=label,description,definition

#### Roles and permissions #####################################################
# Thios section defines the permissions associated with the roles. The list of
# actions available is shown below:
#
# - |ManageItemProposal| with this permission a RegUser can:
# * propose to add and edit simple RegItem ;
# * propose to edit RegItem Register
#
# - |ManageRegisterRegistry| with this permission a RegUser can:
# * add and edit itemclass
# * propose to add RegItem Register and RegItem Registry
#
# - |ManageFieldMapping| with this permission a RegUser can:
# * add field mpping (between field and item)
# * eidt firld mapping (e.g. change properties such mandatory, multivalued, ecc.)
#
# - |ManageField| with this permission a RegUser can:
# * add and edit fields to the system
#
# - |ManageUser| with this permission a RegUser can:
# * add and edit users
#
# - |ManageGroup| with this permission a RegUser can:
# * add and edit groups
#
# - |MapGroupToItem| with this permission a RegUser can:
# * map groups to items
#
# - |MapUserToGroup| with this permission a RegUser can:
# * map userss to grous
#
# - |SubmitProposal| with this pesmission a RegUser can:
# * submit proposals
#
# - |ApproveProposal| : with this permission a RegUser can:
# * approve proposals
#
# - |PublishProposal| : with this permission a RegUser can:
# * publish proposals
#
# - |ManageSystem| : with this permission a RegUser can:
# * manage system properties
#

#role.permissions.registryManager=ManageRegisterRegistry,ManageItemProposal,ManageFieldMapping,ManageField,ManageUser,ManageGroup,MapGroupToItem,MapUserToGroup,ManageSystem
#role.permissions.registerManager=ManageItemProposal,ManageFieldMapping,PublishProposal
role.permissions.registryManager=ManageRegisterRegistry,ManageItemProposal,ManageFieldMapping,ManageField,ManageUser,ManageGroup,MapGroupToItem,MapUserToGroup,ManageSystem,SubmitProposal
role.permissions.registerManager=ManageFieldMapping,PublishProposal
role.permissions.registerOwner=ManageUser,ManageGroup,MapUserToGroup
role.permissions.controlBody=ApproveProposal
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.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.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.

### Webapp properties ####
web.application_root_url=https://localhost/re3gistry2
web.cdn_url=https://inspire.ec.europa.eu/cdn/1.0/
web.default_locale=en
web.default_title=Re3gistry 2 - Reference codes management system
web.default_description=Re3gistry 2 - Reference codes management system
web.head_prefix=og: http://ogp.me/ns#
web.meta_charset=UTF-8
web.meta_author=European Commission - Joint Research Centre
web.meta_xuacompatible=IE=edge
web.meta_viewport=width=device-width, initial-scale=1
web.meta_msthemecolor=#2b5797
web.meta_themecolor=#003399
web.search_max_item_per_page=10
web.search_page_max_adjacent=2
web.text_big_limit=600
web.optimize_output=1
web.link_about=/about
web.link_privacy=https://inspire.ec.europa.eu/privacy-policy/59294
web.link_contact=mailto:[email protected]
web.link_legal=https://ec.europa.eu/info/legal-notice___lng__
web.link_termsofuse=http://inspire.ec.europa.eu/terms-use
web.link_cookies=https://ec.europa.eu/cookies/index_en.htm
web.link_eu=https://ec.europa.eu
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=
Loading

0 comments on commit 39d85bf

Please sign in to comment.