diff options
Diffstat (limited to 'openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp')
2 files changed, 77 insertions, 49 deletions
diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml index 5eb2b98cd5..609d69f9f8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/beans-services.xml @@ -7,6 +7,7 @@ http://cxf.apache.org/jaxrs http://cxf.apache.org/schemas/jaxrs.xsd http://www.springframework.org/schema/context http://www.springframework.org/schema/context/spring-context.xsd"> + <import resource="classpath:META-INF/cxf/cxf.xml"/> <import resource="classpath:META-INF/cxf/cxf-servlet.xml"/> @@ -30,11 +31,27 @@ <!-- ASDC --> <bean id="vendorLicenseManager" class="org.openecomp.sdc.vendorlicense.impl.VendorLicenseManagerImpl"/> - <bean id="vendorSoftwareProductManager" class="org.openecomp.sdc.vendorsoftwareproduct.impl.VendorSoftwareProductManagerImpl"/> - <bean id="UploadValidationManager" class="org.openecomp.sdc.validation.impl.UploadValidationManagerImpl"/> + <bean id="uploadValidationManager" class="org.openecomp.sdc.validation.impl.UploadValidationManagerImpl"/> <bean id="actionManager" class="org.openecomp.sdc.action.impl.ActionManagerImpl"/> <bean id="applicationConfigManager" class="org.openecomp.sdc.applicationconfig.impl.ApplicationConfigManagerImpl"/> + <!-- aspect beans --> + <bean id = "debugAspect" class="org.openecomp.sdc.logging.aspects.DebugAspect"/> + + <!--aop:config> + < aspect pointcuts> + <aop:pointcut id="loggingDebugPointcut" expression="execution(* org.openecomp.sdc.*.*.*(..))"/> + + <advices> + <aop:aspect id="logDebugAspect" ref="debugAspect"> + <aop:before pointcut-ref="loggingDebugPointcut" method="debugEnterMethod"/> + <aop:after-returning pointcut-ref="loggingDebugPointcut" method="debugExitMethod"/> + </aop:aspect> + </aop:config--> + + + + <!-- RESTful Services --> <jaxrs:server id="restContainer" address="/"> @@ -54,6 +71,9 @@ <ref bean="actions"/> <ref bean="applicationConfiguration"/> <ref bean="componentUploads"/> + <ref bean="orchestrationTemplateCandidate"/> + <ref bean="componentDependencyModel"/> + <ref bean="activityLog"/> </jaxrs:serviceBeans> <jaxrs:providers> diff --git a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml index 68b7758609..08e8dd8ec8 100644 --- a/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml +++ b/openecomp-be/api/openecomp-sdc-rest-webapp/onboarding-rest-war/src/main/webapp/WEB-INF/web.xml @@ -1,20 +1,20 @@ -<!DOCTYPE web-app PUBLIC - "-//Sun Microsystems, Inc.//DTD Web Application 2.3//EN" - "http://java.sun.com/dtd/web-app_2_3.dtd" > +<web-app + xmlns="http://java.sun.com/xml/ns/javaee" + xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" + xsi:schemaLocation="http://java.sun.com/xml/ns/javaee http://java.sun.com/xml/ns/javaee/web-app_3_0.xsd" + version="3.0"> -<web-app> + <!-- Spring --> + <context-param> + <param-name>contextConfigLocation</param-name> + <param-value>WEB-INF/beans-services.xml</param-value> + </context-param> - <!-- Spring --> - <context-param> - <param-name>contextConfigLocation</param-name> - <param-value>WEB-INF/beans-services.xml</param-value> - </context-param> - - <listener> - <listener-class>org.openecomp.server.listeners.OnboardingAppStartupListener</listener-class> - </listener> + <listener> + <listener-class>org.openecomp.server.listeners.OnboardingAppStartupListener</listener-class> + </listener> <filter> <filter-name>cross-origin</filter-name> @@ -55,41 +55,49 @@ </filter-mapping> <filter> <filter-name>LoggingServletFilter</filter-name> - <filter-class>org.openecomp.core.logging.servlet.LoggingFilter</filter-class> + <filter-class>org.openecomp.sdc.logging.servlet.LoggingFilter</filter-class> </filter> - <filter-mapping> - <filter-name>LoggingServletFilter</filter-name> - <url-pattern>/*</url-pattern> - </filter-mapping> - <!-- CXF --> - <servlet> - <servlet-name>CXFServlet</servlet-name> - <display-name>CXF Servlet</display-name> - <servlet-class> - org.apache.cxf.transport.servlet.CXFServlet - </servlet-class> - <init-param> - <param-name>redirects-list</param-name> - <param-value> - /docs/(\S)+\.json - </param-value> - </init-param> - <init-param> - <param-name>redirect-attributes</param-name> - <param-value> - javax.servlet.include.request_uri - </param-value> - </init-param> - <init-param> - <param-name>redirect-servlet-name</param-name> - <param-value>default</param-value> - </init-param> - <load-on-startup>1</load-on-startup> - </servlet> - <servlet-mapping> - <servlet-name>CXFServlet</servlet-name> - <url-pattern>/*</url-pattern> - </servlet-mapping> + <filter-mapping> + <filter-name>LoggingServletFilter</filter-name> + <url-pattern>/*</url-pattern> + </filter-mapping> + <!-- CXF --> + <servlet> + <servlet-name>CXFServlet</servlet-name> + <display-name>CXF Servlet</display-name> + <servlet-class> + org.apache.cxf.transport.servlet.CXFServlet + </servlet-class> + <init-param> + <param-name>redirects-list</param-name> + <param-value> + /docs/(\S)+\.json + </param-value> + </init-param> + <init-param> + <param-name>redirect-attributes</param-name> + <param-value> + javax.servlet.include.request_uri + </param-value> + </init-param> + <init-param> + <param-name>redirect-servlet-name</param-name> + <param-value>default</param-value> + </init-param> + <load-on-startup>1</load-on-startup> + </servlet> + <servlet-mapping> + <!--servlet-name>logger-aspect</servlet-name--> + <servlet-name>CXFServlet</servlet-name> + <url-pattern>/*</url-pattern> + </servlet-mapping> + <!--servlet> + <servlet-name>logger-aspect</servlet-name> + <servlet-class>org.springframework.web.servlet.DispatcherServlet</servlet-class> + <load-on-startup>2</load-on-startup> + </servlet--> + + </web-app> |