From 1716c2c7f6e299dda13b8bf32a15ce74375bc9c0 Mon Sep 17 00:00:00 2001 From: prabathabey Date: Sat, 25 Jul 2015 12:41:18 +0530 Subject: [PATCH] Making apimgt extensions module a separate component/feature pair --- .../pom.xml | 0 .../apimgt/webapp/publisher/APIConfig.java | 0 .../webapp/publisher/APIPublisherService.java | 0 .../publisher/APIPublisherServiceImpl.java | 0 .../webapp/publisher/APIPublisherUtil.java | 0 .../internal/APIPublisherDataHolder.java | 0 .../APIPublisherServiceComponent.java | 0 .../APIPublisherLifecycleListener.java | 0 components/apimgt-extensions/pom.xml | 60 +++++++++++++++++++ components/device-mgt/pom.xml | 1 - .../pom.xml | 0 features/apimgt-extensions/pom.xml | 41 +++++++++++++ features/device-mgt/pom.xml | 1 - pom.xml | 4 +- 14 files changed, 104 insertions(+), 3 deletions(-) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/pom.xml (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIConfig.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherService.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java (100%) rename components/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java (100%) create mode 100644 components/apimgt-extensions/pom.xml rename features/{device-mgt => apimgt-extensions}/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml (100%) create mode 100644 features/apimgt-extensions/pom.xml diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/pom.xml b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/pom.xml rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIConfig.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIConfig.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIConfig.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIConfig.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherService.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherService.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherService.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherService.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherUtil.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java diff --git a/components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java similarity index 100% rename from components/device-mgt/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java rename to components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java diff --git a/components/apimgt-extensions/pom.xml b/components/apimgt-extensions/pom.xml new file mode 100644 index 00000000000..26e5c245fc2 --- /dev/null +++ b/components/apimgt-extensions/pom.xml @@ -0,0 +1,60 @@ + + + + + + + org.wso2.carbon.devicemgt + carbon-devicemgt + 0.9.2-SNAPSHOT + ../../pom.xml + + + 4.0.0 + org.wso2.carbon.devicemgt + apimgt-extensions + 0.9.2-SNAPSHOT + pom + WSO2 Carbon - API Management Extensions Component + http://wso2.org + + + org.wso2.carbon.apimgt.webapp.publisher + + + + + + + org.apache.felix + maven-scr-plugin + 1.7.2 + + + generate-scr-scrdescriptor + + scr + + + + + + + + diff --git a/components/device-mgt/pom.xml b/components/device-mgt/pom.xml index daaa8bda231..057e6af1543 100644 --- a/components/device-mgt/pom.xml +++ b/components/device-mgt/pom.xml @@ -38,7 +38,6 @@ org.wso2.carbon.device.mgt.core org.wso2.carbon.device.mgt.common org.wso2.carbon.device.mgt.extensions - org.wso2.carbon.apimgt.webapp.publisher diff --git a/features/device-mgt/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml b/features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml similarity index 100% rename from features/device-mgt/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml rename to features/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher.feature/pom.xml diff --git a/features/apimgt-extensions/pom.xml b/features/apimgt-extensions/pom.xml new file mode 100644 index 00000000000..c8d190dc6b9 --- /dev/null +++ b/features/apimgt-extensions/pom.xml @@ -0,0 +1,41 @@ + + + + + + + org.wso2.carbon.devicemgt + carbon-devicemgt + 0.9.2-SNAPSHOT + ../../pom.xml + + + 4.0.0 + org.wso2.carbon.devicemgt + apimgt-extensions-feature + 0.9.2-SNAPSHOT + pom + WSO2 Carbon - API Management Extensions Feature + http://wso2.org + + + org.wso2.carbon.apimgt.webapp.publisher.feature + + + diff --git a/features/device-mgt/pom.xml b/features/device-mgt/pom.xml index b9290269035..c1e36a3fe03 100644 --- a/features/device-mgt/pom.xml +++ b/features/device-mgt/pom.xml @@ -37,7 +37,6 @@ org.wso2.carbon.device.mgt.server.feature org.wso2.carbon.device.mgt.extensions.feature - org.wso2.carbon.apimgt.webapp.publisher.feature diff --git a/pom.xml b/pom.xml index dee3c949418..06078031207 100644 --- a/pom.xml +++ b/pom.xml @@ -37,11 +37,13 @@ components/device-mgt + components/apimgt-extensions components/policy-mgt components/webapp-authenticator-framework components/oauth-extensions features/device-mgt - features/policy-mgt + features/apimgt-extensions + features/policy-mgt features/webapp-authenticator-framework features/oauth-extensions