From 3c73217e960eaca2244df5ce40d7e24da9dfa79e Mon Sep 17 00:00:00 2001 From: inoshperera Date: Fri, 27 May 2016 19:15:46 +0530 Subject: [PATCH] fixing osgi issue related to usage of carbon context. And adding api publishing check from config. --- .../APIPublisherLifecycleListener.java | 4 +++- .../impl/DeviceManagementServiceImpl.java | 3 +-- .../mgt/jaxrs/util/DeviceMgtAPIUtils.java | 22 +++++++++---------- 3 files changed, 15 insertions(+), 14 deletions(-) diff --git a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java index 042da6b8c2..2466c7cbe2 100644 --- a/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java +++ b/components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java @@ -29,6 +29,7 @@ import org.wso2.carbon.apimgt.webapp.publisher.APIConfig; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherService; import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil; import org.wso2.carbon.apimgt.webapp.publisher.config.APIResourceConfiguration; +import org.wso2.carbon.apimgt.webapp.publisher.config.WebappPublisherConfig; import org.wso2.carbon.apimgt.webapp.publisher.internal.APIPublisherDataHolder; import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor; @@ -48,7 +49,8 @@ public class APIPublisherLifecycleListener implements LifecycleListener { @Override public void lifecycleEvent(LifecycleEvent lifecycleEvent) { - if (Lifecycle.AFTER_START_EVENT.equals(lifecycleEvent.getType())) { + if (Lifecycle.AFTER_START_EVENT.equals(lifecycleEvent.getType()) && WebappPublisherConfig.getInstance() + .isPublished()) { StandardContext context = (StandardContext) lifecycleEvent.getLifecycle(); ServletContext servletContext = context.getServletContext(); String param = servletContext.getInitParameter(PARAM_MANAGED_API_ENABLED); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java index 485c2e5cec..c4d96f58f3 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java @@ -44,12 +44,11 @@ import java.util.Date; import java.util.List; @Path("/devices") -public class DeviceManagementServiceImpl implements DeviceManagementService { +public class DeviceManagementServiceImpl implements DeviceManagementService{ private static final Log log = LogFactory.getLog(DeviceManagementServiceImpl.class); @GET - @Override public Response getDevices(@QueryParam("offset") int offset, @QueryParam("limit") int limit) { try { DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); diff --git a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java index d34a284ac2..0d89dbc9a6 100644 --- a/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java +++ b/components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java @@ -82,7 +82,7 @@ public class DeviceMgtAPIUtils { } public static DeviceManagementProviderService getDeviceManagementService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); DeviceManagementProviderService deviceManagementProviderService = (DeviceManagementProviderService) ctx.getOSGiService(DeviceManagementProviderService.class, null); if (deviceManagementProviderService == null) { @@ -94,7 +94,7 @@ public class DeviceMgtAPIUtils { } public static GroupManagementProviderService getGroupManagementProviderService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); GroupManagementProviderService groupManagementProviderService = (GroupManagementProviderService) ctx.getOSGiService(GroupManagementProviderService.class, null); if (groupManagementProviderService == null) { @@ -108,7 +108,7 @@ public class DeviceMgtAPIUtils { public static UserStoreManager getUserStoreManager() throws UserStoreException { RealmService realmService; UserStoreManager userStoreManager; - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); if (realmService == null) { String msg = "Realm service has not initialized."; @@ -126,7 +126,7 @@ public class DeviceMgtAPIUtils { public static UserRealm getUserRealm() throws UserStoreException { RealmService realmService; UserRealm realm; - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); if (realmService == null) { @@ -140,7 +140,7 @@ public class DeviceMgtAPIUtils { public static AuthorizationManager getAuthorizationManager() throws UserStoreException { RealmService realmService; AuthorizationManager authorizationManager; - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); if (realmService == null) { throw new IllegalStateException("Realm service is not initialized."); @@ -159,7 +159,7 @@ public class DeviceMgtAPIUtils { } public static ApplicationManagementProviderService getAppManagementService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); ApplicationManagementProviderService applicationManagementProviderService = (ApplicationManagementProviderService) ctx.getOSGiService(ApplicationManagementProviderService.class, null); if (applicationManagementProviderService == null) { @@ -170,7 +170,7 @@ public class DeviceMgtAPIUtils { public static PolicyManagerService getPolicyManagementService() { PolicyManagerService policyManagementService; - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); policyManagementService = (PolicyManagerService) ctx.getOSGiService(PolicyManagerService.class, null); if (policyManagementService == null) { @@ -194,7 +194,7 @@ public class DeviceMgtAPIUtils { public static NotificationManagementService getNotificationManagementService() { NotificationManagementService notificationManagementService; - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); notificationManagementService = (NotificationManagementService) ctx.getOSGiService( NotificationManagementService.class, null); if (notificationManagementService == null) { @@ -204,7 +204,7 @@ public class DeviceMgtAPIUtils { } public static CertificateManagementService getCertificateManagementService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); CertificateManagementService certificateManagementService = (CertificateManagementService) ctx.getOSGiService(CertificateManagementService.class, null); @@ -227,7 +227,7 @@ public class DeviceMgtAPIUtils { } public static DeviceInformationManager getDeviceInformationManagerService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); DeviceInformationManager deviceInformationManager = (DeviceInformationManager) ctx.getOSGiService(DeviceInformationManager.class, null); if (deviceInformationManager == null) { @@ -238,7 +238,7 @@ public class DeviceMgtAPIUtils { public static SearchManagerService getSearchManagerService() { - CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); + PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext(); SearchManagerService searchManagerService = (SearchManagerService) ctx.getOSGiService(SearchManagerService.class, null); if (searchManagerService == null) {