You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by la...@apache.org on 2015/04/13 05:22:29 UTC
[16/16] stratos git commit: Organize imports of Stratos manager module
Organize imports of Stratos manager module
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/c774dc03
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/c774dc03
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/c774dc03
Branch: refs/heads/master
Commit: c774dc03647efa1cb08be3495d0b849f39f9cc45
Parents: 779eb76
Author: Lahiru Sandaruwan <la...@apache.org>
Authored: Mon Apr 13 08:50:36 2015 +0530
Committer: Lahiru Sandaruwan <la...@apache.org>
Committed: Mon Apr 13 08:50:36 2015 +0530
----------------------------------------------------------------------
.../manager/components/DomainMappingHandler.java | 2 +-
.../manager/context/StratosManagerContext.java | 14 +++++++-------
.../synchronizer/TenantEventSynchronizer.java | 3 ++-
.../manager/services/StratosManagerService.java | 4 +---
.../services/impl/StratosManagerServiceImpl.java | 4 ++--
.../publisher/CartridgeSubscriptionDataPublisher.java | 8 ++++----
.../user/management/TenantUserRoleManager.java | 2 +-
.../manager/utils/CartridgeConfigFileReader.java | 8 ++++----
.../apache/stratos/manager/utils/UserRoleCreator.java | 3 ---
9 files changed, 22 insertions(+), 26 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
index cbf3fa2..506913f 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/components/DomainMappingHandler.java
@@ -21,9 +21,9 @@ package org.apache.stratos.manager.components;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.exception.DomainMappingException;
import org.apache.stratos.manager.messaging.publisher.DomainMappingEventPublisher;
+import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
import java.util.ArrayList;
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
index 856c9db..299f2fd 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/context/StratosManagerContext.java
@@ -19,20 +19,20 @@
package org.apache.stratos.manager.context;
-import java.io.Serializable;
-import java.util.HashSet;
-import java.util.Map;
-import java.util.Set;
-import java.util.concurrent.locks.Lock;
-
import org.apache.axis2.engine.AxisConfiguration;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.manager.registry.RegistryManager;
import org.apache.stratos.common.services.DistributedObjectProvider;
import org.apache.stratos.manager.internal.ServiceReferenceHolder;
+import org.apache.stratos.manager.registry.RegistryManager;
import org.wso2.carbon.registry.core.exceptions.RegistryException;
+import java.io.Serializable;
+import java.util.HashSet;
+import java.util.Map;
+import java.util.Set;
+import java.util.concurrent.locks.Lock;
+
/**
* Stratos manager context.
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
index 390663d..d7d8ef4 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/messaging/publisher/synchronizer/TenantEventSynchronizer.java
@@ -30,7 +30,8 @@ import org.apache.stratos.messaging.util.MessagingUtil;
import org.wso2.carbon.stratos.common.beans.TenantInfoBean;
import org.wso2.carbon.user.core.tenant.TenantManager;
-import java.util.*;
+import java.util.ArrayList;
+import java.util.List;
/**
* Tenant event synchronizer publishes complete tenant event periodically.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
index cc8dc12..b80aea7 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/StratosManagerService.java
@@ -19,12 +19,10 @@
package org.apache.stratos.manager.services;
-import java.util.List;
-
-import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.manager.exception.ApplicationSignUpException;
import org.apache.stratos.manager.exception.ArtifactDistributionCoordinatorException;
import org.apache.stratos.manager.exception.DomainMappingException;
+import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
/**
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
index cb84da7..f7c0858 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/services/impl/StratosManagerServiceImpl.java
@@ -19,8 +19,6 @@
package org.apache.stratos.manager.services.impl;
-import java.util.concurrent.locks.Lock;
-
import org.apache.stratos.manager.components.ApplicationSignUpHandler;
import org.apache.stratos.manager.components.ArtifactDistributionCoordinator;
import org.apache.stratos.manager.components.DomainMappingHandler;
@@ -32,6 +30,8 @@ import org.apache.stratos.manager.services.StratosManagerService;
import org.apache.stratos.messaging.domain.application.signup.ApplicationSignUp;
import org.apache.stratos.messaging.domain.application.signup.DomainMapping;
+import java.util.concurrent.locks.Lock;
+
/**
* Stratos manager service implementation.
*/
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
index aca7858..caac6e6 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/statistics/publisher/CartridgeSubscriptionDataPublisher.java
@@ -19,10 +19,6 @@
package org.apache.stratos.manager.statistics.publisher;
-import java.util.ArrayList;
-import java.util.HashMap;
-import java.util.List;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.apache.stratos.manager.exception.StratosManagerException;
@@ -36,6 +32,10 @@ import org.wso2.carbon.databridge.commons.Event;
import org.wso2.carbon.databridge.commons.StreamDefinition;
import org.wso2.carbon.utils.CarbonUtils;
+import java.util.ArrayList;
+import java.util.HashMap;
+import java.util.List;
+
/**
* This will publish the subscription details of tenants to a data receiver.
* Data is published when a tenant subscribe to a cartridge and when it unsubscribe.
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
index 54ab562..ed5a029 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/user/management/TenantUserRoleManager.java
@@ -28,9 +28,9 @@ import org.apache.stratos.manager.internal.ServiceReferenceHolder;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.apache.stratos.manager.utils.UserRoleCreator;
import org.wso2.carbon.context.PrivilegedCarbonContext;
+import org.wso2.carbon.user.api.UserRealm;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.api.UserStoreManager;
-import org.wso2.carbon.user.api.UserRealm;
/**
* Listener for Tenant create event to create a new Role
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
index 35b4e48..223e158 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/CartridgeConfigFileReader.java
@@ -19,16 +19,16 @@
package org.apache.stratos.manager.utils;
-import java.io.File;
-import java.io.FileInputStream;
-import java.util.Properties;
-
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
import org.wso2.carbon.utils.CarbonUtils;
import org.wso2.securevault.SecretResolver;
import org.wso2.securevault.SecretResolverFactory;
+import java.io.File;
+import java.io.FileInputStream;
+import java.util.Properties;
+
public class CartridgeConfigFileReader {
private static String carbonHome = CarbonUtils.getCarbonHome();
http://git-wip-us.apache.org/repos/asf/stratos/blob/c774dc03/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
index 6cbb311..e7dfe94 100644
--- a/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
+++ b/components/org.apache.stratos.manager/src/main/java/org/apache/stratos/manager/utils/UserRoleCreator.java
@@ -22,13 +22,10 @@ package org.apache.stratos.manager.utils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.apache.stratos.manager.internal.ServiceReferenceHolder;
import org.apache.stratos.manager.user.management.exception.UserManagerException;
import org.wso2.carbon.user.api.Permission;
import org.wso2.carbon.user.api.UserStoreException;
import org.wso2.carbon.user.api.UserStoreManager;
-import org.wso2.carbon.user.core.UserRealm;
-import org.wso2.carbon.user.core.service.RealmService;
import org.wso2.carbon.user.mgt.UserMgtConstants;
public class UserRoleCreator {