diff --git a/GazelleHL7v2Validator-ear/pom.xml b/GazelleHL7v2Validator-ear/pom.xml
index 10600cbd2a9a77266363775185ddcf864eba9d95..bfffc1f37b697bdc30066103e3e7f4fb2913c37c 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ejb</artifactId>
<type>ejb</type>
- <version>3.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>org.jboss.seam</groupId>
diff --git a/GazelleHL7v2Validator-ear/src/main/sql/init-3.8.2.sql b/GazelleHL7v2Validator-ear/src/main/sql/init-3.9.0.sql
similarity index 100%
rename from GazelleHL7v2Validator-ear/src/main/sql/init-3.8.2.sql
rename to GazelleHL7v2Validator-ear/src/main/sql/init-3.9.0.sql
diff --git a/GazelleHL7v2Validator-ear/src/main/sql/update-3.8.6.sql b/GazelleHL7v2Validator-ear/src/main/sql/update-3.9.0.sql
similarity index 100%
rename from GazelleHL7v2Validator-ear/src/main/sql/update-3.8.6.sql
rename to GazelleHL7v2Validator-ear/src/main/sql/update-3.9.0.sql
diff --git a/GazelleHL7v2Validator-ejb/pom.xml b/GazelleHL7v2Validator-ejb/pom.xml
index a856e92632468d1be574969cba5cebd99acd1c6f..ec2fb5115c8e07db0a2b5eb2b24f1844a1773cbd 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<scope>compile</scope>
</dependency>
<dependency>
diff --git a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/admin/ApplicationConfigurationProvider.java b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/admin/ApplicationConfigurationProvider.java
index bced0d299bd265e1ae6df946f51bce740028ada8..f8bfade91e13f963c9030e4d0a7cfdfd40c67a83 100644
--- a/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/admin/ApplicationConfigurationProvider.java
+++ b/GazelleHL7v2Validator-ejb/src/main/java/net/ihe/gazelle/hl7/admin/ApplicationConfigurationProvider.java
@@ -40,15 +40,12 @@ public class ApplicationConfigurationProvider implements Serializable, Applicati
private Boolean ipLogin;
private String ipLoginAdmin;
private String applicationUrl;
- private String casUrl;
-
@Override
@Create
public void init() {
applicationWorksWithoutCas = null;
ipLogin = null;
ipLoginAdmin = null;
- casUrl = null;
applicationUrl = null;
}
@@ -63,19 +60,6 @@ public class ApplicationConfigurationProvider implements Serializable, Applicati
return (ApplicationConfigurationProviderLocal) Component.getInstance("applicationConfigurationProvider");
}
- @Override
- public Boolean getApplicationWorksWithoutCas() {
- if (applicationWorksWithoutCas == null) {
- String valueAsString = ApplicationConfiguration.getValueOfVariable("application_works_without_cas");
- if (valueAsString == null) {
- applicationWorksWithoutCas = false;
- } else {
- applicationWorksWithoutCas = Boolean.valueOf(valueAsString);
- }
- }
- return applicationWorksWithoutCas;
- }
-
@Override
public String loginByIP() {
Identity identity = (Identity) Component.getInstance("org.jboss.seam.security.identity");
@@ -115,14 +99,6 @@ public class ApplicationConfigurationProvider implements Serializable, Applicati
return applicationUrl;
}
- @Override
- public String getCasUrl() {
- if (casUrl == null) {
- casUrl = ApplicationConfiguration.getValueOfVariable("cas_url");
- }
- return casUrl;
- }
-
@Override
public boolean isUserAllowedAsAdmin() {
return Identity.instance().isLoggedIn() && Identity.instance().hasRole("admin_role");
diff --git a/GazelleHL7v2Validator-ui/pom.xml b/GazelleHL7v2Validator-ui/pom.xml
index e0657148659c2095fdbc9ad4414e0ae86d97be93..e3f0124c0fe3087b3a050246818ae2c73e937b45 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<description>Archetype for the UI part of our java projects</description>
<organization>
<name>INRIA - IHE Development</name>
diff --git a/gazelle-hl7-validator-report-jar/pom.xml b/gazelle-hl7-validator-report-jar/pom.xml
index fcb9ade10a6859c8bfa1c27f0b6c5b2fbe04367b..f510cab8dcc1a4e2735fb97db74d0f9cc89ce67c 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-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 911f89bfaf24a55b560fb10531d6a51c8cd21e82..edac799358e52f24ac0c8cfe22f7cb4a03caa908 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/gvt-validation-jar/pom.xml b/gvt-validation-jar/pom.xml
index 7f6b0ba8c6a2ede044af9bfd088820f7e2599c15..343e7612e7022c29aabbb7d6ce0f181a1d9ed510 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>
diff --git a/pom.xml b/pom.xml
index 52d8daa8a90960472fbffa472e5152fb7c4f03d4..75ed524b3f1a3dc21d9b9e40b84fedaa881cd21c 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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
<packaging>pom</packaging>
<name>GazelleHL7v2Validator</name>
<description>parent for project GazelleHL7v2Validator</description>
@@ -45,8 +45,8 @@
<version.resteasy>2.0-beta-2</version.resteasy>
<messages.mode>crowdin</messages.mode>
<hapi.version>2.2</hapi.version>
- <version.version>1.1.0</version.version>
- <sso.client.v7.version>2.0.1-NPD-694-SNAPSHOT</sso.client.v7.version>
+ <version.version>1.1.0-VER-3-SNAPSHOT</version.version>
+ <sso.client.v7.version>2.0.1-GUM-97-SNAPSHOT</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.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>gazelle-hl7v2-validator-api-jar</artifactId>
- <version>3.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ejb</artifactId>
- <version>3.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ear</artifactId>
- <version>3.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>
<artifactId>GazelleHL7v2Validator-ui</artifactId>
- <version>3.8.6-NPD-694-SNAPSHOT</version>
+ <version>3.9.0-SNAPSHOT</version>
</dependency>
<dependency>
<groupId>net.ihe.gazelle</groupId>