From 845e0913da11e3223c578faf01a25515a2829f68 Mon Sep 17 00:00:00 2001 From: lashinie Date: Thu, 5 Dec 2024 15:58:12 +0530 Subject: [PATCH 1/2] Remove recovery endpoint component --- .../pom.xml | 150 ------------------ .../webapp/META-INF/webapp-classloading.xml | 33 ---- .../src/main/webapp/WEB-INF/beans.xml | 23 --- .../src/main/webapp/WEB-INF/web.xml | 101 ------------ pom.xml | 1 - 5 files changed, 308 deletions(-) delete mode 100644 components/org.wso2.carbon.identity.recovery.endpoint/pom.xml delete mode 100644 components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/META-INF/webapp-classloading.xml delete mode 100644 components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml delete mode 100644 components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml b/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml deleted file mode 100644 index ff1176b1b8..0000000000 --- a/components/org.wso2.carbon.identity.recovery.endpoint/pom.xml +++ /dev/null @@ -1,150 +0,0 @@ - - - - - - org.wso2.carbon.identity.governance - identity-governance - 1.11.18-SNAPSHOT - ../../pom.xml - - - 4.0.0 - org.wso2.carbon.identity.recovery.endpoint - war - WSO2 Carbon - Identity Management Rest API - WSO2 Carbon - Identity Management Rest API - - - - - org.apache.maven.plugins - maven-compiler-plugin - - - org.apache.maven.plugins - maven-war-plugin - - - - - src/main/webapp - - - api#identity#recovery#v0.9 - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - - - - org.wso2.carbon.identity.governance - org.wso2.carbon.identity.api.user.recovery - - - * - * - - - - - org.apache.cxf - cxf-rt-frontend-jaxrs - provided - - - org.apache.cxf - cxf-rt-rs-service-description - provided - - - org.springframework - spring-web - provided - - - javax.ws.rs - javax.ws.rs-api - provided - - - io.swagger - swagger-jaxrs - - - javax.validation - validation-api - - - com.fasterxml.jackson.core - jackson-databind - - - com.fasterxml.jackson.core - jackson-annotations - - - com.fasterxml.jackson.core - jackson-core - - - com.fasterxml.jackson.dataformat - jackson-dataformat-yaml - - - javax.ws.rs - jsr311-api - - - com.google.guava - guava - - - - - com.fasterxml.jackson.core - jackson-databind - provided - - - com.fasterxml.jackson.core - jackson-core - - - - - com.fasterxml.jackson.jaxrs - jackson-jaxrs-json-provider - provided - - - javax.validation - validation-api - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/META-INF/webapp-classloading.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/META-INF/webapp-classloading.xml deleted file mode 100644 index 1b8897a1c5..0000000000 --- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/META-INF/webapp-classloading.xml +++ /dev/null @@ -1,33 +0,0 @@ - - - - - - - - - false - - - CXF3,Carbon - diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml deleted file mode 100644 index 876b4edb7c..0000000000 --- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/beans.xml +++ /dev/null @@ -1,23 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - diff --git a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml b/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml deleted file mode 100644 index b59b40c6b2..0000000000 --- a/components/org.wso2.carbon.identity.recovery.endpoint/src/main/webapp/WEB-INF/web.xml +++ /dev/null @@ -1,101 +0,0 @@ - - - - - - WSO2 Identity Server Recovery REST API - WSO2 Identity Server Recovery REST API - - - contextConfigLocation - WEB-INF/beans.xml - - - - CaptchaFilter - org.wso2.carbon.identity.captcha.filter.CaptchaFilter - - - - HttpHeaderSecurityFilter - org.apache.catalina.filters.HttpHeaderSecurityFilter - - hstsEnabled - false - - - - - HttpHeaderSecurityFilter - * - REQUEST - FORWARD - - - - ContentTypeBasedCachePreventionFilter - - org.wso2.carbon.ui.filters.cache.ContentTypeBasedCachePreventionFilter - - - patterns - "text/html" ,"application/json" ,"plain/text" - - - filterAction - enforce - - - httpHeaders - - Cache-Control: no-store, no-cache, must-revalidate, private - - - - - - ContentTypeBasedCachePreventionFilter - * - REQUEST - FORWARD - - - - - org.springframework.web.context.ContextLoaderListener - - - - - CXFServlet - - org.apache.cxf.transport.servlet.CXFServlet - - 1 - - - - CXFServlet - /* - - - - - - - - - CaptchaFilter - /* - REQUEST - FORWARD - - - - 60 - - - diff --git a/pom.xml b/pom.xml index 158acb08ae..8adf814aca 100644 --- a/pom.xml +++ b/pom.xml @@ -45,7 +45,6 @@ components/org.wso2.carbon.identity.governance components/org.wso2.carbon.identity.recovery - components/org.wso2.carbon.identity.recovery.endpoint components/org.wso2.carbon.identity.api.user.recovery components/org.wso2.carbon.identity.captcha components/org.wso2.carbon.identity.password.history From 0ea93a8017787df3adf40d069f2d4b7e0d4a3462 Mon Sep 17 00:00:00 2001 From: lashinie Date: Fri, 6 Dec 2024 12:21:51 +0530 Subject: [PATCH 2/2] Remove recovery endpoint feature component --- .../pom.xml | 178 ------------------ .../resources/p2.inf | 2 - pom.xml | 1 - 3 files changed, 181 deletions(-) delete mode 100644 features/org.wso2.carbon.identity.recovery.server.feature/pom.xml delete mode 100644 features/org.wso2.carbon.identity.recovery.server.feature/resources/p2.inf diff --git a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml b/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml deleted file mode 100644 index b8a3fc2381..0000000000 --- a/features/org.wso2.carbon.identity.recovery.server.feature/pom.xml +++ /dev/null @@ -1,178 +0,0 @@ - - - - - - - org.wso2.carbon.identity.governance - identity-governance - ../../pom.xml - 1.11.18-SNAPSHOT - - - 4.0.0 - org.wso2.carbon.identity.recovery.server.feature - pom - WSO2 Carbon - Identity Recovery Feature - http://wso2.org - This feature contains the core bundles required for Back-end Identity Recovery - functionality - - - - - org.wso2.carbon.identity.governance - org.wso2.carbon.identity.recovery - ${project.version} - - - org.wso2.carbon.identity.governance - org.wso2.carbon.identity.recovery.endpoint - ${project.version} - war - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - - - org.apache.maven.plugins - maven-dependency-plugin - 2.4 - - - copy - package - - copy - - - - - org.wso2.carbon.identity.governance - org.wso2.carbon.identity.recovery.endpoint - - war - true - ${basedir}/src/main/resources/ - api#identity#recovery#v0.9.war - - - - - - - - maven-resources-plugin - - - prefilter-resources - generate-resources - - copy-resources - - - src/main/resources - - - resources - - p2.inf - account-recovery.war - - - - - - - - - org.wso2.maven - carbon-p2-plugin - ${carbon.p2.plugin.version} - - - p2-feature-generation - package - - p2-feature-gen - - - org.wso2.carbon.identity.recovery.server - ../../etc/feature.properties - - - org.wso2.carbon.p2.category.type:server - - - - org.wso2.carbon.identity.governance:org.wso2.carbon.identity.recovery - - - - - - - - - org.apache.maven.plugins - maven-antrun-plugin - 1.1 - - - clean_target - install - - - - - - - - - run - - - - - - org.jacoco - jacoco-maven-plugin - ${jacoco.version} - - - - prepare-agent - - - - report - test - - report - - - - - - - - diff --git a/features/org.wso2.carbon.identity.recovery.server.feature/resources/p2.inf b/features/org.wso2.carbon.identity.recovery.server.feature/resources/p2.inf deleted file mode 100644 index 3a7ad89ebd..0000000000 --- a/features/org.wso2.carbon.identity.recovery.server.feature/resources/p2.inf +++ /dev/null @@ -1,2 +0,0 @@ -instructions.configure = \ -org.eclipse.equinox.p2.touchpoint.natives.copy(source:${installFolder}/../features/org.wso2.carbon.identity.recovery.server_${feature.version}/api#identity#recovery#v0.9.war,target:${installFolder}/../../deployment/server/webapps/api#identity#recovery#v0.9.war,overwrite:true);\ \ No newline at end of file diff --git a/pom.xml b/pom.xml index 8adf814aca..8807c768c0 100644 --- a/pom.xml +++ b/pom.xml @@ -62,7 +62,6 @@ components/org.wso2.carbon.identity.idle.account.identification components/org.wso2.carbon.identity.user.onboard.core.service - features/org.wso2.carbon.identity.recovery.server.feature features/org.wso2.carbon.identity.user.server.feature features/org.wso2.carbon.identity.governance.server.feature features/org.wso2.carbon.identity.captcha.server.feature