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

fixing osgi issue related to usage of carbon context. And adding api publishing check from config.

Browse Source
revert-70aa11f8
inoshperera 9 years ago
parent 1ffbb2183a
commit 3c73217e96
3 changed files with 15 additions and 14 deletions
Show Stats Download Patch File Download Diff File

4
components/apimgt-extensions/org.wso2.carbon.apimgt.webapp.publisher/src/main/java/org/wso2/carbon/apimgt/webapp/publisher/lifecycle/listener/APIPublisherLifecycleListener.java
Unescape View File

@ -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.APIPublisherService;
import org.wso2.carbon.apimgt.webapp.publisher.APIPublisherUtil; 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.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.internal.APIPublisherDataHolder;
import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor; import org.wso2.carbon.apimgt.webapp.publisher.lifecycle.util.AnnotationProcessor;
@ -48,7 +49,8 @@ public class APIPublisherLifecycleListener implements LifecycleListener {
@Override @Override
public void lifecycleEvent(LifecycleEvent lifecycleEvent) { 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(); StandardContext context = (StandardContext) lifecycleEvent.getLifecycle();
ServletContext servletContext = context.getServletContext(); ServletContext servletContext = context.getServletContext();
String param = servletContext.getInitParameter(PARAM_MANAGED_API_ENABLED); String param = servletContext.getInitParameter(PARAM_MANAGED_API_ENABLED);

3
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/service/impl/DeviceManagementServiceImpl.java
Unescape View File

@ -44,12 +44,11 @@ import java.util.Date;
import java.util.List; import java.util.List;
@Path("/devices") @Path("/devices")
public class DeviceManagementServiceImpl implements DeviceManagementService { public class DeviceManagementServiceImpl implements DeviceManagementService{
private static final Log log = LogFactory.getLog(DeviceManagementServiceImpl.class); private static final Log log = LogFactory.getLog(DeviceManagementServiceImpl.class);
@GET @GET
@Override
public Response getDevices(@QueryParam("offset") int offset, @QueryParam("limit") int limit) { public Response getDevices(@QueryParam("offset") int offset, @QueryParam("limit") int limit) {
try { try {
DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService(); DeviceManagementProviderService dms = DeviceMgtAPIUtils.getDeviceManagementService();

22
components/device-mgt/org.wso2.carbon.device.mgt.api/src/main/java/org/wso2/carbon/device/mgt/jaxrs/util/DeviceMgtAPIUtils.java
Unescape View File

@ -82,7 +82,7 @@ public class DeviceMgtAPIUtils {
} }
public static DeviceManagementProviderService getDeviceManagementService() { public static DeviceManagementProviderService getDeviceManagementService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
DeviceManagementProviderService deviceManagementProviderService = DeviceManagementProviderService deviceManagementProviderService =
(DeviceManagementProviderService) ctx.getOSGiService(DeviceManagementProviderService.class, null); (DeviceManagementProviderService) ctx.getOSGiService(DeviceManagementProviderService.class, null);
if (deviceManagementProviderService == null) { if (deviceManagementProviderService == null) {
@ -94,7 +94,7 @@ public class DeviceMgtAPIUtils {
} }
public static GroupManagementProviderService getGroupManagementProviderService() { public static GroupManagementProviderService getGroupManagementProviderService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
GroupManagementProviderService groupManagementProviderService = GroupManagementProviderService groupManagementProviderService =
(GroupManagementProviderService) ctx.getOSGiService(GroupManagementProviderService.class, null); (GroupManagementProviderService) ctx.getOSGiService(GroupManagementProviderService.class, null);
if (groupManagementProviderService == null) { if (groupManagementProviderService == null) {
@ -108,7 +108,7 @@ public class DeviceMgtAPIUtils {
public static UserStoreManager getUserStoreManager() throws UserStoreException { public static UserStoreManager getUserStoreManager() throws UserStoreException {
RealmService realmService; RealmService realmService;
UserStoreManager userStoreManager; UserStoreManager userStoreManager;
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
String msg = "Realm service has not initialized."; String msg = "Realm service has not initialized.";
@ -126,7 +126,7 @@ public class DeviceMgtAPIUtils {
public static UserRealm getUserRealm() throws UserStoreException { public static UserRealm getUserRealm() throws UserStoreException {
RealmService realmService; RealmService realmService;
UserRealm realm; UserRealm realm;
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
@ -140,7 +140,7 @@ public class DeviceMgtAPIUtils {
public static AuthorizationManager getAuthorizationManager() throws UserStoreException { public static AuthorizationManager getAuthorizationManager() throws UserStoreException {
RealmService realmService; RealmService realmService;
AuthorizationManager authorizationManager; AuthorizationManager authorizationManager;
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
realmService = (RealmService) ctx.getOSGiService(RealmService.class, null); realmService = (RealmService) ctx.getOSGiService(RealmService.class, null);
if (realmService == null) { if (realmService == null) {
throw new IllegalStateException("Realm service is not initialized."); throw new IllegalStateException("Realm service is not initialized.");
@ -159,7 +159,7 @@ public class DeviceMgtAPIUtils {
} }
public static ApplicationManagementProviderService getAppManagementService() { public static ApplicationManagementProviderService getAppManagementService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
ApplicationManagementProviderService applicationManagementProviderService = ApplicationManagementProviderService applicationManagementProviderService =
(ApplicationManagementProviderService) ctx.getOSGiService(ApplicationManagementProviderService.class, null); (ApplicationManagementProviderService) ctx.getOSGiService(ApplicationManagementProviderService.class, null);
if (applicationManagementProviderService == null) { if (applicationManagementProviderService == null) {
@ -170,7 +170,7 @@ public class DeviceMgtAPIUtils {
public static PolicyManagerService getPolicyManagementService() { public static PolicyManagerService getPolicyManagementService() {
PolicyManagerService policyManagementService; PolicyManagerService policyManagementService;
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
policyManagementService = policyManagementService =
(PolicyManagerService) ctx.getOSGiService(PolicyManagerService.class, null); (PolicyManagerService) ctx.getOSGiService(PolicyManagerService.class, null);
if (policyManagementService == null) { if (policyManagementService == null) {
@ -194,7 +194,7 @@ public class DeviceMgtAPIUtils {
public static NotificationManagementService getNotificationManagementService() { public static NotificationManagementService getNotificationManagementService() {
NotificationManagementService notificationManagementService; NotificationManagementService notificationManagementService;
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
notificationManagementService = (NotificationManagementService) ctx.getOSGiService( notificationManagementService = (NotificationManagementService) ctx.getOSGiService(
NotificationManagementService.class, null); NotificationManagementService.class, null);
if (notificationManagementService == null) { if (notificationManagementService == null) {
@ -204,7 +204,7 @@ public class DeviceMgtAPIUtils {
} }
public static CertificateManagementService getCertificateManagementService() { public static CertificateManagementService getCertificateManagementService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
CertificateManagementService certificateManagementService = (CertificateManagementService) CertificateManagementService certificateManagementService = (CertificateManagementService)
ctx.getOSGiService(CertificateManagementService.class, null); ctx.getOSGiService(CertificateManagementService.class, null);
@ -227,7 +227,7 @@ public class DeviceMgtAPIUtils {
} }
public static DeviceInformationManager getDeviceInformationManagerService() { public static DeviceInformationManager getDeviceInformationManagerService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
DeviceInformationManager deviceInformationManager = DeviceInformationManager deviceInformationManager =
(DeviceInformationManager) ctx.getOSGiService(DeviceInformationManager.class, null); (DeviceInformationManager) ctx.getOSGiService(DeviceInformationManager.class, null);
if (deviceInformationManager == null) { if (deviceInformationManager == null) {
@ -238,7 +238,7 @@ public class DeviceMgtAPIUtils {
public static SearchManagerService getSearchManagerService() { public static SearchManagerService getSearchManagerService() {
CarbonContext ctx = CarbonContext.getThreadLocalCarbonContext(); PrivilegedCarbonContext ctx = PrivilegedCarbonContext.getThreadLocalCarbonContext();
SearchManagerService searchManagerService = SearchManagerService searchManagerService =
(SearchManagerService) ctx.getOSGiService(SearchManagerService.class, null); (SearchManagerService) ctx.getOSGiService(SearchManagerService.class, null);
if (searchManagerService == null) { if (searchManagerService == null) {

Write Preview
Loading…
Cancel
Save