Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Change keystore package name and add relevant dependencies. #484

Merged
merged 2 commits into from
Oct 26, 2023
Merged

Change keystore package name and add relevant dependencies. #484

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
05ed481
Change keystore package name and add relevant dependencies.
mpmadhavig Sep 4, 2023
8a556fd
Resolve dependency issues.
mpmadhavig Sep 13, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion ...ccount.identification/org.wso2.carbon.identity.api.idle.account.identification.v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -163,7 +163,6 @@
<dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
<version>2.6.0.wso2v1</version>
<scope>compile</scope>
</dependency>
<dependency>
Expand Down
20 changes: 20 additions & 0 deletions ...eystore.management/org.wso2.carbon.identity.api.server.keystore.management.common/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,5 +53,25 @@
<artifactId>org.wso2.carbon.security.mgt</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
<scope>provided</scope>
</dependency>
</dependencies>
</project>
2 changes: 1 addition & 1 deletion ...2/carbon/identity/api/server/keystore/management/common/KeyStoreManagamentDataHolder.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@
*/
package org.wso2.carbon.identity.api.server.keystore.management.common;

import org.wso2.carbon.security.keystore.KeyStoreManagementService;
import org.wso2.carbon.core.keystore.KeyStoreManagementService;

/**
* Service holder class for keystore management.
Expand Down
2 changes: 1 addition & 1 deletion ...so2/carbon/identity/api/server/keystore/management/common/factory/OSGIServiceFactory.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@

import org.springframework.beans.factory.config.AbstractFactoryBean;
import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.security.keystore.KeyStoreManagementService;
import org.wso2.carbon.core.keystore.KeyStoreManagementService;

/**
* Factory Beans serve as a factory for creating other beans within the IOC container. This factory bean is used to
Expand Down
10 changes: 10 additions & 0 deletions ...er.keystore.management/org.wso2.carbon.identity.api.server.keystore.management.v1/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -160,6 +160,11 @@
<artifactId>cxf-rt-rs-service-description</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.identity.framework</groupId>
<artifactId>org.wso2.carbon.security.mgt</artifactId>
Expand All @@ -174,5 +179,10 @@
<groupId>org.wso2.carbon.identity.server.api</groupId>
<artifactId>org.wso2.carbon.identity.api.server.common</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
<scope>compile</scope>
</dependency>
</dependencies>
</project>
8 changes: 0 additions & 8 deletions .../java/org/wso2/carbon/identity/api/server/keystore/management/v1/KeystoresApiService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,17 +16,9 @@

package org.wso2.carbon.identity.api.server.keystore.management.v1;

import org.wso2.carbon.identity.api.server.keystore.management.v1.*;
import org.wso2.carbon.identity.api.server.keystore.management.v1.model.*;
import org.apache.cxf.jaxrs.ext.multipart.Attachment;
import org.apache.cxf.jaxrs.ext.multipart.Multipart;
import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateRequest;
import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateResponse;
import org.wso2.carbon.identity.api.server.keystore.management.v1.model.ErrorResponse;
import java.io.File;
import javax.ws.rs.core.Response;


public interface KeystoresApiService {

public Response deleteCertificate(String alias);
Expand Down
4 changes: 2 additions & 2 deletions ...java/org/wso2/carbon/identity/api/server/keystore/management/v1/core/KeyStoreService.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,13 @@
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.core.keystore.KeyStoreManagementException;
import org.wso2.carbon.core.keystore.KeyStoreManagementServerException;
import org.wso2.carbon.identity.api.server.common.ContextLoader;
import org.wso2.carbon.identity.api.server.common.error.APIError;
import org.wso2.carbon.identity.api.server.common.error.ErrorResponse;
import org.wso2.carbon.identity.api.server.keystore.management.common.KeyStoreConstants;
import org.wso2.carbon.identity.api.server.keystore.management.v1.model.CertificateResponse;
import org.wso2.carbon.security.keystore.KeyStoreManagementException;
import org.wso2.carbon.security.keystore.KeyStoreManagementServerException;

import java.io.File;
import java.io.FileOutputStream;
Expand Down
25 changes: 25 additions & 0 deletions pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,6 +26,12 @@
</parent>

<groupId>org.wso2.carbon.identity.server.api</groupId>
<dependencies>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
</dependency>
</dependencies>
<modelVersion>4.0.0</modelVersion>
<artifactId>identity-api-server</artifactId>
<packaging>pom</packaging>
Expand Down Expand Up @@ -400,12 +406,24 @@
<version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId>
<version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId>
<version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.base</artifactId>
<version>${carbon.kernel.version}</version>
<scope>provided</scope>
</dependency>
<dependency>
<groupId>org.wso2.carbon.multitenancy</groupId>
<artifactId>org.wso2.carbon.tenant.mgt</artifactId>
Expand Down Expand Up @@ -586,6 +604,12 @@
<artifactId>org.apache.felix.scr.ds-annotations</artifactId>
<version>${apache.felix.scr.ds.annotations.version}</version>
</dependency>
<dependency>
<groupId>commons-lang.wso2</groupId>
<artifactId>commons-lang</artifactId>
<scope>compile</scope>
<version>${commons.lang.version}</version>
</dependency>
<dependency>
<groupId>org.jacoco</groupId>
<artifactId>org.jacoco.agent</artifactId>
Expand Down Expand Up @@ -706,6 +730,7 @@
<identity.branding.preference.management.version>1.0.4</identity.branding.preference.management.version>
<apache.felix.scr.ds.annotations.version>1.2.4</apache.felix.scr.ds.annotations.version>
<!--<maven.checkstyleplugin.excludes>**/gen/**/*</maven.checkstyleplugin.excludes>-->
<commons.lang.version>2.6.0.wso2v1</commons.lang.version>

<tenant.resource.manager.version>1.5.55</tenant.resource.manager.version>
<identity.verification.version>1.0.3</identity.verification.version>
Expand Down