From 16af7a44b50161d127552b6483c38de412bf15d2 Mon Sep 17 00:00:00 2001 From: Amalka Subasinghe 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 @@ - + + application-mgt org.wso2.carbon.devicemgt @@ -8,9 +26,9 @@ 4.0.0 - org.wso2.carbon.device.application.mgt.addons - WSO2 Carbon - Application Management Add-Ons - WSO2 Carbon - Application Management Add-Ons + io.entgra.application.mgt.addons + Entgra - Application Management Add-Ons + Entgra - Application Management Add-Ons https://entgra.io @@ -35,7 +53,7 @@ io.swagger.annotations.*;resolution:=optional - org.wso2.carbon.device.application.mgt.addons.* + io.entgra.application.mgt.addons.* 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 @@ - + - - + + - + 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 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter 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 @@ - + - - + + - + 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 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter 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 @@ - + @@ -60,12 +60,12 @@ - - + + - + 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 @@ ApiOriginFilter - org.wso2.carbon.device.application.mgt.addons.ApiOriginFilter + io.entgra.application.mgt.addons.ApiOriginFilter