Fix swagger basepath

[sdc.git] / catalog-be / src / main / webapp / WEB-INF / web.xml

diff --git a/catalog-be/src/main/webapp/WEB-INF/web.xml b/catalog-be/src/main/webapp/WEB-INF/web.xml
index 814a58a..5ed38e6 100644 (file)
--- a/catalog-be/src/main/webapp/WEB-INF/web.xml
+++ b/catalog-be/src/main/webapp/WEB-INF/web.xml
@@ -8,17 +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>com.wordnik.swagger.jersey.listing.ApiListingResourceJSON;org.glassfish.jersey.media.multipart.MultiPartFeature,org.openecomp.sdc.be.filters.BeServletFilter</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>
@@ -42,43 +50,103 @@
                <servlet-class>org.glassfish.jersey.servlet.ServletContainer</servlet-class>
                <init-param>
                        <param-name>jersey.config.server.provider.packages</param-name>
-                       <param-value>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, org.openecomp.sdc.be.filters.ComponentsAvailabilityFilter</param-value> -->
-                       
-                       <!-- Closed till the feature done and basic authentication defined with M Lando -->
-                       <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>
        
        <servlet-mapping>
                <servlet-name>jerseyDistribution</servlet-name>
-               <url-pattern>/asdc/*</url-pattern>
+               <url-pattern>/sdc/*</url-pattern>
        </servlet-mapping>
 
        <servlet>
-               <servlet-name>Jersey2Config</servlet-name>
-               <servlet-class>com.wordnik.swagger.jersey.config.JerseyJaxrsConfig</servlet-class>
+               <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>
+               
+               <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.0.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>
-                       <param-value>http://behost:8080/sdc2/rest</param-value>
+                       <!-- 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>
+               <servlet-class>org.openecomp.portalsdk.core.onboarding.crossapi.PortalRestAPIProxy</servlet-class>
+               <load-on-startup>3</load-on-startup>
                <async-supported>true</async-supported>
        </servlet>
        
-       <!-- ECOMP Portal -->   
        <servlet>
                <servlet-name>ViewStatusMessages</servlet-name>
                <servlet-class>ch.qos.logback.classic.ViewStatusMessagesServlet</servlet-class>
@@ -90,13 +158,13 @@
                <url-pattern>/lbClassicStatus</url-pattern>
        </servlet-mapping>
 
-       <filter>
+<!--   <filter>
           <filter-name>GzipFilter</filter-name>
           <filter-class>org.eclipse.jetty.servlets.GzipFilter</filter-class>
           <async-supported>true</async-supported>
           <init-param>
                <param-name>methods</param-name>
-               <param-value>GET,POST</param-value>
+               <param-value>GET,POST,PUT,DELETE</param-value>
           </init-param>
           <init-param>
              <param-name>mimeTypes</param-name>
@@ -107,7 +175,7 @@
           <filter-name>GzipFilter</filter-name>
                <url-pattern>/sdc2/rest/*</url-pattern>
        </filter-mapping>
-
+-->
 
        <context-param>
                <param-name>contextConfigLocation</param-name>
@@ -122,9 +190,6 @@
                <listener-class>org.springframework.web.context.ContextLoaderListener</listener-class>
        </listener>
 
-
-
-
        <welcome-file-list>
                <welcome-file>index.html</welcome-file>
        </welcome-file-list>