Merge pull request #219 from ec-jrc/develop

Develop merge preparing v2.4.0-rc.1

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

@@ -34,7 +34,7 @@
         <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.url" value="jdbc:postgresql://DB_ADDRESS:5432/re3gistry2_srv"/>
             <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"/>

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

@@ -39,10 +39,6 @@
             <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>

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

@@ -33,7 +33,7 @@
 application.persistenceunitname=Re3gistry2
 
 # Application version
-application.version=Version: 2.0.0
+application.version=Version: 2.4.0-rc.1
 
 # Localization
 application.language.available=en
@@ -45,6 +45,9 @@ application.language.defaultLocale=en
 # ECAS base URL (authetication method)
 application.ecas.baseurl = https://webgate.ec.europa.eu
 
+# Cache
+application.cache.disk.path=/path/to/cache
+
 # Login type - ECAS | SHIRO
 application.login.type=SHIRO
 
@@ -75,14 +78,14 @@ application.dateformat=yyyy-MM-dd
 application.releasenote.rss.path=/path/to/rss
 
 # Optional heading message
-application.headingmessage.class=
-application.headingmessage.text=
+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 root taken from pom
-application.rooturl=https://localhost/re3gistry2
+application.rooturl=https://registry-test.eu/re3gistry2
 
 # Solr configurations
-application.solr.isactive=true
+application.solr.isactive=false
 application.solr.url=http://localhost:8983/solr/
 application.solr.core=re3gistry2
 application.solr.connectiontimeout=10000
@@ -102,7 +105,7 @@ application.solr.fieldtoindex.localid=label,description,definition
 #   * propose to add RegItem Register and RegItem Registry
 #
 # - |ManageFieldMapping| with this permission a RegUser can:
-#   * add field mpping (between field and item) 
+#   * add field mapping (between field and item) 
 #   * eidt firld mapping (e.g. change properties such mandatory, multivalued, ecc.)
 # 
 # - |ManageField| with this permission a RegUser can:
@@ -166,7 +169,7 @@ mail.text.body.bulkimport.success=Dear {name}, <br/><br/> The bulk import has be
 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.application_root_url=https://registry-test.eu/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

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

@@ -45,6 +45,9 @@ application.language.defaultLocale=en
 # ECAS base URL (authetication method)
 application.ecas.baseurl = https://webgate.ec.europa.eu
 
+# Cache
+application.cache.disk.path=/path/to/cache
+
 # Login type - ECAS | SHIRO
 application.login.type=SHIRO
 
@@ -103,7 +106,7 @@ application.solr.fieldtoindex.localid=label,description,definition
 #   * propose to add RegItem Register and RegItem Registry
 #
 # - |ManageFieldMapping| with this permission a RegUser can:
-#   * add field mpping (between field and item) 
+#   * add field mapping (between field and item) 
 #   * eidt firld mapping (e.g. change properties such mandatory, multivalued, ecc.)
 # 
 # - |ManageField| with this permission a RegUser can:
@@ -149,8 +152,8 @@ mail.smtp.host=smtphost
 mail.smtp.port=25
 mail.smtp.auth=false
 mail.smtp.starttls.enable=true
-mail.user=
-mail.password=
+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>
 

dist/app/re3gistry2/WEB-INF/classes/localizations/LocalizationBundle_en.properties

@@ -533,6 +533,13 @@ installation.clean.registry.label.description=The label of the registry will be
 installation.clean.registry.content.summary=Content summary
 installation.clean.registry.content.summary.description=This text should describe shortly what would be available under your Re3gistry instance. It will be shown in the registry\u2019s landing page.
 
+installation.workflow.title=Type of workflow
+installation.workflow.description=Select the governance model you would like the registry to apply.
+installation.workflow.iso19135.title=Following ISO 19135
+installation.workflow.iso19135.description=Recommended if you plan to receive contributions from different organisations and manage them following a formal and standardised governance process.
+installation.workflow.simplified.title=Simplified workflow
+installation.workflow.simplified.description=Recommended if the data management will be handled entirely internally in the same organisation, or within a small group of contributors, not requiring such formal process.
+
 installation.finalstep.title=Installation progress
 installation.finalstep.description.1=The Re3gistry is in process of installation. 
 installation.finalstep.description.2=You can close this tab if you wish.
