Fix : Custom app update permission issue

Co-authored-by: Pahansith <pahansith@entgra.io>
Reviewed-on: community/device-mgt-core#105
Co-authored-by: Pahansith Gunathilake <pahansith@entgra.io>
Co-committed-by: Pahansith Gunathilake <pahansith@entgra.io>

components/application-mgt/io.entgra.application.mgt.core/src/main/java/io/entgra/application/mgt/core/impl/ApplicationManagerImpl.java

@@ -3244,7 +3244,7 @@ public class ApplicationManagerImpl implements ApplicationManager {
             AtomicReference<ApplicationReleaseDTO> applicationReleaseDTO = new AtomicReference<>(
                     applicationDTO.getApplicationReleaseDTOs().get(0));
             validateAppReleaseUpdating(customAppReleaseWrapper, applicationDTO, applicationArtifact,
-                    ApplicationType.ENTERPRISE.toString());
+                    ApplicationType.CUSTOM.toString());
             applicationReleaseDTO.get().setPrice(customAppReleaseWrapper.getPrice());
             applicationReleaseDTO.get()
                     .setIsSharedWithAllTenants(applicationReleaseDTO.get().getIsSharedWithAllTenants());

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/impl/CertificateGenerator.java

@@ -44,12 +44,17 @@ import org.bouncycastle.operator.OperatorCreationException;
 import org.bouncycastle.operator.jcajce.JcaContentSignerBuilder;
 import org.bouncycastle.pkcs.PKCS10CertificationRequest;
 import org.bouncycastle.util.Store;
-import org.jscep.message.*;
+import org.jscep.message.CertRep;
+import org.jscep.message.MessageDecodingException;
+import org.jscep.message.MessageEncodingException;
+import org.jscep.message.PkcsPkiEnvelopeDecoder;
+import org.jscep.message.PkcsPkiEnvelopeEncoder;
+import org.jscep.message.PkiMessage;
+import org.jscep.message.PkiMessageDecoder;
+import org.jscep.message.PkiMessageEncoder;
 import org.jscep.transaction.FailInfo;
 import org.jscep.transaction.Nonce;
 import org.jscep.transaction.TransactionId;
-import org.wso2.carbon.certificate.mgt.core.cache.CertificateCacheManager;
-import org.wso2.carbon.certificate.mgt.core.cache.impl.CertificateCacheManagerImpl;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateDAO;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOException;
 import org.wso2.carbon.certificate.mgt.core.dao.CertificateManagementDAOFactory;
@@ -72,13 +77,28 @@ import java.io.ByteArrayInputStream;
 import java.io.IOException;
 import java.io.InputStream;
 import java.math.BigInteger;
-import java.security.*;
+import java.security.InvalidKeyException;
+import java.security.KeyFactory;
+import java.security.KeyPair;
+import java.security.KeyPairGenerator;
+import java.security.NoSuchAlgorithmException;
+import java.security.NoSuchProviderException;
+import java.security.PrivateKey;
+import java.security.PublicKey;
+import java.security.SecureRandom;
+import java.security.Security;
+import java.security.SignatureException;
 import java.security.cert.Certificate;
