diff --git a/GazelleHL7v2Validator-ear/pom.xml b/GazelleHL7v2Validator-ear/pom.xml
index 14dd806347b2f8262c04d7dc4d2b2005145499ec..6fc2bff221f6142a742a498714acd7480ab3c38b 100644
--- a/GazelleHL7v2Validator-ear/pom.xml
+++ b/GazelleHL7v2Validator-ear/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,7 +11,7 @@
<artifactId>GazelleHL7v2Validator-ear</artifactId>
<packaging>ear</packaging>
<name>GazelleHL7v2Validator-ear</name>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<contributors>
<contributor>
<organization>INRIA - Rennes Bretagne Atlantique</organization>
@@ -105,14 +105,14 @@
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ui</artifactId>
<type>war</type>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ejb</artifactId>
<type>ejb</type>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
diff --git a/GazelleHL7v2Validator-ejb/pom.xml b/GazelleHL7v2Validator-ejb/pom.xml
index c1e4de2c8f2b36446a98e6d7dff9cb92c30b8fba..238bcd707b50d52ce9c6ee41a1ece7548d70fb1a 100644
--- a/GazelleHL7v2Validator-ejb/pom.xml
+++ b/GazelleHL7v2Validator-ejb/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -270,7 +270,7 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gvt-validation-jar</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/GazelleHL7v2Validator-ui/pom.xml b/GazelleHL7v2Validator-ui/pom.xml
index e3f0124c0fe3087b3a050246818ae2c73e937b45..f8badff548cdf94c2ccda068c37f44954fce967b 100644
--- a/GazelleHL7v2Validator-ui/pom.xml
+++ b/GazelleHL7v2Validator-ui/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<relativePath>../pom.xml</relativePath>
</parent>
<modelVersion>4.0.0</modelVersion>
@@ -11,7 +11,7 @@
<artifactId>GazelleHL7v2Validator-ui</artifactId>
<packaging>war</packaging>
<name>GazelleHL7v2Validator-ui</name>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<description>Archetype for the UI part of our java projects</description>
<organization>
<name>INRIA - IHE Development</name>
@@ -30,7 +30,7 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-assets</artifactId>
- <version>2.0.29</version>
+ <version>3.0.1</version>
<type>war</type>
</dependency>
<dependency>
diff --git a/GazelleHL7v2Validator-ui/src/main/webapp/WEB-INF/web.xml b/GazelleHL7v2Validator-ui/src/main/webapp/WEB-INF/web.xml
index 1ec9f759ec0005d57e6c19197ecd9e7a8e9051b0..5799d5c00458b8e179444dfa34c3d6b94ae6b32c 100644
--- a/GazelleHL7v2Validator-ui/src/main/webapp/WEB-INF/web.xml
+++ b/GazelleHL7v2Validator-ui/src/main/webapp/WEB-INF/web.xml
@@ -52,6 +52,11 @@
<servlet-name>Resource Servlet</servlet-name>
<url-pattern>/org.richfaces.resources/*</url-pattern>
</servlet-mapping>
+
+ <session-config>
+ <session-timeout>20</session-timeout>
+ </session-config>
+
<filter>
<filter-name>Seam Filter</filter-name>
<filter-class>org.jboss.seam.servlet.SeamFilter</filter-class>
diff --git a/GazelleHL7v2Validator-ui/src/main/webapp/layout/menu.xhtml b/GazelleHL7v2Validator-ui/src/main/webapp/layout/menu.xhtml
index f8e27e65c8b41dc83eaa30723be9c1f01f075f0f..870e8624e5c3fb25c7ebe898c2fe529e9e2e2568 100644
--- a/GazelleHL7v2Validator-ui/src/main/webapp/layout/menu.xhtml
+++ b/GazelleHL7v2Validator-ui/src/main/webapp/layout/menu.xhtml
@@ -57,6 +57,8 @@
</ul>
</li>
</h:panelGroup>
+ <!-- First and classic CAS button -->
<ui:include src="/layout/_login_menu.xhtml"/>
+
</ui:define>
</ui:decorate>
diff --git a/gazelle-hl7-validator-report-jar/pom.xml b/gazelle-hl7-validator-report-jar/pom.xml
index f510cab8dcc1a4e2735fb97db74d0f9cc89ce67c..7ad66dee403bf12b569e435dbba8ba44d13c3e22 100644
--- a/gazelle-hl7-validator-report-jar/pom.xml
+++ b/gazelle-hl7-validator-report-jar/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
<packaging>jar</packaging>
diff --git a/gazelle-hl7v2-validator-api-jar/pom.xml b/gazelle-hl7v2-validator-api-jar/pom.xml
index edac799358e52f24ac0c8cfe22f7cb4a03caa908..18c11908067b0c4ff3a0e943e72ef2bdb963e25a 100644
--- a/gazelle-hl7v2-validator-api-jar/pom.xml
+++ b/gazelle-hl7v2-validator-api-jar/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/gvt-validation-jar/pom.xml b/gvt-validation-jar/pom.xml
index 343e7612e7022c29aabbb7d6ce0f181a1d9ed510..4fad3f0039a7a565940004b0270f6d6331ba7948 100644
--- a/gvt-validation-jar/pom.xml
+++ b/gvt-validation-jar/pom.xml
@@ -3,7 +3,7 @@
<parent>
<artifactId>GazelleHL7v2Validator</artifactId>
<groupId>net.ihe.gazelle</groupId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 23a7d438ff23f9e2852749c669828726b9a9d5fa..e9c26ea7583b0ba2d67746e005772fdc8deeb848 100644
--- a/pom.xml
+++ b/pom.xml
@@ -8,7 +8,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GazelleHL7v2Validator</name>
<description>parent for project GazelleHL7v2Validator</description>
@@ -46,7 +46,7 @@
<messages.mode>crowdin</messages.mode>
<hapi.version>2.2</hapi.version>
<metadata.v7.version>1.0.0-SNAPSHOT</metadata.v7.version>
- <sso.client.v7.version>3.0.0-NPD-694-SNAPSHOT</sso.client.v7.version>
+ <sso.client.v7.version>3.0.0</sso.client.v7.version>
<mbval.documentation.version>1.1.10</mbval.documentation.version>
<ksahl7v3.validation.version>1.0.1</ksahl7v3.validation.version>
<ihehl7v3.validation.version>1.5.5</ihehl7v3.validation.version>
@@ -87,27 +87,27 @@
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-hl7-validator-report-jar</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-hl7v2-validator-api-jar</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ejb</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ear</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ui</artifactId>
- <version>3.9.0-SNAPSHOT</version>
+ <version>3.9.0-NPD-694-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>