diff --git a/pom.xml b/pom.xml
index bb4ccab815f041d29b7a48d7debed83f0498a2f9..86ab74d1c404af72ba5c3e870649c3def9c31fb4 100644
--- a/pom.xml
+++ b/pom.xml
@@ -19,7 +19,7 @@
<artifactId>smp-modules</artifactId>
<packaging>pom</packaging>
<name>SMP</name>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<modules>
<module>smp-parent-pom</module>
diff --git a/smp-angular/pom.xml b/smp-angular/pom.xml
index e081460197ac5215f03aa88fb87ba393ceb07859..742338421056fa3764b917d35abc086d97d056b6 100644
--- a/smp-angular/pom.xml
+++ b/smp-angular/pom.xml
@@ -6,7 +6,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-angular</artifactId>
diff --git a/smp-api/pom.xml b/smp-api/pom.xml
index 95e526b30dce2298bcb7c94ce48137f90619a760..d3615620e6d6cf73c992ded57735a8f2caf72c77 100644
--- a/smp-api/pom.xml
+++ b/smp-api/pom.xml
@@ -17,7 +17,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
diff --git a/smp-docker/pom.xml b/smp-docker/pom.xml
index 2f2c7e816db364fea2bf8e2891d658c6aa107fa0..79a2dedd271c3278377496828bd3a70711c4f97e 100644
--- a/smp-docker/pom.xml
+++ b/smp-docker/pom.xml
@@ -6,9 +6,10 @@
<modelVersion>4.0.0</modelVersion>
<parent>
- <groupId>eu.europa.ec</groupId>
- <artifactId>smp-modules</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <groupId>eu.europa.ec.edelivery</groupId>
+ <artifactId>smp-parent-pom</artifactId>
+ <version>4.1.1-SNAPSHOT</version>
+ <relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-docker</artifactId>
<packaging>jar</packaging>
diff --git a/smp-parent-pom/pom.xml b/smp-parent-pom/pom.xml
index 9ba6f24377d67bb792217be4716ef2a0c44362be..b3132cfb3b106f4b4d087cb8e74348fc0106093f 100644
--- a/smp-parent-pom/pom.xml
+++ b/smp-parent-pom/pom.xml
@@ -17,7 +17,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<packaging>pom</packaging>
<name>smp-parent-pom</name>
<description>SMP - CEF eDelivery</description>
diff --git a/smp-server-library/pom.xml b/smp-server-library/pom.xml
index 419f65dbd271c8318bc857144996b9c6d00c6633..0e02616f0162a08decf99514497eed1b1701b984 100644
--- a/smp-server-library/pom.xml
+++ b/smp-server-library/pom.xml
@@ -16,7 +16,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-server-library</artifactId>
diff --git a/smp-soapui-tests/pom.xml b/smp-soapui-tests/pom.xml
index 0f0a37a4d7bd55d49dd33a2e5c0b6fb11524d8e2..01c715871c649912553047cc3a47915edbed8441 100644
--- a/smp-soapui-tests/pom.xml
+++ b/smp-soapui-tests/pom.xml
@@ -4,7 +4,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp-soapui-tests</artifactId>
diff --git a/smp-webapp/pom.xml b/smp-webapp/pom.xml
index a2d772fb6b5e379345cc796d2556137bf8a94b0a..70694ec55bccbe3b9bfa46d3210602e593278c40 100644
--- a/smp-webapp/pom.xml
+++ b/smp-webapp/pom.xml
@@ -3,7 +3,7 @@
<parent>
<groupId>eu.europa.ec.edelivery</groupId>
<artifactId>smp-parent-pom</artifactId>
- <version>4.1.0-RC2-SNAPSHOT</version>
+ <version>4.1.1-SNAPSHOT</version>
<relativePath>../smp-parent-pom/pom.xml</relativePath>
</parent>
<artifactId>smp</artifactId>
@@ -162,13 +162,6 @@
<version>2.0.2</version>
<configuration>
<warName>${project.artifactId}</warName>
- <webResources>
- <resource>
- <directory>${basedir}/src/main/webapp/static_resources</directory>
- <targetPath>static_resources</targetPath>
- <filtering>true</filtering>
- </resource>
- </webResources>
<archive>
<manifestEntries>
<WebLogic-Application-Version>v${project.version}</WebLogic-Application-Version>
diff --git a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
index 0384287dccfa934ddf131b79d29a0dd060069a47..cc0051c7a266b23bf3d3f92c1409cca5274fa17d 100644
--- a/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
+++ b/smp-webapp/src/main/java/eu/europa/ec/edelivery/smp/controllers/RootController.java
@@ -37,13 +37,29 @@ public class RootController {
private static final SMPLogger LOG = SMPLoggerFactory.getLogger(RootController.class);
+ /**
+ * redirect if / to index.html.
+ * @param model
+ * @return
+ */
+ @GetMapping(value={"/", "web/index.html"})
+ @Order(HIGHEST_PRECEDENCE)
+ public ModelAndView redirectOldIndexPath(ModelMap model) {
+ return new ModelAndView("redirect:/index.html", model);
+ }
- @GetMapping( produces = MediaType.TEXT_HTML_VALUE, value={"", "/", "web/index.html","index.html"})
+ @GetMapping( produces = {MediaType.TEXT_HTML_VALUE, MediaType.IMAGE_PNG_VALUE},
+ value={ "/index.html", "/favicon-16x16.png"})
@Order(HIGHEST_PRECEDENCE)
public byte[] getServiceGroup(HttpServletRequest httpReq) throws IOException {
String host = httpReq.getRemoteHost();
LOG.businessInfo(SMPMessageCode.BUS_HTTP_GET_END_STATIC_CONTENT,host,httpReq.getPathInfo());
- return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/index.html"));
+ String value = httpReq.getServletPath();
+ if(value!=null && value.endsWith("favicon-16x16.png")){
+ return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/html/favicon-16x16.png"));
+ }else {
+ return IOUtils.readBytesFromStream(RootController.class.getResourceAsStream("/html/index.html"));
+ }
}
/**
diff --git a/smp-webapp/src/main/webapp/static_resources/favicon-16x16.png b/smp-webapp/src/main/resources/html/favicon-16x16.png
similarity index 100%
rename from smp-webapp/src/main/webapp/static_resources/favicon-16x16.png
rename to smp-webapp/src/main/resources/html/favicon-16x16.png
diff --git a/smp-webapp/src/main/resources/index.html b/smp-webapp/src/main/resources/html/index.html
similarity index 92%
rename from smp-webapp/src/main/resources/index.html
rename to smp-webapp/src/main/resources/html/index.html
index 3f5273e657c5ff00483b0f158493bb83f6ee9a3f..0340764a431f44f0adde16fe880e5e7f1ebb231e 100644
--- a/smp-webapp/src/main/resources/index.html
+++ b/smp-webapp/src/main/resources/html/index.html
@@ -27,6 +27,6 @@
<h2>Version: ${project.version}</h2>
<h6>Build timestamp: ${buildtimestamp}</h6>
<h6>Specification: <a href="http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html" target="_blank">http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html</a></h6>
- <h6>UI: <a href="ui/index.html" target="_blank">eDelivery SMP</a></h6>
+ <h6>UI: <a href="../../../../../smp-angular/src/main/resources/META-INF/resources/ui/index.html" target="_blank">eDelivery SMP</a></h6>
</body>
</html>
diff --git a/smp-webapp/src/main/webapp/WEB-INF/web.xml b/smp-webapp/src/main/webapp/WEB-INF/web.xml
index 6948bb154ddec6f32e7ae501b71bd65aab284d71..c79b6f718580a9d977167e1bd6411f22d496152c 100644
--- a/smp-webapp/src/main/webapp/WEB-INF/web.xml
+++ b/smp-webapp/src/main/webapp/WEB-INF/web.xml
@@ -35,11 +35,6 @@
<servlet-name>firstPage</servlet-name>
<url-pattern>/</url-pattern>
</servlet-mapping>
- <servlet-mapping>
- <servlet-name>firstPage</servlet-name>
- <url-pattern>/web/index.html</url-pattern>
- </servlet-mapping>
-
<servlet>
<servlet-name>smpRestServlet</servlet-name>
diff --git a/smp-webapp/src/main/webapp/index.html b/smp-webapp/src/main/webapp/index.html
deleted file mode 100644
index c870461f34bb9403b114bc7d70049ebddff11df0..0000000000000000000000000000000000000000
--- a/smp-webapp/src/main/webapp/index.html
+++ /dev/null
@@ -1,31 +0,0 @@
-<!--
- ~ Copyright 2017 European Commission | CEF eDelivery
- ~
- ~ 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 attached in file: LICENCE-EUPL-v1.2.pdf
- ~
- ~ 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.
- -->
-<!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" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <title>SMP</title>
- <link rel="shortcut icon" href="favicon-16x16.png" />
- <style type="text/css">
- body { font-family: Arial, Helvetica, sans-serif; }
- a, a:link, a:visited, a:hover, a:active { color: blue; }
- </style>
- </head>
- <body>
- <h1>SMP (Service Metadata Publishing)</h1>
- <h2>Version: ${project.version}</h2>
- <h6>Build timestamp: ${buildtimestamp}</h6>
- <h6>Specification: <a href="http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html" target="_blank">http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html</a></h6>
- </body>
-</html>
diff --git a/smp-webapp/src/main/webapp/static_resources/index.html b/smp-webapp/src/main/webapp/static_resources/index.html
deleted file mode 100644
index 3f5273e657c5ff00483b0f158493bb83f6ee9a3f..0000000000000000000000000000000000000000
--- a/smp-webapp/src/main/webapp/static_resources/index.html
+++ /dev/null
@@ -1,32 +0,0 @@
-<!--
- ~ Copyright 2017 European Commission | CEF eDelivery
- ~
- ~ 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 attached in file: LICENCE-EUPL-v1.2.pdf
- ~
- ~ 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.
- -->
-<!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" xml:lang="en" lang="en">
- <head>
- <meta http-equiv="Content-Type" content="text/html; charset=utf-8" />
- <meta http-equiv="X-UA-Compatible" content="IE=edge" />
- <title>SMP</title>
- <link rel="shortcut icon" href="favicon-16x16.png" />
- <style type="text/css">
- body { font-family: Arial, Helvetica, sans-serif; }
- a, a:link, a:visited, a:hover, a:active { color: blue; }
- </style>
- </head>
- <body>
- <h1>SMP (Service Metadata Publishing)</h1>
- <h2>Version: ${project.version}</h2>
- <h6>Build timestamp: ${buildtimestamp}</h6>
- <h6>Specification: <a href="http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html" target="_blank">http://docs.oasis-open.org/bdxr/bdx-smp/v1.0/bdx-smp-v1.0.html</a></h6>
- <h6>UI: <a href="ui/index.html" target="_blank">eDelivery SMP</a></h6>
- </body>
-</html>