-import java.security.cert.*;
-import java.util.ArrayList;
-import java.util.Collection;
-import java.util.Date;
-import java.util.List;
+import java.security.cert.CertificateEncodingException;
+import java.security.cert.CertificateException;
+import java.security.cert.CertificateExpiredException;
+import java.security.cert.CertificateFactory;
+import java.security.cert.CertificateNotYetValidException;
+import java.security.cert.X509Certificate;
+import java.security.spec.InvalidKeySpecException;
+import java.security.spec.X509EncodedKeySpec;
+import java.util.*;
+import java.util.concurrent.TimeUnit;
 
 public class CertificateGenerator {
 
@@ -757,4 +777,94 @@ public class CertificateGenerator {
         return generateCertificateFromCSR(privateKeyCA, certificationRequest,
                 certCA.getIssuerX500Principal().getName());
     }
-}
+
+    public X509Certificate generateAlteredCertificateFromCSR(String csr)
+            throws KeystoreException {
+        byte[] byteArrayBst = DatatypeConverter.parseBase64Binary(csr);
+        PKCS10CertificationRequest certificationRequest;
+        KeyStoreReader keyStoreReader = new KeyStoreReader();
+        PrivateKey privateKeyCA = keyStoreReader.getCAPrivateKey();
+        X509Certificate certCA = (X509Certificate) keyStoreReader.getCACertificate();
+
+        X509Certificate issuedCert;
+        try {
+            certificationRequest = new PKCS10CertificationRequest(byteArrayBst);
+            JcaContentSignerBuilder csBuilder =
+                    new JcaContentSignerBuilder(CertificateManagementConstants.SIGNING_ALGORITHM);
+            ContentSigner signer = csBuilder.build(privateKeyCA);
+
+            BigInteger serialNumber = BigInteger.valueOf(System.currentTimeMillis());
+
+            //Reversing the order of components of the subject DN due to Nginx not verifying the client certificate
+            //generated by Java using this subject DN.
+            //Ref: https://stackoverflow.com/questions/33769978 & engineering mail SCEP implementation for Android
+            String[] dnParts = certCA.getSubjectDN().getName().split(",");
+            StringJoiner joiner = new StringJoiner(",");
+            for (int i = (dnParts.length - 1); i >= 0; i--) {
+                joiner.add(dnParts[i]);
+            }
+            String subjectDn = joiner.toString();
+            X500Name issuerName = new X500Name(subjectDn);
+            String commonName = certificationRequest.getSubject().getRDNs(BCStyle.CN)[0].getFirst()
+                    .getValue().toString();
+            X500Name subjectName = new X500Name("O=" + commonName + "O=AndroidDevice,CN=" +
+                    serialNumber);
+            Date startDate = new Date(System.currentTimeMillis());
+            Date endDate = new Date(System.currentTimeMillis()
+                    + TimeUnit.DAYS.toMillis(365 * 100));
+            PublicKey publicKey = getPublicKeyFromRequest(certificationRequest);
+
+            X509v3CertificateBuilder certBuilder = new JcaX509v3CertificateBuilder(
+                    issuerName, serialNumber, startDate, endDate,
+                    subjectName, publicKey);
+
+            X509CertificateHolder certHolder = certBuilder.build(signer);
+
+            CertificateFactory certificateFactory = CertificateFactory.getInstance
+                    (CertificateManagementConstants.X_509);
+            byte[] encodedCertificate = certHolder.getEncoded();
+            issuedCert = (X509Certificate) certificateFactory
+                    .generateCertificate(new ByteArrayInputStream(encodedCertificate));
+
+            org.wso2.carbon.certificate.mgt.core.bean.Certificate certificate =
+                    new org.wso2.carbon.certificate.mgt.core.bean.Certificate();
+            List<org.wso2.carbon.certificate.mgt.core.bean.Certificate> certificates = new ArrayList<>();
+            certificate.setTenantId(PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantId());
+            certificate.setCertificate(issuedCert);
+            certificates.add(certificate);
+            saveCertInKeyStore(certificates);
+
+        } catch (OperatorCreationException e) {
+            String errorMsg = "Error creating the content signer";
+            log.error(errorMsg);
+            throw new KeystoreException(errorMsg, e);
+        } catch (CertificateException e) {
+            String errorMsg = "Error when opening the newly created certificate";
+            log.error(errorMsg);
+            throw new KeystoreException(errorMsg, e);
+        } catch (InvalidKeySpecException e) {
+            String errorMsg = "Public key is having invalid specification";
+            log.error(errorMsg);
+            throw new KeystoreException(errorMsg, e);
+        } catch (NoSuchAlgorithmException e) {
+            String errorMsg = "Could not find RSA algorithm";
+            log.error(errorMsg);
+            throw new KeystoreException(errorMsg, e);
+        } catch (IOException e) {
+            String errorMsg = "Error while reading the csr";
+            log.error(errorMsg);
+            throw new KeystoreException(errorMsg, e);
+        }
+        return issuedCert;
+    }
+
+    private static PublicKey getPublicKeyFromRequest(PKCS10CertificationRequest request)
+            throws InvalidKeySpecException, NoSuchAlgorithmException, IOException {
+        byte[] publicKeyBytes = request.getSubjectPublicKeyInfo().getEncoded();
+        X509EncodedKeySpec publicKeySpec = new X509EncodedKeySpec(publicKeyBytes);
+        KeyFactory keyFactory = KeyFactory.getInstance("RSA");
+        PublicKey publicKey = keyFactory.generatePublic(publicKeySpec);
+        return publicKey;
+    }
+
+}

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementService.java

@@ -79,4 +79,6 @@ public interface CertificateManagementService {
 
     List<CertificateResponse> searchCertificates(String serialNumber) throws CertificateManagementException;
 
+    X509Certificate generateAlteredCertificateFromCSR(String csr) throws KeystoreException;
+
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/service/CertificateManagementServiceImpl.java

@@ -234,4 +234,9 @@ public class CertificateManagementServiceImpl implements CertificateManagementSe
         }
     }
 
+    @Override
+    public X509Certificate generateAlteredCertificateFromCSR(String csr) throws KeystoreException{
+        return certificateGenerator.generateAlteredCertificateFromCSR(csr);
+    }
+
 }

components/certificate-mgt/org.wso2.carbon.certificate.mgt.core/src/main/java/org/wso2/carbon/certificate/mgt/core/util/CertificateManagementConstants.java

