Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Spring Removal] Modify web.xml in recovery and user endpoints #883

Closed
wants to merge 1 commit into from
+51 −77
Closed

[Spring Removal] Modify web.xml in recovery and user endpoints #883

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
23 changes: 0 additions & 23 deletions components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop

This file was deleted.

37 changes: 25 additions & 12 deletions components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
<display-name>WSO2 Identity Server Recovery REST API</display-name>
<description>WSO2 Identity Server Recovery REST API</description>

<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
</context-param>

<filter>
<filter-name>CaptchaFilter</filter-name>
<filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
Expand Down Expand Up @@ -63,18 +58,36 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>

<listener>
<listener-class>
org.springframework.web.context.ContextLoaderListener
</listener-class>
</listener>

<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>
org.apache.cxf.transport.servlet.CXFServlet
org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
</servlet-class>
<load-on-startup>1</load-on-startup>

<init-param>
<param-name>jaxrs.serviceClasses</param-name>
<param-value>
org.wso2.carbon.identity.recovery.endpoint.ClaimsApi,
org.wso2.carbon.identity.recovery.endpoint.RecoverPasswordApi,
org.wso2.carbon.identity.recovery.endpoint.RecoverUsernameApi,
org.wso2.carbon.identity.recovery.endpoint.SetPasswordApi,
org.wso2.carbon.identity.recovery.endpoint.ValidateCodeApi,
org.wso2.carbon.identity.recovery.endpoint.CaptchaApi
</param-value>
</init-param>
<init-param>
<param-name>jaxrs.address</param-name>
<param-value>/</param-value>
</init-param>
<init-param>
<param-name>jaxrs.providers</param-name>
<param-value>
com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
org.wso2.carbon.identity.recovery.endpoint.filter.ResponseValidationFilter,
org.wso2.carbon.identity.recovery.endpoint.Exceptions.RecoveryEndpointExceptionMapper
</param-value>
</init-param>
</servlet>

<servlet-mapping>
Expand Down
25 changes: 0 additions & 25 deletions components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/beans.xml
View file
Open in desktop

This file was deleted.

43 changes: 26 additions & 17 deletions components/org.wso2.carbon.identity.user.endpoint/src/main/webapp/WEB-INF/web.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,6 @@
<display-name>WSO2 Identity Server User REST API</display-name>
<description>WSO2 Identity Server User REST API</description>

<context-param>
<param-name>contextConfigLocation</param-name>
<param-value>WEB-INF/beans.xml</param-value>
</context-param>

<filter>
<filter-name>CaptchaFilter</filter-name>
<filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>
Expand Down Expand Up @@ -63,30 +58,44 @@
<dispatcher>FORWARD</dispatcher>
</filter-mapping>

<listener>
<listener-class>
org.springframework.web.context.ContextLoaderListener
</listener-class>
</listener>

<servlet>
<servlet-name>CXFServlet</servlet-name>
<servlet-class>
org.apache.cxf.transport.servlet.CXFServlet
org.apache.cxf.jaxrs.servlet.CXFNonSpringJaxrsServlet
</servlet-class>
<load-on-startup>1</load-on-startup>

<init-param>
<param-name>jaxrs.serviceClasses</param-name>
<param-value>
org.wso2.carbon.identity.user.endpoint.IntrospectCodeApi,
org.wso2.carbon.identity.user.endpoint.LiteApi,
org.wso2.carbon.identity.user.endpoint.MeApi,
org.wso2.carbon.identity.user.endpoint.PiInfoApi,
org.wso2.carbon.identity.user.endpoint.ResendCodeApi,
org.wso2.carbon.identity.user.endpoint.UpdateUsernameApi,
org.wso2.carbon.identity.user.endpoint.ValidateCodeApi,
org.wso2.carbon.identity.user.endpoint.ValidateUsernameApi
</param-value>
</init-param>
<init-param>
<param-name>jaxrs.address</param-name>
<param-value>/</param-value>
</init-param>
<init-param>
<param-name>jaxrs.providers</param-name>
<param-value>
com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider,
org.wso2.carbon.identity.user.endpoint.exceptions.UserEndpointExceptionMapper
</param-value>
</init-param>
</servlet>

<servlet-mapping>
<servlet-name>CXFServlet</servlet-name>
<url-pattern>/*</url-pattern>
</servlet-mapping>

<!--<filter>-->
<!--<filter-name>CaptchaFilter</filter-name>-->
<!--<filter-class>org.wso2.carbon.identity.captcha.filter.CaptchaFilter</filter-class>-->
<!--</filter>-->

<filter-mapping>
<filter-name>CaptchaFilter</filter-name>
<url-pattern>/resend-code</url-pattern>
Expand Down
Loading