rajitha
/
device-mgt-core
forked from community/device-mgt-core
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

cleaned up components/apimgt-extensions

Browse Source
kernel-4.6.x
Amalka Subasinghe 4 years ago
parent c33e13b04c
commit 3ea79ecf77
18 changed files with 3503 additions and 11781 deletions
Show Stats Download Patch File Download Diff File

32
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/pom.xml
Unescape View File

@ -48,42 +48,10 @@
<artifactId>cxf-bundle-jaxrs</artifactId> <artifactId>cxf-bundle-jaxrs</artifactId>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<!--CXF -->
<!--<dependency>-->
<!--<groupId>org.apache.cxf</groupId>-->
<!--<artifactId>cxf-rt-frontend-jaxws</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.cxf</groupId>-->
<!--<artifactId>cxf-rt-frontend-jaxrs</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.cxf</groupId>-->
<!--<artifactId>cxf-rt-transports-http</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--JAX-RS -->
<!--<dependency>-->
<!--<groupId>org.codehaus.jackson</groupId>-->
<!--<artifactId>jackson-core-asl</artifactId>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>org.codehaus.jackson</groupId> <groupId>org.codehaus.jackson</groupId>
<artifactId>jackson-jaxrs</artifactId> <artifactId>jackson-jaxrs</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>javax</groupId>-->
<!--<artifactId>javaee-web-api</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>javax.ws.rs</groupId>-->
<!--<artifactId>jsr311-api</artifactId>-->
<!--<scope>provided</scope>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>commons-httpclient.wso2</groupId> <groupId>commons-httpclient.wso2</groupId>
<artifactId>commons-httpclient</artifactId> <artifactId>commons-httpclient</artifactId>

2
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension.api/src/main/java/org/wso2/carbon/apimgt/application/extension/api/ApiApplicationRegistrationServiceImpl.java
Unescape View File

@ -27,8 +27,6 @@ import org.wso2.carbon.apimgt.application.extension.api.util.RegistrationProfile
import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants; import org.wso2.carbon.apimgt.application.extension.constants.ApiApplicationConstants;
import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey; import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException; import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
//import org.wso2.carbon.apimgt.integration.client.OAuthRequestInterceptor;
//import org.wso2.carbon.apimgt.integration.client.store.StoreClient;
import org.wso2.carbon.base.MultitenantConstants; import org.wso2.carbon.base.MultitenantConstants;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException; import org.wso2.carbon.device.mgt.common.exceptions.DeviceManagementException;

52
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/pom.xml
Unescape View File

@ -51,23 +51,13 @@
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
<!--<artifactId>org.wso2.carbon.apimgt.integration.client</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.wso2.carbon.devicemgt</groupId>-->
<!--<artifactId>org.wso2.carbon.apimgt.integration.generated.client</artifactId>-->
<!--</dependency>-->
<dependency> <dependency>
<groupId>org.wso2.carbon.apimgt</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId> <artifactId>org.wso2.carbon.apimgt.api</artifactId>
<version>9.0.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.apimgt</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId> <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>9.0.5</version>
<scope>provided</scope> <scope>provided</scope>
</dependency> </dependency>
<dependency> <dependency>
@ -117,24 +107,30 @@
<Bundle-Description>API Management Application Bundle</Bundle-Description> <Bundle-Description>API Management Application Bundle</Bundle-Description>
<Private-Package>org.wso2.carbon.apimgt.application.extension.internal</Private-Package> <Private-Package>org.wso2.carbon.apimgt.application.extension.internal</Private-Package>
<Import-Packages> <Import-Packages>
org.apache.commons.lang;version="[2.6,3)",org.apache.c org.apache.commons.lang;version="[2.6,3)",
ommons.logging;version="[1.2,2)",org.json.simple,org.osgi.framework;v org.apache.commons.logging;version="[1.2,2)",
ersion="${imp.package.version.osgi.framework}",org.osgi.service.component;version="${imp.package.version.osgi.service}",org.wso org.json.simple,org.osgi.framework;version="${imp.package.version.osgi.framework}",
2.carbon.apimgt.api;version="[9.0,10)",org.wso2.carbon.apimgt.api.dto org.osgi.service.component;version="${imp.package.version.osgi.service}",
;version="[9.0,10)",org.wso2.carbon.apimgt.api.model;version="[9.0,10 org.wso2.carbon.apimgt.api;version="[9.0,10)",
)",org.wso2.carbon.apimgt.application.extension.bean,org.wso2.carbon. org.wso2.carbon.apimgt.api.dto;version="[9.0,10)",
apimgt.application.extension.dto,org.wso2.carbon.apimgt.application.e org.wso2.carbon.apimgt.api.model;version="[9.0,10)",
xtension.exception,org.wso2.carbon.apimgt.impl;version="[9.0,10)",org org.wso2.carbon.apimgt.application.extension.bean,
.wso2.carbon.apimgt.impl.utils;version="[9.0,10)",org.wso2.carbon.con org.wso2.carbon.apimgt.application.extension.dto,
text;version="[4.6,5)",org.wso2.carbon.device.mgt.core.config.ui;vers org.wso2.carbon.apimgt.application.extension.exception,
ion="[4.1,5)",org.wso2.carbon.identity.jwt.client.extension,org.wso2. org.wso2.carbon.apimgt.impl;version="[9.0,10)",
carbon.identity.jwt.client.extension.dto,org.wso2.carbon.identity.jwt org.wso2.carbon.apimgt.impl.utils;version="[9.0,10)",
.client.extension.exception,org.wso2.carbon.identity.jwt.client.exten org.wso2.carbon.context;version="[4.6,5)",
sion.service,org.wso2.carbon.registry.core.exceptions;version="[1.0,2 org.wso2.carbon.device.mgt.core.config.ui;version="[4.1,5)",
)",org.wso2.carbon.registry.core.service;version="[1.0,2)",org.wso2.c org.wso2.carbon.identity.jwt.client.extension,
arbon.registry.indexing.service;version="[4.7,5)",org.wso2.carbon.use org.wso2.carbon.identity.jwt.client.extension.dto,
r.api;version="[1.0,2)",org.wso2.carbon.user.core.service;version="[4 org.wso2.carbon.identity.jwt.client.extension.exception,
.6,5)",org.wso2.carbon.user.core.tenant;version="[4.6,5)" org.wso2.carbon.identity.jwt.client.extension.service,
org.wso2.carbon.registry.core.exceptions;version="[1.0,2)",
org.wso2.carbon.registry.core.service;version="[1.0,2)",
org.wso2.carbon.registry.indexing.service;version="[4.7,5)",
org.wso2.carbon.user.api;version="[1.0,2)",
org.wso2.carbon.user.core.service;version="[4.6,5)",
org.wso2.carbon.user.core.tenant;version="[4.6,5)"
</Import-Packages> </Import-Packages>
<Export-Package> <Export-Package>
!org.wso2.carbon.apimgt.application.extension.internal, !org.wso2.carbon.apimgt.application.extension.internal,

5
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderService.java
Unescape View File