@@ -39,6 +39,7 @@ public final class CertificateManagementConstants {
     public static final String RSA_PRIVATE_KEY_END_TEXT = "-----END RSA PRIVATE KEY-----";
     public static final String EMPTY_TEXT = "";
     public static final int RSA_KEY_LENGTH = 2048;
+    public static final String SIGNING_ALGORITHM = "SHA256withRSA";
 
     public static final class DataBaseTypes {
         private DataBaseTypes() {

components/device-mgt/org.wso2.carbon.device.mgt.core/src/main/java/org/wso2/carbon/device/mgt/core/internal/DeviceManagementServiceComponent.java

@@ -86,11 +86,9 @@ import org.wso2.carbon.device.mgt.core.traccar.api.service.DeviceAPIClientServic
 import org.wso2.carbon.device.mgt.core.traccar.api.service.impl.DeviceAPIClientServiceImpl;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagementSchemaInitializer;
 import org.wso2.carbon.device.mgt.core.util.DeviceManagerUtil;
-import org.wso2.carbon.device.mgt.core.util.DeviceMgtTenantMgtListener;
 import org.wso2.carbon.email.sender.core.service.EmailSenderService;
 import org.wso2.carbon.ndatasource.core.DataSourceService;
 import org.wso2.carbon.registry.core.service.RegistryService;
-import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
 import org.wso2.carbon.user.core.service.RealmService;
 import org.wso2.carbon.utils.Axis2ConfigurationContextObserver;
 import org.wso2.carbon.utils.ConfigurationContextService;
@@ -271,9 +269,6 @@ public class DeviceManagementServiceComponent {
             componentContext.getBundleContext().registerService(PrivacyComplianceProvider.class.getName(),
                     privacyComplianceProvider, null);
 
-            componentContext.getBundleContext()
-                    .registerService(TenantMgtListener.class.getName(), new DeviceMgtTenantMgtListener(), null);
-
             if (log.isDebugEnabled()) {
                 log.debug("Device management core bundle has been successfully initialized");
             }

components/tenant-mgt/io.entgra.tenant.mgt.common/pom.xml

@@ -0,0 +1,66 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, Entgra (Pvt) Ltd. (http://www.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>tenant-mgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.25-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>io.entgra.tenant.mgt.common</artifactId>
+    <name>Entgra IoT - Tenant Manager Common</name>
+    <description>Entgra IoT - Tenant Manager Common</description>
+    <packaging>bundle</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
+                        <Bundle-Description>Tenant Management Common Bundle</Bundle-Description>
+                        <Import-Package>
+                            org.apache.commons.logging,
+                            org.wso2.carbon.stratos.common.beans
+                        </Import-Package>
+                        <Export-Package>io.entgra.tenant.mgt.common.*</Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.commons</groupId>
+            <artifactId>org.wso2.carbon.tenant.common</artifactId>
+            <version>${carbon.commons.version}</version>
+        </dependency>
+    </dependencies>
+
+</project>

components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/exception/TenantMgtException.java

@@ -0,0 +1,31 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.common.exception;
+
+public class TenantMgtException extends Exception {
+
+    private static final long serialVersionUID = 4304028531230841553L;
+
+    public TenantMgtException(String msg, Throwable ex) {
+        super(msg, ex);
+    }
+
+    public TenantMgtException(String msg) {
+        super(msg);
+    }
+}

components/tenant-mgt/io.entgra.tenant.mgt.common/src/main/java/io/entgra/tenant/mgt/common/spi/TenantManagerService.java

@@ -0,0 +1,27 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.common.spi;
+
+import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+
+public interface TenantManagerService {
+    void addDefaultRoles(TenantInfoBean tenantInfoBean) throws TenantMgtException;
+
+    void addDefaultAppCategories(TenantInfoBean tenantInfoBean) throws TenantMgtException;
+}

components/tenant-mgt/io.entgra.tenant.mgt.core/pom.xml

@@ -0,0 +1,136 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, Entgra (Pvt) Ltd. (http://www.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>tenant-mgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.25-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>io.entgra.tenant.mgt.core</artifactId>
+    <name>Entgra IoT - Tenant Manager Core</name>
+    <description>Entgra IoT - Tenant Manager Core</description>
+    <packaging>bundle</packaging>
+
+    <build>
+        <plugins>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-scr-plugin</artifactId>
+            </plugin>
+            <plugin>
+                <groupId>org.apache.felix</groupId>
+                <artifactId>maven-bundle-plugin</artifactId>
+                <extensions>true</extensions>
+                <configuration>
+                    <instructions>
+                        <Bundle-SymbolicName>${project.artifactId}</Bundle-SymbolicName>
+                        <Bundle-Name>${project.artifactId}</Bundle-Name>
+                        <Bundle-Version>${carbon.device.mgt.version}</Bundle-Version>
+                        <Bundle-Description>Tenant Management Core Bundle</Bundle-Description>
+                        <Private-Package>io.entgra.tenant.mgt.core.internal</Private-Package>
+                        <Import-Package>
+                            org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
+                            org.osgi.service.*;version="${imp.package.version.osgi.service}",
+                            org.apache.commons.logging,
+                            io.entgra.application.mgt.common.*,
+                            io.entgra.application.mgt.core.config,
+                            org.wso2.carbon.device.mgt.core,
+                            org.wso2.carbon.user.api,
+                            org.wso2.carbon.registry.core.exceptions,
+                            io.entgra.tenant.mgt.common.*,
+                            org.wso2.carbon.stratos.common.beans,
+                            org.wso2.carbon.stratos.common.exception,
+                            org.wso2.carbon.stratos.common.listeners,
+                            org.wso2.carbon.device.mgt.common.metadata.mgt,
+                            org.wso2.carbon.device.mgt.common.exceptions,
+                            org.wso2.carbon.device.mgt.common.permission.mgt,
+                            org.wso2.carbon.device.mgt.common.roles.config,
+                            org.wso2.carbon.device.mgt.core.metadata.mgt,
+                            org.wso2.carbon.device.mgt.core.config,
+                            org.wso2.carbon.user.core.service,
+                            org.wso2.carbon.context
+                        </Import-Package>
+                        <Export-Package>
+                            !io.entgra.tenant.mgt.core.internal,
+                            io.entgra.tenant.mgt.core.*
+                        </Export-Package>
+                    </instructions>
+                </configuration>
+            </plugin>
+        </plugins>
+    </build>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.eclipse.osgi</groupId>
+            <artifactId>org.eclipse.osgi.services</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.commons</groupId>
+            <artifactId>org.wso2.carbon.tenant.common</artifactId>
+            <version>${carbon.commons.version}</version>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.registry.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.user.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.user.api</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.application.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.application.mgt.common</artifactId>
+        </dependency>
+        <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>io.entgra.tenant.mgt.common</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon</groupId>
+            <artifactId>org.wso2.carbon.utils</artifactId>
+        </dependency>
+    </dependencies>
+
+</project>

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/TenantManager.java

@@ -0,0 +1,39 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.core;
+
+import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+
+public interface TenantManager {
+
+    /**
+     * Add default roles to a tenant described by the tenant info bean
+     * @param tenantInfoBean The info bean that provides tenant info
+     * @throws TenantMgtException Throws when error occurred while adding
+     *                            a role into user store or adding default white label theme to created tenant
+     */
+    void addDefaultRoles(TenantInfoBean tenantInfoBean) throws TenantMgtException;
+
+    /**
+     * Add default application categories to a tenant described by the tenant info bean
+     * @param tenantInfoBean The info bean that provides tenant info
+     * @throws TenantMgtException Throws when error occurred while adding default application categories
+     */
+    void addDefaultAppCategories(TenantInfoBean tenantInfoBean) throws TenantMgtException;
+}

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerImpl.java

@@ -1,11 +1,12 @@
-/* Copyright (c) 2020, Entgra (Pvt) Ltd. (http://www.entgra.io) All Rights Reserved.
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) All Rights Reserved.
  *
- * Entgra (Pvt) Ltd. licenses this file to you under the Apache License,
+ * 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
+ * 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
@@ -14,23 +15,26 @@
  * specific language governing permissions and limitations
  * under the License.
  */
-
-package org.wso2.carbon.device.mgt.core.util;
-
+package io.entgra.tenant.mgt.core.impl;
+
+import io.entgra.application.mgt.common.exception.ApplicationManagementException;
+import io.entgra.application.mgt.core.config.ConfigurationManager;
+import io.entgra.application.mgt.common.services.ApplicationManager;
+import io.entgra.tenant.mgt.core.TenantManager;
+import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
 import org.apache.commons.logging.Log;
 import org.apache.commons.logging.LogFactory;
 import org.wso2.carbon.context.PrivilegedCarbonContext;
-import org.wso2.carbon.device.mgt.common.exceptions.MetadataManagementException;
-import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagementException;
-import org.wso2.carbon.device.mgt.common.roles.config.Role;
 import org.wso2.carbon.device.mgt.core.config.DeviceConfigurationManager;
 import org.wso2.carbon.device.mgt.core.config.DeviceManagementConfig;
-import org.wso2.carbon.device.mgt.core.internal.DeviceManagementDataHolder;
 import org.wso2.carbon.device.mgt.core.permission.mgt.PermissionUtils;
 import org.wso2.carbon.registry.core.exceptions.RegistryException;
 import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
-import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
 import org.wso2.carbon.user.api.Permission;
+import org.wso2.carbon.device.mgt.common.exceptions.MetadataManagementException;
+import org.wso2.carbon.device.mgt.common.permission.mgt.PermissionManagementException;
+import org.wso2.carbon.device.mgt.common.roles.config.Role;
 import org.wso2.carbon.user.api.UserStoreException;
 import org.wso2.carbon.user.api.UserStoreManager;
 
@@ -39,97 +43,72 @@ import java.util.HashMap;
 import java.util.List;
 import java.util.Map;
 
-public class DeviceMgtTenantMgtListener implements TenantMgtListener {
-    private static final Log log = LogFactory.getLog(DeviceMgtTenantMgtListener.class);
-    private static final int EXEC_ORDER = 10;
+public class TenantManagerImpl implements TenantManager {
+    private static final Log log = LogFactory.getLog(TenantManagerImpl.class);
     private static final String PERMISSION_ACTION = "ui.execute";
 
     @Override
-    public void onTenantCreate(TenantInfoBean tenantInfoBean) {
+    public void addDefaultRoles(TenantInfoBean tenantInfoBean) throws TenantMgtException {
+        initTenantFlow(tenantInfoBean);
         DeviceManagementConfig config = DeviceConfigurationManager.getInstance().getDeviceManagementConfig();
         if (config.getDefaultRoles().isEnabled()) {
             Map<String, List<Permission>> roleMap = getValidRoleMap(config);
             try {
-                PrivilegedCarbonContext.startTenantFlow();
-                PrivilegedCarbonContext.getThreadLocalCarbonContext()
-                        .setTenantDomain(tenantInfoBean.getTenantDomain(), true);
-                UserStoreManager userStoreManager = DeviceManagementDataHolder.getInstance().getRealmService()
+                UserStoreManager userStoreManager = TenantMgtDataHolder.getInstance().getRealmService()
                         .getTenantUserRealm(tenantInfoBean.getTenantId()).getUserStoreManager();
 
                 roleMap.forEach((key, value) -> {
                     try {
                         userStoreManager.addRole(key, null, value.toArray(new Permission[0]));
                     } catch (UserStoreException e) {
-                        log.error("Error occurred while adding default roles into user store.", e);
+                        log.error("Error occurred while adding default roles into user store", e);
                     }
                 });
             } catch (UserStoreException e) {
-                log.error("Error occurred while getting user store manager.", e);
-            } finally {
-                PrivilegedCarbonContext.endTenantFlow();
+                String msg = "Error occurred while getting user store manager";
+                log.error(msg, e);
+                throw new TenantMgtException(msg, e);
             }
         }
         try {
-            DeviceManagementDataHolder.getInstance().getWhiteLabelManagementService().
+            TenantMgtDataHolder.getInstance().getWhiteLabelManagementService().
                     addDefaultWhiteLabelThemeIfNotExist(tenantInfoBean.getTenantId());
         } catch (MetadataManagementException e) {
-            log.error("Error occurred while adding default white label theme to created tenant.", e);
+            String msg = "Error occurred while adding default white label theme to created tenant - id "+tenantInfoBean.getTenantId();
+            log.error(msg, e);
+            throw new TenantMgtException(msg, e);
+        } finally {
+            endTenantFlow();
         }
     }
 
     @Override
-    public void onTenantUpdate(TenantInfoBean tenantInfoBean) {
-        // doing nothing
-    }
-
-    @Override
-    public void onTenantDelete(int i) {
-        // doing nothing
-    }
-
-    @Override
-    public void onTenantRename(int i, String s, String s1) {
-        // doing nothing
-    }
-
-    @Override
-    public void onTenantInitialActivation(int i) {
-        // doing nothing
-    }
-
-    @Override
-    public void onTenantActivation(int i) {
-        // doing nothing
-    }
-
-    @Override
-    public void onTenantDeactivation(int i) {
-        // doing nothing
-    }
-
-    @Override
-    public void onSubscriptionPlanChange(int i, String s, String s1) {
-        // doing nothing
+    public void addDefaultAppCategories(TenantInfoBean tenantInfoBean) throws TenantMgtException {
+        initTenantFlow(tenantInfoBean);
+        try {
+            ApplicationManager applicationManager = TenantMgtDataHolder.getInstance().getApplicationManager();
+            applicationManager
+                    .addApplicationCategories(ConfigurationManager.getInstance().getConfiguration().getAppCategories());
+        } catch (ApplicationManagementException e) {
+            String msg = "Error occurred while getting default application categories";
+            log.error(msg, e);
+            throw new TenantMgtException(msg, e);
+        } finally {
+            endTenantFlow();
+        }
     }
 
-    @Override
-    public int getListenerOrder() {
-        return EXEC_ORDER;
+    private void initTenantFlow(TenantInfoBean tenantInfoBean) {
+        PrivilegedCarbonContext.startTenantFlow();
+        PrivilegedCarbonContext privilegedCarbonContext = PrivilegedCarbonContext.getThreadLocalCarbonContext();
+        privilegedCarbonContext.setTenantId(tenantInfoBean.getTenantId());
+        privilegedCarbonContext.setTenantDomain(tenantInfoBean.getTenantDomain());
     }
 
-    @Override
-    public void onPreDelete(int i) {
-        // doing nothing
+    private void endTenantFlow() {
+        PrivilegedCarbonContext.endTenantFlow();
     }
 
-    /**
-     * Use the default roles defined in the cdm-config and evaluate the defined permissions. If permissions does not
-     * exist then exclude them and return role map which contains defined roles in the cdm-config and existing
-     * permission list as a roleMap
-     * @param config cdm-config
-     * @return {@link Map} key is role name and value is list of permissions which needs to be assigned to the role
-     * defined in the key.
-     */
     private Map<String, List<Permission>> getValidRoleMap(DeviceManagementConfig config) {
         Map<String, List<Permission>> roleMap = new HashMap<>();
         try {

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/impl/TenantManagerServiceImpl.java

@@ -0,0 +1,36 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.core.impl;
+
+import io.entgra.tenant.mgt.common.spi.TenantManagerService;
+import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+
+public class TenantManagerServiceImpl implements TenantManagerService {
+
+    @Override
+    public void addDefaultRoles(TenantInfoBean tenantInfoBean) throws TenantMgtException {
+        TenantMgtDataHolder.getInstance().getTenantManager().addDefaultRoles(tenantInfoBean);
+    }
+
+    @Override
+    public void addDefaultAppCategories(TenantInfoBean tenantInfoBean) throws TenantMgtException {
+        TenantMgtDataHolder.getInstance().getTenantManager().addDefaultAppCategories(tenantInfoBean);
+    }
+}

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtDataHolder.java

@@ -0,0 +1,70 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.core.internal;
+
+import io.entgra.application.mgt.common.services.ApplicationManager;
+import io.entgra.tenant.mgt.core.TenantManager;
+import org.wso2.carbon.device.mgt.common.metadata.mgt.WhiteLabelManagementService;
+import org.wso2.carbon.user.core.service.RealmService;
+
+public class TenantMgtDataHolder {
+    private static final TenantMgtDataHolder instance = new TenantMgtDataHolder();
+    private TenantManager tenantManager;
+
+    private ApplicationManager applicationManager;
+
+    private WhiteLabelManagementService whiteLabelManagementService;
+
+    private RealmService realmService;
+
+    public RealmService getRealmService() {
+        return realmService;
+    }
+
+    public void setRealmService(RealmService realmService) {
+        this.realmService = realmService;
+    }
+
+    public ApplicationManager getApplicationManager() {
+        return applicationManager;
+    }
+
+    public void setApplicationManager(ApplicationManager applicationManager) {
+        this.applicationManager = applicationManager;
+    }
+
+    public WhiteLabelManagementService getWhiteLabelManagementService() {
+        return whiteLabelManagementService;
+    }
+
+    public void setWhiteLabelManagementService(WhiteLabelManagementService whiteLabelManagementService) {
+        this.whiteLabelManagementService = whiteLabelManagementService;
+    }
+
+    public TenantManager getTenantManager() {
+        return tenantManager;
+    }
+
+    public void setTenantManager(TenantManager tenantManager) {
+        this.tenantManager = tenantManager;
+    }
+
+    public static TenantMgtDataHolder getInstance() {
+        return instance;
+    }
+}

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/internal/TenantMgtServiceComponent.java

@@ -0,0 +1,114 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.core.internal;
+
+import io.entgra.application.mgt.common.services.ApplicationManager;
+import io.entgra.tenant.mgt.common.spi.TenantManagerService;
+import io.entgra.tenant.mgt.core.TenantManager;
+import io.entgra.tenant.mgt.core.impl.TenantManagerImpl;
+import io.entgra.tenant.mgt.core.impl.TenantManagerServiceImpl;
+import io.entgra.tenant.mgt.core.listener.DeviceMgtTenantListener;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.osgi.service.component.ComponentContext;
+import org.wso2.carbon.device.mgt.common.metadata.mgt.WhiteLabelManagementService;
+import org.wso2.carbon.device.mgt.core.metadata.mgt.WhiteLabelManagementServiceImpl;
+import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+import org.wso2.carbon.user.core.service.RealmService;
+
+/**
+ * @scr.component name="org.wso2.carbon.devicemgt.tenant.manager" immediate="true"
+ * @scr.reference name="org.wso2.carbon.application.mgt.service"
+ * interface="io.entgra.application.mgt.common.services.ApplicationManager"
+ * cardinality="1..1"
+ * policy="dynamic"
+ * bind="setApplicationManager"
+ * unbind="unsetApplicationManager"
+ * @scr.reference name="user.realmservice.default"
+ * interface="org.wso2.carbon.user.core.service.RealmService"
+ * cardinality="1..1"
+ * policy="dynamic"
+ * bind="setRealmService"
+ * unbind="unsetRealmService"
+ */
+
+@SuppressWarnings("unused")
+public class TenantMgtServiceComponent {
+
+    private static final Log log = LogFactory.getLog(TenantManagerService.class);
+
+    @SuppressWarnings("unused")
+    protected void activate(ComponentContext componentContext) {
+        try {
+            TenantManagerService tenantManagerService = new TenantManagerServiceImpl();
+            componentContext.getBundleContext().
+                    registerService(TenantManagerServiceImpl.class.getName(), tenantManagerService, null);
+            TenantManager tenantManager = new TenantManagerImpl();
+            TenantMgtDataHolder.getInstance().setTenantManager(tenantManager);
+            WhiteLabelManagementService whiteLabelManagementService = new WhiteLabelManagementServiceImpl();
+            componentContext.getBundleContext().registerService(WhiteLabelManagementServiceImpl.class.getName(),
+                    whiteLabelManagementService, null);
+            TenantMgtDataHolder.getInstance().setWhiteLabelManagementService(whiteLabelManagementService);
+            DeviceMgtTenantListener deviceMgtTenantListener = new DeviceMgtTenantListener();
+            if(log.isDebugEnabled()) {
+                log.info("Tenant management listener is registering");
+            }
+            componentContext.getBundleContext().
+                    registerService(TenantMgtListener.class.getName(), deviceMgtTenantListener, null);
+            if(log.isDebugEnabled()) {
+                log.info("Tenant management service activated");
+            }
+        } catch (Throwable t) {
+            String msg = "Error occurred while activating tenant management service";
+            log.error(msg, t);
+        }
+    }
+
+    @SuppressWarnings("unused")
+    protected void deactivate(ComponentContext componentContext) {
+        // nothing to do
+    }
+
+    protected void setApplicationManager(ApplicationManager applicationManager) {
+        if(log.isDebugEnabled()) {
+            log.info("Application manager service is binding");
+        }
+        TenantMgtDataHolder.getInstance().setApplicationManager(applicationManager);
+    }
+
+    protected void unsetApplicationManager(ApplicationManager applicationManager) {
+        if(log.isDebugEnabled()) {
+            log.info("Application manager service is unbinding");
+        }
+        TenantMgtDataHolder.getInstance().setApplicationManager(null);
+    }
+
+    protected void setRealmService(RealmService realmService) {
+        if(log.isDebugEnabled()) {
+            log.info("Realm Service service is binding");
+        }
+        TenantMgtDataHolder.getInstance().setRealmService(realmService);
+    }
+
+    protected void unsetRealmService(RealmService realmService) {
+        if(log.isDebugEnabled()) {
+            log.info("Realm Service service is unbinding");
+        }
+        TenantMgtDataHolder.getInstance().setRealmService(null);
+    }
+}

components/tenant-mgt/io.entgra.tenant.mgt.core/src/main/java/io/entgra/tenant/mgt/core/listener/DeviceMgtTenantListener.java

@@ -0,0 +1,91 @@
+/*
+ * Copyright (c) 2023, Entgra Pvt Ltd. (http://www.wso2.org) 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.
+ */
+package io.entgra.tenant.mgt.core.listener;
+
+import io.entgra.tenant.mgt.core.TenantManager;
+import io.entgra.tenant.mgt.common.exception.TenantMgtException;
+import io.entgra.tenant.mgt.core.internal.TenantMgtDataHolder;
+import org.apache.commons.logging.Log;
+import org.apache.commons.logging.LogFactory;
+import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
+import org.wso2.carbon.stratos.common.exception.StratosException;
+import org.wso2.carbon.stratos.common.listeners.TenantMgtListener;
+
+public class DeviceMgtTenantListener implements TenantMgtListener {
+
+    private static final Log log = LogFactory.getLog(DeviceMgtTenantListener.class);
+    public static final int LISTENER_EXECUTION_ORDER = 10;
+
+    @Override
+    public void onTenantCreate(TenantInfoBean tenantInfoBean) {
+        // Any work to be performed after a tenant creation
+        TenantManager tenantManager = TenantMgtDataHolder.getInstance().getTenantManager();
+        try {
+            tenantManager.addDefaultRoles(tenantInfoBean);
+            tenantManager.addDefaultAppCategories(tenantInfoBean);
+        } catch (TenantMgtException e) {
+            String msg = "Error occurred while executing tenant creation flow";
+            log.error(msg, e);
+        }
+    }
+
+    @Override
+    public void onTenantUpdate(TenantInfoBean tenantInfoBean) throws StratosException {
+        // Any work to be performed after a tenant information update happens
+    }
+
+    @Override
+    public void onTenantDelete(int i) {
+        // Any work to be performed after a tenant deletion
+    }
+
+    @Override
+    public void onTenantRename(int i, String s, String s1) throws StratosException {
+        // Any work to be performed after a tenant rename happens
+    }
+
+    @Override
+    public void onTenantInitialActivation(int i) throws StratosException {
+        // Any work to be performed after a tenant's initial activation happens
+    }
+
+    @Override
+    public void onTenantActivation(int i) throws StratosException {
+        // Any work to be performed after a tenant activation
+    }
+
+    @Override
+    public void onTenantDeactivation(int i) throws StratosException {
+        // Any work to be performed after a tenant deactivation
+    }
+
+    @Override
+    public void onSubscriptionPlanChange(int i, String s, String s1) throws StratosException {
+        // Any work to be performed after subscription plan change
+    }
+
+    @Override
+    public int getListenerOrder() {
+        return LISTENER_EXECUTION_ORDER;
+    }
+
+    @Override
+    public void onPreDelete(int i) throws StratosException {
+        // Any work to be performed before a tenant is deleted
+    }
+}

components/tenant-mgt/pom.xml

@@ -0,0 +1,40 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+  ~ Copyright (c) 2023, Entgra (Pvt) Ltd. (http://www.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>carbon-devicemgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.25-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tenant-mgt</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Tenant Management Component</name>
+    <description>Entgra IoT - Tenant Management Component</description>
+
+    <modules>
+        <module>io.entgra.tenant.mgt.core</module>
+        <module>io.entgra.tenant.mgt.common</module>
+    </modules>
+
+</project>

features/tenant-mgt/io.entgra.tenant.mgt.server.feature/pom.xml

@@ -0,0 +1,111 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. 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>tenant-mgt-feature</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.25-SNAPSHOT</version>
+        <relativePath>../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>io.entgra.tenant.mgt.server.feature</artifactId>
+    <name>Entgra IoT - Tenant Management Server Feature</name>
+    <description>Entgra IoT - Tenant Management Server Feature</description>
+    <packaging>pom</packaging>
+
+    <dependencies>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.tenant.mgt.core</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.devicemgt</groupId>
+            <artifactId>io.entgra.tenant.mgt.common</artifactId>
+        </dependency>
+    </dependencies>
+
+    <build>
+        <plugins>
+            <plugin>
+                <artifactId>maven-resources-plugin</artifactId>
+                <version>2.6</version>
+                <executions>
+                    <execution>
+                        <id>copy-resources</id>
+                        <phase>generate-resources</phase>
+                        <goals>
+                            <goal>copy-resources</goal>
+                        </goals>
+                        <configuration>
+                            <outputDirectory>src/main/resources</outputDirectory>
+                            <resources>
+                                <resource>
+                                    <directory>resources</directory>
+                                    <includes>
+                                        <include>build.properties</include>
+                                        <include>p2.inf</include>
+                                    </includes>
+                                </resource>
+                            </resources>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+            <plugin>
+                <groupId>org.wso2.maven</groupId>
+                <artifactId>carbon-p2-plugin</artifactId>
+                <version>${carbon.p2.plugin.version}</version>
+                <executions>
+                    <execution>
+                        <id>p2-feature-generation</id>
+                        <phase>package</phase>
+                        <goals>
+                            <goal>p2-feature-gen</goal>
+                        </goals>
+                        <configuration>
+                            <id>io.entgra.tenant.mgt.server</id>
+                            <propertiesFile>../../etc/feature.properties</propertiesFile>
+                            <adviceFile>
+                                <properties>
+                                    <propertyDef>org.wso2.carbon.p2.category.type:server
+                                    </propertyDef>
+                                    <propertyDef>org.eclipse.equinox.p2.type.group:true
+                                    </propertyDef>
+                                </properties>
+                            </adviceFile>
+                            <bundles>
+                                <!--<bundleDef>{groupId}:{artifactId}:{version}</bundleDef>-->
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.core:${carbon.device.mgt.version}
+                                </bundleDef>
+                                <bundleDef>
+                                    org.wso2.carbon.devicemgt:io.entgra.tenant.mgt.common:${carbon.device.mgt.version}
+                                </bundleDef>
+                            </bundles>
+                        </configuration>
+                    </execution>
+                </executions>
+            </plugin>
+        </plugins>
+    </build>
+
+</project>

features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/build.properties

@@ -0,0 +1 @@
+custom=true

features/tenant-mgt/io.entgra.tenant.mgt.server.feature/src/main/resources/p2.inf

@@ -0,0 +1 @@
+instructions.configure = \

features/tenant-mgt/pom.xml

@@ -0,0 +1,36 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+~ Copyright (c) 2014, WSO2 Inc. (http://www.wso2.org) All Rights Reserved.
+~
+~ WSO2 Inc. 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>carbon-devicemgt</artifactId>
+        <groupId>org.wso2.carbon.devicemgt</groupId>
+        <version>5.0.25-SNAPSHOT</version>
+        <relativePath>../../pom.xml</relativePath>
+    </parent>
+
+    <modelVersion>4.0.0</modelVersion>
+    <artifactId>tenant-mgt-feature</artifactId>
+    <packaging>pom</packaging>
+    <name>Entgra IoT - Tenant Management Feature</name>
+
+    <modules>
+        <module>io.entgra.tenant.mgt.server.feature</module>
+    </modules>
+</project>

pom.xml

@@ -48,6 +48,7 @@
         <module>components/webapp-authenticator-framework</module>
         <module>components/logger</module>
         <module>components/task-mgt</module>
+        <module>components/tenant-mgt</module>
         <module>features/device-mgt</module>
         <module>features/apimgt-extensions</module>
         <module>features/application-mgt</module>
@@ -62,7 +63,7 @@
         <module>features/webapp-authenticator-framework</module>
         <module>features/logger</module>
         <module>features/task-mgt</module>
-
+        <module>features/tenant-mgt</module>
     </modules>
 
     <dependencyManagement>
@@ -370,6 +371,18 @@
             </dependency>
             <!-- Device Management dependencies -->
 
+            <!-- Tenant Management dependencies -->
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>io.entgra.tenant.mgt.common</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.devicemgt</groupId>
+                <artifactId>io.entgra.tenant.mgt.core</artifactId>
+                <version>${carbon.device.mgt.version}</version>
+            </dependency>
+
             <!-- Task Management dependencies -->
             <dependency>
                 <groupId>org.wso2.carbon.devicemgt</groupId>