summaryrefslogtreecommitdiffstats
path: root/catalog-be/src/main/webapp
diff options
context:
space:
mode:
authorTal Gitelman <tg851x@intl.att.com>2017-06-21 14:29:02 +0300
committerTal Gitelman <tg851x@intl.att.com>2017-06-21 14:29:02 +0300
commitaa8e3a02e993a9265fcc401e11f619955851ac30 (patch)
tree307537eff6657166d8cf4fe8b4a521d0ab497ebb /catalog-be/src/main/webapp
parent1abcafb5c012cb4cd7b03669ce6ce4376b77d84e (diff)
[sdc] fix issue in portal login
+ update swagger Change-Id: I23cdaad7599480d418e6f2d59fb9ff59132b90ac Signed-off-by: Tal Gitelman <tg851x@intl.att.com>
Diffstat (limited to 'catalog-be/src/main/webapp')
-rw-r--r--catalog-be/src/main/webapp/WEB-INF/web.xml102
1 files changed, 93 insertions, 9 deletions
diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 4ff202e45f..fe228a3f97 100644
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -8,16 +8,25 @@
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>jersey.config.server.provider.packages</param-name>
- <param-value>com.wordnik.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value>
+ <param-value>io.swagger.jaxrs.json, org.openecomp.sdc.be.servlets</param-value>
</init-param>
<init-param>
<param-name>jersey.config.server.provider.classnames</param-name>
- <param-value>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter, org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter</param-value>
+ <param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
+ org.glassfish.jersey.media.multipart.MultiPartFeature,
+ org.openecomp.sdc.be.filters.BeServletFilter,
+ org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter</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>1</load-on-startup>
</servlet>
-
<servlet-mapping>
<servlet-name>jersey</servlet-name>
@@ -41,13 +50,26 @@
<servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
<init-param>
<param-name>jersey.config.server.provider.packages</param-name>
- <param-value>com.wordnik.swagger.jaxrs.json, org.openecomp.sdc.be.distribution.servlet, org.openecomp.sdc.be.externalapi.servlet</param-value>
+ <param-value>io.swagger.jaxrs.json, 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>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter,org.openecomp.sdc.be.filters.BasicAuthenticationFilter</param-value>
+ <param-value>io.swagger.jersey.listing.ApiListingResourceJSON,
+ org.glassfish.jersey.media.multipart.MultiPartFeature,
+ org.openecomp.sdc.be.filters.BeServletFilter,
+ 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>
+ </init-param>
+
<load-on-startup>1</load-on-startup>
<async-supported>true</async-supported>
</servlet>
@@ -59,8 +81,69 @@
</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.0.0</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>swagger.api.title</param-name>
+ <param-value>jersey1InternalAPIs</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>swagger.api.basepath</param-name>
+ <param-value>http://localhost:8080/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>ExternalAndDistribution-APIs-Configurations</servlet-name>
+ <servlet-class>io.swagger.jaxrs.config.DefaultJaxrsConfig</servlet-class>
+
+ <init-param>
+ <param-name>api.version</param-name>
+ <param-value>1.0.0</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>swagger.api.title</param-name>
+ <param-value>jersey2DistributionAndExternalAPIs</param-value>
+ </init-param>
+
+ <init-param>
+ <param-name>swagger.api.basepath</param-name>
+ <!-- Check if second param can be added -->
+ <param-value>http://localhost:8080/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>
+
+<!-- Remove after swagger 2 integration -->
+<!-- <servlet>
<servlet-name>Jersey2Config</servlet-name>
- <servlet-class>com.wordnik.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
+ <servlet-class>io.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
<init-param>
<param-name>api.version</param-name>
<param-value>1.0.0</param-value>
@@ -73,7 +156,7 @@
<load-on-startup>2</load-on-startup>
<async-supported>true</async-supported>
- </servlet>
+ </servlet> -->
<!-- ECOMP Portal -->
<servlet>
@@ -83,6 +166,7 @@
<async-supported>true</async-supported>
</servlet>
+<!-- Remove after swagger 2 integration -->
<!-- Removed, the servlet mapping will be taken from annotation -->
<!-- <servlet-mapping>
<servlet-name>ECOMPServlet</servlet-name>