summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorNorm Traxler <normant@amdocs.com>2019-01-15 00:59:28 +0000
committerNorm Traxler <normant@amdocs.com>2019-01-15 01:01:14 +0000
commitdcd5545d38527e498905eafd244d0de0940905da (patch)
treea37dbeb4fd68cab27e5e9b2809df92bc42707991
parent20c6155c781f2bec7920d37da40c23f3e2a26b89 (diff)
Network Discovery Swagger fix
Issue-ID: LOG-927 Change-Id: Ice25909e2aa0dc2bc566b585c1d3e4a577c3a73c Signed-off-by: Norm Traxler <normant@amdocs.com>
-rw-r--r--pomba/network-discovery/config/application.properties17
-rw-r--r--pomba/network-discovery/pom.xml31
-rw-r--r--pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java8
-rw-r--r--pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java18
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/css/print.css (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/css/reset.css (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/css/screen.css (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/css/style.css (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/css/typography.css (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf)bin42480 -> 42480 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf)bin41028 -> 41028 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif)bin69 -> 69 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif)bin73 -> 73 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png)bin5763 -> 5763 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png)bin645 -> 645 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png)bin1654 -> 1654 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico)bin5430 -> 5430 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png)bin770 -> 770 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png)bin824 -> 824 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif)bin9257 -> 9257 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png)bin980 -> 980 bytes
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/index.html (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html)2
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/en.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/es.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/it.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/o2c.html (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js)0
-rw-r--r--pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js (renamed from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js)0
50 files changed, 35 insertions, 41 deletions
diff --git a/pomba/network-discovery/config/application.properties b/pomba/network-discovery/config/application.properties
index 9de4fde..1032d42 100644
--- a/pomba/network-discovery/config/application.properties
+++ b/pomba/network-discovery/config/application.properties
@@ -1,22 +1,5 @@
spring.jersey.type=filter
-spring.mvc.urls=swagger,docs,prometheus,auditevents,info,heapdump,autoconfig,beans,loggers,dump,env,trace,health,configprops,mappings,metrics,webjars
-
-
-server.contextPath=/network-discovery
-spring.autoconfigure.exclude=org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration,org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration
-
-#This property is used to set the Tomcat connector attributes.developers can define multiple attributes separated by comma
-#tomcat.connector.attributes=allowTrace-true
-#The max number of active threads in this pool
-server.tomcat.max-threads=200
-#The minimum number of threads always kept alive
-server.tomcat.min-Spare-Threads=25
-#The number of milliseconds before an idle thread shutsdown, unless the number of active threads are less or equal to minSpareThreads
-server.tomcat.max-idle-time=60000
-
-#Servlet context parameters
-server.context_parameters.p-name=value #context parameter with p-name as key and value as value.
#Enable HTTPS
server.port=8443
diff --git a/pomba/network-discovery/pom.xml b/pomba/network-discovery/pom.xml
index a428a59..2ea5b48 100644
--- a/pomba/network-discovery/pom.xml
+++ b/pomba/network-discovery/pom.xml
@@ -31,11 +31,17 @@ limitations under the License.
<properties>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<swagger.directory>${project.build.directory}/generated-resources/swagger</swagger.directory>
+
<!--docker -->
<docker.tag>${project.version}-${timestamp}</docker.tag>
<docker.latest.tag>${project.version}-latest</docker.latest.tag>
+
+ <jolt.version>0.1.0</jolt.version>
+
</properties>
+
+
<dependencyManagement>
<dependencies>
<dependency>
@@ -54,25 +60,26 @@ limitations under the License.
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>jolt-core</artifactId>
- <version>0.1.0</version>
+ <version>${jolt.version}</version>
</dependency>
<dependency>
<groupId>com.bazaarvoice.jolt</groupId>
<artifactId>json-utils</artifactId>
- <version>0.1.0</version>
+ <version>${jolt.version}</version>
</dependency>
<dependency>
<groupId>commons-io</groupId>
<artifactId>commons-io</artifactId>
<version>2.5</version>
</dependency>
-
- <dependency>
- <groupId>org.springframework.boot</groupId>
- <artifactId>spring-boot-starter-jetty</artifactId>
+
+ <!-- Springboot dependencies -->
+ <dependency>
+ <groupId>org.eclipse.jetty</groupId>
+ <artifactId>jetty-webapp</artifactId>
</dependency>
- <dependency>
+ <dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-jersey</artifactId>
<exclusions>
@@ -82,6 +89,12 @@ limitations under the License.
</exclusion>
</exclusions>
</dependency>
+
+ <!-- Required for swagger UI -->
+ <dependency>
+ <groupId>org.springframework</groupId>
+ <artifactId>spring-webmvc</artifactId>
+ </dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
@@ -142,13 +155,14 @@ limitations under the License.
<executions>
<execution>
<goals>
+ <!-- required to package the jar correctly for springboot-->
<goal>repackage</goal>
</goals>
</execution>
</executions>
</plugin>
</plugins>
-
+
<resources>
<resource>
<directory>src/main/resources</directory>
@@ -158,6 +172,7 @@ limitations under the License.
</includes>
</resource>
</resources>
+
</build>
<profiles>
diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
index c9b995f..5a643b0 100644
--- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
+++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/Application.java
@@ -19,19 +19,11 @@
package org.onap.sdnc.apps.pomba.networkdiscovery;
import org.springframework.boot.SpringApplication;
-import org.springframework.boot.autoconfigure.EnableAutoConfiguration;
import org.springframework.boot.autoconfigure.SpringBootApplication;
-import org.springframework.boot.autoconfigure.jdbc.DataSourceAutoConfiguration;
-import org.springframework.boot.autoconfigure.orm.jpa.HibernateJpaAutoConfiguration;
import org.springframework.boot.builder.SpringApplicationBuilder;
import org.springframework.boot.web.support.SpringBootServletInitializer;
-import org.springframework.context.annotation.ComponentScan;
-import org.springframework.scheduling.annotation.EnableAsync;
@SpringBootApplication
-@ComponentScan(basePackages = {"org.onap.sdnc.apps.pomba.networkdiscovery"})
-@EnableAsync
-@EnableAutoConfiguration(exclude = {DataSourceAutoConfiguration.class, HibernateJpaAutoConfiguration.class})
public class Application extends SpringBootServletInitializer {
@Override
protected SpringApplicationBuilder configure(SpringApplicationBuilder application) {
diff --git a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
index e073e34..5dcddbb 100644
--- a/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
+++ b/pomba/network-discovery/src/main/java/org/onap/sdnc/apps/pomba/networkdiscovery/JerseyConfiguration.java
@@ -31,6 +31,7 @@ import org.glassfish.jersey.servlet.ServletProperties;
import org.onap.sdnc.apps.pomba.networkdiscovery.service.rs.RestService;
import org.onap.sdnc.apps.pomba.networkdiscovery.service.rs.RestServiceImpl;
import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.annotation.Bean;
import org.springframework.stereotype.Component;
@@ -39,13 +40,16 @@ import io.swagger.jaxrs.listing.ApiListingResource;
import io.swagger.jaxrs.listing.SwaggerSerializers;
@Component
-@ApplicationPath("/")
+@ApplicationPath("/network-discovery")
public class JerseyConfiguration extends ResourceConfig {
-
+
public static final String SERVICE_NAME = "network-discovery";
+ @Value("${spring.jersey.application-path:/network-discovery}")
+ private String apiPath;
+
private static final Logger log = Logger.getLogger(JerseyConfiguration.class.getName());
-
+
@Autowired
public JerseyConfiguration() {
register(RestServiceImpl.class);
@@ -61,7 +65,7 @@ public class JerseyConfiguration extends ResourceConfig {
@PostConstruct
public void init() {
// Register components where DI is needed
- this.configureSwagger();
+ configureSwagger();
}
private void configureSwagger() {
@@ -70,10 +74,10 @@ public class JerseyConfiguration extends ResourceConfig {
this.register(SwaggerSerializers.class);
BeanConfig config = new BeanConfig();
- config.setTitle("Network Discovery Swagger");
+ config.setTitle("Network Discovery API");
config.setVersion("v1");
- config.setSchemes(new String[] { "https", "http" });
- config.setBasePath("/" + SERVICE_NAME);
+ config.setSchemes(new String[] { "https", "http" });
+ config.setBasePath(apiPath);
config.setResourcePackage(RestService.class.getPackage().getName());
config.setPrettyPrint(true);
config.setScan(true);
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css b/pomba/network-discovery/src/main/resources/static/swagger/css/print.css
index 32bf0c8..32bf0c8 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/print.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css b/pomba/network-discovery/src/main/resources/static/swagger/css/reset.css
index b2b0789..b2b0789 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/reset.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css b/pomba/network-discovery/src/main/resources/static/swagger/css/screen.css
index 90a93a2..90a93a2 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/screen.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css b/pomba/network-discovery/src/main/resources/static/swagger/css/style.css
index fc21a31..fc21a31 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/style.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css b/pomba/network-discovery/src/main/resources/static/swagger/css/typography.css
index 3235edd..3235edd 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css
+++ b/pomba/network-discovery/src/main/resources/static/swagger/css/typography.css
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf
index 036c4d1..036c4d1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf
+++ b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf
index e517a0c..e517a0c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf
+++ b/pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif
index 8843e8c..8843e8c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif
index 477bf13..477bf13 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png b/pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png
index ed9d2ff..ed9d2ff 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png
index 66b1a5b..66b1a5b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png
index 32f319f..32f319f 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico
index 8b60bcf..8b60bcf 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png b/pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png
index 5496a65..5496a65 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png b/pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png
index f9f9cd4..f9f9cd4 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif b/pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif
index 0639388..0639388 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png b/pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png
index dca4f14..dca4f14 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png
+++ b/pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png
Binary files differ
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html b/pomba/network-discovery/src/main/resources/static/swagger/index.html
index c79f30d..0921554 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html
+++ b/pomba/network-discovery/src/main/resources/static/swagger/index.html
@@ -36,7 +36,7 @@
if (url && url.length > 1) {
url = decodeURIComponent(url[1]);
} else {
- url = "../swagger.json";
+ url = "/network-discovery/swagger.json";
//url = "http://petstore.swagger.io/v2/swagger.json";
}
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/en.js
index 9183136..9183136 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/en.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/es.js
index 13fa015..13fa015 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/es.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js
index 388dff1..388dff1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/fr.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js
index 609c20d..609c20d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/geo.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/it.js
index 8529c2a..8529c2a 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/it.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js
index 3207bfc..3207bfc 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/ja.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js
index ce41e91..ce41e91 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/pl.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js
index f2e7c13..f2e7c13 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/pt.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js
index 592744e..592744e 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/ru.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js
index 16426a9..16426a9 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/tr.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js
index 591f6d4..591f6d4 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/translator.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js b/pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js
index 570319b..570319b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lang/zh-cn.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js
index a3f544b..a3f544b 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/backbone-min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js
index 53cf921..53cf921 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/handlebars-2.0.0.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js
index 928386d..928386d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js
index 571c740..571c740 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/highlight.9.1.0.pack_extended.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js
index 066d72c..066d72c 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery-1.8.0.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js
index bcbf248..bcbf248 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.ba-bbq.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js
index ba32cff..ba32cff 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.slideto.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js
index 2adb0d6..2adb0d6 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jquery.wiggle.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js
index c3d07ad..c3d07ad 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/js-yaml.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js
index 343397f..343397f 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/jsoneditor.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js
index 05870d1..05870d1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/lodash.min.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js
index c2a678d..c2a678d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/marked.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js b/pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js
index 2bb6be1..2bb6be1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/lib/swagger-oauth.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html b/pomba/network-discovery/src/main/resources/static/swagger/o2c.html
index 88e8bf1..88e8bf1 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html
+++ b/pomba/network-discovery/src/main/resources/static/swagger/o2c.html
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js
index 7e0cc6d..7e0cc6d 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.js
diff --git a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js
index 2c56818..2c56818 100644
--- a/pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js
+++ b/pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js