From: Norm Traxler Date: Tue, 15 Jan 2019 00:59:28 +0000 (+0000) Subject: Network Discovery Swagger fix X-Git-Tag: 1.5.1~10 X-Git-Url: https://gerrit.onap.org/r/gitweb?a=commitdiff_plain;h=dcd5545d38527e498905eafd244d0de0940905da;p=sdnc%2Fapps.git Network Discovery Swagger fix Issue-ID: LOG-927 Change-Id: Ice25909e2aa0dc2bc566b585c1d3e4a577c3a73c Signed-off-by: Norm Traxler --- 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. UTF-8 ${project.build.directory}/generated-resources/swagger + ${project.version}-${timestamp} ${project.version}-latest + + 0.1.0 + + + @@ -54,25 +60,26 @@ limitations under the License. com.bazaarvoice.jolt jolt-core - 0.1.0 + ${jolt.version} com.bazaarvoice.jolt json-utils - 0.1.0 + ${jolt.version} commons-io commons-io 2.5 - - - org.springframework.boot - spring-boot-starter-jetty + + + + org.eclipse.jetty + jetty-webapp - + org.springframework.boot spring-boot-starter-jersey @@ -82,6 +89,12 @@ limitations under the License. + + + + org.springframework + spring-webmvc + org.springframework.boot @@ -142,13 +155,14 @@ limitations under the License. + repackage - + src/main/resources @@ -158,6 +172,7 @@ limitations under the License. + 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/print.css rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/reset.css rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/screen.css rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/style.css rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/css/typography.css rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans-Bold.ttf rename to pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans-Bold.ttf 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/fonts/DroidSans.ttf rename to pomba/network-discovery/src/main/resources/static/swagger/fonts/DroidSans.ttf 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/collapse.gif rename to pomba/network-discovery/src/main/resources/static/swagger/images/collapse.gif 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/expand.gif rename to pomba/network-discovery/src/main/resources/static/swagger/images/expand.gif 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/explorer_icons.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/explorer_icons.png 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-16x16.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/favicon-16x16.png 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon-32x32.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/favicon-32x32.png 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/favicon.ico rename to pomba/network-discovery/src/main/resources/static/swagger/images/favicon.ico 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/logo_small.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/logo_small.png 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/pet_store_api.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/pet_store_api.png 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/throbber.gif rename to pomba/network-discovery/src/main/resources/static/swagger/images/throbber.gif 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/images/wordnik_api.png rename to pomba/network-discovery/src/main/resources/static/swagger/images/wordnik_api.png 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 similarity index 98% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/index.html rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/en.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/es.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/fr.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/geo.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/it.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ja.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pl.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/pt.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/ru.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/tr.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/translator.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lang/zh-cn.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/backbone-min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/handlebars-2.0.0.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/highlight.9.1.0.pack_extended.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery-1.8.0.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.ba-bbq.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.slideto.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jquery.wiggle.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/js-yaml.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/jsoneditor.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/lodash.min.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/marked.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/lib/swagger-oauth.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/o2c.html rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.js rename to 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 similarity index 100% rename from pomba/network-discovery/src/main/resources/META-INF/resources/swagger/swagger-ui.min.js rename to pomba/network-discovery/src/main/resources/static/swagger/swagger-ui.min.js