@@ -594,7 +601,8 @@ mail.text.subject.cache.success=Re3gistry - complete CACHE success
 mail.text.body.cache.success=The Re3gistry software has has complete the CACHE all items with success. You can start managing your registry content by signing in.
 mail.text.subject.cache.error=Re3gistry - complete CACHE error
 mail.text.body.cache.error=An error has occurred during the Re3gistry CACHE all items, please review your settings. 
-
+mail.text.subject.item.publised={label} had been published
+mail.text.body.item.publised= {label} had been published successfully. The changelog associated with this action is: {changelog}
 
 mail.text.subject.bulkimport.success=Re3gistry - bulk import {itemclass} success
 mail.text.subject.bulkimport.error=Re3gistry - bulk import {itemclass} error

dist/app/re3gistry2/WEB-INF/shiro.ini

@@ -54,7 +54,7 @@ jdbcRealm.authenticationQuery = SELECT shiropassword, shirosalt FROM RegUser WHE
 # Connection 
 ds = org.postgresql.jdbc2.optional.SimpleDataSource
 ds.serverName = DB_ADDRESS
-ds.databaseName = re3gistry2_dev
+ds.databaseName = re3gistry2_srv
 ds.user = DB_USERNAME
 ds.password = DB_PASSWORD
 jdbcRealm.dataSource=$ds

dist/app/re3gistry2/WEB-INF/web.xml

@@ -35,18 +35,17 @@
     </servlet-mapping>
 
 
-    <filter>
+      <filter>
         <filter-name>loadSalt</filter-name>
-        <filter-class>eu.europa.ec.re3gistry2.web.controller.LoadSalt</filter-class>
+        <filter-class>eu.europa.ec.re3gistry2.web.utility.LoadSalt</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>loadSalt</filter-name>
         <url-pattern>*</url-pattern>
     </filter-mapping>
-
     <filter>
         <filter-name>validateSalt</filter-name>
-        <filter-class>eu.europa.ec.re3gistry2.web.controller.ValidateSalt</filter-class>
+        <filter-class>eu.europa.ec.re3gistry2.web.utility.ValidateSalt</filter-class>
     </filter>
     <filter-mapping>
         <filter-name>validateSalt</filter-name>

dist/app/re3gistry2/jsp/addRegister.jsp

@@ -62,7 +62,7 @@
 <jsp:useBean id="constants" class="eu.europa.ec.re3gistry2.base.utility.BaseConstants" scope="session"/>
 <%    // Setting system localization
     ResourceBundle localization = (ResourceBundle) request.getAttribute(BaseConstants.KEY_REQUEST_LOCALIZATION);
-
+    boolean checWorkflowSimplifiedAdd = configuration.checkWorkflowSimplified();
     // Initializing managers
     RegFieldManager regFieldManager = new RegFieldManager(entityManager);
     RegLocalizationManager regLocalizationManager = new RegLocalizationManager(entityManager);
@@ -191,7 +191,7 @@
                         <textarea id="<%=BaseConstants.KEY_FIELD_MANDATORY_CONTENTSUMMARY_LOCALID%>" maxlength="<%=configuration.getProperties().getProperty("application.input.maxlength")%>" type="text" class="form-control" value="" name="<%=BaseConstants.KEY_FIELD_MANDATORY_CONTENTSUMMARY_LOCALID%>"></textarea>
                     </div>
                 </div>
-
+                <% if (checWorkflowSimplifiedAdd==false) { %>
                 <%-- Showing the register ownerr field and selector --%>                            
                 <div class="row form-group editing-labels" title="${localization.getString("registry.registerowner.tooltip")}">
                     <%
@@ -292,6 +292,7 @@
                         </div>
                     </div>
                 </div>
+                <% } %>
 
 
                 <%-- If the user has the rights to insert a new RegItemclass, showing