Merge pull request #2 in ESPD/espd from develop to master

* commit '0ade3e5bec87a273d8553c3a5b2fab1983db68f4': release 08-2016 #20 phrase with parameters was splitted ESPD-26 added separated finish page to have same code for printing ESPD-124 #16 added list legal representatives #16 add more economic operator representatives to the XML ESPD-126 #17 Added links for EO's #34 change the id of the G1.1 requirement group of criminal convictions exclusion criteria because it was duplicated #32 add schemeID for VAT number and national number at the economic operator party identification level branch for hotifx #42 #35 added characterFilter for WebLogic server only fix for WL12.1.3 revert back my fix commits hotfix for WL, country changed to String temporary FIX for WL migration temporary FIX for WL migration temporary FIX for WL migration fix for Wl migration fix for wl migration
ESPD · Aug 29, 2016 · 4535faa · 4535faa
2 parents 8f3d155 + 0ade3e5
commit 4535faa
Show file tree

Hide file tree

Showing 80 changed files with 2,184 additions and 2,424 deletions.
diff --git a/README.md b/README.md
@@ -35,6 +35,7 @@ services to their users.
 
 ### Older versions
 
+* [2016.07](https://github.com/espd/ESPD-Service/blob/2016.07/espd-docs/src/main/asciidoc/espd.adoc)
 * [2016.06](https://github.com/espd/ESPD-Service/blob/2016.06/espd-docs/src/main/asciidoc/espd.adoc)
 * [2016.05](https://github.com/espd/ESPD-Service/blob/2016.05/espd-docs/src/main/asciidoc/espd.adoc)
 

diff --git a/espd-docs/pom.xml b/espd-docs/pom.xml
@@ -29,7 +29,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2016.07</version>
+        <version>2016.08</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
 

diff --git a/espd-docs/src/main/asciidoc/about.adoc b/espd-docs/src/main/asciidoc/about.adoc
@@ -1,4 +1,4 @@
-:homepage: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:homepage: https://ec.europa.eu/espd[ESPD]
 
 == About
 

diff --git a/espd-docs/src/main/asciidoc/configuration.adoc b/espd-docs/src/main/asciidoc/configuration.adoc
@@ -1,6 +1,6 @@
 :sourcedir: ../java/eu/europa/ec/grow/espd
-:homepage: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:homepage: https://ec.europa.eu/espd[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :appVersion: 2016.05
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]
@@ -226,7 +226,7 @@ And this is how the static resources are referenced in the view part:
 ----
 
 For example, a request made to the `all.js` file would be translated into a request made to a Javascript file with a hash:
-`https://ec.europa.eu/growth/tools-databases/espd/static/bundle/all-60d9cd4aee2d53a2a4bd69a5546a9d18.js`.
+`https://ec.europa.eu/espdstatic/bundle/all-60d9cd4aee2d53a2a4bd69a5546a9d18.js`.
 
 ==== WRO4J
 

diff --git a/espd-docs/src/main/asciidoc/espd.adoc b/espd-docs/src/main/asciidoc/espd.adoc
@@ -3,11 +3,11 @@
 Alexey Lukashov +
 Virgiliu Ratoi
 
-v2016.07, 29-07-2016
+v2016.08, 31-08-2016
 
 :sourcedir: ../java/eu/europa/ec/grow/espd
-:homepage: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:homepage: https://ec.europa.eu/espd[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :appVersion: 2016.05
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]

diff --git a/espd-docs/src/main/asciidoc/installation.adoc b/espd-docs/src/main/asciidoc/installation.adoc
@@ -1,6 +1,6 @@
 :sourcedir: ../java/eu/europa/ec/grow/espd
-:homepage: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:homepage: https://ec.europa.eu/espd[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :appVersion: 2016.05
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]

diff --git a/espd-docs/src/main/asciidoc/license.adoc b/espd-docs/src/main/asciidoc/license.adoc
@@ -1,4 +1,4 @@
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 
 == License
 

diff --git a/espd-docs/src/main/asciidoc/overview.adoc b/espd-docs/src/main/asciidoc/overview.adoc
@@ -1,4 +1,4 @@
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]

