diff options
Diffstat (limited to 'catalog-be/src/main/webapp')
| -rw-r--r-- | catalog-be/src/main/webapp/WEB-INF/web.xml | 100 | ||||
| -rw-r--r-- | catalog-be/src/main/webapp/index.html | 7 | ||||
| -rw-r--r-- | catalog-be/src/main/webapp/index.jsp | 5 |
3 files changed, 14 insertions, 98 deletions
diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml index 3acf64ca6f..9991e30a86 100644 --- a/catalog-be/src/main/webapp/WEB-INF/web.xml +++ b/catalog-be/src/main/webapp/WEB-INF/web.xml @@ -8,11 +8,14 @@ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> <init-param> <param-name>jersey.config.server.provider.packages</param-name> - <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value> + <param-value> + io.swagger.v3.jaxrs2.integration.resources, + org.openecomp.sdc.be.servlets + </param-value> </init-param> <init-param> <param-name>jersey.config.server.provider.classnames</param-name> - <param-value>io.swagger.jersey.listing.ApiListingResourceJSON, + <param-value> org.glassfish.jersey.media.multipart.MultiPartFeature, org.openecomp.sdc.be.filters.BeServletFilter, org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter, @@ -24,15 +27,6 @@ org.openecomp.sdc.be.view.MixinModelWriter, org.openecomp.sdc.config.ObjectMapperProvider </param-value> - - </init-param> - <init-param> - <param-name>swagger.scanner.id</param-name> - <param-value>test.1</param-value> - </init-param> - <init-param> - <param-name>swagger.config.id</param-name> - <param-value>test.1</param-value> </init-param> <init-param> <param-name>exclude_url_endpoints</param-name> @@ -52,30 +46,24 @@ <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class> <init-param> <param-name>jersey.config.server.provider.packages</param-name> - <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.distribution.servlet, org.openecomp.sdc.be.externalapi.servlet </param-value> + <param-value> + io.swagger.v3.jaxrs2.integration.resources, + org.openecomp.sdc.be.distribution.servlet, + org.openecomp.sdc.be.externalapi.servlet + </param-value> </init-param> <init-param> <param-name>jersey.config.server.provider.classnames</param-name> - <param-value>io.swagger.jersey.listing.ApiListingResourceJSON, + <param-value> org.glassfish.jersey.media.multipart.MultiPartFeature, org.openecomp.sdc.be.filters.BeServletFilter, + org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter, org.openecomp.sdc.be.servlets.exception.DefaultExceptionMapper, org.openecomp.sdc.be.servlets.exception.ComponentExceptionMapper, org.openecomp.sdc.be.servlets.exception.StorageExceptionMapper, org.openecomp.sdc.be.filters.BasicAuthenticationFilter - </param-value> - </init-param> - - <init-param> - <param-name>swagger.scanner.id</param-name> - <param-value>test.2</param-value> - </init-param> - - <init-param> - <param-name>swagger.config.id</param-name> - <param-value>test.2</param-value> + </param-value> </init-param> - <load-on-startup>1</load-on-startup> <async-supported>true</async-supported> </servlet> @@ -85,66 +73,6 @@ <url-pattern>/sdc/*</url-pattern> </servlet-mapping> - <servlet> - <servlet-name>Internal-APIs-Configurations</servlet-name> - <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class> - - <init-param> - <param-name>api.version</param-name> - <param-value>1.2.0</param-value> - </init-param> - - <init-param> - <param-name>swagger.api.title</param-name> - <param-value>Internal API's</param-value> - </init-param> - - <init-param> - <param-name>swagger.api.basepath</param-name> - <param-value>/sdc2/rest</param-value> - </init-param> - - <init-param> - <param-name>swagger.scanner.id</param-name> - <param-value>test.1</param-value> - </init-param> - - <init-param> - <param-name>swagger.config.id</param-name> - <param-value>test.1</param-value> - </init-param> - - <load-on-startup>2</load-on-startup> - <async-supported>true</async-supported> - </servlet> - - <servlet> - <servlet-name>External and Distribution API's</servlet-name> - <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class> - - <init-param> - <param-name>api.version</param-name> - <param-value>1.2.0</param-value> - </init-param> - - <init-param> - <param-name>swagger.api.title</param-name> - <param-value>DistributionAndExternalAPIs</param-value> - </init-param> - - <init-param> - <param-name>swagger.api.basepath</param-name> - <!-- Check if second param can be added --> - <param-value>/sdc</param-value> - </init-param> - - <init-param> - <param-name>swagger.context.id</param-name> - <param-value>test.2</param-value> - </init-param> - <load-on-startup>2</load-on-startup> - </servlet> - <!-- ECOMP Portal --> <servlet> <servlet-name>ECOMPServlet</servlet-name> @@ -310,6 +238,6 @@ </listener> <welcome-file-list> - <welcome-file>index.html</welcome-file> + <welcome-file>swagger-ui/index.html</welcome-file> </welcome-file-list> </web-app> diff --git a/catalog-be/src/main/webapp/index.html b/catalog-be/src/main/webapp/index.html deleted file mode 100644 index 4b26987758..0000000000 --- a/catalog-be/src/main/webapp/index.html +++ /dev/null @@ -1,7 +0,0 @@ -<html> - -<body> - <h1>Hello Catalog Server</h1> -</body> - -</html>
\ No newline at end of file diff --git a/catalog-be/src/main/webapp/index.jsp b/catalog-be/src/main/webapp/index.jsp deleted file mode 100644 index c38169bb95..0000000000 --- a/catalog-be/src/main/webapp/index.jsp +++ /dev/null @@ -1,5 +0,0 @@ -<html> -<body> -<h2>Hello World!</h2> -</body> -</html> |