You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@stratos.apache.org by ni...@apache.org on 2014/11/30 08:16:59 UTC
[03/13] stratos git commit: Service component methods' should be
protected.
Service component methods' should be protected.
Project: http://git-wip-us.apache.org/repos/asf/stratos/repo
Commit: http://git-wip-us.apache.org/repos/asf/stratos/commit/799b1768
Tree: http://git-wip-us.apache.org/repos/asf/stratos/tree/799b1768
Diff: http://git-wip-us.apache.org/repos/asf/stratos/diff/799b1768
Branch: refs/heads/master
Commit: 799b1768c58b818183e202e45eba8c53895baa3c
Parents: 494e293
Author: Nirmal Fernando <ni...@gmail.com>
Authored: Sun Nov 30 12:37:54 2014 +0530
Committer: Nirmal Fernando <ni...@gmail.com>
Committed: Sun Nov 30 12:47:23 2014 +0530
----------------------------------------------------------------------
.../controller/internal/CloudControllerServiceComponent.java | 7 ++++---
.../controller/services/impl/CloudControllerServiceImpl.java | 5 +++--
2 files changed, 7 insertions(+), 5 deletions(-)
----------------------------------------------------------------------
http://git-wip-us.apache.org/repos/asf/stratos/blob/799b1768/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
index 9b99e7a..8f826e3 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/internal/CloudControllerServiceComponent.java
@@ -22,6 +22,7 @@ package org.apache.stratos.cloud.controller.internal;
import com.hazelcast.core.HazelcastInstance;
+
import org.apache.axis2.clustering.ClusteringAgent;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -29,8 +30,8 @@ import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.messaging.receiver.application.ApplicationTopicReceiver;
import org.apache.stratos.cloud.controller.messaging.receiver.cluster.status.ClusterStatusTopicReceiver;
import org.apache.stratos.cloud.controller.exception.CloudControllerException;
-import org.apache.stratos.cloud.controller.services.CloudControllerServiceImpl;
import org.apache.stratos.cloud.controller.services.CloudControllerService;
+import org.apache.stratos.cloud.controller.services.impl.CloudControllerServiceImpl;
import org.apache.stratos.cloud.controller.messaging.publisher.TopologySynchronizerTaskScheduler;
import org.apache.stratos.cloud.controller.messaging.receiver.instance.status.InstanceStatusTopicReceiver;
import org.apache.stratos.messaging.broker.publish.EventPublisherPool;
@@ -163,11 +164,11 @@ public class CloudControllerServiceComponent {
ServiceReferenceHolder.getInstance().setAxisConfiguration(null);
}
- public void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
+ protected void setHazelcastInstance(HazelcastInstance hazelcastInstance) {
ServiceReferenceHolder.getInstance().setHazelcastInstance(hazelcastInstance);
}
- public void unsetHazelcastInstance(HazelcastInstance hazelcastInstance) {
+ protected void unsetHazelcastInstance(HazelcastInstance hazelcastInstance) {
ServiceReferenceHolder.getInstance().setHazelcastInstance(null);
}
http://git-wip-us.apache.org/repos/asf/stratos/blob/799b1768/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
----------------------------------------------------------------------
diff --git a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
index b9d891f..abec364 100644
--- a/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
+++ b/components/org.apache.stratos.cloud.controller/src/main/java/org/apache/stratos/cloud/controller/services/impl/CloudControllerServiceImpl.java
@@ -16,10 +16,11 @@
* specific language governing permissions and limitations
* under the License.
*/
-package org.apache.stratos.cloud.controller.services;
+package org.apache.stratos.cloud.controller.services.impl;
import com.google.common.collect.ImmutableSet;
import com.google.common.net.InetAddresses;
+
import org.apache.commons.collections.ListUtils;
import org.apache.commons.lang.StringUtils;
import org.apache.commons.logging.Log;
@@ -31,7 +32,6 @@ import org.apache.stratos.cloud.controller.context.CloudControllerContext;
import org.apache.stratos.cloud.controller.domain.*;
import org.apache.stratos.cloud.controller.domain.Cartridge;
import org.apache.stratos.cloud.controller.domain.Dependencies;
-import org.apache.stratos.cloud.controller.domain.Partition;
import org.apache.stratos.cloud.controller.exception.*;
import org.apache.stratos.cloud.controller.functions.ContainerClusterContextToKubernetesService;
import org.apache.stratos.cloud.controller.functions.ContainerClusterContextToReplicationController;
@@ -40,6 +40,7 @@ import org.apache.stratos.cloud.controller.iaas.Iaas;
import org.apache.stratos.cloud.controller.registry.Deserializer;
import org.apache.stratos.cloud.controller.messaging.publisher.CartridgeInstanceDataPublisher;
import org.apache.stratos.cloud.controller.registry.RegistryManager;
+import org.apache.stratos.cloud.controller.services.CloudControllerService;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyBuilder;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyEventPublisher;
import org.apache.stratos.cloud.controller.messaging.topology.TopologyManager;