diff --git a/espd-docs/src/main/asciidoc/releaseNotes.adoc b/espd-docs/src/main/asciidoc/releaseNotes.adoc
@@ -1,5 +1,24 @@
 == Release notes
 
+=== 2016.08 (31st of August 2016)
+
+==== Bug
+
+* https://github.com/ESPD/ESPD-Service/issues/63[Text shown twice]
+* https://github.com/ESPD/ESPD-Service/issues/35[Bug needs to be fixed due to an upgrade to weblogic 12 1.3]
+* https://github.com/ESPD/ESPD-Service/issues/34[Duplicate ids of requirement groups]
+* https://github.com/ESPD/ESPD-Service/issues/32[KvK number is filled in for the VAT number after reloading the xml]
+* https://github.com/ESPD/ESPD-Service/issues/20[For more information about the UEA click here not translated]
+
+==== Improvement
+
+* https://github.com/ESPD/ESPD-Service/issues/42[Inform users that they are using the wrong environment]
+
+==== Enhancement
+
+* https://github.com/ESPD/ESPD-Service/issues/17[Link to eCertis for EOs]
+* https://github.com/ESPD/ESPD-Service/issues/16[Add more Legal representative]
+
 === 2016.07 (29th of July 2016)
 
 ==== Bug

diff --git a/espd-docs/src/main/asciidoc/requirements.adoc b/espd-docs/src/main/asciidoc/requirements.adoc
@@ -1,4 +1,4 @@
-:homepage: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:homepage: https://ec.europa.eu/espd[ESPD]
 :maven: https://maven.apache.org[Maven 3]
 :tomcat: https://tomcat.apache.org[Tomcat 7+]
 

diff --git a/espd-docs/src/main/asciidoc/testing.adoc b/espd-docs/src/main/asciidoc/testing.adoc
@@ -1,4 +1,4 @@
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :maven: https://maven.apache.org[Maven 3]
 :intellij: https://www.jetbrains.com/idea[IntelliJ]
 :eclipse: https://eclipse.org/downloads[Eclipse]

diff --git a/espd-docs/src/main/asciidoc/view.adoc b/espd-docs/src/main/asciidoc/view.adoc
@@ -1,4 +1,4 @@
-:espd: https://ec.europa.eu/growth/tools-databases/espd/[ESPD]
+:espd: https://ec.europa.eu/espd[ESPD]
 :maven: https://maven.apache.org[Maven 3]
 :springBoot: http://projects.spring.io/spring-boot/[Spring Boot]
 :spring: https://projects.spring.io/spring-framework/[Spring]

diff --git a/espd-web/pom.xml b/espd-web/pom.xml
@@ -27,7 +27,7 @@
     <parent>
         <artifactId>espd</artifactId>
         <groupId>eu.europa.ec.grow.espd</groupId>
-        <version>2016.07</version>
+        <version>2016.08</version>
     </parent>
     <modelVersion>4.0.0</modelVersion>
     <artifactId>espd-web</artifactId>

diff --git a/espd-web/src/main/java/eu/europa/ec/grow/espd/config/EspdApplication.java b/espd-web/src/main/java/eu/europa/ec/grow/espd/config/EspdApplication.java
@@ -24,8 +24,6 @@
 
 package eu.europa.ec.grow.espd.config;
 
-import ac.simons.spring.boot.wro4j.Wro4jAutoConfiguration;
-import com.fasterxml.jackson.databind.ObjectMapper;
 import org.springframework.beans.factory.annotation.Value;
 import org.springframework.boot.SpringApplication;
 import org.springframework.boot.autoconfigure.SpringBootApplication;
@@ -36,6 +34,10 @@
 import org.springframework.http.client.SimpleClientHttpRequestFactory;
 import org.springframework.web.WebApplicationInitializer;
 import org.springframework.web.client.RestTemplate;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+
+import ac.simons.spring.boot.wro4j.Wro4jAutoConfiguration;
 /**
  * Created by vigi on 10/20/15:5:17 PM.
  */