From 16af7a44b50161d127552b6483c38de412bf15d2 Mon Sep 17 00:00:00 2001
From: Amalka Subasinghe <amalkasubasinghe@gmail.com>
Date: Tue, 10 Aug 2021 16:15:59 +0530
Subject: [PATCH] package name change - appmgt addons

---
 .../pom.xml                                   | 28 +++++++++++++++----
 .../mgt/addons/ApiOriginFilter.java           |  2 +-
 .../mgt/addons/FileStreamingOutput.java       |  2 +-
 .../mgt/addons/JSONMessageHandler.java        |  4 +--
 .../mgt/addons/MultipartCustomProvider.java   |  4 +--
 .../mgt/addons/ValidationInterceptor.java     |  2 +-
 .../jaxrs/AnnotationExclusionStrategy.java    |  2 +-
 .../application/mgt/addons/jaxrs/Exclude.java |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  8 +++---
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  8 +++---
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 .../src/main/webapp/WEB-INF/cxf-servlet.xml   |  8 +++---
 .../src/main/webapp/WEB-INF/web.xml           |  2 +-
 14 files changed, 47 insertions(+), 29 deletions(-)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons => io.entgra.application.mgt.addons}/pom.xml (78%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/ApiOriginFilter.java (96%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/FileStreamingOutput.java (96%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/JSONMessageHandler.java (95%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/MultipartCustomProvider.java (94%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/ValidationInterceptor.java (98%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java (95%)
 rename components/application-mgt/{org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device => io.entgra.application.mgt.addons/src/main/java/io/entgra}/application/mgt/addons/jaxrs/Exclude.java (94%)

diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml
similarity index 78%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml
rename to components/application-mgt/io.entgra.application.mgt.addons/pom.xml
index 059af5fb7e..06a97f01aa 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/pom.xml
+++ b/components/application-mgt/io.entgra.application.mgt.addons/pom.xml
@@ -1,5 +1,23 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
+<!--
+~ Copyright (c) 2019, Entgra (pvt) Ltd. (http://entgra.io) All Rights Reserved.
+~
+~ Entgra (pvt) Ltd. licenses this file to you under the Apache License,
+~ Version 2.0 (the "License"); you may not use this file except
+~ in compliance with the License.
+~ You may obtain a copy of the License at
+~
+~    http://www.apache.org/licenses/LICENSE-2.0
+~
+~ Unless required by applicable law or agreed to in writing,
+~ software distributed under the License is distributed on an
+~ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+~ KIND, either express or implied.  See the License for the
+~ specific language governing permissions and limitations
+~ under the License.
+-->
+<project xmlns="http://maven.apache.org/POM/4.0.0" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+         xsi:schemaLocation="http://maven.apache.org/POM/4.0.0 http://maven.apache.org/xsd/maven-4.0.0.xsd">
     <parent>
         <artifactId>application-mgt</artifactId>
         <groupId>org.wso2.carbon.devicemgt</groupId>
@@ -8,9 +26,9 @@
     </parent>
 
     <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.device.application.mgt.addons</artifactId>
-    <name>WSO2 Carbon - Application Management Add-Ons</name>
-    <description>WSO2 Carbon - Application Management Add-Ons</description>
+    <artifactId>io.entgra.application.mgt.addons</artifactId>
+    <name>Entgra - Application Management Add-Ons</name>
+    <description>Entgra - Application Management Add-Ons</description>
     <url>https://entgra.io</url>
 
     <build>
@@ -35,7 +53,7 @@
                             io.swagger.annotations.*;resolution:=optional
                         </Import-Package>
                         <Export-Package>
-                            org.wso2.carbon.device.application.mgt.addons.*
+                            io.entgra.application.mgt.addons.*
                         </Export-Package>
                     </instructions>
                 </configuration>
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java
similarity index 96%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java
index 25446e9513..62ba2f3521 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ApiOriginFilter.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ApiOriginFilter.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 
 import javax.servlet.Filter;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java
similarity index 96%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java
index a1ad912d19..cf477e58c9 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/FileStreamingOutput.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/FileStreamingOutput.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 
 import javax.ws.rs.WebApplicationException;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java
similarity index 95%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java
index 6951e02b2e..9aa828b34c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/JSONMessageHandler.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/JSONMessageHandler.java
@@ -14,11 +14,11 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
-import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.Produces;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java
similarity index 94%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java
index 647cbcc27d..3a8c2d42ea 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/MultipartCustomProvider.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/MultipartCustomProvider.java
@@ -14,14 +14,14 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import com.google.gson.Gson;
 import com.google.gson.GsonBuilder;
 import com.google.gson.JsonObject;
 import com.google.gson.JsonParser;
 import org.apache.cxf.jaxrs.ext.multipart.Attachment;
-import org.wso2.carbon.device.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
+import io.entgra.application.mgt.addons.jaxrs.AnnotationExclusionStrategy;
 
 import javax.ws.rs.Consumes;
 import javax.ws.rs.WebApplicationException;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java
similarity index 98%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java
index d36e9986b1..43182bafdc 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/ValidationInterceptor.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/ValidationInterceptor.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons;
+package io.entgra.application.mgt.addons;
 
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java
similarity index 95%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java
index d2a92c4c27..5a4932532c 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/AnnotationExclusionStrategy.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons.jaxrs;
+package io.entgra.application.mgt.addons.jaxrs;
 
 import com.google.gson.ExclusionStrategy;
 import com.google.gson.FieldAttributes;
diff --git a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java
similarity index 94%
rename from components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java
rename to components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java
index e185ececcb..1f42ccb335 100644
--- a/components/application-mgt/org.wso2.carbon.device.application.mgt.addons/src/main/java/org/wso2/carbon/device/application/mgt/addons/jaxrs/Exclude.java
+++ b/components/application-mgt/io.entgra.application.mgt.addons/src/main/java/io/entgra/application/mgt/addons/jaxrs/Exclude.java
@@ -14,7 +14,7 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-package org.wso2.carbon.device.application.mgt.addons.jaxrs;
+package io.entgra.application.mgt.addons.jaxrs;
 
 import java.lang.annotation.ElementType;
 import java.lang.annotation.Retention;
diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index cfcce344b9..69b6816220 100644
--- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -48,17 +48,17 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.application.mgt.addons.ValidationInterceptor"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
     <bean id="applicationMgtArtifactService" class="io.entgra.application.mgt.api.services.impl.ArtifactDownloadAPIImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.addons.JSONMessageHandler"/>
-    <bean id="multipartProvider" class="org.wso2.carbon.device.application.mgt.addons.MultipartCustomProvider"/>
+    <bean id="jsonProvider" class="io.entgra.application.mgt.addons.JSONMessageHandler"/>
+    <bean id="multipartProvider" class="io.entgra.application.mgt.addons.MultipartCustomProvider"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.application.mgt.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 
diff --git a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml
index 15677f5277..5917cf8aaa 100644
--- a/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/application-mgt/io.entgra.application.mgt.api/src/main/webapp/WEB-INF/web.xml
@@ -74,7 +74,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.application.mgt.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>
diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index 91580abb68..8314c023b3 100644
--- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -50,19 +50,19 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.application.mgt.addons.ValidationInterceptor"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
     <bean id="applicationMgtServiceBean" class="io.entgra.application.mgt.publisher.api.services.impl.ApplicationManagementPublisherAPIImpl"/>
     <bean id="applicationMgtAdminServiceBean" class="io.entgra.application.mgt.publisher.api.services.impl.admin.ApplicationManagementPublisherAdminAPIImpl"/>
     <bean id="reviewMgtAdminServiceBean" class="io.entgra.application.mgt.publisher.api.services.impl.admin.ReviewManagementPublisherAdminAPIImpl" />
-    <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.addons.JSONMessageHandler"/>
-    <bean id="multipartProvider" class="org.wso2.carbon.device.application.mgt.addons.MultipartCustomProvider"/>
+    <bean id="jsonProvider" class="io.entgra.application.mgt.addons.JSONMessageHandler"/>
+    <bean id="multipartProvider" class="io.entgra.application.mgt.addons.MultipartCustomProvider"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.application.mgt.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 
diff --git a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml
index fb8b266948..634df3e71a 100644
--- a/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/application-mgt/io.entgra.application.mgt.publisher.api/src/main/webapp/WEB-INF/web.xml
@@ -73,7 +73,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.application.mgt.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>
diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
index b9f9d11576..c7003a4fdb 100644
--- a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/cxf-servlet.xml
@@ -51,7 +51,7 @@
         <property name="scan" value="true"/>
     </bean>
 
-    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+    <bean id="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor" class="io.entgra.application.mgt.addons.ValidationInterceptor"/>
     <bean id="swaggerWriter" class="io.swagger.jaxrs.listing.SwaggerSerializers" />
     <bean id="swaggerResource" class="io.swagger.jaxrs.listing.ApiListingResource" />
 
@@ -60,12 +60,12 @@
     <bean id="applicationMgtServiceBean" class="io.entgra.application.mgt.store.api.services.impl.ApplicationManagementAPIImpl"/>
     <bean id="reviewMgtServiceBean" class="io.entgra.application.mgt.store.api.services.impl.ReviewManagementAPIImpl" />
     <bean id="subscriptionMgtServiceBean" class="io.entgra.application.mgt.store.api.services.impl.SubscriptionManagementAPIImpl"/>
-    <bean id="jsonProvider" class="org.wso2.carbon.device.application.mgt.addons.JSONMessageHandler"/>
-    <bean id="multipartProvider" class="org.wso2.carbon.device.application.mgt.addons.MultipartCustomProvider"/>
+    <bean id="jsonProvider" class="io.entgra.application.mgt.addons.JSONMessageHandler"/>
+    <bean id="multipartProvider" class="io.entgra.application.mgt.addons.MultipartCustomProvider"/>
 
     <cxf:bus>
         <cxf:inInterceptors>
-            <ref bean="org.wso2.carbon.device.application.mgt.addons.ValidationInterceptor"/>
+            <ref bean="io.entgra.application.mgt.addons.ValidationInterceptor"/>
         </cxf:inInterceptors>
     </cxf:bus>
 
diff --git a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml
index 93903ed95a..09dc9ca61f 100644
--- a/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml
+++ b/components/application-mgt/io.entgra.application.store.api/src/main/webapp/WEB-INF/web.xml
@@ -73,7 +73,7 @@
 
     <filter>
         <filter-name>ApiOriginFilter</filter-name>
-        <filter-class>org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter</filter-class>
+        <filter-class>io.entgra.application.mgt.addons.ApiOriginFilter</filter-class>
     </filter>
 
     <filter>