Merge pull request #16509 from ThaminduR/add-api-mgt

Add API resource management feature
wso2 · Sep 21, 2023 · eb934e6 · eb934e6
2 parents 9135787 + 5d2a049
commit eb934e6
Show file tree

Hide file tree

Showing 5 changed files with 51 additions and 2 deletions.
diff --git a/modules/api-resources/api-resources-full/pom.xml b/modules/api-resources/api-resources-full/pom.xml
@@ -239,6 +239,15 @@
             <artifactId>org.wso2.carbon.identity.api.user.organization.common</artifactId>
         </dependency>
 
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.api.resource.v1</artifactId>
+        </dependency>
+        <dependency>
+            <groupId>org.wso2.carbon.identity.server.api</groupId>
+            <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+        </dependency>
+
         <!-- Server REST API Dependencies. -->
         <dependency>
             <groupId>org.wso2.carbon.identity.server.api</groupId>

diff --git a/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml b/modules/api-resources/api-resources-full/src/main/webapp/WEB-INF/beans.xml
@@ -74,6 +74,7 @@
     <import resource="classpath:META-INF/cxf/org-mgt-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/org-role-mgt-server-v1-cxf.xml"/>
     <import resource="classpath:META-INF/cxf/user-organization-v1-cxf.xml"/>
+    <import resource="classpath:META-INF/cxf/api-resource-server-v1-cxf.xml"/>
 
     <context:property-placeholder/>
     <context:annotation-config/>
@@ -117,6 +118,8 @@
             <bean class="org.wso2.carbon.identity.api.server.organization.role.management.v1.OrganizationsApi"/>
             <bean class="org.wso2.carbon.identity.api.server.organization.user.invitation.management.v1.GuestsApi"/>
             <bean class="org.wso2.carbon.identity.api.expired.password.identification.v1.PasswordExpiredUsersApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ApiResourcesApi"/>
+            <bean class="org.wso2.carbon.identity.api.server.api.resource.v1.ScopesApi"/>
         </jaxrs:serviceBeans>
         <jaxrs:providers>
             <bean class="com.fasterxml.jackson.jaxrs.json.JacksonJsonProvider">

diff --git a/modules/api-resources/pom.xml b/modules/api-resources/pom.xml
@@ -490,6 +490,16 @@
                 <artifactId>org.wso2.carbon.identity.api.expired.password.identification.common</artifactId>
                 <version>${identity.server.api.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.api.resource.v1</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.server.api</groupId>
+                <artifactId>org.wso2.carbon.identity.api.server.api.resource.common</artifactId>
+                <version>${identity.server.api.version}</version>
+            </dependency>
 
             <!-- Legacy API dependencies -->
             <dependency>

diff --git a/modules/p2-profile-gen/pom.xml b/modules/p2-profile-gen/pom.xml
@@ -339,6 +339,11 @@
                                     org.wso2.carbon.identity.framework:org.wso2.carbon.identity.provisioning.server.feature:${carbon.identity.framework.version}
                                 </featureArtifactDef>
 
+                                <!-- API Resource Management Feature -->
+                                <featureArtifactDef>
+                                    org.wso2.carbon.identity.framework:org.wso2.carbon.identity.api.resource.mgt.server.feature:${carbon.identity.framework.version}
+                                </featureArtifactDef>
+
                                 <!-- SAML Request/Response Validator Toolkit Feature -->
                                 <featureArtifactDef>
                                     org.wso2.carbon.identity.tool.validator.sso.saml2:org.wso2.carbon.identity.tools.saml.validator.feature:${identity.tool.samlsso.validator.version}
@@ -825,6 +830,10 @@
                                     </id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.api.resource.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.unique.claim.mgt.server.feature.group
@@ -927,7 +936,7 @@
                                     <id>org.wso2.carbon.identity.provisioning.server.feature.group</id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
-
+                              
                                 <feature>
                                     <id>org.wso2.carbon.identity.tools.saml.validator.feature.group</id>
                                     <version>${identity.tool.samlsso.validator.version}</version>
@@ -1441,6 +1450,10 @@
                                     </id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.api.resource.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.unique.claim.mgt.server.feature.group
@@ -1919,6 +1932,10 @@
                                     </id>
                                     <version>${carbon.identity.framework.version}</version>
                                 </feature>
+                                <feature>
+                                    <id>org.wso2.carbon.identity.api.resource.mgt.server.feature.group</id>
+                                    <version>${carbon.identity.framework.version}</version>
+                                </feature>
                                 <feature>
                                     <id>
                                         org.wso2.carbon.identity.unique.claim.mgt.server.feature.group

diff --git a/pom.xml b/pom.xml
@@ -1441,6 +1441,11 @@
                 <artifactId>org.wso2.carbon.identity.secret.mgt.core</artifactId>
                 <version>${carbon.identity.framework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.api.resource.mgt</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.saml.common</groupId>
                 <artifactId>org.wso2.carbon.identity.saml.common.util</artifactId>
@@ -1964,6 +1969,11 @@
                 <artifactId>org.wso2.carbon.identity.userstore.configuration.server.feature</artifactId>
                 <version>${carbon.identity.framework.version}</version>
             </dependency>
+            <dependency>
+                <groupId>org.wso2.carbon.identity.framework</groupId>
+                <artifactId>org.wso2.carbon.identity.api.resource.mgt.server.feature</artifactId>
+                <version>${carbon.identity.framework.version}</version>
+            </dependency>
             <dependency>
                 <groupId>org.wso2.carbon.identity.governance</groupId>
                 <artifactId>org.wso2.carbon.identity.multi.attribute.login.service.server.feature</artifactId>
@@ -2403,7 +2413,7 @@
         <!-- Identity REST API feature -->
         <identity.api.dispatcher.version>2.0.13</identity.api.dispatcher.version>
         <identity.user.api.version>1.3.19</identity.user.api.version>
-        <identity.server.api.version>1.2.82</identity.server.api.version>
+        <identity.server.api.version>1.2.83</identity.server.api.version>
 
         <identity.agent.sso.version>5.5.9</identity.agent.sso.version>
         <identity.tool.samlsso.validator.version>5.5.7</identity.tool.samlsso.validator.version>