@ -21,8 +21,6 @@ package org.wso2.carbon.apimgt.application.extension;
import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey; import org.wso2.carbon.apimgt.application.extension.dto.ApiApplicationKey;
import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException; import org.wso2.carbon.apimgt.application.extension.exception.APIManagerException;
import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo; import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
//import org.wso2.carbon.apimgt.integration.client.store.StoreClient;
//import org.wso2.carbon.identity.jwt.client.extension.dto.AccessTokenInfo;
/** /**
* This comprise on operation that is been done with api manager from CDMF. This service needs to be implemented in APIM. * This comprise on operation that is been done with api manager from CDMF. This service needs to be implemented in APIM.
@ -62,11 +60,10 @@ public interface APIManagementProviderService {
* @param username to whom the application is created * @param username to whom the application is created
* @param isAllowedAllDomains application is allowed to all the tenants * @param isAllowedAllDomains application is allowed to all the tenants
* @param validityTime validity period of the application * @param validityTime validity period of the application
// * @param storeClient Specified store client * @param scopes scopes
* @return consumerkey and secrete of the created application. * @return consumerkey and secrete of the created application.
* @throws APIManagerException * @throws APIManagerException
*/ */
ApiApplicationKey generateAndRetrieveApplicationKeys(String apiApplicationName, ApiApplicationKey generateAndRetrieveApplicationKeys(String apiApplicationName,
String tags[], String tags[],
String keyType, String keyType,

66
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/APIManagementProviderServiceImpl.java
Unescape View File

@ -18,20 +18,17 @@
package org.wso2.carbon.apimgt.application.extension; package org.wso2.carbon.apimgt.application.extension;
//import feign.FeignException;
import org.apache.commons.lang.StringUtils; import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.apimgt.api.APIAdmin; import org.wso2.carbon.apimgt.api.APIAdmin;
import org.wso2.carbon.apimgt.api.APIConsumer; import org.wso2.carbon.apimgt.api.APIConsumer;
import org.wso2.carbon.apimgt.api.APIManagementException; import org.wso2.carbon.apimgt.api.APIManagementException;
import org.wso2.carbon.apimgt.api.APIProvider;
import org.wso2.carbon.apimgt.api.dto.KeyManagerConfigurationDTO; import org.wso2.carbon.apimgt.api.dto.KeyManagerConfigurationDTO;
import org.wso2.carbon.apimgt.api.model.API; import org.wso2.carbon.apimgt.api.model.API;
import org.wso2.carbon.apimgt.api.model.APIKey; import org.wso2.carbon.apimgt.api.model.APIKey;
import org.wso2.carbon.apimgt.api.model.ApiTypeWrapper; import org.wso2.carbon.apimgt.api.model.ApiTypeWrapper;
import org.wso2.carbon.apimgt.api.model.Application; import org.wso2.carbon.apimgt.api.model.Application;
import org.wso2.carbon.apimgt.api.model.KeyManagerConfiguration;
import org.wso2.carbon.apimgt.api.model.SubscribedAPI; import org.wso2.carbon.apimgt.api.model.SubscribedAPI;
import org.wso2.carbon.apimgt.api.model.Subscriber; import org.wso2.carbon.apimgt.api.model.Subscriber;
import org.wso2.carbon.apimgt.application.extension.bean.APIRegistrationProfile; import org.wso2.carbon.apimgt.application.extension.bean.APIRegistrationProfile;
@ -43,17 +40,6 @@ import org.wso2.carbon.apimgt.application.extension.util.APIManagerUtil;
import org.wso2.carbon.apimgt.impl.APIAdminImpl; import org.wso2.carbon.apimgt.impl.APIAdminImpl;
import org.wso2.carbon.apimgt.impl.APIConstants; import org.wso2.carbon.apimgt.impl.APIConstants;
import org.wso2.carbon.apimgt.impl.APIManagerFactory; import org.wso2.carbon.apimgt.impl.APIManagerFactory;
//import org.wso2.carbon.apimgt.integration.client.OAuthRequestInterceptor;
//import org.wso2.carbon.apimgt.integration.client.store.StoreClient;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.APIInfo;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.APIList;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.Application;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.ApplicationInfo;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.ApplicationKey;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.ApplicationKeyGenerateRequest;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.ApplicationList;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.Subscription;
//import org.wso2.carbon.apimgt.integration.generated.client.store.model.SubscriptionList;
import org.wso2.carbon.apimgt.impl.utils.APIUtil; import org.wso2.carbon.apimgt.impl.utils.APIUtil;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.device.mgt.core.config.ui.UIConfiguration; import org.wso2.carbon.device.mgt.core.config.ui.UIConfiguration;
@ -66,7 +52,6 @@ import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.utils.multitenancy.MultitenantConstants; import org.wso2.carbon.utils.multitenancy.MultitenantConstants;
import java.util.ArrayList; import java.util.ArrayList;
import java.util.HashMap;
import java.util.HashSet; import java.util.HashSet;
import java.util.List; import java.util.List;
import java.util.Map; import java.util.Map;
@ -78,66 +63,34 @@ import java.util.Set;
public class APIManagementProviderServiceImpl implements APIManagementProviderService { public class APIManagementProviderServiceImpl implements APIManagementProviderService {
private static final Log log = LogFactory.getLog(APIManagementProviderServiceImpl.class); private static final Log log = LogFactory.getLog(APIManagementProviderServiceImpl.class);
private static final String CONTENT_TYPE = "application/json";
private static final int MAX_API_PER_TAG = 200;
private static final String APP_TIER_TYPE = "application";
public static final APIManagerFactory API_MANAGER_FACTORY = APIManagerFactory.getInstance(); public static final APIManagerFactory API_MANAGER_FACTORY = APIManagerFactory.getInstance();
@Override @Override
public boolean isTierLoaded() { public boolean isTierLoaded() {
// StoreClient storeClient = APIApplicationManagerExtensionDataHolder.getInstance().getIntegrationClientService()
// .getStoreClient(); String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext()
.getTenantDomain();
// String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
// try {
try { try {
APIUtil.getTiers(APIConstants.TIER_APPLICATION_TYPE, tenantDomain); APIUtil.getTiers(APIConstants.TIER_APPLICATION_TYPE, tenantDomain);
return true;
} catch (APIManagementException e) { } catch (APIManagementException e) {
log.error("APIs not ready", e); log.error("APIs not ready", e);
} }
// storeClient.getIndividualTier().tiersTierLevelTierNameGet(ApiApplicationConstants.DEFAULT_TIER,
// APP_TIER_TYPE, return false;
// tenantDomain, CONTENT_TYPE, null, null);
return true;
// } catch (FeignException e) {
// log.error("Feign Exception", e);
// if (e.status() == 401) {
// OAuthRequestInterceptor oAuthRequestInterceptor = new OAuthRequestInterceptor();
// String username = PrivilegedCarbonContext.getThreadLocalCarbonContext().getUsername();
// oAuthRequestInterceptor.removeToken(username, tenantDomain);
// try {
// storeClient.getIndividualTier().tiersTierLevelTierNameGet(ApiApplicationConstants.DEFAULT_TIER,
// APP_TIER_TYPE, tenantDomain, CONTENT_TYPE, null, null);
// } catch (FeignException ex) {
// log.error("Invalid Attempt : " + ex);
// }
// }
// } catch (Exception e) {
// log.error("APIs not ready", e);
// }
// return false;
} }
@Override @Override
public void removeAPIApplication(String applicationName, String username) throws APIManagerException { public void removeAPIApplication(String applicationName, String username) throws APIManagerException {
// StoreClient storeClient = APIApplicationManagerExtensionDataHolder.getInstance().getIntegrationClientService()
// .getStoreClient();
// ApplicationList applicationList = storeClient.getApplications()
// .applicationsGet("", applicationName, 1, 0, CONTENT_TYPE, null);
try { try {
APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username); APIConsumer apiConsumer = API_MANAGER_FACTORY.getAPIConsumer(username);
Application application = apiConsumer.getApplicationsByName(username, applicationName, ""); Application application = apiConsumer.getApplicationsByName(username, applicationName, "");
if (application != null) { if (application != null) {
// ApplicationInfo applicationInfo = applicationList.getList().get(0);
// storeClient.getIndividualApplication().applicationsApplicationIdDelete(applicationInfo.getApplicationId(),
// null, null);
apiConsumer.removeApplication(application, username); apiConsumer.removeApplication(application, username);
} }
} catch (APIManagementException e) { } catch (APIManagementException e) {
//todo:amalka throw new APIManagerException("Failed to remove api application : " + applicationName, e);
e.printStackTrace();
} }
@ -148,9 +101,8 @@ public class APIManagementProviderServiceImpl implements APIManagementProviderSe
*/ */
@Override @Override
public synchronized ApiApplicationKey generateAndRetrieveApplicationKeys(String applicationName, String tags[], public synchronized ApiApplicationKey generateAndRetrieveApplicationKeys(String applicationName, String tags[],
String keyType, String username, String keyType, String username, boolean isAllowedAllDomains, String validityTime, String scopes)
boolean isAllowedAllDomains, throws APIManagerException {
String validityTime, String scopes) throws APIManagerException {
String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain(); String tenantDomain = PrivilegedCarbonContext.getThreadLocalCarbonContext().getTenantDomain();
if (StringUtils.isEmpty(username)) { if (StringUtils.isEmpty(username)) {

11
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/internal/APIApplicationManagerExtensionDataHolder.java
Unescape View File

@ -18,7 +18,6 @@
package org.wso2.carbon.apimgt.application.extension.internal; package org.wso2.carbon.apimgt.application.extension.internal;
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
//import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
import org.wso2.carbon.context.PrivilegedCarbonContext; import org.wso2.carbon.context.PrivilegedCarbonContext;
import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService; import org.wso2.carbon.identity.jwt.client.extension.service.JWTClientManagerService;
import org.wso2.carbon.registry.core.service.TenantRegistryLoader; import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
@ -35,7 +34,6 @@ public class APIApplicationManagerExtensionDataHolder {
private TenantManager tenantManager; private TenantManager tenantManager;
private TenantRegistryLoader tenantRegistryLoader; private TenantRegistryLoader tenantRegistryLoader;
private TenantIndexingLoader indexLoader; private TenantIndexingLoader indexLoader;
// private IntegrationClientService integrationClientService;
private JWTClientManagerService jwtClientManagerService; private JWTClientManagerService jwtClientManagerService;
private APIApplicationManagerExtensionDataHolder() { private APIApplicationManagerExtensionDataHolder() {
@ -94,15 +92,6 @@ public class APIApplicationManagerExtensionDataHolder {
return indexLoader; return indexLoader;
} }
// public IntegrationClientService getIntegrationClientService() {
// return integrationClientService;
// }
//
// public void setIntegrationClientService(
// IntegrationClientService integrationClientService) {
// this.integrationClientService = integrationClientService;
// }
public JWTClientManagerService getJwtClientManagerService() { public JWTClientManagerService getJwtClientManagerService() {
if (jwtClientManagerService == null) { if (jwtClientManagerService == null) {
PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();

12
components/apimgt-extensions/org.wso2.carbon.apimgt.application.extension/src/main/java/org/wso2/carbon/apimgt/application/extension/internal/APIApplicationManagerExtensionServiceComponent.java
Unescape View File

@ -23,7 +23,6 @@ import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext;; import org.osgi.service.component.ComponentContext;;
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService; import org.wso2.carbon.apimgt.application.extension.APIManagementProviderService;
import org.wso2.carbon.apimgt.application.extension.APIManagementProviderServiceImpl; import org.wso2.carbon.apimgt.application.extension.APIManagementProviderServiceImpl;
//import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
import org.wso2.carbon.registry.core.service.TenantRegistryLoader; import org.wso2.carbon.registry.core.service.TenantRegistryLoader;
import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader; import org.wso2.carbon.registry.indexing.service.TenantIndexingLoader;
import org.wso2.carbon.user.core.service.RealmService; import org.wso2.carbon.user.core.service.RealmService;
@ -91,17 +90,6 @@ public class APIApplicationManagerExtensionServiceComponent {
APIApplicationManagerExtensionDataHolder.getInstance().setIndexLoaderService(null); APIApplicationManagerExtensionDataHolder.getInstance().setIndexLoaderService(null);
} }
// protected void setIntegrationClientService(IntegrationClientService integrationClientService) {
// if (integrationClientService != null && log.isDebugEnabled()) {
// log.debug("integrationClientService initialized");
// }
// APIApplicationManagerExtensionDataHolder.getInstance().setIntegrationClientService(integrationClientService);
// }
//
// protected void unsetIntegrationClientService(IntegrationClientService integrationClientService) {
// APIApplicationManagerExtensionDataHolder.getInstance().setIntegrationClientService(null);
// }
/** /**
* Sets Realm Service. * Sets Realm Service.
* *

164
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/pom.xml
Unescape View File

@ -47,39 +47,46 @@
org.wso2.carbon.apimgt.integration.client.*, org.wso2.carbon.apimgt.integration.client.*,
!org.wso2.carbon.apimgt.integration.client.internal !org.wso2.carbon.apimgt.integration.client.internal
</Export-Package> </Export-Package>
<!--<Import-Package>--> <Import-Package>
<!--feign;version="9.3",feign.auth;version="9.3",feign.cod--> org.osgi.framework,
<!--ec;version="9.3",feign.gson;version="9.3",feign.jaxrs;version="9.3",f--> org.osgi.service.component,
<!--eign.okhttp;version="9.3",feign.slf4j;version="10.7",javax.net.ssl,ja--> feign,
<!--vax.ws.rs,javax.xml,javax.xml.bind;version="2.3",javax.xml.bind.annot--> feign.codec,
<!--ation;version="2.3",javax.xml.parsers,okhttp3,org.apache.commons.lang--> feign.auth,
<!--;version="2.4",org.apache.commons.logging;version="1.2",org.osgi.fram--> feign.gson,
<!--ework;version="1.7",org.osgi.service.component;version="1.2",org.w3c.--> feign.slf4j,
<!--dom,org.wso2.carbon.apimgt.integration.client,org.wso2.carbon.apimgt.--> org.wso2.carbon.apimgt.integration.generated.client.publisher.api,
<!--integration.client.configs,org.wso2.carbon.apimgt.integration.client.--> org.wso2.carbon.apimgt.integration.generated.client.store.api,
<!--exception,org.wso2.carbon.apimgt.integration.client.internal,org.wso2--> javax.xml.bind,
<!--.carbon.apimgt.integration.client.model,org.wso2.carbon.apimgt.integr--> javax.xml.bind.annotation,
<!--ation.client.publisher,org.wso2.carbon.apimgt.integration.client.serv--> javax.xml.parsers;resolution:=optional,
<!--ice,org.wso2.carbon.apimgt.integration.client.store,org.wso2.carbon.a--> org.apache.commons.logging,
<!--pimgt.integration.client.util,org.wso2.carbon.base;version="1.0",org.--> org.w3c.dom,
<!--wso2.carbon.context;version="4.6",org.wso2.carbon.core.util;version="--> org.wso2.carbon.context,
<!--4.6",org.wso2.carbon.identity.jwt.client.extension,org.wso2.carbon.id--> org.wso2.carbon.identity.jwt.client.*,
<!--entity.jwt.client.extension.dto,org.wso2.carbon.identity.jwt.client.e--> org.wso2.carbon.user.api,
<!--xtension.exception,org.wso2.carbon.identity.jwt.client.extension.serv--> org.wso2.carbon.utils,
<!--ice,org.wso2.carbon.utils;version="4.6"--> com.fasterxml.jackson.annotation,
io.swagger.annotations,
org.wso2.carbon.core.util,
<!--org.osgi.framework.*;version="${imp.package.version.osgi.framework}",--> javax.xml,
<!--org.osgi.service.*;version="${imp.package.version.osgi.service}",--> org.wso2.carbon.base,
javax.net.ssl,
<!--</Import-Package>--> org.apache.commons.lang,
<!--<Embed-Dependency>--> android.util;resolution:=optional,
<!--jsr311-api,--> javax.annotation;resolution:=optional,
<!--feign-jaxrs,--> javax.net;resolution:=optional,
<!--feign-okhttp,--> javax.security.auth.x500;resolution:=optional,
<!--okhttp,--> javax.crypto;resolution:=optional,
<!--okio--> javax.crypto.spec;resolution:=optional
<!--</Embed-Dependency>--> </Import-Package>
<Embed-Dependency>
jsr311-api,
feign-jaxrs,
feign-okhttp,
okhttp,
okio
</Embed-Dependency>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
@ -113,60 +120,55 @@
</build> </build>
<dependencies> <dependencies>
<!--<dependency>--> <dependency>
<!--<groupId>com.squareup.okhttp3</groupId>--> <groupId>com.squareup.okhttp3</groupId>
<!--<artifactId>okhttp</artifactId>--> <artifactId>okhttp</artifactId>
<!--</dependency>--> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>com.squareup.okio</groupId>--> <groupId>com.squareup.okio</groupId>
<!--<artifactId>okio</artifactId>--> <artifactId>okio</artifactId>
<!--</dependency>--> </dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-okhttp</artifactId> <artifactId>feign-okhttp</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>feign-slf4j</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
<version>10.7.2</version> </dependency>
</dependency> <dependency>
<!--<dependency>--> <groupId>org.eclipse.osgi</groupId>
<!--<groupId>org.wso2.carbon</groupId>--> <artifactId>org.eclipse.osgi</artifactId>
<!--<artifactId>org.wso2.carbon.logging</artifactId>--> </dependency>
<!--</dependency>--> <dependency>
<!--<dependency>--> <groupId>org.eclipse.osgi</groupId>
<!--<groupId>org.eclipse.osgi</groupId>--> <artifactId>org.eclipse.osgi.services</artifactId>
<!--<artifactId>org.eclipse.osgi</artifactId>--> </dependency>
<!--</dependency>--> <dependency>
<!--<dependency>--> <groupId>com.google.code.gson</groupId>
<!--<groupId>org.eclipse.osgi</groupId>--> <artifactId>gson</artifactId>
<!--<artifactId>org.eclipse.osgi.services</artifactId>--> </dependency>
<!--</dependency>--> <dependency>
<!--<dependency>--> <groupId>javax.ws.rs</groupId>
<!--<groupId>com.google.code.gson</groupId>--> <artifactId>jsr311-api</artifactId>
<!--<artifactId>gson</artifactId>--> </dependency>
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>javax.ws.rs</groupId>-->
<!--<artifactId>jsr311-api</artifactId>-->
<!--</dependency>-->
<!--<dependency>--> <dependency>
<!--<groupId>io.swagger</groupId>--> <groupId>io.swagger</groupId>
<!--<artifactId>swagger-annotations</artifactId>--> <artifactId>swagger-annotations</artifactId>
<!--</dependency>--> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>junit</groupId>--> <groupId>junit</groupId>
<!--<artifactId>junit</artifactId>--> <artifactId>junit</artifactId>
<!--</dependency>--> </dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-core</artifactId> <artifactId>feign-core</artifactId>
</dependency> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>io.github.openfeign</groupId>--> <groupId>io.github.openfeign</groupId>
<!--<artifactId>feign-jackson</artifactId>--> <artifactId>feign-jackson</artifactId>
<!--</dependency>--> </dependency>
<dependency> <dependency>
<groupId>io.github.openfeign</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>feign-jaxrs</artifactId> <artifactId>feign-jaxrs</artifactId>
@ -176,10 +178,10 @@
<artifactId>feign-gson</artifactId> <artifactId>feign-gson</artifactId>
</dependency> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>org.testng</groupId>--> <groupId>org.testng</groupId>
<!--<artifactId>testng</artifactId>--> <artifactId>testng</artifactId>
<!--</dependency>--> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId> <artifactId>org.wso2.carbon.identity.jwt.client.extension</artifactId>

89
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/publisher/PublisherClient.java
Unescape View File

@ -27,8 +27,7 @@ import feign.slf4j.Slf4jLogger;
import org.apache.commons.logging.Log; import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.apimgt.integration.client.configs.APIMConfigReader; import org.wso2.carbon.apimgt.integration.client.configs.APIMConfigReader;
import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.ApIsApi; import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.*;
import org.wso2.carbon.apimgt.integration.generated.client.publisher.api.ApiLifecycleApi;
import org.wso2.carbon.core.util.Utils; import org.wso2.carbon.core.util.Utils;
/** /**
@ -37,15 +36,13 @@ import org.wso2.carbon.core.util.Utils;
public class PublisherClient { public class PublisherClient {
private static final Log log = LogFactory.getLog(PublisherClient.class); private static final Log log = LogFactory.getLog(PublisherClient.class);
private ApIsApi apIsApi = null; private APIIndividualApi api = null;
private ApiLifecycleApi apiLifecycleApi = null; private APICollectionApi apis = null;
// private APIIndividualApi api = null; private DocumentIndividualApi document = null;
// private APICollectionApi apis = null; private ApplicationIndividualApi application = null;
// private DocumentIndividualApi document = null; private EnvironmentCollectionApi environments = null;
// private ApplicationIndividualApi application = null; private SubscriptionCollectionApi subscriptions = null;
// private EnvironmentCollectionApi environments = null; private ThrottlingTierCollectionApi tiers = null;
// private SubscriptionApi subscriptions = null;
// private ThrottlingTierCollectionApi tiers = null;
/** /**
@ -60,50 +57,40 @@ public class PublisherClient {
.requestInterceptor(requestInterceptor).encoder(new GsonEncoder()).decoder(new GsonDecoder()); .requestInterceptor(requestInterceptor).encoder(new GsonEncoder()).decoder(new GsonDecoder());
String basePath = Utils.replaceSystemProperty(APIMConfigReader.getInstance().getConfig().getPublisherEndpoint()); String basePath = Utils.replaceSystemProperty(APIMConfigReader.getInstance().getConfig().getPublisherEndpoint());
apIsApi = builder.target(ApIsApi.class, basePath); api = builder.target(APIIndividualApi.class, basePath);
apiLifecycleApi = builder.target(ApiLifecycleApi.class, basePath); apis = builder.target(APICollectionApi.class, basePath);
// api = builder.target(APIIndividualApi.class, basePath); document = builder.target(DocumentIndividualApi.class, basePath);
// apis = builder.target(APICollectionApi.class, basePath); application = builder.target(ApplicationIndividualApi.class, basePath);
// document = builder.target(DocumentIndividualApi.class, basePath); environments = builder.target(EnvironmentCollectionApi.class, basePath);
// application = builder.target(ApplicationIndividualApi.class, basePath); subscriptions = builder.target(SubscriptionCollectionApi.class, basePath);
// environments = builder.target(EnvironmentCollectionApi.class, basePath); tiers = builder.target(ThrottlingTierCollectionApi.class, basePath);
// subscriptions = builder.target(SubscriptionCollectionApi.class, basePath);
// tiers = builder.target(ThrottlingTierCollectionApi.class, basePath);
} }
public ApIsApi getApIsApi() { public APIIndividualApi getApi() {
return apIsApi; return api;
} }
public ApiLifecycleApi getApiLifecycleApi() { public APICollectionApi getApis() {
return apiLifecycleApi; return apis;
} }
// public APIIndividualApi getApi() { public DocumentIndividualApi getDocument() {
// return api; return document;
// } }
//
// public APICollectionApi getApis() { public ApplicationIndividualApi getApplication() {
// return apis; return application;
// } }
//
// public DocumentIndividualApi getDocument() { public EnvironmentCollectionApi getEnvironments() {
// return document; return environments;
// } }
//
// public ApplicationIndividualApi getApplication() { public SubscriptionCollectionApi getSubscriptions() {
// return application; return subscriptions;
// } }
//
// public EnvironmentCollectionApi getEnvironments() { public ThrottlingTierCollectionApi getTiers() {
// return environments; return tiers;
// } }
//
// public SubscriptionCollectionApi getSubscriptions() {
// return subscriptions;
// }
//
// public ThrottlingTierCollectionApi getTiers() {
// return tiers;
// }
} }

124
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.client/src/main/java/org/wso2/carbon/apimgt/integration/client/store/StoreClient.java
Unescape View File

@ -39,17 +39,16 @@ import java.util.concurrent.TimeUnit;
public class StoreClient { public class StoreClient {
private static final org.apache.commons.logging.Log log = LogFactory.getLog(StoreClient.class); private static final org.apache.commons.logging.Log log = LogFactory.getLog(StoreClient.class);
private ApplicationsApi applicationsApi = null; private APICollectionApi apis = null;
// private APICollectionApi apis = null; private APIIndividualApi individualApi = null;
// private ApIsApi individualApi = null; private ApplicationCollectionApi applications = null;
// private ApplicationsApi applications = null; private ApplicationIndividualApi individualApplication = null;
// private ApplicationIndividualApi individualApplication = null; private SubscriptionCollectionApi subscriptions = null;
// private SubscriptionCollectionApi subscriptions = null; private SubscriptionIndividualApi individualSubscription = null;
// private SubscriptionIndividualApi individualSubscription = null; private SubscriptionMultitpleApi subscriptionMultitpleApi = null;
// private SubscriptionMultitpleApi subscriptionMultitpleApi = null; private ThrottlingTierIndividualApi individualTier = null;
// private ThrottlingTierIndividualApi individualTier = null; private TagCollectionApi tags = null;
// private TagsApi tags = null; private ThrottlingTierCollectionApi tiers = null;
// private ThrottlingTierCollectionApi tiers = null;
public StoreClient(RequestInterceptor requestInterceptor) { public StoreClient(RequestInterceptor requestInterceptor) {
@ -61,59 +60,58 @@ public class StoreClient {
.requestInterceptor(requestInterceptor).encoder(new GsonEncoder()).decoder(new GsonDecoder()); .requestInterceptor(requestInterceptor).encoder(new GsonEncoder()).decoder(new GsonDecoder());
String basePath = Utils.replaceSystemProperty(APIMConfigReader.getInstance().getConfig().getStoreEndpoint()); String basePath = Utils.replaceSystemProperty(APIMConfigReader.getInstance().getConfig().getStoreEndpoint());
applicationsApi = builder.target(ApplicationsApi.class, basePath); apis = builder.target(APICollectionApi.class, basePath);
// apis = builder.target(APICollectionApi.class, basePath); individualApi = builder.target(APIIndividualApi.class, basePath);
// individualApi = builder.target(ApIsApi.class, basePath); applications = builder.target(ApplicationCollectionApi.class, basePath);
// applications = builder.target(ApplicationCollectionApi.class, basePath); individualApplication = builder.target(ApplicationIndividualApi.class, basePath);
// individualApplication = builder.target(ApplicationIndividualApi.class, basePath); subscriptions = builder.target(SubscriptionCollectionApi.class, basePath);
// subscriptions = builder.target(SubscriptionCollectionApi.class, basePath); individualSubscription = builder.target(SubscriptionIndividualApi.class, basePath);
// individualSubscription = builder.target(SubscriptionIndividualApi.class, basePath); subscriptionMultitpleApi = builder.target(SubscriptionMultitpleApi.class, basePath);
// subscriptionMultitpleApi = builder.target(SubscriptionMultitpleApi.class, basePath); tags = builder.target(TagCollectionApi.class, basePath);
// tags = builder.target(TagCollectionApi.class, basePath); individualTier = builder.target(ThrottlingTierIndividualApi.class, basePath);
// individualTier = builder.target(ThrottlingTierIndividualApi.class, basePath); tiers = builder.retryer(new Retryer.Default(100L, TimeUnit.SECONDS.toMillis(1L), 1))
// tiers = builder.retryer(new Retryer.Default(100L, TimeUnit.SECONDS.toMillis(1L), 1)) .options(new Request.Options(10000, 5000))
// .options(new Request.Options(10000, 5000)) .target(ThrottlingTierCollectionApi.class, basePath);
// .target(ThrottlingTierCollectionApi.class, basePath);
} }
// public APICollectionApi getApis() { public APICollectionApi getApis() {
// return apis; return apis;
// } }
//
// public APIIndividualApi getIndividualApi() { public APIIndividualApi getIndividualApi() {
// return individualApi; return individualApi;
// } }
//
// public ApplicationCollectionApi getApplications() { public ApplicationCollectionApi getApplications() {
// return applications; return applications;
// } }
//
// public ApplicationIndividualApi getIndividualApplication() { public ApplicationIndividualApi getIndividualApplication() {
// return individualApplication; return individualApplication;
// } }
//
// public SubscriptionCollectionApi getSubscriptions() { public SubscriptionCollectionApi getSubscriptions() {
// return subscriptions; return subscriptions;
// } }
//
// public SubscriptionIndividualApi getIndividualSubscription() { public SubscriptionIndividualApi getIndividualSubscription() {
// return individualSubscription; return individualSubscription;
// } }
//
// public ThrottlingTierIndividualApi getIndividualTier() { public ThrottlingTierIndividualApi getIndividualTier() {
// return individualTier; return individualTier;
// } }
//
// public TagCollectionApi getTags() { public TagCollectionApi getTags() {
// return tags; return tags;
// } }
//
// public ThrottlingTierCollectionApi getTiers() { public ThrottlingTierCollectionApi getTiers() {
// return tiers; return tiers;
// } }
//
// public SubscriptionMultitpleApi getSubscriptionMultitpleApi() { public SubscriptionMultitpleApi getSubscriptionMultitpleApi() {
// return subscriptionMultitpleApi; return subscriptionMultitpleApi;
// } }
} }

176
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/pom.xml
Unescape View File

@ -26,12 +26,12 @@
<url>http://wso2.org</url> <url>http://wso2.org</url>
<build> <build>
<plugins> <plugins>
<!--swagger yaml is used to generate code-->
<plugin> <plugin>
<groupId>org.openapitools</groupId> <groupId>io.swagger</groupId>
<artifactId>openapi-generator-maven-plugin</artifactId> <artifactId>swagger-codegen-maven-plugin</artifactId>
<version>5.0.0</version> <version>2.2.1</version>
<executions> <executions>
<execution> <execution>
<phase>process-resources</phase> <phase>process-resources</phase>
@ -41,11 +41,12 @@
</goals> </goals>
<configuration> <configuration>
<inputSpec>${project.basedir}/src/main/resources/publisher-api.yaml</inputSpec> <inputSpec>${project.basedir}/src/main/resources/publisher-api.yaml</inputSpec>
<generatorName>java</generatorName> <language>java</language>
<configOptions> <configOptions>
<apiPackage>${project.artifactId}.publisher.api</apiPackage> <apiPackage>${project.artifactId}.publisher.api</apiPackage>
<modelPackage>${project.artifactId}.publisher.model</modelPackage> <modelPackage>${project.artifactId}.publisher.model</modelPackage>
</configOptions> </configOptions>
<library>feign</library>
</configuration> </configuration>
</execution> </execution>
<execution> <execution>
@ -55,12 +56,13 @@
<goal>generate</goal> <goal>generate</goal>
</goals> </goals>
<configuration> <configuration>
<inputSpec>${project.basedir}/src/main/resources/devportal-api.yaml</inputSpec> <inputSpec>${project.basedir}/src/main/resources/store-api.yaml</inputSpec>
<generatorName>java</generatorName> <language>java</language>
<configOptions> <configOptions>
<apiPackage>${project.artifactId}.store.api</apiPackage> <apiPackage>${project.artifactId}.store.api</apiPackage>
<modelPackage>${project.artifactId}.store.model</modelPackage> <modelPackage>${project.artifactId}.store.model</modelPackage>
</configOptions> </configOptions>
<library>feign</library>
</configuration> </configuration>
</execution> </execution>
</executions> </executions>
@ -70,15 +72,15 @@
<artifactId>replacer</artifactId> <artifactId>replacer</artifactId>
<version>1.5.2</version> <version>1.5.2</version>
<executions> <executions>
<!--Replace java code that is generated from swagger to fix swagger client generation issues.--> <!-- Replace java code that is generated from swagger to fix swagger client generation issues. -->
<execution> <execution>
<phase>process-resources</phase> <phase>process-resources</phase>
<id>replace-for-openapi-genenerated-code-publisher</id> <id>replace-for-swagger-genenerated-code-publisher</id>
<goals> <goals>
<goal>replace</goal> <goal>replace</goal>
</goals> </goals>
<configuration> <configuration>
<file>${project.basedir}/target/generated-sources/openapi/src/main/java/org/wso2/carbon/apimgt/integration/generated/client/publisher/model/API.java</file> <file>${project.basedir}/target/generated-sources/swagger/src/main/java/org/wso2/carbon/apimgt/integration/generated/client/publisher/model/API.java</file>
<replacements> <replacements>
<replacement> <replacement>
<token>CURRENT_TENANT</token> <token>CURRENT_TENANT</token>
@ -114,32 +116,27 @@
org.wso2.carbon.apimgt.integration.generated.client.store.model.* org.wso2.carbon.apimgt.integration.generated.client.store.model.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
com.google.gson;version="[2.8,3)", feign;version="${io.github.openfeign.version.range}",
com.google.gson.annotations;version="[2.8,3)", feign.jackson;version="${io.github.openfeign.version.range}",
com.google.gson.internal.bind.util, feign.codec;version="${io.github.openfeign.version.range}",
com.google.gson.reflect;version="[2.8,3)", feign.auth;version="${io.github.openfeign.version.range}",
com.google.gson.stream;version="[2.8,3)", feign.gson;version="${io.github.openfeign.version.range}",
io.gsonfire;version="[1.8,2)", feign.slf4j;version="${io.github.openfeign.version.range}",
io.swagger.annotations;version="[1.5,2)", com.google.gson,
javax.annotation;version="[3.0,4)", com.fasterxml.jackson.core;resolution:=optional,
com.fasterxml.jackson.annotation,
com.fasterxml.jackson.databind;resolution:=optional,
io.swagger.annotations,
javax.net.ssl, javax.net.ssl,
okhttp3, com.fasterxml.jackson.datatype.joda;resolution:=optional,
okhttp3.internal.http, org.apache.oltu.oauth2.client.*;resolution:=optional,
okhttp3.internal.tls, org.apache.oltu.oauth2.common.*;resolution:=optional,
okhttp3.logging, org.junit;resolution:=optional,
okio,
org.apache.oltu.oauth2.client;version="[1.0,2)",
org.apache.oltu.oauth2.client.request;version="[1.0,2)",
org.apache.oltu.oauth2.client.response;version="[1.0,2)",
org.apache.oltu.oauth2.common.exception;version="[1.0,2)",
org.apache.oltu.oauth2.common.message.types;version="[1.0,2)",
org.threeten.bp;version="[1.5,2)",
org.threeten.bp.format;version="[1.5,2)",
org.threeten.bp.temporal;version="[1.5,2)",
org.wso2.carbon.apimgt.integration.generated.client.publisher.model,
org.wso2.carbon.apimgt.integration.generated.client.store.model
</Import-Package> </Import-Package>
<Embed-Dependency>
jsr311-api,
feign-jaxrs
</Embed-Dependency>
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
@ -148,105 +145,60 @@
</build> </build>
<dependencies> <dependencies>
<dependency>
<groupId>io.swagger.core.v3</groupId>
<artifactId>swagger-annotations</artifactId>
<version>2.1.7</version>
</dependency>
<!---->
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<version>2.8.5</version>
</dependency> </dependency>
<!--<dependency>--> <dependency>
<!--<groupId>javax.ws.rs</groupId>--> <groupId>javax.ws.rs</groupId>
<!--<artifactId>jsr311-api</artifactId>--> <artifactId>jsr311-api</artifactId>
<!--</dependency>--> </dependency>
<dependency> <dependency>
<groupId>io.swagger</groupId> <groupId>io.swagger</groupId>
<artifactId>swagger-annotations</artifactId> <artifactId>swagger-annotations</artifactId>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>junit</groupId>
<artifactId>okhttp</artifactId> <artifactId>junit</artifactId>
<version>4.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.oltu.oauth2</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId> <artifactId>feign-core</artifactId>
<version>1.0.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.squareup.okhttp3</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>logging-interceptor</artifactId> <artifactId>feign-jackson</artifactId>
<version>4.9.1</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.threeten</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>threetenbp</artifactId> <artifactId>feign-jaxrs</artifactId>
<version>1.5.0</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.gsonfire</groupId> <groupId>io.github.openfeign</groupId>
<artifactId>gson-fire</artifactId> <artifactId>feign-gson</artifactId>
<version>1.8.5</version>
</dependency> </dependency>
<dependency> <dependency>
<groupId>io.swagger.parser.v3</groupId> <groupId>org.testng</groupId>
<artifactId>swagger-parser</artifactId> <artifactId>testng</artifactId>
<version>2.0.25</version> </dependency>
<dependency>
<groupId>org.apache.oltu.oauth2</groupId>
<artifactId>org.apache.oltu.oauth2.client</artifactId>
</dependency>
<dependency>
<groupId>io.github.openfeign</groupId>
<artifactId>feign-slf4j</artifactId>
</dependency>
<dependency>
<groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>
<artifactId>jackson-databind</artifactId>
<version>${jackson-databind.version}</version>
</dependency>
<dependency>
<groupId>com.fasterxml.jackson.datatype</groupId>
<artifactId>jackson-datatype-joda</artifactId>
</dependency> </dependency>
<!--<dependency>-->
<!--<groupId>junit</groupId>-->
<!--<artifactId>junit</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>io.github.openfeign</groupId>-->
<!--<artifactId>feign-core</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>io.github.openfeign</groupId>-->
<!--<artifactId>feign-jackson</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>io.github.openfeign</groupId>-->
<!--<artifactId>feign-jaxrs</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>io.github.openfeign</groupId>-->
<!--<artifactId>feign-gson</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.testng</groupId>-->
<!--<artifactId>testng</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.apache.oltu.oauth2</groupId>-->
<!--<artifactId>org.apache.oltu.oauth2.client</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>io.github.openfeign</groupId>-->
<!--<artifactId>feign-slf4j</artifactId>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>org.wso2.orbit.com.fasterxml.jackson.core</groupId>-->
<!--<artifactId>jackson-databind</artifactId>-->
<!--<version>${jackson-databind.version}</version>-->
<!--</dependency>-->
<!--<dependency>-->
<!--<groupId>com.fasterxml.jackson.datatype</groupId>-->
<!--<artifactId>jackson-datatype-joda</artifactId>-->
<!--</dependency>-->
</dependencies> </dependencies>
<properties> <properties>
<maven.javadoc.skip>true</maven.javadoc.skip> <maven.javadoc.skip>true</maven.javadoc.skip>

13425
components/apimgt-extensions/org.wso2.carbon.apimgt.integration.generated.client/src/main/resources/publisher-api.yaml
View File

File diff suppressed because one or more lines are too long

220
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/pom.xml
Unescape View File

@ -43,22 +43,10 @@
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi</artifactId> <artifactId>org.eclipse.osgi</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.eclipse.osgi</groupId> <groupId>org.eclipse.osgi</groupId>
<artifactId>org.eclipse.osgi.services</artifactId> <artifactId>org.eclipse.osgi.services</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.testng</groupId> <groupId>org.testng</groupId>
@ -67,166 +55,68 @@
<dependency> <dependency>
<groupId>org.wso2.tomcat</groupId> <groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat</artifactId> <artifactId>tomcat</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.tomcat</groupId> <groupId>org.wso2.tomcat</groupId>
<artifactId>tomcat-servlet-api</artifactId> <artifactId>tomcat-servlet-api</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.core</artifactId> <artifactId>org.wso2.carbon.core</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.logging</artifactId> <artifactId>org.wso2.carbon.logging</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon</groupId> <groupId>org.wso2.carbon</groupId>
<artifactId>org.wso2.carbon.utils</artifactId> <artifactId>org.wso2.carbon.utils</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.apache.axis2.wso2</groupId> <groupId>org.apache.axis2.wso2</groupId>
<artifactId>axis2</artifactId> <artifactId>axis2</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.google.code.gson</groupId> <groupId>com.google.code.gson</groupId>
<artifactId>gson</artifactId> <artifactId>gson</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.orbit.org.scannotation</groupId> <groupId>org.wso2.orbit.org.scannotation</groupId>
<artifactId>scannotation</artifactId> <artifactId>scannotation</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>jsr311-api</artifactId> <artifactId>jsr311-api</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.apimgt.annotations</artifactId> <artifactId>org.wso2.carbon.apimgt.annotations</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.governance</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.api</artifactId> <artifactId>org.wso2.carbon.governance.api</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.governance</groupId> <groupId>org.wso2.carbon.governance</groupId>
<artifactId>org.wso2.carbon.governance.lcm</artifactId> <artifactId>org.wso2.carbon.governance.lcm</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>javax.ws.rs</groupId> <groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs-api</artifactId> <artifactId>javax.ws.rs-api</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.devicemgt</groupId> <groupId>org.wso2.carbon.devicemgt</groupId>
<artifactId>org.wso2.carbon.device.mgt.common</artifactId> <artifactId>org.wso2.carbon.device.mgt.common</artifactId>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.apimgt</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId> <artifactId>org.wso2.carbon.apimgt.api</artifactId>
<scope>provided</scope> <scope>provided</scope>
<version>9.0.5</version>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>org.wso2.carbon.apimgt</groupId> <groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId> <artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>9.0.5</version>
<scope>provided</scope> <scope>provided</scope>
<exclusions>
<exclusion>
<groupId>javax.ws.rs</groupId>
<artifactId>javax.ws.rs</artifactId>
</exclusion>
</exclusions>
</dependency> </dependency>
<dependency> <dependency>
<groupId>com.h2database.wso2</groupId> <groupId>com.h2database.wso2</groupId>
@ -260,61 +150,75 @@
org.wso2.carbon.apimgt.webapp.publisher.* org.wso2.carbon.apimgt.webapp.publisher.*
</Export-Package> </Export-Package>
<Import-Package> <Import-Package>
com.google.gson;version="2.3",com.google.gson.reflect; com.google.gson;version="2.3",
version="2.3",io.swagger.annotations,javax.servlet;version="2.6",javax.xml,javax.xml.bind,javax.xml.bind.annotat com.google.gson.reflect;version="2.3",
ion,javax.xml.parsers,org.apache.catalina;version="9.0",org.apache.ca io.swagger.annotations,
talina.core;version="9.0",org.apache.commons.logging;version="1.2",org.osgi.framework.*;version="${imp.package.version.osgi.framework}", javax.servlet;version="2.6",
org.osgi.service.*;version="${imp.package.version.osgi.service}",org.scannotation;version="1.0",org.scannotation.archiveiterator;ve javax.xml,
rsion="1.0",org.w3c.dom,org.wso2.carbon.apimgt.annotations.api,org.ws javax.xml.bind,
o2.carbon.apimgt.api,org.wso2.carbon.apimgt.api.model,org.wso2.carbon javax.xml.bind.annotation,
.apimgt.impl,org.wso2.carbon.apimgt.webapp.publisher,org.wso2.carbon. javax.xml.parsers,
apimgt.webapp.publisher.config,org.wso2.carbon.apimgt.webapp.publishe org.apache.catalina;version="9.0",
r.dto,org.wso2.carbon.apimgt.webapp.publisher.exception,org.wso2.carb org.apache.catalina.core;version="9.0",
on.apimgt.webapp.publisher.lifecycle.listener,org.wso2.carbon.apimgt. org.apache.commons.logging;version="1.2",
webapp.publisher.lifecycle.util,org.wso2.carbon.base;version="1.0",or org.osgi.framework.*;version="${imp.package.version.osgi.framework}",
g.wso2.carbon.context;version="4.6",org.wso2.carbon.core;version="4.6 org.osgi.service.*;version="${imp.package.version.osgi.service}",
",org.wso2.carbon.core.util;version="4.6",org.wso2.carbon.registry.co org.scannotation;version="1.0",
re.service;version="1.0",org.wso2.carbon.user.api;version="1.0",org.w org.scannotation.archiveiterator;version="1.0",
so2.carbon.user.core.service;version="4.6",org.wso2.carbon.user.core. org.w3c.dom,
tenant;version="4.6",org.wso2.carbon.utils;version="4.6",org.wso2.car org.wso2.carbon.apimgt.annotations.api,
bon.utils.multitenancy;version="4.6" org.wso2.carbon.apimgt.api,
org.wso2.carbon.apimgt.api.model,
org.wso2.carbon.apimgt.impl,
org.wso2.carbon.apimgt.webapp.publisher,
org.wso2.carbon.apimgt.webapp.publisher.config,
org.wso2.carbon.apimgt.webapp.publisher.dto,
org.wso2.carbon.apimgt.webapp.publisher.exception,
org.wso2.carbon.apimgt.webapp.publisher.lifecycle.listener,
org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util,
org.wso2.carbon.base;version="1.0",
org.wso2.carbon.context;version="4.6",
org.wso2.carbon.core;version="4.6",
org.wso2.carbon.core.util;version="4.6",
org.wso2.carbon.registry.core.service;version="1.0",
org.wso2.carbon.user.api;version="1.0",
org.wso2.carbon.user.core.service;version="4.6",
org.wso2.carbon.user.core.tenant;version="4.6",
org.wso2.carbon.utils;version="4.6",
org.wso2.carbon.utils.multitenancy;version="4.6"
</Import-Package> </Import-Package>
<Embed-Dependency> <Embed-Dependency>
<!--javax.ws.rs;scope=compile|runtime;inline=false-->
jsr311-api;scope=compile|runtime;inline=false jsr311-api;scope=compile|runtime;inline=false
<!--scribe;scope=compile|runtime;inline=false;-->
</Embed-Dependency> </Embed-Dependency>
<!--<DynamicImport-Package>*</DynamicImport-Package>-->
</instructions> </instructions>
</configuration> </configuration>
</plugin> </plugin>
<!--<plugin>--> <plugin>
<!--<groupId>org.jacoco</groupId>--> <groupId>org.jacoco</groupId>
<!--<artifactId>jacoco-maven-plugin</artifactId>--> <artifactId>jacoco-maven-plugin</artifactId>
<!--<configuration>--> <configuration>
<!--<destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>--> <destFile>${basedir}/target/coverage-reports/jacoco-unit.exec</destFile>
<!--</configuration>--> </configuration>
<!--<executions>--> <executions>
<!--<execution>--> <execution>
<!--<id>jacoco-initialize</id>--> <id>jacoco-initialize</id>
<!--<goals>--> <goals>
<!--<goal>prepare-agent</goal>--> <goal>prepare-agent</goal>
<!--</goals>--> </goals>
<!--</execution>--> </execution>
<!--<execution>--> <execution>
<!--<id>jacoco-site</id>--> <id>jacoco-site</id>
<!--<phase>test</phase>--> <phase>test</phase>
<!--<goals>--> <goals>
<!--<goal>report</goal>--> <goal>report</goal>
<!--</goals>--> </goals>
<!--<configuration>--> <configuration>
<!--<dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>--> <dataFile>${basedir}/target/coverage-reports/jacoco-unit.exec</dataFile>
<!--<outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>--> <outputDirectory>${basedir}/target/coverage-reports/site</outputDirectory>
<!--</configuration>--> </configuration>
<!--</execution>--> </execution>
<!--</executions>--> </executions>
<!--</plugin>--> </plugin>
</plugins> </plugins>
</build> </build>

8
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/APIPublisherServiceImpl.java
Unescape View File

@ -44,9 +44,6 @@ import java.util.Iterator;
import java.util.List; import java.util.List;
import java.util.Set; import java.util.Set;
//import org.wso2.carbon.apimgt.integration.generated.client.publisher.model.*;
//import org.wso2.carbon.apimgt.integration.client.publisher.PublisherClient;
/** /**
* This class represents the concrete implementation of the APIPublisherService that corresponds to providing all * This class represents the concrete implementation of the APIPublisherService that corresponds to providing all
* API publishing related operations. * API publishing related operations.
@ -54,8 +51,6 @@ import java.util.Set;
public class APIPublisherServiceImpl implements APIPublisherService { public class APIPublisherServiceImpl implements APIPublisherService {
private static final String UNLIMITED_TIER = "Unlimited"; private static final String UNLIMITED_TIER = "Unlimited";
private static final String API_PUBLISH_ENVIRONMENT = "Production and Sandbox"; private static final String API_PUBLISH_ENVIRONMENT = "Production and Sandbox";
private static final String CONTENT_TYPE = "application/json";
private static final String PUBLISHED_STATUS = "PUBLISHED";
private static final String CREATED_STATUS = "CREATED"; private static final String CREATED_STATUS = "CREATED";
private static final String PUBLISH_ACTION = "Publish"; private static final String PUBLISH_ACTION = "Publish";
public static final APIManagerFactory API_MANAGER_FACTORY = APIManagerFactory.getInstance(); public static final APIManagerFactory API_MANAGER_FACTORY = APIManagerFactory.getInstance();
@ -118,7 +113,6 @@ public class APIPublisherServiceImpl implements APIPublisherService {
String context = config.getContext(); String context = config.getContext();
context = context.startsWith("/") ? context : ("/" + context); context = context.startsWith("/") ? context : ("/" + context);
api.setContext(context + "/" + config.getVersion()); api.setContext(context + "/" + config.getVersion());
// api.setContext(context);
api.setStatus(CREATED_STATUS); api.setStatus(CREATED_STATUS);
api.setWsdlUrl(null); api.setWsdlUrl(null);
api.setResponseCache("Disabled"); api.setResponseCache("Disabled");
@ -172,8 +166,6 @@ public class APIPublisherServiceImpl implements APIPublisherService {
api.setSubscriptionAvailability(APIConstants.SUBSCRIPTION_TO_CURRENT_TENANT); api.setSubscriptionAvailability(APIConstants.SUBSCRIPTION_TO_CURRENT_TENANT);
api.setVisibility(APIConstants.API_PRIVATE_VISIBILITY); api.setVisibility(APIConstants.API_PRIVATE_VISIBILITY);
} }
// String endpointConfig = "{\"production_endpoints\":{\"url\":\"" + config.getEndpoint() +
// "\",\"config\":null},\"endpoint_type\":\"http\"}";
String endpointConfig = "{ \"endpoint_type\": \"http\", \"sandbox_endpoints\": { \"url\": \" " + String endpointConfig = "{ \"endpoint_type\": \"http\", \"sandbox_endpoints\": { \"url\": \" " +
config.getEndpoint() + "\" }, \"production_endpoints\": { \"url\": \" "+ config.getEndpoint()+"\" } }"; config.getEndpoint() + "\" }, \"production_endpoints\": { \"url\": \" "+ config.getEndpoint()+"\" } }";

11
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherDataHolder.java
Unescape View File

@ -18,7 +18,6 @@
*/ */
package org.wso2.carbon.apimgt.webapp.publisher.internal; package org.wso2.carbon.apimgt.webapp.publisher.internal;
//import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
import org.wso2.carbon.apimgt.webapp.publisher.APIConfig; import org.wso2.carbon.apimgt.webapp.publisher.APIConfig;
import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
import org.wso2.carbon.registry.core.service.RegistryService; import org.wso2.carbon.registry.core.service.RegistryService;
@ -37,8 +36,6 @@ public class APIPublisherDataHolder {
private RegistryService registryService; private RegistryService registryService;
private boolean isServerStarted; private boolean isServerStarted;
private Stack<APIConfig> unpublishedApis = new Stack<>(); private Stack<APIConfig> unpublishedApis = new Stack<>();
// private IntegrationClientService integrationClientService;
private static APIPublisherDataHolder thisInstance = new APIPublisherDataHolder(); private static APIPublisherDataHolder thisInstance = new APIPublisherDataHolder();
private APIPublisherDataHolder() { private APIPublisherDataHolder() {
@ -117,12 +114,4 @@ public class APIPublisherDataHolder {
this.unpublishedApis = unpublishedApis; this.unpublishedApis = unpublishedApis;
} }
// public IntegrationClientService getIntegrationClientService() {
// return integrationClientService;
// }
// public void setIntegrationClientService(
// IntegrationClientService integrationClientService) {
// this.integrationClientService = integrationClientService;
// }
} }

12
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/internal/APIPublisherServiceComponent.java
Unescape View File

@ -22,7 +22,6 @@ import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory; import org.apache.commons.logging.LogFactory;
import org.osgi.framework.BundleContext; import org.osgi.framework.BundleContext;
import org.osgi.service.component.ComponentContext; import org.osgi.service.component.ComponentContext;
//import org.wso2.carbon.apimgt.integration.client.service.IntegrationClientService;
import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService;
import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherServiceImpl; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherServiceImpl;
import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherStartupHandler; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherStartupHandler;
@ -45,7 +44,6 @@ import org.wso2.carbon.user.core.service.RealmService;
* policy="dynamic" * policy="dynamic"
* bind="setRegistryService" * bind="setRegistryService"
* unbind="unsetRegistryService" * unbind="unsetRegistryService"
*/ */
public class APIPublisherServiceComponent { public class APIPublisherServiceComponent {
@ -116,14 +114,4 @@ public class APIPublisherServiceComponent {
APIPublisherDataHolder.getInstance().setRegistryService(null); APIPublisherDataHolder.getInstance().setRegistryService(null);
} }
// protected void setIntegrationClientService(IntegrationClientService integrationClientService) {
// if (integrationClientService != null && log.isDebugEnabled()) {
// log.debug("integrationClientService initialized");
// }
// APIPublisherDataHolder.getInstance().setIntegrationClientService(integrationClientService);
// }
//
// protected void unsetIntegrationClientService(IntegrationClientService integrationClientService) {
// APIPublisherDataHolder.getInstance().setIntegrationClientService(null);
// }
} }

3
components/apimgt-extensions/pom.xml
Unescape View File

@ -34,13 +34,10 @@
<url>http://wso2.org</url> <url>http://wso2.org</url>
<modules> <modules>
<!--<module>org.wso2.carbon.apimgt.integration.generated.client</module>-->
<!--<module>org.wso2.carbon.apimgt.integration.client</module>-->
<module>org.wso2.carbon.apimgt.webapp.publisher</module> <module>org.wso2.carbon.apimgt.webapp.publisher</module>
<module>org.wso2.carbon.apimgt.application.extension</module> <module>org.wso2.carbon.apimgt.application.extension</module>
<module>org.wso2.carbon.apimgt.application.extension.api</module> <module>org.wso2.carbon.apimgt.application.extension.api</module>
<module>org.wso2.carbon.apimgt.annotations</module> <module>org.wso2.carbon.apimgt.annotations</module>
<!--<module>org.wso2.carbon.apimgt.handlers</module>-->
</modules> </modules>
<build> <build>

10
pom.xml
Unescape View File

@ -912,6 +912,16 @@
<artifactId>org.wso2.carbon.apimgt.keymgt</artifactId> <artifactId>org.wso2.carbon.apimgt.keymgt</artifactId>
<version>${carbon.api.mgt.version}</version> <version>${carbon.api.mgt.version}</version>
</dependency> </dependency>
<dependency>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.api</artifactId>
<version>${carbon.api.mgt.version}</version>
</dependency>
<dependency>
<groupId>org.wso2.carbon.apimgt</groupId>
<artifactId>org.wso2.carbon.apimgt.impl</artifactId>
<version>${carbon.api.mgt.version}</version>
</dependency>
<!-- End of API Management dependencies --> <!-- End of API Management dependencies -->
<!-- Tomcat dependencies --> <!-- Tomcat dependencies -->

Write Preview
Loading…
Cancel
Save