From 4024c2dc44a5f941a8660ca74fc4ae954c21dd99 Mon Sep 17 00:00:00 2001
From: dewniMW <dewni.matheesha@gmail.com>
Date: Fri, 17 Jun 2022 12:10:20 +0530
Subject: [PATCH] Move component.xml

---
 .../src/main/resources/META-INF/component.xml |  0
 .../pom.xml                                   | 80 -------------------
 ...ionManagementUserRoleServiceComponent.java | 44 ----------
 .../pom.xml                                   |  5 --
 pom.xml                                       |  7 --
 5 files changed, 136 deletions(-)
 rename components/{org.wso2.carbon.identity.organization.management.user.role.service => org.wso2.carbon.identity.organization.management.service}/src/main/resources/META-INF/component.xml (100%)
 delete mode 100644 components/org.wso2.carbon.identity.organization.management.user.role.service/pom.xml
 delete mode 100644 components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/java/org/wso2/carbon/identity/organization/management/user/role/service/internal/OrganizationManagementUserRoleServiceComponent.java

diff --git a/components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/resources/META-INF/component.xml b/components/org.wso2.carbon.identity.organization.management.service/src/main/resources/META-INF/component.xml
similarity index 100%
rename from components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/resources/META-INF/component.xml
rename to components/org.wso2.carbon.identity.organization.management.service/src/main/resources/META-INF/component.xml
diff --git a/components/org.wso2.carbon.identity.organization.management.user.role.service/pom.xml b/components/org.wso2.carbon.identity.organization.management.user.role.service/pom.xml
deleted file mode 100644
index d649ad87a..000000000
--- a/components/org.wso2.carbon.identity.organization.management.user.role.service/pom.xml
+++ /dev/null
@@ -1,80 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-  ~ Copyright (c) 2022, WSO2 Inc. (http://www.wso2.com).
-  ~
-  ~ Licensed 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>
-        <groupId>org.wso2.carbon.identity.organization.management</groupId>
-        <artifactId>identity-organization-management</artifactId>
-        <version>1.0.12-SNAPSHOT</version>
-        <relativePath>../../pom.xml</relativePath>
-    </parent>
-
-    <modelVersion>4.0.0</modelVersion>
-    <artifactId>org.wso2.carbon.identity.organization.management.user.role.service</artifactId>
-    <name>WSO2 - Organization User Role Management Service</name>
-    <packaging>bundle</packaging>
-
-    <dependencies>
-        <dependency>
-            <groupId>org.apache.felix</groupId>
-            <artifactId>org.apache.felix.scr.ds-annotations</artifactId>
-            <scope>provided</scope>
-        </dependency>
-        <dependency>
-            <groupId>org.ops4j.pax.logging</groupId>
-            <artifactId>pax-logging-api</artifactId>
-        </dependency>
-
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi.services</artifactId>
-        </dependency>
-        <dependency>
-            <groupId>org.eclipse.osgi</groupId>
-            <artifactId>org.eclipse.osgi</artifactId>
-        </dependency>
-    </dependencies>
-
-    <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-Description>Organization Management Service Bundle</Bundle-Description>
-                        <Private-Package>org.wso2.carbon.identity.organization.management.user.role.service.internal
-                        </Private-Package>
-                        <Export-Package>
-                            !org.wso2.carbon.identity.organization.management.user.role.service.internal,
-                            org.wso2.carbon.identity.organization.management.user.role.service.*;
-                            version="${identity.organization.management.exp.pkg.version}",
-                        </Export-Package>
-                        <Import-Package>
-                            org.apache.commons.logging;version="${org.apache.commons.logging.imp.pkg.version.range}",
-                            org.osgi.service.component;version="${osgi.service.component.imp.pkg.version.range}",
-                        </Import-Package>
-                    </instructions>
-                </configuration>
-            </plugin>
-        </plugins>
-    </build>
-</project>
diff --git a/components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/java/org/wso2/carbon/identity/organization/management/user/role/service/internal/OrganizationManagementUserRoleServiceComponent.java b/components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/java/org/wso2/carbon/identity/organization/management/user/role/service/internal/OrganizationManagementUserRoleServiceComponent.java
deleted file mode 100644
index c467094ef..000000000
--- a/components/org.wso2.carbon.identity.organization.management.user.role.service/src/main/java/org/wso2/carbon/identity/organization/management/user/role/service/internal/OrganizationManagementUserRoleServiceComponent.java
+++ /dev/null
@@ -1,44 +0,0 @@
-/*
- * Copyright (c) 2022, 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.
- */
-
-package org.wso2.carbon.identity.organization.management.user.role.service.internal;
-
-import org.apache.commons.logging.Log;
-import org.apache.commons.logging.LogFactory;
-import org.osgi.service.component.ComponentContext;
-import org.osgi.service.component.annotations.Activate;
-import org.osgi.service.component.annotations.Component;
-
-/**
- * Service component class for user role relations of organization management.
- */
-@Component(
-        name = "org.wso2.carbon.identity.organization.management.user.role.service",
-        immediate = true)
-public class OrganizationManagementUserRoleServiceComponent {
-
-    private static final Log log = LogFactory.getLog(OrganizationManagementUserRoleServiceComponent.class);
-
-    @Activate
-    protected void activate(ComponentContext cxt) {
-
-        if (log.isDebugEnabled()) {
-            log.debug("OrganizationManagementUserRoleServiceComponent is activated");
-        }
-    }
-}
diff --git a/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml b/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml
index 3b8f0cb8c..7a34bdbe6 100644
--- a/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml
+++ b/features/org.wso2.carbon.identity.organization.management.server.feature/pom.xml
@@ -55,10 +55,6 @@
             <groupId>org.wso2.carbon.identity.organization.management</groupId>
             <artifactId>org.wso2.carbon.identity.organization.management.service</artifactId>
         </dependency>
-        <dependency>
-            <groupId>org.wso2.carbon.identity.organization.management</groupId>
-            <artifactId>org.wso2.carbon.identity.organization.management.user.role.service</artifactId>
-        </dependency>
     </dependencies>
 
     <build>
@@ -89,7 +85,6 @@
                                 <bundleDef>org.wso2.carbon.identity.organization.management:org.wso2.carbon.identity.organization.management.authz.valve</bundleDef>
                                 <bundleDef>org.wso2.carbon.identity.organization.management:org.wso2.carbon.identity.organization.management.role.management.service</bundleDef>
                                 <bundleDef>org.wso2.carbon.identity.organization.management:org.wso2.carbon.identity.organization.management.service</bundleDef>
-                                <bundleDef>org.wso2.carbon.identity.organization.management:org.wso2.carbon.identity.organization.management.user.role.service</bundleDef>
                             </bundles>
                             <importFeatures>
                                 <importFeatureDef>org.wso2.carbon.core:compatible:${carbon.kernel.feature.version}</importFeatureDef>
diff --git a/pom.xml b/pom.xml
index a8b251322..0799a2b1d 100644
--- a/pom.xml
+++ b/pom.xml
@@ -44,7 +44,6 @@
         <module>components/org.wso2.carbon.identity.organization.management.authz.valve</module>
         <module>components/org.wso2.carbon.identity.organization.management.endpoint</module>
         <module>components/org.wso2.carbon.identity.organization.management.service</module>
-        <module>components/org.wso2.carbon.identity.organization.management.user.role.service</module>
         <module>components/org.wso2.carbon.identity.organization.management.role.management.service</module>
         <module>components/org.wso2.carbon.identity.organization.management.role.management.endpoint</module>
         <module>components/org.wso2.carbon.identity.organization.management.application</module>
@@ -179,12 +178,6 @@
                 <version>${project.version}</version>
                 <scope>provided</scope>
             </dependency>
-            <dependency>
-                <groupId>org.wso2.carbon.identity.organization.management</groupId>
-                <artifactId>org.wso2.carbon.identity.organization.management.user.role.service</artifactId>
-                <version>${project.version}</version>
-                <scope>provided</scope>
-            </dependency>
 
             <dependency>
                 <groupId>org.wso2.carbon.identity.framework</groupId>